diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 6d425392bde0d582e9f94e1f9f6f95c64df1ddc6..f1ed22e1b60d1aca7652d6ec25f69b836b886d54 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -6,6 +6,7 @@
 
 @import 'sidebar'
 @import 'header'
+@import 'footer'
 @import 'sprites'
 @import 'opengraph'
 
@@ -1154,47 +1155,6 @@ ul#request_result
         :top 2px
         :right 1em
 
-footer
-  :width 100%
-  :left 0
-  :bottom 0
-  :color #999
-
-  .container
-    :margin
-      :top 4em
-    :padding 0
-      :top 0.5em
-    :border
-      :top 1px solid #ddd
-
-  .branding-powered_by_diaspora
-    :display inline-block
-    :margin-top 3px
-    :height 11px
-    :width 145px
-
-  ul#footer_nav
-    :margin 0
-    :padding 0
-    :display inline-block
-    :float right
-
-    > li
-      :display inline
-      :margin
-        :right 1em
-
-      &.separator
-        :margin-left -.35em
-        :margin-right .65em
-        @include opacity(.6)
-
-      &:last-child
-        :margin 0
-    a
-      :color #777
-
 #signup_field
   :margin
     :top -200px
diff --git a/app/assets/stylesheets/footer.css.scss b/app/assets/stylesheets/footer.css.scss
new file mode 100644
index 0000000000000000000000000000000000000000..15d5df9d7a138a89b4e8b309c2989c182d9757cd
--- /dev/null
+++ b/app/assets/stylesheets/footer.css.scss
@@ -0,0 +1,46 @@
+footer {
+  width: 100%;
+  left: 0;
+  bottom: 0;
+  color: #999;
+
+  .container {
+    width: 95%;
+    margin: 4em auto 0 auto;
+    padding: 0.5em 0 1em 0;
+    border-top: 1px solid #ddd;
+  }
+
+  .branding-powered_by_diaspora {
+    display: inline-block;
+    margin-top: 3px;
+    height: 11px;
+    width: 145px;
+  }
+
+  ul#footer_nav {
+    margin: 0;
+    padding: 0;
+    display: inline-block;
+    float: right;
+
+    > li {
+      display: inline;
+      margin-right: 1em;
+
+      &.separator {
+        margin-left: -.35em;
+        margin-right: .65em;
+        @include opacity(.6);
+      }
+
+      &:last-child {
+        margin: 0;
+      }
+    }
+
+    a {
+      color: #777;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index 03609434117783effb477875aca75aabbd1e8d81..aa096384b1fb1c85e0f642f9bad5c0103c038f8f 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -21,6 +21,7 @@
 
 /* new SPV */
 @import 'header';
+@import 'footer';
 @import 'bootstrap-headerfix';
 @import 'opengraph';
 @import 'single-post-view';
diff --git a/app/assets/stylesheets/single-post-view.css.scss b/app/assets/stylesheets/single-post-view.css.scss
index 1f714bb0f83a1245cd8470100de8105aef8bbbd9..e9c74c1d62fdb2b88458010a4674fdab52a0dce8 100644
--- a/app/assets/stylesheets/single-post-view.css.scss
+++ b/app/assets/stylesheets/single-post-view.css.scss
@@ -1,6 +1,5 @@
 #single-post-container {
   padding-top: 20px;
-  padding-bottom: 3em;
 }
 
 #single-post-content {
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 361cf814feab54b7dc5327f1faaacda654113d06..1d7dad7dfeb5654294dfbc0be2223b8cc908e1b5 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -26,7 +26,7 @@ class PostsController < ApplicationController
     mark_corresponding_notifications_read if user_signed_in?
 
     respond_to do |format|
-      format.html{ gon.post = PostPresenter.new(@post, current_user); render 'posts/show', layout: 'with_header' }
+      format.html{ gon.post = PostPresenter.new(@post, current_user); render 'posts/show', layout: 'with_header_with_footer' }
       format.xml{ render :xml => @post.to_diaspora_xml }
       format.mobile{render 'posts/show' }
       format.json{ render :json => PostPresenter.new(@post, current_user) }