diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bd2ed1f6..85d6586d6 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.13
 
+**v1.11.13.1** *(2015-10-16)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.1/builds/4chan-X-noupdate.crx "Chromium version")]
+- HTML/CSS tweaks for Mona font toggle button.
+
 **v1.11.13.0** *(2015-10-14)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.0/builds/4chan-X-noupdate.crx "Chromium version")]
 - Based on v1.11.12.7.
 - Add button to toggle Mona font in QR on /jp/.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 20950f9ca..2879f0d3b 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index 99ebe65ca..2f73e6c12 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.13.0
+// @version      1.11.13.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 743c0376d..912717b05 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.13.0
+// @version      1.11.13.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -415,7 +415,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.13.0',
+    VERSION: '1.11.13.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7070,6 +7070,12 @@
         return QR.unhide();
       }
     },
+    toggleSJIS: function(e) {
+      e.preventDefault();
+      Conf['sjisPreview'] = !Conf['sjisPreview'];
+      $.set('sjisPreview', Conf['sjisPreview']);
+      return QR.nodes.el.classList.toggle('sjis-preview', Conf['sjisPreview']);
+    },
     setCustomCooldown: function(enabled) {
       Conf['customCooldownEnabled'] = enabled;
       QR.cooldown.customCooldown = enabled;
@@ -7404,7 +7410,7 @@
       var dialog, event, i, items, m, match_max, match_min, name, node, nodes, ref, rules, save, scriptData, setNode;
       QR.nodes = nodes = {
         el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', {
-          innerHTML: "<div class=\"move\"><label><input type=\"checkbox\" id=\"autohide\" title=\"Auto-hide\">Quick Reply</label><a href=\"javascript:;\" class=\"close\" title=\"Close\">×</a><select data-name=\"thread\" title=\"Create a new thread / Reply\"><option value=\"new\">New thread</option></select></div><form><div class=\"persona\"><label id=\"sjis-toggle\" title=\"Toggle Mona font\"><input name=\"sjisPreview\" type=\"checkbox\"></label><input name=\"name\" data-name=\"name\" list=\"list-name\" placeholder=\"Name\" class=\"field\" size=\"1\"><input name=\"email\" data-name=\"email\" list=\"list-email\" placeholder=\"Options\" class=\"field\" size=\"1\"><input name=\"sub\" data-name=\"sub\" list=\"list-sub\" placeholder=\"Subject\" class=\"field\" size=\"1\"></div><div class=\"textarea\"><textarea data-name=\"com\" placeholder=\"Comment\" class=\"field\"></textarea><span id=\"char-count\"></span></div><div id=\"dump-list-container\"><div id=\"dump-list\"></div><a id=\"add-post\" href=\"javascript:;\" title=\"Add a post\">+</a></div><div id=\"file-n-submit\"><input type=\"button\" id=\"qr-file-button\" value=\"Files\"><span id=\"qr-filename-container\" class=\"field\"><span id=\"qr-no-file\">No selected file</span><input id=\"qr-filename\" data-name=\"filename\" spellcheck=\"false\"><label id=\"qr-spoiler-label\"><input type=\"checkbox\" id=\"qr-file-spoiler\" title=\"Spoiler image\"></label><a href=\"javascript:;\" id=\"qr-filerm\" title=\"Remove file\"><i class=\"fa fa-times-circle\"></i></a><a id=\"url-button\" title=\"Post from url\"><i class=\"fa fa-link\"></i></a><a hidden id=\"paste-area\" title=\"Select to paste images\" class=\"fa fa-clipboard\" tabindex=\"-1\" contentEditable=\"true\"></a><a id=\"custom-cooldown-button\" title=\"Toggle custom cooldown\" class=\"disabled\"><i class=\"fa fa-clock-o\"></i></a><a id=\"dump-button\" title=\"Dump list\"><i class=\"fa fa-plus-square\"></i></a></span><input type=\"submit\"></div><input type=\"file\" multiple></form><datalist id=\"list-name\"></datalist><datalist id=\"list-email\"></datalist><datalist id=\"list-sub\"></datalist> "
+          innerHTML: "<div class=\"move\"><label><input type=\"checkbox\" id=\"autohide\" title=\"Auto-hide\">Quick Reply</label><a href=\"javascript:;\" class=\"close\" title=\"Close\">×</a><select data-name=\"thread\" title=\"Create a new thread / Reply\"><option value=\"new\">New thread</option></select></div><form><div class=\"persona\"><input type=\"button\" id=\"sjis-toggle\" title=\"Toggle Mona font\" value=\"∀\"><input name=\"name\" data-name=\"name\" list=\"list-name\" placeholder=\"Name\" class=\"field\" size=\"1\"><input name=\"email\" data-name=\"email\" list=\"list-email\" placeholder=\"Options\" class=\"field\" size=\"1\"><input name=\"sub\" data-name=\"sub\" list=\"list-sub\" placeholder=\"Subject\" class=\"field\" size=\"1\"></div><div class=\"textarea\"><textarea data-name=\"com\" placeholder=\"Comment\" class=\"field\"></textarea><span id=\"char-count\"></span></div><div id=\"dump-list-container\"><div id=\"dump-list\"></div><a id=\"add-post\" href=\"javascript:;\" title=\"Add a post\">+</a></div><div id=\"file-n-submit\"><input type=\"button\" id=\"qr-file-button\" value=\"Files\"><span id=\"qr-filename-container\" class=\"field\"><span id=\"qr-no-file\">No selected file</span><input id=\"qr-filename\" data-name=\"filename\" spellcheck=\"false\"><label id=\"qr-spoiler-label\"><input type=\"checkbox\" id=\"qr-file-spoiler\" title=\"Spoiler image\"></label><a href=\"javascript:;\" id=\"qr-filerm\" title=\"Remove file\"><i class=\"fa fa-times-circle\"></i></a><a id=\"url-button\" title=\"Post from url\"><i class=\"fa fa-link\"></i></a><a hidden id=\"paste-area\" title=\"Select to paste images\" class=\"fa fa-clipboard\" tabindex=\"-1\" contentEditable=\"true\"></a><a id=\"custom-cooldown-button\" title=\"Toggle custom cooldown\" class=\"disabled\"><i class=\"fa fa-clock-o\"></i></a><a id=\"dump-button\" title=\"Dump list\"><i class=\"fa fa-plus-square\"></i></a></span><input type=\"submit\"></div><input type=\"file\" multiple></form><datalist id=\"list-name\"></datalist><datalist id=\"list-email\"></datalist><datalist id=\"list-sub\"></datalist> "
         })
       };
       setNode = function(name, query) {
@@ -7419,7 +7425,7 @@
       setNode('dumpButton', '#dump-button');
       setNode('pasteArea', '#paste-area');
       setNode('urlButton', '#url-button');
-      setNode('sjisToggle', '#sjis-toggle > input');
+      setNode('sjisToggle', '#sjis-toggle');
       setNode('name', '[data-name=name]');
       setNode('email', '[data-name=email]');
       setNode('sub', '[data-name=sub]');
@@ -7469,7 +7475,6 @@
         nodes.spoiler.parentElement.hidden = true;
       }
       if (g.BOARD.ID === 'jp' && Conf['sjisPreview']) {
-        nodes.sjisToggle.checked = true;
         $.addClass(QR.nodes.el, 'sjis-preview');
       }
       if (parseInt(Conf['customCooldown'], 10) > 0) {
@@ -7518,10 +7523,7 @@
         return QR.selected.nodes.spoiler.click();
       });
       $.on(nodes.fileInput, 'change', QR.handleFiles);
