diff --git a/Gemfile b/Gemfile
index 7925952..091c553 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem 'bootstrap-sass'
 gem 'bootstrap-sass-extras'
 gem 'bootswatch-rails'
 gem 'autoprefixer-rails'
-gem 'font-awesome-rails'
+gem 'font-awesome-sass'
 
 gem 'nested_form'
 gem 'jquery-datatables-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 297b2ac..3875612 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,8 +117,8 @@ GEM
     faker (1.4.3)
       i18n (~> 0.5)
     ffi (1.9.8)
-    font-awesome-rails (4.3.0.0)
-      railties (>= 3.2, < 5.0)
+    font-awesome-sass (4.3.2.1)
+      sass (~> 3.2)
     formatador (0.2.5)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
@@ -343,7 +343,7 @@ DEPENDENCIES
   devise-i18n
   factory_girl_rails
   faker
-  font-awesome-rails
+  font-awesome-sass
   globalize
   guard-rspec
   hirb
diff --git a/app/views/layouts/management.html.slim b/app/views/layouts/management.html.slim
index ed8182f..2055b2c 100644
--- a/app/views/layouts/management.html.slim
+++ b/app/views/layouts/management.html.slim
@@ -49,14 +49,14 @@ html
         ul.nav#side-menu
           li class="#{controller_name == 'conferences' ? 'active' : nil}"
             = link_to management_conferences_path
-              = fa_icon 'group fw', text: Conference.model_name.human(count: 2).mb_chars.capitalize
+              = icon 'group', Conference.model_name.human(count: 2).mb_chars.capitalize, class: 'fw'
             ul.nav.nav-second-level
               - Conference.all.each do |conference|
                 li
                   = link_to conference.title, management_conference_path(conference)
           li class="#{controller_name == 'users' ? 'active' : nil}"
             = link_to management_users_path
-              = fa_icon 'user fw', text: User.model_name.human(count: 2).mb_chars.capitalize
+              = icon 'user', User.model_name.human(count: 2).mb_chars.capitalize, class: 'fw'
 
 
     div.content#page-wrapper
diff --git a/app/views/management/conferences/_conference.html.slim b/app/views/management/conferences/_conference.html.slim
index 91419d8..884a748 100644
--- a/app/views/management/conferences/_conference.html.slim
+++ b/app/views/management/conferences/_conference.html.slim
@@ -5,17 +5,17 @@ tr
   td.action
     - if conference.call_for_papers_open?
       = link_to cfp_management_conference_path(conference), method: :delete, class: 'btn btn-sm btn-success cfp-toggle', remote: true, onclick: '$(".cfp-toggle").addClass("disabled")'
-        = fa_icon 'dot-circle-o fw'
+        = icon 'dot-circle-o', '', class: 'fa-fw'
     - else
       = link_to cfp_management_conference_path(conference), method: :post, class: 'btn btn-sm btn-warning cfp-toggle', remote: true, onclick: '$(".cfp-toggle").addClass("disabled")'
-        = fa_icon 'circle-o fw'
+        = icon 'circle-o', class: 'fa-fw'
 
   td = conference.events.count
   td.actions
     div.btn-group.btn-group-sm
       = link_to management_conference_path(conference), title: t('actions.view.button', model: Conference.model_name.human), class: 'btn btn-info'
-        = fa_icon :eye
+        = icon :eye
       = link_to edit_management_conference_path(conference), title: t('actions.edit.button', model: Conference.model_name.human), class: 'btn btn-primary'
-        = fa_icon :edit
+        = icon :edit
       = link_to management_conference_path(conference), title: t('actions.destroy.button', model: Conference.model_name.human), class: ['btn', 'btn-danger', conference.events.any? ? 'disabled' : nil], remote: true, method: :delete, data: {confirm: t('actions.are_you_sure')}
