diff --git a/public/img/glyphicons-halflings-blue.png b/app/assets/images/img/glyphicons-halflings-blue.png
similarity index 100%
rename from public/img/glyphicons-halflings-blue.png
rename to app/assets/images/img/glyphicons-halflings-blue.png
diff --git a/public/img/glyphicons-halflings-green.png b/app/assets/images/img/glyphicons-halflings-green.png
similarity index 100%
rename from public/img/glyphicons-halflings-green.png
rename to app/assets/images/img/glyphicons-halflings-green.png
diff --git a/public/img/glyphicons-halflings-red.png b/app/assets/images/img/glyphicons-halflings-red.png
similarity index 100%
rename from public/img/glyphicons-halflings-red.png
rename to app/assets/images/img/glyphicons-halflings-red.png
diff --git a/public/img/glyphicons-halflings-white.png b/app/assets/images/img/glyphicons-halflings-white.png
similarity index 100%
rename from public/img/glyphicons-halflings-white.png
rename to app/assets/images/img/glyphicons-halflings-white.png
diff --git a/public/img/glyphicons-halflings.png b/app/assets/images/img/glyphicons-halflings.png
similarity index 100%
rename from public/img/glyphicons-halflings.png
rename to app/assets/images/img/glyphicons-halflings.png
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index c8ce38355..f0c0cbd25 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -1,3 +1,4 @@
+
 /* variables */
 
 $light-grey: #999;
@@ -88,7 +89,7 @@ $pane-width: 420px;
 
 @mixin dark-hatched-bg() {
   background-color: #444;
-  background-image: url("../images/hatched-bg-dark.png");
+  background-image: image-url("hatched-bg-dark.png");
 }
 
 @mixin photo-shadow() {
@@ -108,15 +109,15 @@ $pane-width: 420px;
 
 /* bootstrap extentions */
 .icon-red {
-  background-image: url(../img/glyphicons-halflings-red.png);
+  background-image: image-url("img/glyphicons-halflings-red.png");
 }
 
 .icon-green {
-  background-image: url(../img/glyphicons-halflings-green.png);
+  background-image: image-url("img/glyphicons-halflings-green.png");
 }
 
 .icon-blue {
-  background-image: url(../img/glyphicons-halflings-blue.png);
+  background-image: image-url("img/glyphicons-halflings-blue.png");
 }
 
 /* styles */
@@ -516,7 +517,7 @@ body.idle {
 
     border-top: 1px solid #444;
     text-align: left;
-    background-image: url("../images/hatched-bg-dark.png");
+    background-image: image-url("hatched-bg-dark.png");
   }
 
   #new-post-comment-container {
diff --git a/app/assets/templates/post-viewer/feedback.jst.hbs b/app/assets/templates/post-viewer/feedback.jst.hbs
index 18bf51ab9..a6d9a997f 100644
--- a/app/assets/templates/post-viewer/feedback.jst.hbs
+++ b/app/assets/templates/post-viewer/feedback.jst.hbs
@@ -45,7 +45,7 @@
 <div id="post-info-sneaky" class="passive">
   <div id="post-info-container-sneaky">
     <a href="#" rel="invoke-interaction-pane" class="invoker">
-      <img src="/images/up-tick-inset.png" class="info-tick"/>
+      <img src="{{imageUrl "up-tick-inset.png"}}" class="info-tick"/>
       <a href="/" title="{{t "header.home"}}" class="home-button">
         <i class="icon-home icon-white"></i>
       </a>
diff --git a/app/assets/templates/post-viewer/interactions.jst.hbs b/app/assets/templates/post-viewer/interactions.jst.hbs
index 239f549d8..1b59fa325 100644
--- a/app/assets/templates/post-viewer/interactions.jst.hbs
+++ b/app/assets/templates/post-viewer/interactions.jst.hbs
@@ -2,7 +2,7 @@
 
 <div id="post-info" style="display:none;">
   <div id="post-info-container">
-    <img src="/images/down-tick-inset.png" class="info-tick"/>
+    <img src="{{imageUrl "down-tick-inset.png"}}" class="info-tick"/>
 
     <div id="post-reactions"> </div>
     <div id="new-post-comment"> </div>
diff --git a/app/assets/templates/post-viewer/nav.jst.hbs b/app/assets/templates/post-viewer/nav.jst.hbs
index 68b3b9fe0..81924ce37 100644
--- a/app/assets/templates/post-viewer/nav.jst.hbs
+++ b/app/assets/templates/post-viewer/nav.jst.hbs
@@ -1,11 +1,11 @@
 <a href="#" class="nav-arrow left" id="forward">
   <div class="nav-arrow-inner">
-    <img src="/images/arrow-left.png" />
+    <img src="{{imageUrl "arrow-left.png"}}" />
   </div>
 </a>
 
 <a href="#" class="nav-arrow right" id="back">
   <div class="nav-arrow-inner">
-    <img src="/images/arrow-right.png" />
+    <img src="{{imageUrl "arrow-right.png"}}" />
   </div>
 </a>
diff --git a/app/views/layouts/post.html.haml b/app/views/layouts/post.html.haml
index d7a288d15..75ae0cb19 100644
--- a/app/views/layouts/post.html.haml
+++ b/app/views/layouts/post.html.haml
@@ -23,7 +23,7 @@
       = page_title yield(:page_title)
 
     = include_base_css_framework(:bootstrap)
-    = stylesheet_link_tag :default, :new_templates, :media => 'all'
+    = stylesheet_link_tag :default, 'new-templates', :media => 'all'
 
     - if rtl?
       = stylesheet_link_tag :rtl, :media => 'all'