-      $.on(nodes.sjisToggle, 'change', $.cb.checked);
-      $.on(nodes.sjisToggle, 'change', function() {
-        return nodes.el.classList.toggle('sjis-preview', this.checked);
-      });
+      $.on(nodes.sjisToggle, 'click', QR.toggleSJIS);
       $.on(nodes.customCooldown, 'click', QR.toggleCustomCooldown);
       window.addEventListener('focus', QR.focus, true);
       window.addEventListener('blur', QR.focus, true);
@@ -19567,30 +19569,23 @@
 "#qr.forced-anon input[data-name=\"sub\"]:not(.force-show),\n" +
 "#qr.reply-to-thread input[data-name=\"sub\"]:not(.force-show),\n" +
 "#qr.reply-to-thread select[name=\"filetag\"],\n" +
-"body:not(.board_jp) #sjis-toggle,\n" +
-"#sjis-toggle > input {\n" +
+"body:not(.board_jp) #sjis-toggle {\n" +
 "  display: none;\n" +
 "}\n" +
 "#sjis-toggle {\n" +
+"  -webkit-flex: 0 0 23px;\n" +
+"  flex: 0 0 23px;\n" +
 "  -webkit-align-self: stretch;\n" +
 "  align-self: stretch;\n" +
-"  width: 20px;\n" +
 "  border: 1px solid #BBB;\n" +
