diff --git a/4chan_x.user.js b/4chan_x.user.js
index b78932bae..351d3c6ad 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -759,7 +759,8 @@
       $.replace(a.parentNode.parentNode, bq);
       if (conf['Quote Preview']) quotePreview.node(bq);
       if (conf['Quote Inline']) quoteInline.node(bq);
-      return quoteIndicators.node(bq);
+      if (conf['Indicate OP quote']) quoteOP.node(bq);
+      if (conf['Indicate Cross-thread Quotes']) return quoteDR.node(bq);
     }
   };
 
@@ -3587,7 +3588,7 @@
     },
     node: function(post) {
       var img, src;
-      if (post.root.hidden || post.img) return;
+      if (post.root.hidden || !post.img) return;
       src = post.img.parentNode.href;
       if (/gif$/.test(src) && !/spoiler/.test(src)) {
         img = $.el('img');
diff --git a/script.coffee b/script.coffee
index 69c48da18..992ba5366 100644
--- a/script.coffee
+++ b/script.coffee
@@ -641,7 +641,10 @@ expandComment =
       quotePreview.node bq
     if conf['Quote Inline']
       quoteInline.node bq
-    quoteIndicators.node bq
+    if conf['Indicate OP quote']
+      quoteOP.node bq
+    if conf['Indicate Cross-thread Quotes']
+      quoteDR.node bq
 
 expandThread =
   init: ->
@@ -2892,7 +2895,7 @@ imgGif =
   init: ->
     g.callbacks.push @node
   node: (post) ->
-    return if post.root.hidden or post.img
+    return if post.root.hidden or not post.img
     src = post.img.parentNode.href
     if /gif$/.test(src) and !/spoiler/.test src
       img = $.el 'img'