diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 02b7f679..cf4d1fde 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -29,16 +29,16 @@
           - if current_page?(new_registration_path('user'))
             %li.active
               = link_to(new_registration_path('user')) do
-                %span.glyphicon.glyphicon-heart
+                %span.fa.fa-heart
                 Sign Up
           - else
             %li
               = link_to(new_registration_path('user')) do
-                %span.glyphicon.glyphicon-heart
+                %span.fa.fa-heart
                 Sign Up
           %li.dropdown.visible-desktop
             %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
-              %span.glyphicon.glyphicon-user
+              %span.fa.fa-user
               Sign In
               %span.caret
             .dropdown-menu{:style => "padding: 17px;"}
diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml
index 8e4f4ac4..882d7efe 100644
--- a/app/views/layouts/_user_menu.html.haml
+++ b/app/views/layouts/_user_menu.html.haml
@@ -1,29 +1,29 @@
 %li
   = link_to(edit_user_registration_path) do
-    %span.glyphicon.glyphicon-wrench
+    %span.fa.fa-wrench
     Edit Account
 -if @conference and @conference.id
   %li
     = link_to(conference_proposal_index_path(@conference.short_title)) do
-      %span.glyphicon.glyphicon-comment
+      %span.fa.fa-comment
       My Submissions
 %li
   = link_to(destroy_user_session_path, :method=>'delete') do
-    %span.glyphicon.glyphicon-minus
+    %span.fa.fa-minus
     Sign out
 - if can? :index, Conference
   %li.divider
     %li
       = link_to(admin_conference_index_path()) do
         - if Conference.any?
-          %span.glyphicon.glyphicon-home
+          %span.fa.fa-home
             Administration
         - else
-          %span.glyphicon.glyphicon-plus
+          %span.fa.fa-plus
           Create Conference
     -if @conference and @conference.id and can? :show, @conference
       %li
         = link_to(admin_conference_path(@conference.short_title)) do
-          %span.glyphicon.glyphicon-cog
+          %span.fa.fa-cog
           Manage
           = @conference.short_title