-"  background-color: #DCDCDC;\n" +
-"  color: #000;\n" +
-"  display: -webkit-flex;\n" +
-"  display: flex;\n" +
-"  -webkit-align-items: center;\n" +
-"  align-items: center;\n" +
-"}\n" +
-"#sjis-toggle::after {\n" +
-"  content: \"∀\";\n" +
-"  margin: auto;\n" +
-"}\n" +
-"#qr:not(.sjis-preview) #sjis-toggle {\n" +
+"  padding: 0;\n" +
 "  background: linear-gradient(to bottom, #F8F8F8, #DCDCDC) no-repeat;\n" +
+"  color: #000;\n" +
 "}\n" +
-"#sjis-toggle, #qr.sjis-preview textarea {\n" +
+"#qr.sjis-preview #sjis-toggle {\n" +
+"  background: #DCDCDC;\n" +
+"}\n" +
+"#sjis-toggle, #qr.sjis-preview textarea.field {\n" +
 "  font-family: \"IPAMonaPGothic\",\"Mona\",\"MS PGothic\",monospace;\n" +
 "  font-size: 16px;\n" +
 "  line-height: 17px;\n" +
@@ -20684,8 +20679,7 @@
 ":root.tomorrow .qr-preview {\n" +
 "  background-color: rgba(255, 255, 255, .15);\n" +
 "}\n" +
-":root.tomorrow #qr .field,\n" +
-":root.tomorrow #qr #sjis-toggle {\n" +
+":root.tomorrow #qr .field {\n" +
 "  background-color: rgb(26, 27, 29);\n" +
 "  color: rgb(197,200,198);\n" +
 "  border-color: rgb(40, 41, 42);\n" +
@@ -20695,8 +20689,20 @@
 "  border-color: rgb(129, 162, 190) !important;\n" +
 "  background-color: rgb(30,32,36);\n" +
 "}\n" +
-":root.tomorrow #qr:not(.sjis-preview) #sjis-toggle {\n" +
+":root.tomorrow #sjis-toggle {\n" +
 "  background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" +
+"  color: rgb(197,200,198);\n" +
+"  border-color: rgb(40, 41, 42);\n" +
+"  outline: none;\n" +
+"}\n" +
+":root.tomorrow #sjis-toggle::-moz-focus-inner {\n" +
+"  border: none;\n" +
+"}\n" +
+":root.tomorrow #sjis-toggle:focus {\n" +
+"  border-color: rgb(129, 162, 190);\n" +
+"}\n" +
+":root.tomorrow #qr.sjis-preview #sjis-toggle {\n" +
+"  background: rgb(26, 27, 29);\n" +
 "}\n" +
 ":root.tomorrow #qr select,\n" +
 ":root.tomorrow #file-n-submit > input {\n" +
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index f2833b96c..47082a58c 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index 68faa7f6a..26c3cbb0d 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.13.0
+// @version      1.11.13.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -415,7 +415,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.13.0',
+    VERSION: '1.11.13.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7070,6 +7070,12 @@
         return QR.unhide();
       }
     },
