diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index ad9cd8608..8e73e2222 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -4,6 +4,7 @@
 @import '_flash_messages.scss'
 @import 'new_styles/_spinner'
 @import 'sidebar.css.scss'
+@import 'header.css.scss'
 
 /* ===== sprites ===== */
 
@@ -129,164 +130,7 @@ ul > li
   ul
     :margin 0
 
-header
-  @include box-shadow(0,1px,3px,rgba(0,0,0,0.9))
-
-  :background
-    :color rgb(40,35,35)
-    :image image-url('header-bg.png')
-
-  :z-index 1001
-  :padding 6px 0
-  :color #CCC
-  :height 26px
-
-  :position fixed
-
-  :width 100%
-  :top 0
-  :left 0
-
-  :border
-    :bottom 1px solid #000
-
-  a.header_root_link
-    :display inline-block
-    :margin-top 5px
-
-  a
-    :color #CCC
-    :color rgb(147,147,147)
-
-    &:hover
-      :background none
-      :color #fafafa
-
-  &.landing
-    .right
-      :top 10px
-    :height 40px
-
-  ul#user_menu
-    :overflow hidden
-    :white-space nowrap
-    :text-overflow ellipsis
-    :text-shadow 0 1px 0 #000
-    :color rgb(147,147,147)
-
-    :min-width 100px
-
-    :cursor pointer
-
-    :z-index 10
-    :padding 5px 0
-      :left 32px
-      :right 7px
-    :margin 0
-      :top -2px
-      :right -5px
-
-    :border
-      :left 1px solid #333
-      :right 1px solid #333
-
-    :display inline
-
-    :top -4px
-    :float right
-
-    li
-      a
-        :padding 4px
-        :height 100%
-        :color #939393
-        &:hover
-          :background
-            :color $blue
-          :color #fff
-          :text
-            :decoration none
-
-      &:first-child
-        :padding 5px 0
-        a
-          :padding
-            :right 15px
-          &:hover
-            :background
-              :color transparent
-            :text
-              :decoration none
-          &:focus
-            :outline none
-        .right
-          :right 5px
-
-    &.active
-      @include dropdown-shadow
-
-      :margin
-        :top -3px
-        :right -5px
-      :background
-        :color rgb(34,30,30)
-      :border 1px solid #999
-
-    .avatar
-      :height 22px
-      :width 22px
-      :position absolute
-      :left 7px
-      :top 9px
-      :display block
-
-  .header-nav
-    :font-weight bold
-    :float left
-    :height 100%
-    :margin-right 5px
-    :margin-top 3px
-
-    a
-      :padding 0 10px
-      :width 100%
-      &:hover
-        :text-decoration none
-
-    > span
-      :height 100%
-      :display inline-block
-      :margin-left -4px
-      :border
-        :left 1px solid #333
-        :right 1px solid #333
-
-      &:last-child
-        :margin-left -5px
-
-
-header.ie-user-menu-active
-  :height 150px
-
 //////////////////////////////////
-ul.dropdown
-  :padding 0
-
-  li
-    :display none
-    a
-      :display block
-
-    &:first-child
-      :display block
-      a
-        :height auto
-        :display inline
-
-  &.active
-    :z-index 30
-    li
-      :display block
 
 //////////////////////////////////
 //hacks for tagging plugin...
@@ -300,12 +144,6 @@ ul.as-selections
   time
     :color #333 !important
 
-.diaspora_header_logo
-  :float left
-  :margin-top -6px
-  :height 38px
-  :width 65px
-
 .stream
   audio
     :display block
@@ -984,47 +822,6 @@ img.scaled_full
     img
       :height 140px
 
