diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index f934a1268..4bcad79c6 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -83,8 +83,7 @@ en:
         reshare: "Reshare"
         comment: "Comment"
         original_post_deleted: "Original post deleted by author."
-        nsfw: "This post has been flagged NSFW by its author."
-        show: "Show"
+        show_post: "Show post"
 
         likes:
           zero: "<%= count %> Pins"
diff --git a/public/javascripts/app/templates/stream-element.handlebars b/public/javascripts/app/templates/stream-element.handlebars
index ff85e9271..7af3c8872 100644
--- a/public/javascripts/app/templates/stream-element.handlebars
+++ b/public/javascripts/app/templates/stream-element.handlebars
@@ -45,23 +45,23 @@
     </div>
 
     {{#if nsfw}}
-      <div class="shield_wrapper">
-        <div class="shield">
-          {{t "stream.nsfw"}}
-          <a href="#">
-            {{t "stream.show"}}
-          </a>
-        </div>
-    {{/if}}
-
-    <div class="post-content"> </div>
-
-    {{#if nsfw}}
+      <div class="nsfw-shield">
+        <strong>
+          NSFW
+        </strong>
+        |
+        <a href="#">
+          {{t "stream.show_post"}}
+        </a>
       </div>
-    {{/if}}
 
-    <div class="feedback"> </div>
-    <div class="likes"> </div>
-    <div class="comments"> </div>
+    {{else}}
+
+      <div class="post-content"> </div>
+
+      <div class="feedback"> </div>
+      <div class="likes"> </div>
+      <div class="comments"> </div>
+    {{/if}}
 
   </div>
diff --git a/public/javascripts/app/views/post_view.js b/public/javascripts/app/views/post_view.js
index c722ceed8..9d93b28ba 100644
--- a/public/javascripts/app/views/post_view.js
+++ b/public/javascripts/app/views/post_view.js
@@ -1,12 +1,12 @@
 app.views.Post = app.views.StreamObject.extend({
-  
+
   templateName: "stream-element",
 
   className : "stream_element loaded",
 
   events: {
     "click .focus_comment_textarea": "focusCommentTextarea",
-    "click .shield a": "removeNsfwShield",
+    "click .nsfw-shield a": "removeNsfwShield",
     "click .remove_post": "destroyModel",
     "click .hide_post": "hidePost",
     "click .block_user": "blockUser"
@@ -55,9 +55,8 @@ app.views.Post = app.views.StreamObject.extend({
 
   removeNsfwShield: function(evt){
     if(evt){ evt.preventDefault(); }
-
-    $(evt.target).parent(".shield").remove();
-
+    this.model.set({nsfw : false})
+    this.render();
     return this;
   },
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index cb45fb58b..e905e20cd 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2786,20 +2786,13 @@ a.toggle_selector
       &:hover
         @include opacity(1)
 
-.shield
+.nsfw-shield
   @include border-radius(3px)
-  :z-index 3
   :background-color #eee
-  :position absolute
-  :width 100%
-  :min-height 100%
-  :padding 5px
+  :width 90%
+  :padding 5px 10px
   :border 1px solid #ddd
-
-.shield_wrapper
-  :position relative
-  :margin
-    :bottom 15px
+  :color #999
 
 #back-to-top
   :display block
diff --git a/spec/javascripts/app/views/post_view_spec.js b/spec/javascripts/app/views/post_view_spec.js
index 1773bad79..27f0731fa 100644
--- a/spec/javascripts/app/views/post_view_spec.js
+++ b/spec/javascripts/app/views/post_view_spec.js
@@ -68,7 +68,7 @@ describe("app.views.Post", function(){
         var view = new app.views.Post({model : this.statusMessage}).render();
         var statusElement = $(view.el)
 
-        expect(statusElement.find(".shield").length).toBe(1)
+        expect(statusElement.find(".nsfw-shield").length).toBe(1)
       })
 
       it("does not contain a shield element", function(){