+    toggleSJIS: function(e) {
+      e.preventDefault();
+      Conf['sjisPreview'] = !Conf['sjisPreview'];
+      $.set('sjisPreview', Conf['sjisPreview']);
+      return QR.nodes.el.classList.toggle('sjis-preview', Conf['sjisPreview']);
+    },
     setCustomCooldown: function(enabled) {
       Conf['customCooldownEnabled'] = enabled;
       QR.cooldown.customCooldown = enabled;
@@ -7404,7 +7410,7 @@
       var dialog, event, i, items, m, match_max, match_min, name, node, nodes, ref, rules, save, scriptData, setNode;
       QR.nodes = nodes = {
         el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', {
-          innerHTML: "<div class=\"move\"><label><input type=\"checkbox\" id=\"autohide\" title=\"Auto-hide\">Quick Reply</label><a href=\"javascript:;\" class=\"close\" title=\"Close\">×</a><select data-name=\"thread\" title=\"Create a new thread / Reply\"><option value=\"new\">New thread</option></select></div><form><div class=\"persona\"><label id=\"sjis-toggle\" title=\"Toggle Mona font\"><input name=\"sjisPreview\" type=\"checkbox\"></label><input name=\"name\" data-name=\"name\" list=\"list-name\" placeholder=\"Name\" class=\"field\" size=\"1\"><input name=\"email\" data-name=\"email\" list=\"list-email\" placeholder=\"Options\" class=\"field\" size=\"1\"><input name=\"sub\" data-name=\"sub\" list=\"list-sub\" placeholder=\"Subject\" class=\"field\" size=\"1\"></div><div class=\"textarea\"><textarea data-name=\"com\" placeholder=\"Comment\" class=\"field\"></textarea><span id=\"char-count\"></span></div><div id=\"dump-list-container\"><div id=\"dump-list\"></div><a id=\"add-post\" href=\"javascript:;\" title=\"Add a post\">+</a></div><div id=\"file-n-submit\"><input type=\"button\" id=\"qr-file-button\" value=\"Files\"><span id=\"qr-filename-container\" class=\"field\"><span id=\"qr-no-file\">No selected file</span><input id=\"qr-filename\" data-name=\"filename\" spellcheck=\"false\"><label id=\"qr-spoiler-label\"><input type=\"checkbox\" id=\"qr-file-spoiler\" title=\"Spoiler image\"></label><a href=\"javascript:;\" id=\"qr-filerm\" title=\"Remove file\"><i class=\"fa fa-times-circle\"></i></a><a id=\"url-button\" title=\"Post from url\"><i class=\"fa fa-link\"></i></a><a hidden id=\"paste-area\" title=\"Select to paste images\" class=\"fa fa-clipboard\" tabindex=\"-1\" contentEditable=\"true\"></a><a id=\"custom-cooldown-button\" title=\"Toggle custom cooldown\" class=\"disabled\"><i class=\"fa fa-clock-o\"></i></a><a id=\"dump-button\" title=\"Dump list\"><i class=\"fa fa-plus-square\"></i></a></span><input type=\"submit\"></div><input type=\"file\" multiple></form><datalist id=\"list-name\"></datalist><datalist id=\"list-email\"></datalist><datalist id=\"list-sub\"></datalist> "
+          innerHTML: "<div class=\"move\"><label><input type=\"checkbox\" id=\"autohide\" title=\"Auto-hide\">Quick Reply</label><a href=\"javascript:;\" class=\"close\" title=\"Close\">×</a><select data-name=\"thread\" title=\"Create a new thread / Reply\"><option value=\"new\">New thread</option></select></div><form><div class=\"persona\"><input type=\"button\" id=\"sjis-toggle\" title=\"Toggle Mona font\" value=\"∀\"><input name=\"name\" data-name=\"name\" list=\"list-name\" placeholder=\"Name\" class=\"field\" size=\"1\"><input name=\"email\" data-name=\"email\" list=\"list-email\" placeholder=\"Options\" class=\"field\" size=\"1\"><input name=\"sub\" data-name=\"sub\" list=\"list-sub\" placeholder=\"Subject\" class=\"field\" size=\"1\"></div><div class=\"textarea\"><textarea data-name=\"com\" placeholder=\"Comment\" class=\"field\"></textarea><span id=\"char-count\"></span></div><div id=\"dump-list-container\"><div id=\"dump-list\"></div><a id=\"add-post\" href=\"javascript:;\" title=\"Add a post\">+</a></div><div id=\"file-n-submit\"><input type=\"button\" id=\"qr-file-button\" value=\"Files\"><span id=\"qr-filename-container\" class=\"field\"><span id=\"qr-no-file\">No selected file</span><input id=\"qr-filename\" data-name=\"filename\" spellcheck=\"false\"><label id=\"qr-spoiler-label\"><input type=\"checkbox\" id=\"qr-file-spoiler\" title=\"Spoiler image\"></label><a href=\"javascript:;\" id=\"qr-filerm\" title=\"Remove file\"><i class=\"fa fa-times-circle\"></i></a><a id=\"url-button\" title=\"Post from url\"><i class=\"fa fa-link\"></i></a><a hidden id=\"paste-area\" title=\"Select to paste images\" class=\"fa fa-clipboard\" tabindex=\"-1\" contentEditable=\"true\"></a><a id=\"custom-cooldown-button\" title=\"Toggle custom cooldown\" class=\"disabled\"><i class=\"fa fa-clock-o\"></i></a><a id=\"dump-button\" title=\"Dump list\"><i class=\"fa fa-plus-square\"></i></a></span><input type=\"submit\"></div><input type=\"file\" multiple></form><datalist id=\"list-name\"></datalist><datalist id=\"list-email\"></datalist><datalist id=\"list-sub\"></datalist> "
         })
       };
       setNode = function(name, query) {
@@ -7419,7 +7425,7 @@
       setNode('dumpButton', '#dump-button');
       setNode('pasteArea', '#paste-area');
       setNode('urlButton', '#url-button');
-      setNode('sjisToggle', '#sjis-toggle > input');
+      setNode('sjisToggle', '#sjis-toggle');
       setNode('name', '[data-name=name]');
       setNode('email', '[data-name=email]');
       setNode('sub', '[data-name=sub]');
@@ -7469,7 +7475,6 @@
         nodes.spoiler.parentElement.hidden = true;
       }
       if (g.BOARD.ID === 'jp' && Conf['sjisPreview']) {
-        nodes.sjisToggle.checked = true;
         $.addClass(QR.nodes.el, 'sjis-preview');
       }
       if (parseInt(Conf['customCooldown'], 10) > 0) {
@@ -7518,10 +7523,7 @@
         return QR.selected.nodes.spoiler.click();
       });
       $.on(nodes.fileInput, 'change', QR.handleFiles);