-        = fa_icon :trash
+        = icon :trash
diff --git a/app/views/management/conferences/_form_halls.html.slim b/app/views/management/conferences/_form_halls.html.slim
index 88ce9d8..7068329 100644
--- a/app/views/management/conferences/_form_halls.html.slim
+++ b/app/views/management/conferences/_form_halls.html.slim
@@ -5,7 +5,7 @@ div#halls
         .panel-heading
           .panel-title
             = Hall.model_name.human.mb_chars.capitalize
-            = ff.link_to_remove fa_icon(:remove), class: ['btn', 'btn-danger', 'btn-xs', 'pull-right']
+            = ff.link_to_remove icon(:remove), class: ['btn', 'btn-danger', 'btn-xs', 'pull-right']
           span.clearfix
         .panel-body
           = ff.input :name
diff --git a/app/views/management/conferences/_form_tracks.html.slim b/app/views/management/conferences/_form_tracks.html.slim
index b4eb773..6dc5d96 100644
--- a/app/views/management/conferences/_form_tracks.html.slim
+++ b/app/views/management/conferences/_form_tracks.html.slim
@@ -5,7 +5,7 @@ div#tracks
         .panel-heading
           .panel-title
             = Track.model_name.human.mb_chars.capitalize
-            = ff.link_to_remove fa_icon(:remove), class: ['btn', 'btn-danger', 'btn-xs', 'pull-right', ff.object.events.any? ? 'disabled' : nil]
+            = ff.link_to_remove icon(:remove), class: ['btn', 'btn-danger', 'btn-xs', 'pull-right', ff.object.events.any? ? 'disabled' : nil]
 
         .panel-body
           = ff.input :name
diff --git a/app/views/management/conferences/index.html.slim b/app/views/management/conferences/index.html.slim
index d3c1643..21fdfcc 100644
--- a/app/views/management/conferences/index.html.slim
+++ b/app/views/management/conferences/index.html.slim
@@ -21,4 +21,4 @@
       .panel-footer
         .text-right
           = link_to new_management_conference_path, class: 'btn btn-primary'
-            => fa_icon 'plus fw', text: t('actions.create.button', model: Conference.model_name.human)
+            => icon 'plus', t('actions.create.button', model: Conference.model_name.human), class: 'fa-fw'
diff --git a/app/views/management/conferences/show.html.slim b/app/views/management/conferences/show.html.slim
index c42546c..7ec21be 100644
--- a/app/views/management/conferences/show.html.slim
+++ b/app/views/management/conferences/show.html.slim
@@ -10,7 +10,7 @@
       .panel-heading
         .row
           .col-xs-3
-            = fa_icon 'files-o 5x'
+            = icon 'files-o', '', class: 'fa-5x'
           .col-xs-9.text-right
             .huge
               = @conference.events.count
@@ -19,14 +19,14 @@
       = link_to management_conference_events_path(@conference)
         .panel-footer.text-primary
           span.pull-left = t 'views.conference.see_details'
-          span.pull-right = fa_icon 'arrow-circle-right'
+          span.pull-right = icon 'arrow-circle-right'
           span.clearfix
   .col-lg-3.col-md-6
     .panel.panel-danger
       .panel-heading
         .row
           .col-xs-3
-            = fa_icon 'thumbs-down 5x'
+            = icon 'thumbs-down', '', class: 'fa-5x'
           .col-xs-9.text-right
             .huge
               = @conference.events.rejected.count
@@ -35,14 +35,14 @@
       = link_to rejected_management_conference_events_path(@conference)
         .panel-footer.text-danger
           span.pull-left = t 'views.conference.see_details'
-          span.pull-right = fa_icon 'arrow-circle-right'
+          span.pull-right = icon 'arrow-circle-right'
           span.clearfix
   .col-lg-3.col-md-6
     .panel.panel-info
       .panel-heading
         .row
           .col-xs-3
-            = fa_icon 'thumbs-up 5x'
+            = icon 'thumbs-up', class: 'fa-5x'
           .col-xs-9.text-right
             .huge
               = @conference.events.approved.count
@@ -51,14 +51,14 @@
       = link_to approved_management_conference_events_path(@conference)
         .panel-footer.text-info
           span.pull-left = t 'views.conference.see_details'
