diff --git a/src/General/css/style.css b/src/General/css/style.css
index 656a598de..cf10da731 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -1206,8 +1206,18 @@ input.field.tripped:not(:hover):not(:focus) {
   text-shadow: none !important;
 }
 #qr textarea {
+  min-width: 100%;
   resize: both;
 }
+.field {
+  -moz-box-sizing: border-box;
+  margin: 0px;
+  padding: 2px 4px 3px;
+}
+#qr label input[type="checkbox"] {
+  position: relative;
+  top: 2px;
+}
 
 /* Noscript Recaptcha */
 .captcha-img {
@@ -1253,25 +1263,28 @@ input.field.tripped:not(:hover):not(:focus) {
   display: block;
   width: 100%;
 }
-.field {
-  -moz-box-sizing: border-box;
-  margin: 0px;
-  padding: 2px 4px 3px;
-}
-#qr textarea {
-  min-width: 100%;
-}
-#qr label input[type="checkbox"] {
-  position: relative;
-  top: 2px;
-}
 
 /* Fake File Input */
 #file-n-submit {
+  display: -webkit-flex;
+  display: flex;
+  -webkit-align-items: stretch;
+  align-items: stretch;
+  margin-top: 1px;
+}
+:root.gecko #file-n-submit > input {
+  margin: 0px -1px -1px;
+}
+#qr-filename-container {
+  -webkit-flex: 1 1 auto;
+  flex: 1 1 auto;
+  width: 0;
   display: -webkit-flex;
   display: flex;
   -webkit-align-items: center;
   align-items: center;
+  position: relative;
+  padding: 1px;
 }
 input#qr-filename {
   border: none !important;
@@ -1286,7 +1299,8 @@ input#qr-filename {
   -webkit-flex: 1 1 auto;
   flex: 1 1 auto;
   display: inline-block;
-  padding: 0px 4px;
+  padding: 0;
+  padding-left: 3px;
   overflow: hidden;
   text-overflow: ellipsis;
 }
@@ -1298,41 +1312,33 @@ input#qr-filename {
   position: absolute;
 }
 
-/* QR Icons */
-#file-n-submit > a {
+/* Spoiler Checkbox, QR Icons */
+#qr-spoiler-label, #qr-filename-container > a {
+  -webkit-flex: none;
+  flex: none;
   margin: 0;
-  margin-right: 4px;
+  margin-right: 3px;
   font: 13px sans-serif;
 }
+#qr.has-spoiler #file-n-submit:not(.has-file) #qr-spoiler-label,
+.has-file #url-button,
+#file-n-submit:not(.custom-cooldown) #custom-cooldown-button {
+  display: none;
+}
+#qr-file-spoiler {
+  margin: 0;
+}
 #url-button, #custom-cooldown-button, #dump-button {
   opacity: 0.6;
 }
 #custom-cooldown-button.disabled {
   opacity: 0.27;
 }
-#file-n-submit:not(.custom-cooldown) #custom-cooldown-button {
-  display: none;
-}
 
-/* Thread Select / Spoiler Label */
+/* Thread Select */
 #qr select[data-name="thread"] {
   float: right;
 }
-#qr.has-spoiler .has-file #qr-spoiler-label {
-  width: 6.7%;
-  min-width: 6.7%;
-  max-width: 6.7%;
-  display: inline-block;
-  text-align: center;
-  vertical-align: top;
-}
-#qr.has-spoiler #file-n-submit:not(.has-file) #qr-spoiler-label {
-  display: none;
-}
-#qr-spoiler-label input {
-  position: relative;
-  top: 3px;
-}
 
 /* Dumping UI */
 .dump #dump-list-container {
diff --git a/src/General/html/Features/QuickReply.html b/src/General/html/Features/QuickReply.html
index b1fb7b2ef..54cfa32f3 100755
--- a/src/General/html/Features/QuickReply.html
+++ b/src/General/html/Features/QuickReply.html
@@ -22,20 +22,22 @@
     <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="Choose files">
-    <span id="qr-no-file">No selected file</span>
-    <input id="qr-filename" data-name="filename" spellcheck="false">
-    <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 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>
-    <label id=qr-spoiler-label>
-      <input type=checkbox id=qr-file-spoiler title='Spoiler image'>
-    </label>
-    <input type=submit>
+  <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 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>
+  <input type="file" multiple>
 </form>
 <datalist id="list-name"></datalist>
 <datalist id="list-email"></datalist>