-      $.on(nodes.sjisToggle, 'change', $.cb.checked);
-      $.on(nodes.sjisToggle, 'change', function() {
-        return nodes.el.classList.toggle('sjis-preview', this.checked);
-      });
+      $.on(nodes.sjisToggle, 'click', QR.toggleSJIS);
       $.on(nodes.customCooldown, 'click', QR.toggleCustomCooldown);
       window.addEventListener('focus', QR.focus, true);
       window.addEventListener('blur', QR.focus, true);
@@ -19567,30 +19569,23 @@
 "#qr.forced-anon input[data-name=\"sub\"]:not(.force-show),\n" +
 "#qr.reply-to-thread input[data-name=\"sub\"]:not(.force-show),\n" +
 "#qr.reply-to-thread select[name=\"filetag\"],\n" +
-"body:not(.board_jp) #sjis-toggle,\n" +
-"#sjis-toggle > input {\n" +
+"body:not(.board_jp) #sjis-toggle {\n" +
 "  display: none;\n" +
 "}\n" +
 "#sjis-toggle {\n" +
+"  -webkit-flex: 0 0 23px;\n" +
+"  flex: 0 0 23px;\n" +
 "  -webkit-align-self: stretch;\n" +
 "  align-self: stretch;\n" +
-"  width: 20px;\n" +
 "  border: 1px solid #BBB;\n" +
-"  background-color: #DCDCDC;\n" +
-"  color: #000;\n" +
-"  display: -webkit-flex;\n" +
-"  display: flex;\n" +
-"  -webkit-align-items: center;\n" +
-"  align-items: center;\n" +
-"}\n" +
-"#sjis-toggle::after {\n" +
-"  content: \"∀\";\n" +
-"  margin: auto;\n" +
-"}\n" +
-"#qr:not(.sjis-preview) #sjis-toggle {\n" +
+"  padding: 0;\n" +
 "  background: linear-gradient(to bottom, #F8F8F8, #DCDCDC) no-repeat;\n" +
+"  color: #000;\n" +
 "}\n" +
-"#sjis-toggle, #qr.sjis-preview textarea {\n" +
+"#qr.sjis-preview #sjis-toggle {\n" +
+"  background: #DCDCDC;\n" +
+"}\n" +
+"#sjis-toggle, #qr.sjis-preview textarea.field {\n" +
 "  font-family: \"IPAMonaPGothic\",\"Mona\",\"MS PGothic\",monospace;\n" +
 "  font-size: 16px;\n" +
 "  line-height: 17px;\n" +
@@ -20684,8 +20679,7 @@
 ":root.tomorrow .qr-preview {\n" +
 "  background-color: rgba(255, 255, 255, .15);\n" +
 "}\n" +
-":root.tomorrow #qr .field,\n" +
-":root.tomorrow #qr #sjis-toggle {\n" +
+":root.tomorrow #qr .field {\n" +
 "  background-color: rgb(26, 27, 29);\n" +
 "  color: rgb(197,200,198);\n" +
 "  border-color: rgb(40, 41, 42);\n" +
