diff --git a/Changelog.md b/Changelog.md
index 5d3af0bd5..215f341e2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@
 * Port getting started to Bootstrap [#5057](https://github.com/diaspora/diaspora/pull/5057)
 * Port people search page to Bootstrap [#5077](https://github.com/diaspora/diaspora/pull/5077)
 * Clarify explanations and defaults in diaspora.yml.example [#5088](https://github.com/diaspora/diaspora/pull/5088)
+* Consistent header spacing on Bootstrap pages [#5108](https://github.com/diaspora/diaspora/pull/5108)
 
 ## Bug fixes
 * Fix hiding of poll publisher on close [#5029](https://github.com/diaspora/diaspora/issues/5029)
diff --git a/app/assets/stylesheets/conversations.css.scss b/app/assets/stylesheets/conversations.css.scss
index 2daa36cbc..10e183f87 100644
--- a/app/assets/stylesheets/conversations.css.scss
+++ b/app/assets/stylesheets/conversations.css.scss
@@ -1,6 +1,4 @@
 .conversations_container {
-  padding-top: 40px;
-
   .stream_element {
     border-bottom: 1px solid $border-grey;
     &:first-child {
diff --git a/app/assets/stylesheets/getting-started.css.scss b/app/assets/stylesheets/getting-started.css.scss
index 6c6870c07..d5817f94c 100644
--- a/app/assets/stylesheets/getting-started.css.scss
+++ b/app/assets/stylesheets/getting-started.css.scss
@@ -13,7 +13,7 @@
   }
 
   .hero-unit {
-    margin: 58px 42px;
+    margin: 20px 42px;
     padding: 40px 80px;
   }
 
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss
index 66af41072..a6073c1fc 100644
--- a/app/assets/stylesheets/header.css.scss
+++ b/app/assets/stylesheets/header.css.scss
@@ -3,8 +3,6 @@
   border-bottom: none;
 }
 
-body > #container { margin-top: 50px; } /* to avoid being hidden under the header in the SPV */
-
 body > header {
   @include box-shadow(0,1px,3px,rgba(0,0,0,0.9));
   background: url('header-bg.png') rgb(40,35,35);
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index 5c3eee467..88c3c97c6 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -5,6 +5,7 @@ body {
 }
 
 body {
+  margin-top: 40px;
   padding : none;
 
   &.lock {
@@ -146,12 +147,6 @@ $bring-dark-accent-forward-color: #DDD;
   }
 }
 
-/* padder helper to push content below the header, to be removed when porting to bootstrap is complete */
-.bootstrap_header_padding {
-  padding-top: 40px;
-}
-
-
 #back-to-top {
   display: block;
   color: white;
diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss
index ca96cdda4..5bd6abccc 100644
--- a/app/assets/stylesheets/new_styles/_registration.scss
+++ b/app/assets/stylesheets/new_styles/_registration.scss
@@ -4,8 +4,6 @@
   min-height: 100%;
   background-color : #afc652;
   color: #fff;
-  
-  .container { margin-top: 50px; }
 
   #create-something-text {
     font-family : Roboto-Light;
diff --git a/app/assets/stylesheets/notifications.css.scss b/app/assets/stylesheets/notifications.css.scss
index 4c89b0a12..23408b2da 100644
--- a/app/assets/stylesheets/notifications.css.scss
+++ b/app/assets/stylesheets/notifications.css.scss
@@ -1,6 +1,4 @@
 #notifications_container {
-  padding-top: 50px;
-
   .nav.nav-tabs{
     li > a {
       color: $text-dark-grey;
diff --git a/app/assets/templates/help_tpl.jst.hbs b/app/assets/templates/help_tpl.jst.hbs
index f54bdea16..9bd79d684 100644
--- a/app/assets/templates/help_tpl.jst.hbs
+++ b/app/assets/templates/help_tpl.jst.hbs
@@ -1,6 +1,3 @@
-
-<div class="bootstrap_header_padding"></div>
-
 <div class="container">
 
   <div id="section_header">
@@ -78,4 +75,4 @@
     <div class="span9 last" id=faq>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index 9ede109c1..ced29ec28 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -9,8 +9,6 @@
   = javascript_include_tag :people
   = javascript_include_tag 'contact-list'
 
-.bootstrap_header_padding
-
 .container-fluid#people_search
   .row-fluid
     .page-header
diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml
index 1c36f1c29..6b09af4df 100644
--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -6,4 +6,4 @@
   = post_page_title @post
 
 - content_for :content do
-  #container
+  #container.container-fluid