diff --git a/app/views/conference/_schedule_item.html.erb b/app/views/conference/_schedule_item.html.erb
deleted file mode 100644
index e8aadd8d..00000000
--- a/app/views/conference/_schedule_item.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<td style="width: <%= 95 / @rooms.length %>%; cursor:pointer"
-      rowspan ="<%= span[room.id] %>"
-      class="event" role="button">
-  <a class="unstyled-link" 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.name,
-                                         :title => speaker.name,
-                                         :style => "padding:8px;" %>
-    <%- end %>
-    <h5>
-      <span class="fa fa-comment"></span>
-      <%= event[0].title %>
-      <% unless event[0].subtitle.blank? %>
-        <span class="schedule-subtitle">
-          <%= event[0].subtitle %>
-        </span>
-      <% end %>
-    </h5>
-    <span class="schedule-speaker">
-      <span class="fa fa-user"></span>
-      <%= "#{speaker.name}" %>
-    </span>
-    <% if event[0].track%>
-      <span class="schedule-track">
-        <span class="fa fa-road"></span>
-        <span class="label" style="background-color:<%= event[0].track.color if event[0].track %>"><%= event[0].track.name %></span>
-      </span>
-    <% end -%>
-  </a>
-</td>
-
diff --git a/app/views/conference/_schedule_item.html.haml b/app/views/conference/_schedule_item.html.haml
new file mode 100644
index 00000000..507e9f34
--- /dev/null
+++ b/app/views/conference/_schedule_item.html.haml
@@ -0,0 +1,24 @@
+%td.event{ style: "width: #{95 / @rooms.length}%; cursor:pointer", |
+           rowspan: span[room.id], |
+           role: "button" } |
+  %a.unstyled-link{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.name, |
+                                         :title => speaker.name, |
+                                         :style => "padding:8px;" |
+    %h5
+      %span.fa.fa-comment
+      = event[0].title
+      - unless event[0].subtitle.blank?
+        %span.schedule-subtitle
+          = event[0].subtitle
+    %span.schedule-speaker
+      %span.fa.fa-user
+      = speaker.name
+    - if event[0].track
+      %span.schedule-track
+        %span.fa.fa-road
+        %span.label{ style: "background-color: #{event[0].track.color if event[0].track}" }
+          = event[0].track.name
+