@@ -20695,8 +20689,20 @@
 "  border-color: rgb(129, 162, 190) !important;\n" +
 "  background-color: rgb(30,32,36);\n" +
 "}\n" +
-":root.tomorrow #qr:not(.sjis-preview) #sjis-toggle {\n" +
+":root.tomorrow #sjis-toggle {\n" +
 "  background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" +
+"  color: rgb(197,200,198);\n" +
+"  border-color: rgb(40, 41, 42);\n" +
+"  outline: none;\n" +
+"}\n" +
+":root.tomorrow #sjis-toggle::-moz-focus-inner {\n" +
+"  border: none;\n" +
+"}\n" +
+":root.tomorrow #sjis-toggle:focus {\n" +
+"  border-color: rgb(129, 162, 190);\n" +
+"}\n" +
+":root.tomorrow #qr.sjis-preview #sjis-toggle {\n" +
+"  background: rgb(26, 27, 29);\n" +
 "}\n" +
 ":root.tomorrow #qr select,\n" +
 ":root.tomorrow #file-n-submit > input {\n" +
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 208ce2f2e..b2d933131 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 5166f08ff..5c8988076 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.13.0
+// @version      1.11.13.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index d055adb2c..4d00da9d2 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.13.0
+// @version      1.11.13.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -415,7 +415,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.13.0',
+    VERSION: '1.11.13.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7070,6 +7070,12 @@
         return QR.unhide();
       }
     },
