diff --git a/app/assets/images/branding/white@2x.png b/app/assets/images/branding/white2x.png
similarity index 100%
rename from app/assets/images/branding/white@2x.png
rename to app/assets/images/branding/white2x.png
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index f3f57fda0..f23d79719 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -7,7 +7,9 @@
 /* ===== sprites ===== */
 
 @import 'icons/*.png'
+@import 'branding/*.png'
 @include all-icons-sprites
+@include all-branding-sprites
 /* ====== media ====== */
 .media
   :margin 10px
@@ -145,6 +147,14 @@ header
   :border
     :bottom 1px solid #000
 
+  a.header_root_link
+    :display inline-block
+    :margin-top 5px
+
+  .branding-logo_small
+    :height 16px
+    :width 161px
+
   a
     :color #CCC
     :color rgb(147,147,147)
@@ -294,6 +304,8 @@ ul.as-selections
 .diaspora_header_logo
   :float left
   :margin-top -6px
+  :height 38px
+  :width 65px
 
 .stream
   audio
@@ -1381,8 +1393,10 @@ footer
     :border
       :top 1px solid #ddd
 
-  img
-    :margin-top 2px
+  .branding-powered_by_diaspora
+    :margin-top 3px
+    :height 11px
+    :width 145px
 
   ul#footer_nav
     :margin 0
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index 1635ac4ee..dc713f535 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -1,7 +1,8 @@
 <div class="container" style="position:relative;">
 
   <a href="/stream">
-    <img alt="Logo_small" class="diaspora_header_logo" height="38px" width="65px" src="{{imageUrl "branding/header-logo.png"}}" />
+    <div alt="Logo_small" class="diaspora_header_logo branding-header-logo">
+    </div>
   </a>
 
   <span class="header-nav">
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 3681f1813..f3ae5949e 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 .container{:style => "position:relative;"}
-  = link_to image_tag('branding/logo_small.png', :height => "16px", :width => "161px", :style => 'position:relative;top:5px;'), root_path
+  = link_to content_tag(:div, nil, :class => 'branding-logo_small'), root_path, :class => 'header_root_link'
 
   %ul#landing_nav
     %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml
index 1e52630d9..0081a8b0d 100644
--- a/app/views/shared/_footer.html.haml
+++ b/app/views/shared/_footer.html.haml
@@ -8,4 +8,4 @@
       %li.separator= "|"
       %li= link_to(t('layouts.header.code'), "#{root_path.chomp('/')}/source.tar.gz", {:title => t('layouts.application.source_package')}) unless request.url.match(/joindiaspora.com/)
       %li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
-    = image_tag 'branding/powered_by_diaspora.png', :height => "11px", :width => "145px"
\ No newline at end of file
+    = content_tag :div, nil, :class => 'branding-powered_by_diaspora'