diff --git a/builds/appchan-x.js b/builds/appchan-x.js
index 02a41dfdc..4ed2e110c 100644
--- a/builds/appchan-x.js
+++ b/builds/appchan-x.js
@@ -3746,7 +3746,7 @@
       }
       boardList = $.el('span', {
         id: 'board-list',
-        innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><a href=javascript:; class='hide-board-list-button fourchanx-link'>&nbsp;&nbsp;-&nbsp;&nbsp;</a> " + fourchannav.innerHTML + "</span>"
+        innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><a href=javascript:; class='hide-board-list-button brackets-wrap'>&nbsp;&nbsp;-&nbsp;&nbsp;</a> " + fourchannav.innerHTML + "</span>"
       });
       fullBoardList = $('#full-board-list', boardList);
       btn = $('.hide-board-list-button', fullBoardList);
@@ -3919,8 +3919,9 @@
       var shortcut;
 
       shortcut = $.el('span', {
-        className: 'shortcut fourchanx-link'
+        className: 'shortcut'
       });
+      $.addClass(el, 'brackets-wrap');
       $.add(shortcut, el);
       return $.prepend(Header.shortcuts, shortcut);
     },
@@ -5297,7 +5298,7 @@
 
       a = $.el('a', {
         className: "" + type + "-reply-button",
-        innerHTML: "<span class=fourchanx-link>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
+        innerHTML: "<span class=brackets-wrap>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
         href: 'javascript:;'
       });
       $.on(a, 'click', PostHiding.toggle);
@@ -5627,7 +5628,7 @@
 
       a = $.el('a', {
         className: "" + type + "-thread-button",
-        innerHTML: "<span class=fourchanx-link>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
+        innerHTML: "<span class=brackets-wrap>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
         href: 'javascript:;'
       });
       a.setAttribute('data-fullid', thread.fullID);
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 77dd2a006..3bb46b0e8 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -3742,7 +3742,7 @@
       }
       boardList = $.el('span', {
         id: 'board-list',
-        innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><a href=javascript:; class='hide-board-list-button fourchanx-link'>&nbsp;&nbsp;-&nbsp;&nbsp;</a> " + fourchannav.innerHTML + "</span>"
+        innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><a href=javascript:; class='hide-board-list-button brackets-wrap'>&nbsp;&nbsp;-&nbsp;&nbsp;</a> " + fourchannav.innerHTML + "</span>"
       });
       fullBoardList = $('#full-board-list', boardList);
       btn = $('.hide-board-list-button', fullBoardList);
@@ -3915,8 +3915,9 @@
       var shortcut;
 
       shortcut = $.el('span', {
-        className: 'shortcut fourchanx-link'
+        className: 'shortcut'
       });
+      $.addClass(el, 'brackets-wrap');
       $.add(shortcut, el);
       return $.prepend(Header.shortcuts, shortcut);
     },
@@ -5293,7 +5294,7 @@
 
       a = $.el('a', {
         className: "" + type + "-reply-button",
-        innerHTML: "<span class=fourchanx-link>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
+        innerHTML: "<span class=brackets-wrap>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
         href: 'javascript:;'
       });
       $.on(a, 'click', PostHiding.toggle);
@@ -5623,7 +5624,7 @@
 
       a = $.el('a', {
         className: "" + type + "-thread-button",
-        innerHTML: "<span class=fourchanx-link>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
+        innerHTML: "<span class=brackets-wrap>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
         href: 'javascript:;'
       });
       a.setAttribute('data-fullid', thread.fullID);
diff --git a/builds/crx/script.js b/builds/crx/script.js
index a95ca3e91..deee1b2af 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -3743,7 +3743,7 @@
       }
       boardList = $.el('span', {
         id: 'board-list',
-        innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><a href=javascript:; class='hide-board-list-button fourchanx-link'>&nbsp;&nbsp;-&nbsp;&nbsp;</a> " + fourchannav.innerHTML + "</span>"
+        innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><a href=javascript:; class='hide-board-list-button brackets-wrap'>&nbsp;&nbsp;-&nbsp;&nbsp;</a> " + fourchannav.innerHTML + "</span>"
       });
       fullBoardList = $('#full-board-list', boardList);
       btn = $('.hide-board-list-button', fullBoardList);