+    toggleSJIS: function(e) {
+      e.preventDefault();
+      Conf['sjisPreview'] = !Conf['sjisPreview'];
+      $.set('sjisPreview', Conf['sjisPreview']);
+      return QR.nodes.el.classList.toggle('sjis-preview', Conf['sjisPreview']);
+    },
     setCustomCooldown: function(enabled) {
       Conf['customCooldownEnabled'] = enabled;
       QR.cooldown.customCooldown = enabled;
@@ -7404,7 +7410,7 @@
       var dialog, event, i, items, m, match_max, match_min, name, node, nodes, ref, rules, save, scriptData, setNode;
       QR.nodes = nodes = {
         el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', {
-          innerHTML: "<div class=\"move\"><label><input type=\"checkbox\" id=\"autohide\" title=\"Auto-hide\">Quick Reply</label><a href=\"javascript:;\" class=\"close\" title=\"Close\">×</a><select data-name=\"thread\" title=\"Create a new thread / Reply\"><option value=\"new\">New thread</option></select></div><form><div class=\"persona\"><label id=\"sjis-toggle\" title=\"Toggle Mona font\"><input name=\"sjisPreview\" type=\"checkbox\"></label><input name=\"name\" data-name=\"name\" list=\"list-name\" placeholder=\"Name\" class=\"field\" size=\"1\"><input name=\"email\" data-name=\"email\" list=\"list-email\" placeholder=\"Options\" class=\"field\" size=\"1\"><input name=\"sub\" data-name=\"sub\" list=\"list-sub\" placeholder=\"Subject\" class=\"field\" size=\"1\"></div><div class=\"textarea\"><textarea data-name=\"com\" placeholder=\"Comment\" class=\"field\"></textarea><span id=\"char-count\"></span></div><div id=\"dump-list-container\"><div id=\"dump-list\"></div><a id=\"add-post\" href=\"javascript:;\" title=\"Add a post\">+</a></div><div id=\"file-n-submit\"><input type=\"button\" id=\"qr-file-button\" value=\"Files\"><span id=\"qr-filename-container\" class=\"field\"><span id=\"qr-no-file\">No selected file</span><input id=\"qr-filename\" data-name=\"filename\" spellcheck=\"false\"><label id=\"qr-spoiler-label\"><input type=\"checkbox\" id=\"qr-file-spoiler\" title=\"Spoiler image\"></label><a href=\"javascript:;\" id=\"qr-filerm\" title=\"Remove file\"><i class=\"fa fa-times-circle\"></i></a><a id=\"url-button\" title=\"Post from url\"><i class=\"fa fa-link\"></i></a><a hidden id=\"paste-area\" title=\"Select to paste images\" class=\"fa fa-clipboard\" tabindex=\"-1\" contentEditable=\"true\"></a><a id=\"custom-cooldown-button\" title=\"Toggle custom cooldown\" class=\"disabled\"><i class=\"fa fa-clock-o\"></i></a><a id=\"dump-button\" title=\"Dump list\"><i class=\"fa fa-plus-square\"></i></a></span><input type=\"submit\"></div><input type=\"file\" multiple></form><datalist id=\"list-name\"></datalist><datalist id=\"list-email\"></datalist><datalist id=\"list-sub\"></datalist> "
+          innerHTML: "<div class=\"move\"><label><input type=\"checkbox\" id=\"autohide\" title=\"Auto-hide\">Quick Reply</label><a href=\"javascript:;\" class=\"close\" title=\"Close\">×</a><select data-name=\"thread\" title=\"Create a new thread / Reply\"><option value=\"new\">New thread</option></select></div><form><div class=\"persona\"><input type=\"button\" id=\"sjis-toggle\" title=\"Toggle Mona font\" value=\"∀\"><input name=\"name\" data-name=\"name\" list=\"list-name\" placeholder=\"Name\" class=\"field\" size=\"1\"><input name=\"email\" data-name=\"email\" list=\"list-email\" placeholder=\"Options\" class=\"field\" size=\"1\"><input name=\"sub\" data-name=\"sub\" list=\"list-sub\" placeholder=\"Subject\" class=\"field\" size=\"1\"></div><div class=\"textarea\"><textarea data-name=\"com\" placeholder=\"Comment\" class=\"field\"></textarea><span id=\"char-count\"></span></div><div id=\"dump-list-container\"><div id=\"dump-list\"></div><a id=\"add-post\" href=\"javascript:;\" title=\"Add a post\">+</a></div><div id=\"file-n-submit\"><input type=\"button\" id=\"qr-file-button\" value=\"Files\"><span id=\"qr-filename-container\" class=\"field\"><span id=\"qr-no-file\">No selected file</span><input id=\"qr-filename\" data-name=\"filename\" spellcheck=\"false\"><label id=\"qr-spoiler-label\"><input type=\"checkbox\" id=\"qr-file-spoiler\" title=\"Spoiler image\"></label><a href=\"javascript:;\" id=\"qr-filerm\" title=\"Remove file\"><i class=\"fa fa-times-circle\"></i></a><a id=\"url-button\" title=\"Post from url\"><i class=\"fa fa-link\"></i></a><a hidden id=\"paste-area\" title=\"Select to paste images\" class=\"fa fa-clipboard\" tabindex=\"-1\" contentEditable=\"true\"></a><a id=\"custom-cooldown-button\" title=\"Toggle custom cooldown\" class=\"disabled\"><i class=\"fa fa-clock-o\"></i></a><a id=\"dump-button\" title=\"Dump list\"><i class=\"fa fa-plus-square\"></i></a></span><input type=\"submit\"></div><input type=\"file\" multiple></form><datalist id=\"list-name\"></datalist><datalist id=\"list-email\"></datalist><datalist id=\"list-sub\"></datalist> "
         })
       };
       setNode = function(name, query) {
@@ -7419,7 +7425,7 @@
       setNode('dumpButton', '#dump-button');
       setNode('pasteArea', '#paste-area');
       setNode('urlButton', '#url-button');
-      setNode('sjisToggle', '#sjis-toggle > input');
+      setNode('sjisToggle', '#sjis-toggle');
       setNode('name', '[data-name=name]');
       setNode('email', '[data-name=email]');
       setNode('sub', '[data-name=sub]');
@@ -7469,7 +7475,6 @@
         nodes.spoiler.parentElement.hidden = true;
       }
       if (g.BOARD.ID === 'jp' && Conf['sjisPreview']) {
-        nodes.sjisToggle.checked = true;
         $.addClass(QR.nodes.el, 'sjis-preview');
       }
       if (parseInt(Conf['customCooldown'], 10) > 0) {
@@ -7518,10 +7523,7 @@
         return QR.selected.nodes.spoiler.click();
       });
       $.on(nodes.fileInput, 'change', QR.handleFiles);
-      $.on(nodes.sjisToggle, 'change', $.cb.checked);
-      $.on(nodes.sjisToggle, 'change', function() {
-        return nodes.el.classList.toggle('sjis-preview', this.checked);
-      });
+      $.on(nodes.sjisToggle, 'click', QR.toggleSJIS);
       $.on(nodes.customCooldown, 'click', QR.toggleCustomCooldown);
       window.addEventListener('focus', QR.focus, true);
       window.addEventListener('blur', QR.focus, true);
