diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml
index 51701519..e484e3cb 100644
--- a/app/views/layouts/_user_menu.html.haml
+++ b/app/views/layouts/_user_menu.html.haml
@@ -1,15 +1,15 @@
 %li
   = link_to(edit_user_registration_path) do
-    %i.icon-wrench
+    %span.glyphicon.glyphicon-wrench
     Edit Account
 -if @conference and @conference.id
   %li
     = link_to(conference_proposal_index_path(@conference.short_title)) do
-      %i.icon-comment
+      %span.glyphicon.glyphicon-comment
       My Submissions
 %li
   = link_to(destroy_user_session_path, :method=>'delete') do
-    %i.icon-minus
+    %span.glyphicon.glyphicon-minus
     Sign out
 -if has_role?(current_user, "admin") || has_role?(current_user, "organizer")
   %li.divider
@@ -18,21 +18,21 @@
   - @conferences.each do |conference|
     %li
       = link_to(admin_conference_path(conference.short_title)) do
-        %i.icon-cog
+        %span.glyphicon.glyphicon-cog
         Manage
         = conference.short_title
   %li
     = link_to(new_admin_conference_path) do
-      %i.icon-plus
+      %span.glyphicon.glyphicon-plus
       New Conference
   %li.divider
   %li.dropdown-header
     People
   %li
     = link_to(admin_users_path) do
-      %i.icon-user
+      %span.glyphicon.glyphicon-user
       Users
   %li
     = link_to(admin_people_path) do
-      %i.icon-star-empty
-      People
\ No newline at end of file
+      %span.glyphicon.glyphicon-star-empty
+      People
diff --git a/app/views/proposal/_form.html.haml b/app/views/proposal/_form.html.haml
index 434f7d8d..2d1e456f 100644
--- a/app/views/proposal/_form.html.haml
+++ b/app/views/proposal/_form.html.haml
@@ -26,7 +26,7 @@
               %tbody.files
             .row-fluid.fileupload-buttonbar
               .btn.btn-success.fileinput-button
-                %i.icon-plus.icon-white
+                %span.glyphicon.glyphicon-icon-plus.icon-white
                 Add files...
                 = f.file_field :attachment
                 = f.hidden_field :event_id, :value => @event.id
@@ -72,7 +72,7 @@
       </td>
       <td class="start">{% if (!o.options.autoUpload) { %}
         <button class="btn btn-primary">
-          <i class="icon-upload icon-white"></i>
+          <span class="glyphicon glyphicon-upload"></span>
           <span>{%=locale.fileupload.start%}</span>
         </button>
         {% } %}</td>
@@ -81,7 +81,7 @@
       {% } %}
       <td class="cancel">{% if (!i) { %}
         <button class="btn btn-warning">
-          <i class="icon-ban-circle icon-white"></i>
+          <span class="glyphicon glyphicon-circle"></span>
           <span>{%=locale.fileupload.cancel%}</span>
         </button>
         {% } %}</td>
@@ -111,7 +111,7 @@
           {% } %}
         <td class="delete">
           <button class="btn btn-danger pull-right" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}">
-            <i class="icon-trash icon-white"></i>
+            <span class="glyphicon glyphicon-trash"></i>
             <span>{%=locale.fileupload.destroy%}</span>
           </button>
         </td>
diff --git a/app/views/schedule/index.html.erb b/app/views/schedule/index.html.erb
index c8a98d09..34d7274f 100644
--- a/app/views/schedule/index.html.erb
+++ b/app/views/schedule/index.html.erb
@@ -47,30 +47,32 @@
                          rowspan ="<%= span[room.id] %>"
                          class="event" role="button"
                          data-href="<%= url_for(conference_proposal_path(@conference.short_title, event[0].id)) %>">
+                    <%- if speaker = event[0].speakers.first %>
+                      <%= image_tag speaker.gravatar_url, :class => "img-circle pull-right",
+							  :alt => speaker.public_name,
+							  :title => speaker.public_name,
+							  :style => "padding:8px;" %>
+                    <%- end %>
                     <h5>
-                      <%- if speaker = event[0].speakers.first %>
-                        <%= image_tag speaker.gravatar_url, :class => "img-circle pull-right", :alt => speaker.public_name, :title => speaker.public_name, :style => "padding:8px;" %>
-                      <%- end %>
-                      <span class="schedule-title">
-                      <i class="icon-comment"></i>
+                      <span class="glyphicon glyphicon-comment"></span>
                       <%= event[0].title %>
-                      </span>
                       <% unless event[0].subtitle.empty? %>
-                        <span class="schedule-subtitle">
-                        <%= event[0].subtitle %>
-                        </span>
+			<span class="schedule-subtitle">
+			  <%= event[0].subtitle %>
+                        <span>
                       <% end %>
+                    </h5>
+		      </span>
                       <span class="schedule-speaker">
-                      <i class="icon-user"></i>
-                      <%= "#{speaker.first_name} #{speaker.last_name}" %>
+                        <span class="glyphicon glyphicon-user"></span>
+                        <%= "#{speaker.first_name} #{speaker.last_name}" %>
                       </span>
                       <% if event[0].track%>
                         <span class="schedule-track">
-                        <i class="icon-road"></i>
-                        <span class="label" style="background-color:<%= event[0].track.color if event[0].track %>"><%= event[0].track.name %></span>
+                          <span class="glyphicon glyphicon-road"></span>
+                          <span class="label" style="background-color:<%= event[0].track.color if event[0].track %>"><%= event[0].track.name %></span>
                         </span>
                         <% end -%>
-                    </h5>
                    </td>
                    <% span[room.id] = span[room.id] + 1 %>
                   <% elsif  span[room.id] > 1 %>