-#global_search
-  :float right
-
-  :margin
-    :right 10px
-
-  :position relative
-
-  form
-    :position absolute
-    :right 0
-    input
-      @include box-shadow(0,1px,1px,#444)
-      @include border-radius(15px)
-      @include transition(width)
-
-      :width 100px
-      :background-color #444
-
-      :border 1px solid #222
-
-      :font-size 13px
-      :padding 4px
-
-      &:hover
-        :background-color #555
-
-      &.active
-        :background-color #fafafa
-        :background-color rgba(160,160,160,0.6)
-
-      &:focus
-        :outline none
-        :background-color white
-        :width 200px
-
-      &::-webkit-input-placeholder
-        :text-shadow none
-      &:-moz-placeholder
-        :text-shadow none
-
 ul#settings_nav
   :display inline
   :padding 0
@@ -1219,68 +1016,6 @@ h3 span.current_gs_step
       :vertical
         :align middle
 
-#nav_badges
-  :display inline-block
-  :margin-top 2px
-  :float left
-  :width 61px
-
-  a:hover
-    :text
-      :decoration none
-
-
-  .badge
-    :position relative
-    :top 2px
-    :display inline
-    :margin 0 2px
-    :font
-      :weight bold
-      :size smaller
-    :width 22px
-
-    &:hover
-      .badge_count
-        :background
-          :color lighten(#A40802, 5%)
-
-    a.badge_link
-      :display block
-      :width 100%
-      :height 16px
-      :float left
-
-    .icons-notifications_grey
-      :height 16px
-
-    .icons-mail_grey
-      :height 11px
-
-#message_inbox_badge
-  :float left
-  :padding 3px 3px 0px 0px
-
-#notification_badge
-  :float left
-  :padding 0px 3px 0px 3px
-
-.badge_count
-  @include border-radius(2px)
-
-  :z-index 3
-  :position absolute
-  :top -2px
-  :left 13px
-  :padding 0 2px
-    :bottom 1px
-  :background
-    :color #A40802
-  :line
-    :height 12px
-
-  :color #fff
-
 ul#request_result
   :padding 0
   :margin 0
@@ -1456,44 +1191,6 @@ footer
     a
       :color #777
 
-ul#landing_nav
-  :margin 0
-  :padding 0
-
-  :position absolute
-  :top 4px
-  :right 0
-
-  > li
-    :display inline
-    :margin
-      :right 0.5em
-
-    &:last-child
-      :margin
-        :right 0
-
-    a
-      :color $blue
-
-      &.login
-        @include border-radius(5px)
-        @include box-shadow(0,1px,1px,#666)
-
-        :padding 5px 8px
-
-        :background
-          :color #000
-
-        :border
-          :top 1px solid #000
-
-        &:hover
-          :background
-            :color #222
-
-    :text-shadow 0 1px 0 #000
-
 #signup_field
   :margin
     :top -200px
@@ -2679,77 +2376,6 @@ a.toggle_selector
     :color #eee
   :color #666
 
-#notification_dropdown
-  @include dropdown-shadow
-
-  :background white
-  :border solid #888 1px
-  :left 300px
-  :width 380px
-  :display none
-  :float left
-
-  :color #444
-
-  .right
-    :font-size smaller
-    :display inline
-    :position relative
-    :float right
-    :top 4px
-    :font
-      :weight bold
-
-  a
-    :color $blue
-
-  .header
-    :padding 10px
-    h4
-      :padding
-        :bottom 0
-      :margin
-        :bottom 0
-
-  .notification_element,
-  .header
-    :border
-      :bottom 1px solid #ddd
-
-  .ajax_loader
-    :text-align center
-    :padding 15px
-
-  .notification_element
-    :padding 10px
-    :min-height 30px
-    &:hover
-      :background-color #FAFAFA
-    > img
-      :height 30px
-      :width 30px
-      :float left
-      :margin
-        :right 10px
-
-    &.unread
-      :background
-        :color #eee
-      :color #000
-      :font
-        :weight bold
-
-#notification_badge.active
-  :z-index 10
-  :background
-    :color #fff
-  :border 1px solid #888
-    :bottom none
-  :margin
-    :left 0px
-  :padding
-    :bottom 12px
-
 .cubbies_collage
   :position absolute
   :right 50px
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss
new file mode 100644
index 000000000..344fcd086
--- /dev/null
+++ b/app/assets/stylesheets/header.css.scss
@@ -0,0 +1,359 @@
+body > header {
+  @include box-shadow(0,1px,3px,rgba(0,0,0,0.9));
+  background: url('header-bg.png') rgb(40,35,35);
+  z-index: 1001;
+  padding: 6px 0;
+  color: #CCC;
+  height: 26px;
+  position: fixed;
+  width: 100%;
+  top: 0;
+  left: 0;
+  border-bottom: 1px solid #000;
+
+  .diaspora_header_logo {
+    float: left;
+    margin-top: -6px;
+    height: 38px;
+    width: 65px;
+  }
+  
+  .ie-user-menu-active { height: 150px; }
+
+  a.header_root_link {
+    display: inline-block;
+    margin-top: 5px;
+  }
+  
+  a {
+    color: #CCC;
+    color: rgb(147,147,147);
+
+    &:hover {
+      background: none;
+      color: #fafafa;
+    }
+  }
+
+  &.landing {
+    height: 40px;
+    .right { top: 10px; }
+  }
+  
+  #nav_badges {
+    display: inline-block;
+    margin-top: 2px;
+    float: left;
+
+    a:hover { text-decoration: none; }
+
+    .badge {
+      width: 22px;
+      position: relative;
+      top: 2px;
+      display: inline;
+      margin: 0 2px;      
+      font-weight: bold;
+      font-size: smaller;
+
+      &:hover .badge_count { background-color: lighten(#A40802, 5%); }
+      
+      .icons-notifications_grey { height: 16px; }
+      .icons-mail_grey { height: 11px }
+
+      a.badge_link {
+        display: block;
+        width: 100%;
+        height: 16px;
+        float: left;
+      }
+    }
+    
+    #notification_badge, #message_inbox_badge {
+      float: left;
+      padding: 0px 3px;
+    }
+    
+    #message_inbox_badge { padding-top: 3px; }
+
+    #notification_badge {
+      .active {
+        z-index: 10;
+        background-color: #fff;
+        border: 1px solid #888;
+        border-bottom: 0px;
+        margin-left: 0px;
+        padding-bottom: 12px;
+      }
+
+      .badge_count {
+        @include border-radius(2px);
+        z-index: 3;
+        position: absolute;
+        top: -2px;
+        left: 13px;
+        padding: 0 2px 1px 2px;
+        background-color: #A40802;
+        line-height: 12px;
+        color: #fff;
+      }
+    }
+
+    #notification_dropdown {
+      @include dropdown-shadow;
+
+      background: white;
+      border: solid #888 1px;
+      left: 300px;
+      width: 380px;
+      display: none;
+      float: left;
+      color: #444;
+
+      .right {
+        font-size: smaller;
+        display: inline;
+        position: relative;
+        float: right;
+        top: 4px;
+        font-weight: bold;
+      }
+
+      a { color: $blue; }
+
+      .header {
+        padding: 10px;
+        
+        h4 {
+          padding-bottom: 0;
+          margin-bottom: 0;
+        }
+      }
+
+      .notification_element,
+      .header { border-bottom: 1px solid #ddd; }
+
+      .ajax_loader {
+        text-align: center;
+        padding: 15px;
+      }
+
+      .notification_element {
+        padding: 10px;
+        min-height: 30px;
+      
+        &:hover { background-color: #FAFAFA; }
+        
+        > img {
+          height: 30px;
+          width: 30px;
+          float: left;
+          margin-right: 10px;
+        }
+
+        &.unread {
+          background-color: #eee;
+          color: #000;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+  
+  #global_search {
+    float: right;
+    margin-right: 10px;
+    position: relative;
+
+    form {
+      position: absolute;
+      right: 0;
+      
+      input {
+        @include box-shadow(0, 1px, 1px, #444);
+        @include border-radius(15px);
+        @include transition(width);
+        width: 100px;
+        background-color: #444;
+        border: 1px solid #222;
+        font-size: 13px;
+        padding: 4px;
+
+        &:hover { background-color: #555; }
+
+        &.active {
+          background-color: #fafafa;
+          background-color: rgba(160,160,160,0.6);
+        }
+
+        &:focus {
+          outline: none;
+          background-color: white;
+          width: 200px;
+        }
+
+        &::-webkit-input-placeholder, &:-moz-placeholder { text-shadow: none; }
+      }
+    }
+  }
+
+  ul#user_menu {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    text-shadow: 0 1px 0 #000;
+    color: rgb(147,147,147);
+    min-width: 100px;
+    cursor: pointer;
+    z-index: 10;
+    display: inline;
+    top: -4px;
+    float: right;      
+    margin: -2px -5px 0px 0px;    
+    padding: 5px 7px 5px 32px;
+    
+    border {
+      left: 1px solid #333;
+      right: 1px solid #333;
+    }
+
+    li {
+      a {
+        padding: 4px;
+        height: 100%;
+        color: #939393;
+        
+        &:hover {
+          background-color: $blue;
+          color: #fff;
+          text-decoration: none;
+        }
+      }
+
+      &:first-child {
+        padding: 5px 0;
+        
+        a {
+          padding-right: 15px;
+          
+          &:hover {
+            background-color: transparent;
+            text-decoration: none;
+          }
+          
+          &:focus { :outline: none; }
+        }
+        
+        .right {
+          position: absolute;
+          right: 5px;
+        }
+      }
+    }
+
+    &.active {
+      margin-top: -3px;
+      margin-right: -5px;
+      @include dropdown-shadow;
+      background-color: rgb(34,30,30);
+      border: 1px solid #999;
+    }
+
+    .avatar {
+      height: 22px;
+      width: 22px;
+      position: absolute;
+      left: 7px;
+      top: 9px;
+      display: block;
+    }
+  }
+
+  .header-nav {
+    font-weight: bold;
+    float: left;
+    height: 100%;
+    margin-right: 5px;
+    margin-top: 3px;
+
+    a {
+      padding: 0 10px;
+      width: 100%;
+      &:hover { text-decoration: none; }
+    }
+
+    > span {
+      height: 100%;
+      display: inline-block;
+      margin-left: -4px;
+      border {
+        left: 1px solid #333;
+        right: 1px solid #333;
+      }
+
+      &:last-child {
+        margin-left: -5px;
+      }
+    }
+  }
+  
+  /* When the user is not connected */
+  ul#landing_nav {
+    position: absolute;
+    top: 4px;
+    right: 0;  
+    margin: 0;
+    padding: 0;
+  
+    > li {
+      text-shadow: 0 1px 0 #000;
+      display: inline;
+      margin-right: 0.5em;
+    
+      a {      
+        color: $blue;
+      
+        &.login {        
+          @include border-radius(5px);
+          @include box-shadow(0, 1px, 1px, #666);
+          padding: 5px 8px;
+          background-color: #000;
+          border-top: 1px solid #000;
+          
+          &:hover { background-color: #222; }
+        }
+ 	  }
+ 	
+      &:last-child { margin-right: 0; }
+    }
+  }
+}
+
+
+/* 
+ * Extract here from application.sass because
+ * needed for the header in the bootstrap part
+ */
+ul.dropdown {
+  padding: 0px;
+
+  li {
+    display: none;
+    
+    a { display: block; }
+
+    &:first-child {
+      display: block;
+      
+      a {
+        height: auto;
+        display: inline;
+      }
+    }
+  }
+
+  &.active {
+    z-index: 30;
+    li { display: block; }
+  }
+}
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index ebc8f15b5..43444ad8b 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -4,6 +4,7 @@
 
 /* core */
 @import 'new_styles/flash_messages';
+@import 'header.css.scss';
 
 @import 'new_styles/base';
 @import 'new_styles/interactions';
diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss
index 16717ea9d..ca96cdda4 100644
--- a/app/assets/stylesheets/new_styles/_registration.scss
+++ b/app/assets/stylesheets/new_styles/_registration.scss
@@ -1,11 +1,11 @@
 #registration {
-  position : absolute;
-  left : 0;
+  position:absolute;
+  min-width: 100%;
+  min-height: 100%;
   background-color : #afc652;
-  min-height : 100%;
-  min-width : 100%;
-
-  color : #fff;
+  color: #fff;
+  
+  .container { margin-top: 50px; }
 
   #create-something-text {
     font-family : Roboto-Light;
@@ -31,7 +31,6 @@
   #collage {
     width : 344px;
     height : auto;
-
     max-width : 95%;
   }
 
@@ -47,55 +46,3 @@
     }
   }
 }
-
-ul#landing_nav {
-  margin: 0;
-  padding: 0;
-
-  position: absolute;
-  top: 10px;
-  right: 20px;
-
-  > li {
-    display: inline;
-    margin-right: 0.5em;
-
-    &:last-child {
-      margin-right: 0;
-    }
-
-    a {
-      color: $blue;
-
-      &.login {
-        @include border-radius(5px);
-        @include box-shadow(0,1px,1px,#666);
-
-        padding: 5px 8px;
-
-        background-color: #000;
-
-        border-top: 1px solid #000;
-
-        &:hover {
-          background-color: #222;
-        }
-      }
-    }
-
-    text-shadow: 0 1px 0 #000;
-  }
-}
-
-
-body > header {
-  @include box-shadow(0,1px,3px,rgba(0,0,0,0.9));
-
-  background-color: rgb(40,35,35);
-  background-image: image-url('header-bg.png');
-
-  z-index: 1001;
-  padding: 6px 0;
-  color: #CCC;
-  height: 26px;
-}
diff --git a/config/application.rb b/config/application.rb
index d0e17637d..ee781069e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -90,7 +90,6 @@ module Diaspora
       mobile.css
       new-templates.css
       rtl.css
-      sidebar.css
     }
 
     # Version of your assets, change this if you want to expire all your assets