diff --git a/app/views/templates/header.jst b/app/views/templates/header.handlebars
similarity index 50%
rename from app/views/templates/header.jst
rename to app/views/templates/header.handlebars
index 4b11290a8..d5edfaade 100644
--- a/app/views/templates/header.jst
+++ b/app/views/templates/header.handlebars
@@ -7,30 +7,30 @@
   <div id="global_search">
     <form accept-charset="UTF-8" action="/people" class="search_form" method="get">
       <input name="utf8" type="hidden" value="✓">
-      <input id="q" name="q" placeholder="<%= Diaspora.I18n.t('header.search') %>" results="5" type="search" autocomplete="off" class="ac_input">
+      <input id="q" name="q" placeholder="{{t "header.search"}}" results="5" type="search" autocomplete="off" class="ac_input">
     </form>
   </div>
 
   <div id="nav_badges">
     <div class="badge" id="home_badge">
-      <a href="/stream" title="<%= Diaspora.I18n.t('header.home') %>"><img alt="Home" src="/images/icons/home_grey.png">
+      <a href="/stream" title="{{t "header.home"}}"><img alt="Home" src="/images/icons/home_grey.png">
       </a>
     </div>
 
     <div class="badge" id="notification_badge">
-      <a href="/notifications" title="<%= Diaspora.I18n.t('header.notifications') %>">
-        <img alt="<%= Diaspora.I18n.t('header.notifications') %>" id="notification-flag" src="/images/icons/notifications_grey.png">
-        <div class="badge_count <%= current_user.notifications_count > 0 ? '' : 'hidden' %>">
-          <%= current_user.notifications_count %>
+      <a href="/notifications" title="{{t "header.notifications"}}">
+        <img alt="{{t "header.notifications"}}" id="notification-flag" src="/images/icons/notifications_grey.png">
+        <div class="badge_count {{#unless current_user.notifications_count}} hidden {{/unless}}">
+          {{current_user.notifications_count}}
         </div>
       </a>
     </div>
 
     <div class="badge" id="message_inbox_badge">
-      <a href="/conversations" title="<%= Diaspora.I18n.t('header.messages') %>">
-        <img alt="<%= Diaspora.I18n.t('header.messages') %>" src="/images/icons/mail_grey.png">
-        <div class="badge_count <%= current_user.unread_messages_count > 0 ? '' : 'hidden' %>">
-          <%= current_user.unread_messages_count %>
+      <a href="/conversations" title="{{t "header.messages"}}">
+        <img alt="{{t "header.messages"}}" src="/images/icons/mail_grey.png">
+        <div class="badge_count {{#unless current_user.unread_messages_count}} hidden {{/unless}}">
+          {{current_user.unread_messages_count}}
         </div>
       </a>
     </div>
@@ -40,16 +40,16 @@
     <div class="header">
       <div class="right">
         <a href="#" id="mark_all_read_link">
-          <%= Diaspora.I18n.t("header.mark_all_as_read") %>
+          {{t "header.mark_all_as_read"}}
         </a>
         |
         <a href="/notifications" id="view_all_notifications">
-          <%= Diaspora.I18n.t("header.view_all") %>
+          {{t "header.view_all"}}
         </a>
       </div>
 
       <h4>
-        <%= Diaspora.I18n.t("header.recent_notifications") %>
+        {{t "header.recent_notifications"}}
       </h4>
     </div>
 
@@ -81,16 +81,16 @@
     <div class="right">
       ▼
     </div>
-    <img alt="<%= current_user.name %>" class="avatar" data-person_id="<%= current_user.id %>" src="<%= current_user.avatar.small %>" title="<%= current_user.name %>" />
-    <a href="#"><%= current_user.name %></a>
+    <img alt="{{current_user.name}}" class="avatar" src="{{current_user.avatar.small}}" title="{{current_user.name}}" />
+    <a href="#">{{current_user.name}}</a>
     </li>
-    <li><a href="/people/<%= current_user.id %>"><%= Diaspora.I18n.t("header.profile") %></a></li>
-    <li><a href="/contacts"><%= Diaspora.I18n.t("header.contacts") %></a></li>
-    <li><a href="/user/edit"><%= Diaspora.I18n.t("header.settings") %></a></li>
-    <% if(current_user.admin) { %>
-      <li><a href="/admins/user_search"><%= Diaspora.I18n.t("header.admin") %></a></li>
-    <% } %>
-    <li><a href="/users/sign_out"><%= Diaspora.I18n.t("header.log_out") %></a></li>
+    <li><a href="/people/{{current_user.id}}">{{t "header.profile"}}</a></li>
+    <li><a href="/contacts">{{t "header.contacts"}}</a></li>
+    <li><a href="/user/edit">{{t "header.settings"}}</a></li>
+    {{#if current_user.admin}}
+      <li><a href="/admins/user_search">{{t "header.admin"}}</a></li>
+    {{/if}}
+    <li><a href="/users/sign_out">{{t "header.log_out"}}</a></li>
   </ul>
 
   <div id="lightbox">
diff --git a/public/javascripts/app/views/header_view.js b/public/javascripts/app/views/header_view.js
index c9a2db120..457c3c517 100644
--- a/public/javascripts/app/views/header_view.js
+++ b/public/javascripts/app/views/header_view.js
@@ -1,7 +1,5 @@
 app.views.Header = app.views.Base.extend({
-  legacyTemplate : true,
-
-  template_name : "#header-template",
+  templateName : "header",
 
   tagName : "header",