@@ -3916,8 +3916,9 @@
       var shortcut;
 
       shortcut = $.el('span', {
-        className: 'shortcut fourchanx-link'
+        className: 'shortcut'
       });
+      $.addClass(el, 'brackets-wrap');
       $.add(shortcut, el);
       return $.prepend(Header.shortcuts, shortcut);
     },
@@ -5294,7 +5295,7 @@
 
       a = $.el('a', {
         className: "" + type + "-reply-button",
-        innerHTML: "<span class=fourchanx-link>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
+        innerHTML: "<span class=brackets-wrap>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
         href: 'javascript:;'
       });
       $.on(a, 'click', PostHiding.toggle);
@@ -5624,7 +5625,7 @@
 
       a = $.el('a', {
         className: "" + type + "-thread-button",
-        innerHTML: "<span class=fourchanx-link>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
+        innerHTML: "<span class=brackets-wrap>&nbsp;" + (type === 'hide' ? '-' : '+') + "&nbsp;</span>",
         href: 'javascript:;'
       });
       a.setAttribute('data-fullid', thread.fullID);
diff --git a/src/Filtering/PostHiding.coffee b/src/Filtering/PostHiding.coffee
index d0c52079d..7fc8cd0a0 100644
--- a/src/Filtering/PostHiding.coffee
+++ b/src/Filtering/PostHiding.coffee
@@ -135,7 +135,7 @@ PostHiding =
   makeButton: (post, type) ->
     a = $.el 'a',
       className: "#{type}-reply-button"
-      innerHTML: "<span class=fourchanx-link>&nbsp;#{if type is 'hide' then '-' else '+'}&nbsp;</span>"
+      innerHTML: "<span class=brackets-wrap>&nbsp;#{if type is 'hide' then '-' else '+'}&nbsp;</span>"
       href:      'javascript:;'
     $.on a, 'click', PostHiding.toggle
     a
diff --git a/src/Filtering/ThreadHiding.coffee b/src/Filtering/ThreadHiding.coffee
index bbdc8287b..ef7e09108 100644
--- a/src/Filtering/ThreadHiding.coffee
+++ b/src/Filtering/ThreadHiding.coffee
@@ -111,7 +111,7 @@ ThreadHiding =
   makeButton: (thread, type) ->
     a = $.el 'a',
       className: "#{type}-thread-button"
-      innerHTML: "<span class=fourchanx-link>&nbsp;#{if type is 'hide' then '-' else '+'}&nbsp;</span>"
+      innerHTML: "<span class=brackets-wrap>&nbsp;#{if type is 'hide' then '-' else '+'}&nbsp;</span>"
       href:      'javascript:;'
     a.setAttribute 'data-fullid', thread.fullID
     $.on a, 'click', ThreadHiding.toggle
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index c1b23a254..5d4609fb7 100644
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -82,7 +82,7 @@ Header =
 
     boardList = $.el 'span',
       id: 'board-list'
-      innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><a href=javascript:; class='hide-board-list-button fourchanx-link'>&nbsp;&nbsp;-&nbsp;&nbsp;</a> #{fourchannav.innerHTML}</span>"
+      innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><a href=javascript:; class='hide-board-list-button brackets-wrap'>&nbsp;&nbsp;-&nbsp;&nbsp;</a> #{fourchannav.innerHTML}</span>"
     fullBoardList = $ '#full-board-list', boardList
     btn = $ '.hide-board-list-button', fullBoardList
     $.on btn, 'click', Header.toggleBoardList
@@ -245,7 +245,8 @@ Header =
 
   addShortcut: (el) ->
     shortcut = $.el 'span',
-      className: 'shortcut fourchanx-link'
+      className: 'shortcut'
+    $.addClass el, 'brackets-wrap'
     $.add shortcut, el
     $.prepend Header.shortcuts, shortcut