@@ -19567,30 +19569,23 @@
 "#qr.forced-anon input[data-name=\"sub\"]:not(.force-show),\n" +
 "#qr.reply-to-thread input[data-name=\"sub\"]:not(.force-show),\n" +
 "#qr.reply-to-thread select[name=\"filetag\"],\n" +
-"body:not(.board_jp) #sjis-toggle,\n" +
-"#sjis-toggle > input {\n" +
+"body:not(.board_jp) #sjis-toggle {\n" +
 "  display: none;\n" +
 "}\n" +
 "#sjis-toggle {\n" +
+"  -webkit-flex: 0 0 23px;\n" +
+"  flex: 0 0 23px;\n" +
 "  -webkit-align-self: stretch;\n" +
 "  align-self: stretch;\n" +
-"  width: 20px;\n" +
 "  border: 1px solid #BBB;\n" +
-"  background-color: #DCDCDC;\n" +
-"  color: #000;\n" +
-"  display: -webkit-flex;\n" +
-"  display: flex;\n" +
-"  -webkit-align-items: center;\n" +
-"  align-items: center;\n" +
-"}\n" +
-"#sjis-toggle::after {\n" +
-"  content: \"∀\";\n" +
-"  margin: auto;\n" +
-"}\n" +
-"#qr:not(.sjis-preview) #sjis-toggle {\n" +
+"  padding: 0;\n" +
 "  background: linear-gradient(to bottom, #F8F8F8, #DCDCDC) no-repeat;\n" +
+"  color: #000;\n" +
 "}\n" +
-"#sjis-toggle, #qr.sjis-preview textarea {\n" +
+"#qr.sjis-preview #sjis-toggle {\n" +
+"  background: #DCDCDC;\n" +
+"}\n" +
+"#sjis-toggle, #qr.sjis-preview textarea.field {\n" +
 "  font-family: \"IPAMonaPGothic\",\"Mona\",\"MS PGothic\",monospace;\n" +
 "  font-size: 16px;\n" +
 "  line-height: 17px;\n" +
@@ -20684,8 +20679,7 @@
 ":root.tomorrow .qr-preview {\n" +
 "  background-color: rgba(255, 255, 255, .15);\n" +
 "}\n" +
-":root.tomorrow #qr .field,\n" +
-":root.tomorrow #qr #sjis-toggle {\n" +
+":root.tomorrow #qr .field {\n" +
 "  background-color: rgb(26, 27, 29);\n" +
 "  color: rgb(197,200,198);\n" +
 "  border-color: rgb(40, 41, 42);\n" +
@@ -20695,8 +20689,20 @@
 "  border-color: rgb(129, 162, 190) !important;\n" +
 "  background-color: rgb(30,32,36);\n" +
 "}\n" +
-":root.tomorrow #qr:not(.sjis-preview) #sjis-toggle {\n" +
+":root.tomorrow #sjis-toggle {\n" +
 "  background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" +
+"  color: rgb(197,200,198);\n" +
+"  border-color: rgb(40, 41, 42);\n" +
+"  outline: none;\n" +
+"}\n" +
+":root.tomorrow #sjis-toggle::-moz-focus-inner {\n" +
+"  border: none;\n" +
+"}\n" +
+":root.tomorrow #sjis-toggle:focus {\n" +
+"  border-color: rgb(129, 162, 190);\n" +
+"}\n" +
+":root.tomorrow #qr.sjis-preview #sjis-toggle {\n" +
+"  background: rgb(26, 27, 29);\n" +
 "}\n" +
 ":root.tomorrow #qr select,\n" +
 ":root.tomorrow #file-n-submit > input {\n" +
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index d609fcdfb..7c842e387 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 50e80fb58..d5eb5ca23 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.13.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.13.1' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index ceeca334b..87b831cb2 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.13.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.13.1' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 88a1e1034..06f7cbcfb 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "meta": {
     "name": "4chan X",
     "fork": "ccd0",
-    "version": "1.11.13.0",
-    "date": "2015-10-14T07:03:43.601Z",
+    "version": "1.11.13.1",
+    "date": "2015-10-17T03:43:21.599Z",
     "page": "https://www.4chan-x.net/",
     "downloads": "https://www.4chan-x.net/builds/",
     "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",