-          span.pull-right = fa_icon 'arrow-circle-right'
+          span.pull-right = icon 'arrow-circle-right'
           span.clearfix
   .col-lg-3.col-md-6
     .panel.panel-success
       .panel-heading
         .row
           .col-xs-3
-            = fa_icon 'check 5x'
+            = icon 'check', '', class: 'fa-5x'
           .col-xs-9.text-right
             .huge
               = @conference.events.approved.confirmed.count
@@ -67,7 +67,7 @@
       = link_to confirmed_management_conference_events_path(@conference)
         .panel-footer.text-success
           span.pull-left = t 'views.conference.see_details'
-          span.pull-right = fa_icon 'arrow-circle-right'
+          span.pull-right = icon 'arrow-circle-right'
           span.clearfix
 .row
   .col-lg-12
diff --git a/app/views/management/events/_suggestion_details.html.slim b/app/views/management/events/_suggestion_details.html.slim
index 204ade7..299ebd9 100644
--- a/app/views/management/events/_suggestion_details.html.slim
+++ b/app/views/management/events/_suggestion_details.html.slim
@@ -25,18 +25,18 @@
               = @suggestion.user.speaker_profile.name
             - if @suggestion.user.speaker_profile.organisation.present?
               div
-                => fa_icon(:briefcase)
+                => icon(:briefcase)
                 = @suggestion.user.speaker_profile.organisation
 
             div.social
               = link_to "mailto://#{@suggestion.user.email}"
-                = fa_icon :envelope
+                = icon :envelope
               - if @suggestion.user.speaker_profile.github.present?
                 = link_to "https://github.com/#{@suggestion.user.speaker_profile.github}"
-                  = fa_icon :github
+                  = icon :github
               - if @suggestion.user.speaker_profile.twitter.present?
                 = link_to "https://twitter.com/#{@suggestion.user.speaker_profile.twitter}"
-                  = fa_icon :twitter
+                  = icon :twitter
 
         h4 = @suggestion.class.human_attribute_name(:abstract)
         = simple_format @suggestion.abstract
diff --git a/app/views/management/users/_about_user.html.slim b/app/views/management/users/_about_user.html.slim
index a10ede9..b68c4fe 100644
--- a/app/views/management/users/_about_user.html.slim
+++ b/app/views/management/users/_about_user.html.slim
@@ -11,17 +11,17 @@
             = @user.speaker_profile.name
           - if @user.speaker_profile.organisation.present?
             div
-              => fa_icon(:briefcase)
+              => icon(:briefcase)
               = @user.speaker_profile.organisation
           div.social
             = link_to "mailto://#{@user.email}"
-              = fa_icon :envelope
+              = icon :envelope
             - if @user.speaker_profile.github.present?
               = link_to "https://github.com/#{@user.speaker_profile.github}"
-                = fa_icon :github
+                = icon :github
             - if @user.speaker_profile.twitter.present?
               = link_to "https://twitter.com/#{@user.speaker_profile.twitter}"
-                = fa_icon :twitter
+                = icon :twitter
 
         hr
 
@@ -30,10 +30,10 @@
 
         h5 = t :contacts
         - if @user.speaker_profile.twitter.present?
-          p #{fa_icon(:twitter)} @#{@user.speaker_profile.twitter}
+          p #{icon(:twitter)} @#{@user.speaker_profile.twitter}
         - if @user.speaker_profile.public_email.present?
-          p #{fa_icon(:envelope)} #{@user.speaker_profile.public_email} (#{t(:public)})
-        p #{fa_icon(:envelope)} #{@user.email} (#{t(:private)})
+          p #{icon(:envelope)} #{@user.speaker_profile.public_email} (#{t(:public)})
+        p #{icon(:envelope)} #{@user.email} (#{t(:private)})
         p #{glyph(:phone)} #{Phony.format(@user.speaker_profile.mobile_phone, format: :international)}
 
       .modal-footer