diff --git a/Gemfile b/Gemfile
index 7da812cc..b2a23adb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,6 +46,7 @@ gem 'uglifier', '>= 1.3.0'
 
 # as the front-end framework
 gem 'bootstrap-sass'
+gem 'autoprefixer-rails'
 gem 'formtastic-bootstrap'
 gem 'formtastic', '~> 2.3.0.rc3'
 gem 'momentjs-rails', '>= 2.8.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 86d166f3..c9cce0ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,6 +56,8 @@ GEM
       uuidtools
     arel (5.0.1.20140414130214)
     ast (2.0.0)
+    autoprefixer-rails (4.0.1)
+      execjs
     awesome_nested_set (3.0.0.rc.5)
       activerecord (>= 4.0.0, < 5)
     axlsx (2.0.1)
@@ -432,6 +434,7 @@ DEPENDENCIES
   acts_as_commentable_with_threading
   acts_as_list
   ahoy_matey
+  autoprefixer-rails
   awesome_nested_set (~> 3.0.0.rc.5)
   axlsx_rails
   bootstrap-sass
diff --git a/app/assets/stylesheets/fonts/suse-icons.eot b/app/assets/fonts/suse-icons.eot
similarity index 100%
rename from app/assets/stylesheets/fonts/suse-icons.eot
rename to app/assets/fonts/suse-icons.eot
diff --git a/app/assets/stylesheets/fonts/suse-icons.svg b/app/assets/fonts/suse-icons.svg
similarity index 100%
rename from app/assets/stylesheets/fonts/suse-icons.svg
rename to app/assets/fonts/suse-icons.svg
diff --git a/app/assets/stylesheets/fonts/suse-icons.ttf b/app/assets/fonts/suse-icons.ttf
similarity index 100%
rename from app/assets/stylesheets/fonts/suse-icons.ttf
rename to app/assets/fonts/suse-icons.ttf
diff --git a/app/assets/stylesheets/fonts/suse-icons.woff b/app/assets/fonts/suse-icons.woff
similarity index 100%
rename from app/assets/stylesheets/fonts/suse-icons.woff
rename to app/assets/fonts/suse-icons.woff
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index a9d2d93b..4ff9cf5d 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -7,9 +7,9 @@
  *= require osem-schedule
  *= require osem-schedule-print
  *= require osem-dashboard
- *= require osem-fonts
  *= require osem-splash
  *= require font-awesome
+ *= require osem-fonts
  *= require bootstrap-markdown.min
  *= require bootstrap-datetimepicker
  *= require leaflet
diff --git a/app/assets/stylesheets/fonts/Coustard-Black.woff b/app/assets/stylesheets/fonts/Coustard-Black.woff
deleted file mode 100644
index 15b9fa14..00000000
Binary files a/app/assets/stylesheets/fonts/Coustard-Black.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Coustard.woff b/app/assets/stylesheets/fonts/Coustard.woff
deleted file mode 100644
index 177c66ce..00000000
Binary files a/app/assets/stylesheets/fonts/Coustard.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-Bold.woff b/app/assets/stylesheets/fonts/Lato-Bold.woff
deleted file mode 100644
index 4b172511..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-Bold.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-Italic.woff b/app/assets/stylesheets/fonts/Lato-Italic.woff
deleted file mode 100644
index 09cc3791..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-Italic.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-Light.woff b/app/assets/stylesheets/fonts/Lato-Light.woff
deleted file mode 100644
index 209dcdd8..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-Light.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-LightItalic.woff b/app/assets/stylesheets/fonts/Lato-LightItalic.woff
deleted file mode 100644
index 4e91ecd9..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-LightItalic.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-Regular.woff b/app/assets/stylesheets/fonts/Lato-Regular.woff
deleted file mode 100644
index f48e4848..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-Regular.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Raleway-Bold.woff b/app/assets/stylesheets/fonts/Raleway-Bold.woff
deleted file mode 100644
index 95127a9f..00000000
Binary files a/app/assets/stylesheets/fonts/Raleway-Bold.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Raleway-Light.woff b/app/assets/stylesheets/fonts/Raleway-Light.woff
deleted file mode 100644
index e8d18314..00000000
Binary files a/app/assets/stylesheets/fonts/Raleway-Light.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Raleway.woff b/app/assets/stylesheets/fonts/Raleway.woff
deleted file mode 100644
index f042895d..00000000
Binary files a/app/assets/stylesheets/fonts/Raleway.woff and /dev/null differ
diff --git a/app/assets/stylesheets/osem-fonts.css b/app/assets/stylesheets/osem-fonts.css.scss
similarity index 100%
rename from app/assets/stylesheets/osem-fonts.css
rename to app/assets/stylesheets/osem-fonts.css.scss
diff --git a/app/assets/stylesheets/strap-on.css.scss b/app/assets/stylesheets/strap-on.css.scss
index 7d73b0b4..83fd8e9a 100644
--- a/app/assets/stylesheets/strap-on.css.scss
+++ b/app/assets/stylesheets/strap-on.css.scss
@@ -6,6 +6,7 @@ $navbar-default-link-color: #ffffff;
 $navbar-default-link-hover-color: #000000;
 
 @import 'bootstrap-datetimepicker';
+@import "bootstrap-sprockets";
 
 //
 // Bootstrap components
@@ -59,4 +60,4 @@ $navbar-default-link-hover-color: #000000;
 
 // Utility classes
 @import "bootstrap/utilities";
-@import "bootstrap/responsive-utilities";
\ No newline at end of file
+@import "bootstrap/responsive-utilities";