Add images, fix layout rendering

app/assets/stylesheets/application.css.sass

@@ -5,15 +5,8 @@
 @import 'new_styles/_spinner'
 @import 'sidebar.css.scss'
 @import 'header.css.scss'
+@import 'sprites.css.scss'
 
-/* ===== sprites ===== */
-
-@import 'icons/*.png'
-@import 'branding/*.png'
-@import 'social_media_logos/*.png'
-@include all-icons-sprites
-@include all-branding-sprites
-@include all-social_media_logos-sprites
 /* ====== media ====== */
 .media
   :margin 10px

app/assets/stylesheets/new-templates.css.scss

@@ -4,6 +4,7 @@
 
 /* core */
 @import 'new_styles/flash_messages';
+@import 'sprites.css.scss';
 @import 'header.css.scss';
 
 @import 'new_styles/base';

app/controllers/posts_controller.rb

@@ -9,7 +9,6 @@ class PostsController < ApplicationController
   before_filter :set_format_if_malformed_from_status_net, :only => :show
   before_filter :find_post, :only => [:show, :next, :previous, :interactions]
 
-  layout 'with_header'
   before_filter -> { @css_framework = :bootstrap }
 
   respond_to :html,
@@ -27,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' }
+      format.html{ gon.post = PostPresenter.new(@post, current_user); render 'posts/show', layout: 'with_header' }
       format.xml{ render :xml => @post.to_diaspora_xml }
       format.mobile{render 'posts/show' }
       format.json{ render :json => PostPresenter.new(@post, current_user) }