--- a/mobile/android/themes/core/content.css
+++ b/mobile/android/themes/core/content.css
@@ -95,30 +95,24 @@ select[size="1"] xul|scrollbarbutton {
 }
 
 /* Override inverse OS themes */
 textarea,
 button,
 xul|button,
 * > input:not([type="image"]) {
   -moz-appearance: none !important;  /* See bug 598421 for fixing the platform */
-}
-
-textarea,
-button,
-xul|button,
-* > input:not(:-moz-any([type="image"], [type="checkbox"], [type="radio"])) {
   border-radius: var(--form_border_radius);
 }
 
 select[size],
 select[multiple],
 select[size][multiple],
 textarea,
-* > input:not([type="image"]) {
+* > input:not([type="image"]):not([type="image"]) {
   border-style: solid;
   border-color: var(--form_border);
   color: var(--form_text);
   background-color: var(--form_background);
 }
 
 /* Selects are handled by the form helper, see bug 685197 */
 select option, select optgroup {
@@ -134,21 +128,21 @@ select[size="1"],
 button {
   border-style: solid;
   border-color: var(--form_border);
   color: var(--form_text);
   background-color: var(--form_background);
 }
 
 input[type="checkbox"] {
-  background-color: var(--form_background);
+  background: var(--form_background);
 }
 
 input[type="radio"] {
-  background-color: var(--form_background)
+  background: var(--form_background)
 }
 
 select {
   border-width: 1px;
   padding: 1px;
   border-radius: var(--form_border_radius);
 }
 
@@ -234,21 +228,21 @@ button:focus {
 }
 
 input[type="checkbox"]:focus,
 input[type="radio"]:focus {
   border-color: var(--form_border) !important;
 }
 
 input[type="checkbox"]:focus {
-  background-color: var(--form_background);
+  background: var(--form_background);
 }
 
 input[type="radio"]:focus {
-  background-color: var(--form_background);
+  background: var(--form_background);
 }
 
 /* we need to be specific for selects because the above rules are specific too */
 textarea:disabled,
 select[size]:disabled,
 select[multiple]:disabled,
 select[size][multiple]:disabled,
 select:not([size]):not([multiple]):disabled,
@@ -257,38 +251,38 @@ select[size="1"]:disabled,
 button:disabled,
 button:disabled:active,
 * > input:not([type="image"]):disabled,
 * > input:not([type="image"]):disabled:active {
   color: var(--form_text_disabled);
   border-color: var(--form_border);
   border-style: solid;
   border-width: 1px;
-  background-color: var(--form_background_disabled);
+  background: var(--form_background_disabled);
 }
 
 select:not([size]):not([multiple]):disabled,
 select[size="0"]:disabled,
 select[size="1"]:disabled {
-  background-color: var(--form_background_disabled);
+  background: var(--form_background_disabled);
 }
 
 input[type="button"]:disabled,
 input[type="button"]:disabled:active,
 input[type="submit"]:disabled,
 input[type="submit"]:disabled:active,
 input[type="reset"]:disabled,
 input[type="reset"]:disabled:active,
 button:disabled,
 button:disabled:active {
   padding-inline-start: 7px;
   padding-inline-end: 7px;
   padding-block-start: 0;
   padding-block-end: 0;
-  background-color: var(--form_background_disabled);
+  background: var(--form_background_disabled);
 }
 
 input[type="radio"]:disabled,
 input[type="radio"]:disabled:active,
 input[type="radio"]:disabled:hover,
 input[type="radio"]:disabled:hover:active,
 input[type="checkbox"]:disabled,
 input[type="checkbox"]:disabled:active,