diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf1f2b637..bed10235c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda
 
 ### v1.10.6
 
+**v1.10.6.4** *(2015-03-24)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.4/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.10.5.6: Fix QR file/submit button focus indication in Firefox.
+
 **v1.10.6.3** *(2015-03-23)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.3/builds/4chan-X-noupdate.crx "Chromium version")]
 - Drop `Remove Original Link` option; work around DownThemAll limitations a better way.
 
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 40c337e12..8b0f08c17 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 bb9db3cbc..5bd13e403 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.10.6.3
+// @version      1.10.6.4
 // @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 6e3777045..474cfdc48 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.10.6.3
+// @version      1.10.6.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -395,7 +395,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.6.3',
+    VERSION: '1.10.6.4',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -18273,7 +18273,7 @@
 "  display: flex;\n" +
 "  -webkit-align-items: stretch;\n" +
 "  align-items: stretch;\n" +
-"  height: 1.7em;\n" +
+"  height: 25px;\n" +
 "  margin-top: 1px;\n" +
 "}\n" +
 "#file-n-submit > input {\n" +
@@ -18281,10 +18281,6 @@
 "  border: 1px solid #BBB;\n" +
 "  border-radius: 2px;\n" +
 "}\n" +
-"#file-n-submit > input::-moz-focus-inner {\n" +
-"  border: 0;\n" +
-"  padding: 0;\n" +
-"}\n" +
 "#qr-file-button {\n" +
 "  width: 15%;\n" +
 "}\n" +
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index a4735165c..e89bea7cc 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 7b37a5dc3..607d961a6 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.10.6.3
+// @version      1.10.6.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -394,7 +394,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.6.3',
+    VERSION: '1.10.6.4',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -18272,7 +18272,7 @@
 "  display: flex;\n" +
 "  -webkit-align-items: stretch;\n" +
 "  align-items: stretch;\n" +
-"  height: 1.7em;\n" +
+"  height: 25px;\n" +
 "  margin-top: 1px;\n" +
 "}\n" +
 "#file-n-submit > input {\n" +
@@ -18280,10 +18280,6 @@
 "  border: 1px solid #BBB;\n" +
 "  border-radius: 2px;\n" +
 "}\n" +
-"#file-n-submit > input::-moz-focus-inner {\n" +
-"  border: 0;\n" +
-"  padding: 0;\n" +
-"}\n" +
 "#qr-file-button {\n" +
 "  width: 15%;\n" +
 "}\n" +
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index fa4f3563c..e043de47b 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 006ad5471..9bb4f112e 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.10.6.3
+// @version      1.10.6.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 2ce3e596d..1c9b28005 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.10.6.3
+// @version      1.10.6.4
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -395,7 +395,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.6.3',
+    VERSION: '1.10.6.4',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -18273,7 +18273,7 @@
 "  display: flex;\n" +
 "  -webkit-align-items: stretch;\n" +
 "  align-items: stretch;\n" +
-"  height: 1.7em;\n" +
+"  height: 25px;\n" +
 "  margin-top: 1px;\n" +
 "}\n" +
 "#file-n-submit > input {\n" +
@@ -18281,10 +18281,6 @@
 "  border: 1px solid #BBB;\n" +
 "  border-radius: 2px;\n" +
 "}\n" +
-"#file-n-submit > input::-moz-focus-inner {\n" +
-"  border: 0;\n" +
-"  padding: 0;\n" +
-"}\n" +
 "#qr-file-button {\n" +
 "  width: 15%;\n" +
 "}\n" +
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index aad179627..9e39f13b8 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 11ec6fc78..af3945f9f 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://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.6.3' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.6.4' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index ca5685345..8b0f4fb6f 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://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.6.3' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.6.4' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 0ff4b4e12..c0c10822b 100755
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.10.6.3",
-    "date": "2015-03-23T13:07:03.503Z",
+    "version": "1.10.6.4",
+    "date": "2015-03-24T17:20:04.895Z",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",