diff --git a/mobile/android/components/HelperAppDialog.js b/mobile/android/components/HelperAppDialog.js
index c9f1ef0303ac..7f305ea52b13 100644
--- a/mobile/android/components/HelperAppDialog.js
+++ b/mobile/android/components/HelperAppDialog.js
@@ -40,11 +40,7 @@ const Cu = Components.utils;
 const Cr = Components.results;
 
 const PREF_BD_USEDOWNLOADDIR = "browser.download.useDownloadDir";
-#ifdef ANDROID
 const URI_GENERIC_ICON_DOWNLOAD = "drawable://alertdownloads";
-#else
-const URI_GENERIC_ICON_DOWNLOAD = "chrome://browser/skin/images/alert-downloads-30.png";
-#endif
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
diff --git a/mobile/android/themes/core/content.css b/mobile/android/themes/core/content.css
index 978f9cc8dbb8..73b1cb50fa99 100644
--- a/mobile/android/themes/core/content.css
+++ b/mobile/android/themes/core/content.css
@@ -44,7 +44,7 @@
 
 /* make clicking on links stand out a bit (bug 532206) */
 * > *:not(embed):focus, * > *:focus > font {
-  outline: 2px solid #8db8d8 !important;
+  outline: 2px solid @color_background_highlight@ !important;
   /*
     XXX How do I preserve mac focusring without blowing focus color on other platforms?
     outline-color: -moz-mac-focusring !important;
@@ -55,6 +55,11 @@
   outline-offset: -2px;
 }
 
+::-moz-selection {
+  background-color: @color_background_highlight@;
+  color: @color_text_highlight@;
+}
+
 /* Style the scrollbars */
 html xul|scrollbar {
   display: none;
@@ -123,7 +128,7 @@ xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
 }
 
 xul|scrollbar xul|thumb {
-  background-color: rgba(0, 0, 0, 0.4) !important;
+  background-color: @color_background_scroller@ !important;
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-right-colors: none !important;
@@ -347,7 +352,7 @@ option:active,
 select:active,
 label:active,
 textarea:active {
-  background-color: rgba(141, 184, 216, 0.5) !important;
+  background-color: @color_background_highlight_overlay@ !important;
 }
 
 /* 
diff --git a/mobile/android/themes/core/defines.inc b/mobile/android/themes/core/defines.inc
index 9b707fa873b1..186aa0a2675b 100644
--- a/mobile/android/themes/core/defines.inc
+++ b/mobile/android/themes/core/defines.inc
@@ -1,5 +1,31 @@
 %filter substitution
 
+%define color_background_active #525252
+%define color_background_default #000
+%define color_text_default #fff
+%define color_divider_border #333333
+%define color_button_border #5a5a5a
+%define color_dialog_border #5a5a5a
+%define color_background_dlgbuttons #9a9a9a
+%define color_background_panel #d6d6d6
+%define color_text_panel #000
+%define color_background_header #292929
+%define color_text_header #999999
+%define color_background_scroller #9a9a9a
+%define color_background_inverse #fff
+%define color_text_inverse #000
+%define color_text_button #000
+%define color_text_disabled #808080
+%define color_text_placeholder #808080
+%define color_text_as_link #febc2b
+
+%define color_background_highlight #febc2b
+%define color_background_highlight_overlay rgba(254, 188, 43, 0.8)
+%define color_text_highlight #000
+
+%define color_subtext_default lightgray
+%define color_subtext_inverse #414141
+
 %define font_xlarge 5.08mozmm
 %define font_xnormal 2.75mozmm
 %define font_normal 2.54mozmm
@@ -14,6 +40,7 @@
 %define touch_button_xlarge 7.62mozmm
 %define touch_button_large 6.77mozmm
 %define touch_button_small 5.93mozmm
+%define touch_button_minwidth 11.86mozmm
 %define touch_action_minwidth 21.17mozmm
 %define touch_normal 6.77mozmm
 
@@ -68,7 +95,7 @@
 
 %define sidebar_width_minimum 8.47mozmm
 %define sidebar_button_height 7.41mozmm
-%define documenttab_margin_bottom 0.53mozmm
+%define documenttab_margin_bottom 0.85mozmm
 
 %define placelabel_padding 8.47mozmm
 %define placeitem_padding 4.23mozmm
diff --git a/mobile/android/themes/core/gingerbread/browser.css b/mobile/android/themes/core/gingerbread/browser.css
deleted file mode 100644
index 44afd509da3a..000000000000
--- a/mobile/android/themes/core/gingerbread/browser.css
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Mobile Browser.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Mark Finkle <mfinkle@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-%filter substitution
-%include defines.inc
-
-/* content scrollbars */
-.scroller {
-  opacity: 0;
-  background-color: rgba(0, 0, 0, 0.4) !important;
-  -moz-border-top-colors: none !important;
-  -moz-border-bottom-colors: none !important;
-  -moz-border-right-colors: none !important;
-  -moz-border-left-colors: none !important;
-  border-radius: @border_radius_tiny@;
-  border: @border_width_tiny@ solid rgba(255, 255, 255, 0.4) !important;
-}
-
-.scroller[panning="true"] {
-  opacity: 1;
-}
-
-.scroller[orient="vertical"] {
-  min-width: @scroller_thickness@;
-  width: @scroller_thickness@;
-  min-height: @scroller_minimum@;
-}
-
-.scroller[orient="horizontal"] {
-  min-height: @scroller_thickness@;
-  height: @scroller_thickness@;
-  min-width: @scroller_minimum@;
-}
diff --git a/mobile/android/themes/core/gingerbread/content.css b/mobile/android/themes/core/gingerbread/content.css
deleted file mode 100644
index d16cf9ad65d0..000000000000
--- a/mobile/android/themes/core/gingerbread/content.css
+++ /dev/null
@@ -1,368 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Mobile Browser.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Mark Finkle <mfinkle@mozilla.com>
- *   Doug Turner <dougt@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-%filter substitution
-%include defines.inc
-
-@namespace url("http://www.w3.org/1999/xhtml");
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* make clicking on links stand out a bit (bug 532206) */
-* > *:not(embed):focus, * > *:focus > font {
-  outline: 2px solid @color_background_highlight@ !important;
-  /*
-    XXX How do I preserve mac focusring without blowing focus color on other platforms?
-    outline-color: -moz-mac-focusring !important;
-  */
-}
-
-*:-moz-any-link:focus {
-  outline-offset: -2px;
-}
-
-::-moz-selection {
-  background-color: @color_background_highlight@;
-  color: @color_text_highlight@;
-}
-
-/* Style the scrollbars */
-html xul|scrollbar {
-  display: none;
-}
-
-xul|window xul|scrollbar {
-  display: block;
-}
-
-xul|scrollbar[orient="vertical"] {
-  -moz-appearance: none !important;
-  opacity: 0;
-  position: relative;
-  margin-left: -8px;
-  min-width: 8px;
-  background-color: transparent !important;
-  background-image: none !important;
-  border: 0px solid transparent !important;
-}
-
-xul|scrollbar[orient="vertical"]:-moz-locale-dir(rtl) {
-  margin-left: 2px;
-  margin-right: -10px;
-}
-
-xul|scrollbar[orient="vertical"] xul|thumb {
-  max-width: 6px !important;
-  min-width: 6px !important;
-}
-
-xul|scrollbar[orient="horizontal"] {
-  -moz-appearance: none !important;
-  opacity: 0;
-  position: relative;
-  min-height: 8px;
-  margin-top: -8px;
-  background-color: transparent !important;
-  background-image: none !important;
-  border: 0px solid transparent !important;
-}
-
-xul|scrollbar[orient="horizontal"] xul|thumb {
-  max-height: 6px !important;
-  min-height: 6px !important;
-}
-
-xul|*[panning="true"] xul|scrollbar {
-  opacity: 1;
-}
-
-xul|scrollbox {
-  overflow-y: scroll;
-  overflow-x: scroll;
-}
-
-xul|scrollbarbutton {
-  min-height: 8px !important;
-  min-width: 8px !important;
-  -moz-appearance: none !important;
-  visibility: hidden;
-}
-
-xul|scrollbarbutton[sbattr="scrollbar-up-top"],
-xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
-  display: none;
-}
-
-xul|scrollbar xul|thumb {
-  background-color: @color_background_scroller@ !important;
-  -moz-border-top-colors: none !important;
-  -moz-border-bottom-colors: none !important;
-  -moz-border-right-colors: none !important;
-  -moz-border-left-colors: none !important;
-  border: 1px solid rgba(255, 255, 255, 0.4) !important;
-  border-radius: 3px;
-}
-
-select:not([size]):not([multiple]) > xul|scrollbar,
-select[size="1"] > xul|scrollbar,
-select:not([size]):not([multiple]) xul|scrollbarbutton,
-select[size="1"] xul|scrollbarbutton {
-  display: block;
-  margin-left: 0;
-  min-width: 16px;
-}
-
-/* Override inverse OS themes */
-select,
-textarea,
-button,
-xul|button,
-* > input:not([type="image"]) {
-  -moz-appearance: none !important;  /* See bug 598421 for fixing the platform */
-  border-radius: 3px;
-}
-
-select[size],
-select[multiple],
-select[size][multiple],
-textarea,
-* > input:not([type="image"]) {
-  border-style: solid;
-  border-color: #7d7d7d;
-  color: #414141;
-  background: white -moz-linear-gradient(top, rgba(115,115,115,0.5) 0, rgba(215,215,215,0.5) 3px, rgba(255,255,255,0.2) 16px);
-}
-
-input:-moz-placeholder,
-textarea:-moz-placeholder {
-  color: GrayText;
-}
-
-select:not([size]):not([multiple]),
-select[size="0"],
-select[size="1"],
-* > input[type="button"],
-* > input[type="submit"],
-* > input[type="reset"],
-button {
-  border-style: solid;
-  border-color: #7d7d7d;
-  color: #414141;
-  background: white -moz-linear-gradient(top, rgba(255,255,255,0.2) 0, rgba(215,215,215,0.5) 18px, rgba(115,115,115,0.5) 100%);
-}
-
-input[type="checkbox"] {
-  background: white -moz-linear-gradient(top, rgba(115,115,115,0.5) 0, rgba(215,215,215,0.5) 2px, rgba(255,255,255,0.2) 6px);
-}
-
-input[type="radio"] {
-  background: -moz-radial-gradient(6px 6px, cover, rgba(255,255,255,0.2) 3px, rgba(195,195,195,0.5) 5px, rgba(115,115,115,0.5) 100%);
-}
-
-select {
-  border-width: 1px;
-  padding: 1px;
-}
-
-select:not([size]):not([multiple]),
-select[size="0"],
-select[size="1"] {
-  padding: 0 1px 0 1px;
-}
-
-* > input:not([type="image"]) {
-  border-width: 1px;
-  padding: 1px;
-}
-
-textarea {
-  resize: none;
-  border-width: 1px;
-  padding: 2px 1px 2px 1px;
-}
-
-input[type="button"],
-input[type="submit"],
-input[type="reset"],
-button {
-  border-width: 1px;
-  padding: 0 7px 0 7px;
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-  max-width: 14px;
-  max-height: 14px;
-  border: 1px solid #a7a7a7 !important;
-  padding: 2px 1px 2px 1px;
-}
-
-select > button {
-  border-width: 0px !important;
-  margin: 0px !important;
-  padding: 0px !important;
-  border-radius: 0;
-  color: #414141;
-
-  background-size: auto auto, 100% 90%;
-  background-color: transparent;
-  background-image: url("chrome://browser/skin/images/dropmarker.svg"),
-                    -moz-radial-gradient(bottom left, #bbbbbb 40%, #f5f5f5) !important;
-  background-position: -moz-calc(50% + 1px) center, -15px center !important;
-  background-repeat: no-repeat !important;
-
-  font-size: inherit;
-}
-
-select[size]:focus,
-select[multiple]:focus,
-select[size][multiple]:focus,
-textarea:focus,
-input[type="file"]:focus > input[type="text"],
-* > input:not([type="image"]):focus {
-  outline: 0px !important;
-  border-style: solid;
-  border-color: rgb(94,128,153);
-  background: white -moz-linear-gradient(top, rgba(27,113,177,0.5) 0, rgba(198,225,246,0.2) 3px, rgba(255,255,255,0.2) 16px);
-}
-
-select:not([size]):not([multiple]):focus,
-select[size="0"]:focus,
-select[size="1"]:focus,
-input[type="button"]:focus,
-input[type="submit"]:focus,
-input[type="reset"]:focus,
-button:focus {
-  outline: 0px !important;
-  border-style: solid;
-  border-color: rgb(94,128,153);
-  background: white -moz-linear-gradient(top, rgba(255,255,255,0.2) 0, rgba(198,225,256,0.2) 18px, rgba(27,113,177,0.5) 100%);
-}
-
-input[type="checkbox"]:focus,
-input[type="radio"]:focus {
-  border-color: #99c6e0 !important;
-}
-
-input[type="checkbox"]:focus {
-  background: white -moz-linear-gradient(top, rgba(27,113,177,0.5) 0, rgba(198,225,246,0.2) 2px, rgba(255,255,255,0.2) 6px);
-}
-
-input[type="radio"]:focus {
-  background: -moz-radial-gradient(6px 6px, cover, rgba(255,255,255,0.2) 3px, rgba(198,225,246,0.2) 5px, rgba(27,113,177,0.5) 100%);
-}
-
-/* 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],
-select[size="0"][disabled],
-select[size="1"][disabled],
-button[disabled],
-* > input:not([type="image"])[disabled] {
-  color: rgba(0,0,0,0.3);
-  border-color: rgba(125,125,125,0.4);
-  border-style: solid;
-  border-width: 1px;
-  background: transparent -moz-linear-gradient(top, rgba(185,185,185,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(255,255,255,0.4) 100%);
-}
-
-select:not([size]):not([multiple])[disabled],
-select[size="0"][disabled],
-select[size="1"][disabled] {
-  background: transparent -moz-linear-gradient(top, rgba(255,255,255,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(185,185,185,0.4) 100%);
-}
-
-input[type="button"][disabled],
-input[type="submit"][disabled],
-input[type="reset"][disabled],
-button[disabled="true"] {
-  padding: 0 7px 0 7px;
-  background: transparent -moz-linear-gradient(top, rgba(255,255,255,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(185,185,185,0.4) 100%);
-}
-
-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,
-input[type="checkbox"][disabled]:hover,
-input[type="checkbox"][disabled]:hover:active {
-  border:1px solid rgba(125,125,125,0.4) !important;
-}
-
-select[disabled] > button {
-  opacity: 0.6;
-  padding: 1px 7px 1px 7px;
-}
-
-/* -moz-touch-enabled? media elements */
-video > xul|videocontrols,
-audio > xul|videocontrols {
-  -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
-}
-
-*:-moz-any-link:active,
-*[role=button]:active,
-button:active,
-input:active,
-option:active,
-select:active,
-label:active,
-textarea:active {
-  background-color: @color_background_highlight_overlay@ !important;
-}
-
-/* 
- * Generate an additional space after the anonymous div to make it easier to
- * to position the caret at the end of the text
- */
-input > .anonymous-div:after {
-  content: "";
-  margin: 16px;
-}
-
-/*
- * Enforce nearest scaling for video in order not to lose too much performance
- * after fixing bug 598736 ("Use higher-quality imageinterpolation on mobile")
- */
-video {
-    image-rendering: -moz-crisp-edges;
-}
diff --git a/mobile/android/themes/core/gingerbread/defines.inc b/mobile/android/themes/core/gingerbread/defines.inc
deleted file mode 100644
index 186aa0a2675b..000000000000
--- a/mobile/android/themes/core/gingerbread/defines.inc
+++ /dev/null
@@ -1,128 +0,0 @@
-%filter substitution
-
-%define color_background_active #525252
-%define color_background_default #000
-%define color_text_default #fff
-%define color_divider_border #333333
-%define color_button_border #5a5a5a
-%define color_dialog_border #5a5a5a
-%define color_background_dlgbuttons #9a9a9a
-%define color_background_panel #d6d6d6
-%define color_text_panel #000
-%define color_background_header #292929
-%define color_text_header #999999
-%define color_background_scroller #9a9a9a
-%define color_background_inverse #fff
-%define color_text_inverse #000
-%define color_text_button #000
-%define color_text_disabled #808080
-%define color_text_placeholder #808080
-%define color_text_as_link #febc2b
-
-%define color_background_highlight #febc2b
-%define color_background_highlight_overlay rgba(254, 188, 43, 0.8)
-%define color_text_highlight #000
-
-%define color_subtext_default lightgray
-%define color_subtext_inverse #414141
-
-%define font_xlarge 5.08mozmm
-%define font_xnormal 2.75mozmm
-%define font_normal 2.54mozmm
-%define font_snormal 2.33mozmm
-%define font_small 1.91mozmm
-%define font_xsmall 1.69mozmm
-%define font_tiny 1.48mozmm
-%define font_xtiny 1.27mozmm
-%define font_xxtiny 1.08mozmm
-
-%define touch_row 7.41mozmm
-%define touch_button_xlarge 7.62mozmm
-%define touch_button_large 6.77mozmm
-%define touch_button_small 5.93mozmm
-%define touch_button_minwidth 11.86mozmm
-%define touch_action_minwidth 21.17mozmm
-%define touch_normal 6.77mozmm
-
-%define margin_context_popup 3.39mozmm
-%define margin_large 2.54mozmm
-%define margin_xxxnormal 1.69mozmm
-%define margin_xnormal 1.06mozmm
-%define margin_normal 0.85mozmm
-%define margin_snormal 0.64mozmm
-%define margin_small 0.42mozmm
-%define margin_tiny 0.21mozmm
-%define margin_xtiny 0.15mozmm
-
-%define padding_xlarge 3.39mozmm
-%define padding_large 2.54mozmm
-%define padding_xxxnormal 1.69mozmm
-%define padding_xxnormal 1.27mozmm
-%define padding_xnormal 1.06mozmm
-%define padding_normal 0.85mozmm
-%define padding_snormal 0.64mozmm
-%define padding_small 0.42mozmm
-%define padding_xsmall 0.21mozmm
-%define padding_tiny 0.11mozmm
-
-%define border_width_xxlarge 0.64mozmm
-%define border_width_xlarge 0.42mozmm
-%define border_width_large 0.32mozmm
-%define border_width_small 0.21mozmm
-%define border_width_tiny 0.11mozmm
-
-%define border_radius_normal 0.85mozmm
-%define border_radius_small 0.64mozmm
-%define border_radius_xsmall 0.31mozmm
-%define border_radius_tiny 0.21mozmm
-
-%define shadow_width_xlarge 1.06mozmm
-%define shadow_width_large 0.64mozmm
-%define shadow_width_small 0.21mozmm
-
-%define textbox_height 5.08mozmm
-
-%define dropmarker_padding 0.53mozmm
-
-%define progressmeter_height 3.39mozmm
-
-%define urlbar_edit_height 6.35mozmm
-%define urlbar_edit_indent 0.85mozmm
-%define identity_popup_tablet_width 72mozmm
-
-%define scroller_thickness 0.64mozmm
-%define scroller_minimum 1.27mozmm
-
-%define sidebar_width_minimum 8.47mozmm
-%define sidebar_button_height 7.41mozmm
-%define documenttab_margin_bottom 0.85mozmm
-
-%define placelabel_padding 8.47mozmm
-%define placeitem_padding 4.23mozmm
-
-%define autocomplete_item_container_image_padding 0.53mozmm
-%define autocomplete_item_container_position 0.21mozmm
-%define autocomplete_item_container_size 2.75mozmm
-%define autocomplete_item_container_padding 5.08mozmm
-
-%define autocomplete_item_subtitle_margin 2.75mozmm
-%define autocomplete_item_label_margin 3.18mozmm
-%define autocomplete_item_tags_margin 3.39mozmm
-
-%define autocompleteresult_padding 0.53mozmm
-
-%define dialog_width 76.2mozmm
-
-%define appmenu_portrait_height 21.17mozmm
-%define appmenu_button_height  10.48mozmm
-
-%define tablet_panel_controls  40mozmm
-%define tablet_panel_minwidth  124mozmm
-
-%ifdef MOZ_PLATFORM_MAEMO
-%define orientation -moz-device-orientation
-%elifdef ANDROID
-%define orientation -moz-device-orientation
-%else
-%define orientation orientation
-%endif
diff --git a/mobile/android/themes/core/gingerbread/images/alert-addons-30.png b/mobile/android/themes/core/gingerbread/images/alert-addons-30.png
deleted file mode 100644
index c8c1a8d3a0c2..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/alert-addons-30.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/alert-downloads-30.png b/mobile/android/themes/core/gingerbread/images/alert-downloads-30.png
deleted file mode 100644
index 8279c3c92c16..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/alert-downloads-30.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/arrowdown-16.png b/mobile/android/themes/core/gingerbread/images/arrowdown-16.png
deleted file mode 100644
index c982426f2ade..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/arrowdown-16.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/arrowleft-16.png b/mobile/android/themes/core/gingerbread/images/arrowleft-16.png
deleted file mode 100644
index 464a4a866cd9..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/arrowleft-16.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/arrowright-16.png b/mobile/android/themes/core/gingerbread/images/arrowright-16.png
deleted file mode 100644
index 859e98ba64b6..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/arrowright-16.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/errorpage-larry-black.png b/mobile/android/themes/core/gingerbread/images/errorpage-larry-black.png
deleted file mode 100644
index 9f2e4a6e7366..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/errorpage-larry-black.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/errorpage-larry-white.png b/mobile/android/themes/core/gingerbread/images/errorpage-larry-white.png
deleted file mode 100644
index fc153c7314e8..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/errorpage-larry-white.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/errorpage-warning.png b/mobile/android/themes/core/gingerbread/images/errorpage-warning.png
deleted file mode 100644
index 8bf9d8e7decc..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/errorpage-warning.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/forward-default-hdpi.png b/mobile/android/themes/core/gingerbread/images/forward-default-hdpi.png
deleted file mode 100644
index 1bfa8012f6d1..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/forward-default-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/mute-hdpi.png b/mobile/android/themes/core/gingerbread/images/mute-hdpi.png
deleted file mode 100644
index c716ef35cd50..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/mute-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/pause-hdpi.png b/mobile/android/themes/core/gingerbread/images/pause-hdpi.png
deleted file mode 100644
index 42b36576978b..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/pause-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/play-hdpi.png b/mobile/android/themes/core/gingerbread/images/play-hdpi.png
deleted file mode 100644
index 7410c99cd5d4..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/play-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/popup-selected-item-hdpi.png b/mobile/android/themes/core/gingerbread/images/popup-selected-item-hdpi.png
deleted file mode 100644
index a11bd508f685..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/popup-selected-item-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/remotetabs-32.png b/mobile/android/themes/core/gingerbread/images/remotetabs-32.png
deleted file mode 100644
index 80f59a022c34..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/remotetabs-32.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/scrubber-hdpi.png b/mobile/android/themes/core/gingerbread/images/scrubber-hdpi.png
deleted file mode 100644
index 0a2fdd3c7fe3..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/scrubber-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/search-clear-30.png b/mobile/android/themes/core/gingerbread/images/search-clear-30.png
deleted file mode 100644
index 8bab39a08d35..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/search-clear-30.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/throbber.png b/mobile/android/themes/core/gingerbread/images/throbber.png
deleted file mode 100644
index c601ec80ba7c..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/throbber.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/unmute-hdpi.png b/mobile/android/themes/core/gingerbread/images/unmute-hdpi.png
deleted file mode 100644
index cf2fb7bfb666..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/unmute-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/gingerbread/images/urlbar-bg.png b/mobile/android/themes/core/gingerbread/images/urlbar-bg.png
deleted file mode 100644
index 9dddc7e7363a..000000000000
Binary files a/mobile/android/themes/core/gingerbread/images/urlbar-bg.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/browser.css b/mobile/android/themes/core/honeycomb/browser.css
deleted file mode 100644
index 186f23e84457..000000000000
--- a/mobile/android/themes/core/honeycomb/browser.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Mobile Browser.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Mark Finkle <mfinkle@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-%filter substitution
-%include defines.inc
-%define honeycomb 1
-
-/* content scrollbars */
-.scroller {
-  opacity: 0;
-  background-color: rgba(0, 0, 0, 0.4) !important;
-  -moz-border-top-colors: none !important;
-  -moz-border-bottom-colors: none !important;
-  -moz-border-right-colors: none !important;
-  -moz-border-left-colors: none !important;
-  border-radius: @border_radius_tiny@;
-  border: @border_width_tiny@ solid rgba(255, 255, 255, 0.4) !important;
-}
-
-.scroller[panning="true"] {
-  opacity: 1;
-}
-
-.scroller[orient="vertical"] {
-  min-width: @scroller_thickness@;
-  width: @scroller_thickness@;
-  min-height: @scroller_minimum@;
-}
-
-.scroller[orient="horizontal"] {
-  min-height: @scroller_thickness@;
-  height: @scroller_thickness@;
-  min-width: @scroller_minimum@;
-}
diff --git a/mobile/android/themes/core/honeycomb/defines.inc b/mobile/android/themes/core/honeycomb/defines.inc
deleted file mode 100644
index 309a6c824804..000000000000
--- a/mobile/android/themes/core/honeycomb/defines.inc
+++ /dev/null
@@ -1,165 +0,0 @@
-%filter substitution
-
-%define color_background_active #fff
-%define color_text_active #222222
-%define color_background_default_window #fff
-%define color_background_default rgba(255,255,255,0.95)
-%define color_text_default #222222
-%define color_toolbar_background #eaeaea
-%define color_toolbar_border #d9d9d9
-%define color_divider_border #6699ff
-%define color_url_border #737373
-%define color_background_button #d9d9d9
-%define color_background_button_disabled #e3e3e3
-%define color_background_button_overlay rgba(217, 217, 217, 0.8)
-%define color_button_border rgb(207,207,207)
-%define color_background_dialog #fff
-%define color_text_dialog #000
-%define color_dialog_border #5a5a5a
-%define color_background_dlgbuttons #9a9a9a
-%define color_background_panel #d6d6d6
-%define color_text_panel #000
-%define color_background_header #6699ff
-%define color_text_header #fff
-%define color_background_scroller #9a9a9a
-%define color_background_textbox #fff
-%define color_text_textbox #000
-%define color_text_disabled #808080
-%define color_text_button #222
-%define color_text_button_disabled #999
-%define color_text_placeholder #808080
-%define color_text_as_link #69f
-%define color_background_panelrow #c8c8c8
-%define color_text_panelrow #222222
-%define color_text_toolbutton_inverse #666666
-%define color_background_settings #efefef
-%define color_text_panel_header #999
-%define color_text_panel_subheader #333
-%define color_background_toaster #000
-
-%define color_background_highlight #a7c5f4
-%define color_background_highlight_overlay rgba(167, 197, 244, 0.8)
-%define color_text_highlight #000
-%define color_selection #c0e49a
-%define color_shadow #6699ff
-%define color_shadow_light rgba(102,153,255, 0.2)
-%define color_shadow_green rgba(137,251,21, 0.2)
-%define color_shadow_grey rgba(200,200,200, 0.5)
-
-%define color_subtext_default #aaaaaa
-%define color_subtext_settings #666666
-
-%define font_xlarge 6.08mozmm
-%define font_xnormal 3.75mozmm
-%define font_normal 3.54mozmm
-%define font_snormal 3mozmm
-%define font_small 2.91mozmm
-%define font_xsmall 2.69mozmm
-%define font_tiny 2.48mozmm
-%define font_xtiny 2.27mozmm
-%define font_xxtiny 1.93mozmm
-
-%define touch_row 10.478mozmm
-%define touch_button_xlarge 10.62mozmm
-%define touch_button_large 9.77mozmm
-%define touch_button_small 8.93mozmm
-%define touch_button_minwidth 11.86mozmm
-%define touch_action_minwidth 21.17mozmm
-%define touch_button_tiny 3.75mozmm
-%define touch_button_minwidth 16.30mozmm
-%define touch_button_minwidth 11.86mozmm
-%define touch_normal 6.77mozmm
-
-%define margin_toaster 15.24mozmm
-%define margin_context_popup 3.39mozmm
-%define margin_xlarge 3.39mozmm
-%define margin_large 2.54mozmm
-%define margin_xxxnormal 1.69mozmm
-%define margin_xxnormal 1.27mozmm
-%define margin_xnormal 1.06mozmm
-%define margin_normal 0.85mozmm
-%define margin_snormal 0.64mozmm
-%define margin_small 0.42mozmm
-%define margin_tiny 0.21mozmm
-%define margin_xtiny 0.15mozmm
-
-%define padding_xxxlarge 13.35mozmm
-%define padding_xxlarge 7.938mozmm
-%define padding_xlarge 3.39mozmm
-%define padding_large 2.54mozmm
-%define padding_xxxnormal 1.69mozmm
-%define padding_xxnormal 1.27mozmm
-%define padding_xnormal 1.06mozmm
-%define padding_normal 0.85mozmm
-%define padding_snormal 0.64mozmm
-%define padding_small 0.42mozmm
-%define padding_xsmall 0.21mozmm
-%define padding_tiny 0.11mozmm
-
-%define border_width_xxlarge 0.64mozmm
-%define border_width_xlarge 0.42mozmm
-%define border_width_large 0.32mozmm
-%define border_width_small 0.21mozmm
-%define border_width_tiny 0.11mozmm
-
-%define border_radius_normal 0.85mozmm
-%define border_radius_small 0.64mozmm
-%define border_radius_xsmall 0.31mozmm
-%define border_radius_tiny 0.21mozmm
-
-%define shadow_width_xlarge 3.06mozmm
-%define shadow_width_large 2.64mozmm
-%define shadow_width_medium 0.75mozmm
-%define shadow_width_small 0.21mozmm
-%define shadow_width_tiny 0.1mozmm
-
-%define textbox_height 5.08mozmm
-
-%define dropmarker_padding 0.53mozmm
-
-%define progressmeter_height 3.39mozmm
-
-%define urlbar_edit_height 5.25mozmm
-%define urlbar_edit_indent 0.85mozmm
-%define identity_popup_tablet_width 72mozmm
-
-%define scroller_thickness 0.64mozmm
-%define scroller_minimum 1.27mozmm
-
-%define sidebar_width_minimum 8.47mozmm
-%define sidebar_button_height 7.41mozmm
-%define documenttab_margin_bottom 0.85mozmm
-
-%define placelabel_padding 8.47mozmm
-%define placeitem_padding 4.23mozmm
-
-%define awesome_header_maxwidth 25mozmm
-%define autocomplete_item_container_image_padding 0.53mozmm
-%define autocomplete_item_container_position 0.21mozmm
-%define autocomplete_item_container_size 4mozmm
-%define autocomplete_item_container_padding 5.08mozmm
-
-%define autocomplete_item_subtitle_margin 2.75mozmm
-%define autocomplete_item_label_margin 3.18mozmm
-%define autocomplete_item_tags_margin 3.39mozmm
-
-%define autocompleteresult_padding 0.53mozmm
-
-%define dialog_width 76.2mozmm
-
-%define appmenu_portrait_height 21.17mozmm
-%define appmenu_button_height  10.48mozmm
-
-%define tablet_panel_controls  40mozmm
-%define tablet_panel_controls_wide  55mozmm
-%define tablet_panel_minwidth  124mozmm
-%define tablet_panel_item_width  69mozmm
-%define tablet_panel_item_width_wide  90mozmm
-
-%ifdef MOZ_PLATFORM_MAEMO
-%define orientation -moz-device-orientation
-%elifdef ANDROID
-%define orientation -moz-device-orientation
-%else
-%define orientation orientation
-%endif
diff --git a/mobile/android/themes/core/honeycomb/images/alert-addons-30.png b/mobile/android/themes/core/honeycomb/images/alert-addons-30.png
deleted file mode 100644
index 18744ad85224..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/alert-addons-30.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/alert-downloads-30.png b/mobile/android/themes/core/honeycomb/images/alert-downloads-30.png
deleted file mode 100644
index 2546352d28f4..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/alert-downloads-30.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/arrowdown-16.png b/mobile/android/themes/core/honeycomb/images/arrowdown-16.png
deleted file mode 100644
index c982426f2ade..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/arrowdown-16.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/arrowleft-16.png b/mobile/android/themes/core/honeycomb/images/arrowleft-16.png
deleted file mode 100644
index 464a4a866cd9..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/arrowleft-16.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/arrowright-16.png b/mobile/android/themes/core/honeycomb/images/arrowright-16.png
deleted file mode 100644
index 859e98ba64b6..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/arrowright-16.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/errorpage-larry-black.png b/mobile/android/themes/core/honeycomb/images/errorpage-larry-black.png
deleted file mode 100644
index 9f2e4a6e7366..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/errorpage-larry-black.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/errorpage-larry-white.png b/mobile/android/themes/core/honeycomb/images/errorpage-larry-white.png
deleted file mode 100644
index fc153c7314e8..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/errorpage-larry-white.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/errorpage-warning.png b/mobile/android/themes/core/honeycomb/images/errorpage-warning.png
deleted file mode 100644
index 8bf9d8e7decc..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/errorpage-warning.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/forward-default-hdpi.png b/mobile/android/themes/core/honeycomb/images/forward-default-hdpi.png
deleted file mode 100644
index 57611d4dc202..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/forward-default-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/mute-hdpi.png b/mobile/android/themes/core/honeycomb/images/mute-hdpi.png
deleted file mode 100644
index 0bd1e60e6a3e..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/mute-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/pause-hdpi.png b/mobile/android/themes/core/honeycomb/images/pause-hdpi.png
deleted file mode 100644
index e377d321ce03..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/pause-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/play-hdpi.png b/mobile/android/themes/core/honeycomb/images/play-hdpi.png
deleted file mode 100644
index a8482eb4dd7e..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/play-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/popup-selected-item-hdpi.png b/mobile/android/themes/core/honeycomb/images/popup-selected-item-hdpi.png
deleted file mode 100644
index dd511023c1fa..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/popup-selected-item-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/remotetabs-32.png b/mobile/android/themes/core/honeycomb/images/remotetabs-32.png
deleted file mode 100644
index 80f59a022c34..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/remotetabs-32.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/scrubber-hdpi.png b/mobile/android/themes/core/honeycomb/images/scrubber-hdpi.png
deleted file mode 100644
index 49c60505f465..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/scrubber-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/search-clear-30.png b/mobile/android/themes/core/honeycomb/images/search-clear-30.png
deleted file mode 100644
index 8bab39a08d35..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/search-clear-30.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/sidebarbutton-active-hdpi.png b/mobile/android/themes/core/honeycomb/images/sidebarbutton-active-hdpi.png
deleted file mode 100644
index 30f1d2017bc6..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/sidebarbutton-active-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/throbber.png b/mobile/android/themes/core/honeycomb/images/throbber.png
deleted file mode 100644
index c601ec80ba7c..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/throbber.png and /dev/null differ
diff --git a/mobile/android/themes/core/honeycomb/images/unmute-hdpi.png b/mobile/android/themes/core/honeycomb/images/unmute-hdpi.png
deleted file mode 100644
index 4dbb94f98f0a..000000000000
Binary files a/mobile/android/themes/core/honeycomb/images/unmute-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/images/alert-addons-30.png b/mobile/android/themes/core/images/alert-addons-30.png
deleted file mode 100644
index 18744ad85224..000000000000
Binary files a/mobile/android/themes/core/images/alert-addons-30.png and /dev/null differ
diff --git a/mobile/android/themes/core/images/alert-downloads-30.png b/mobile/android/themes/core/images/alert-downloads-30.png
deleted file mode 100644
index 2546352d28f4..000000000000
Binary files a/mobile/android/themes/core/images/alert-downloads-30.png and /dev/null differ
diff --git a/mobile/android/themes/core/images/forward-default-hdpi.png b/mobile/android/themes/core/images/forward-default-hdpi.png
deleted file mode 100644
index 4bcf5010976b..000000000000
Binary files a/mobile/android/themes/core/images/forward-default-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/images/popup-selected-item-hdpi.png b/mobile/android/themes/core/images/popup-selected-item-hdpi.png
deleted file mode 100644
index dd511023c1fa..000000000000
Binary files a/mobile/android/themes/core/images/popup-selected-item-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/images/remotetabs-32.png b/mobile/android/themes/core/images/remotetabs-32.png
deleted file mode 100644
index 80f59a022c34..000000000000
Binary files a/mobile/android/themes/core/images/remotetabs-32.png and /dev/null differ
diff --git a/mobile/android/themes/core/images/sidebarbutton-active-hdpi.png b/mobile/android/themes/core/images/sidebarbutton-active-hdpi.png
deleted file mode 100644
index 30f1d2017bc6..000000000000
Binary files a/mobile/android/themes/core/images/sidebarbutton-active-hdpi.png and /dev/null differ
diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
index e8cac0857dfa..4b308be2c87b 100644
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -1,11 +1,7 @@
 #filter substitution
 
 chrome.jar:
-% skin browser classic/1.0 %skin/ os!=Android
-% skin browser classic/1.0 %skin/ os=Android osversion<2.3
-% skin browser froyo/1.0 %skin/
-# NOTE: If you add a new file here, you'll need to add it to the gingerbread
-# and honeycomb sections at the bottom of this file
+% skin browser classic/1.0 %skin/
   skin/aboutPage.css                        (aboutPage.css)
   skin/about.css                            (about.css)
   skin/aboutAddons.css                      (aboutAddons.css)
@@ -29,17 +25,11 @@ chrome.jar:
   skin/images/checkbox_unchecked_disabled.png (images/checkbox_unchecked_disabled.png)
   skin/images/checkbox_unchecked_pressed.png  (images/checkbox_unchecked_pressed.png)
   skin/images/dropmarker.svg                (images/dropmarker.svg)
-  skin/images/popup-selected-item-hdpi.png  (images/popup-selected-item-hdpi.png)
   skin/images/errorpage-warning.png         (images/errorpage-warning.png)
   skin/images/errorpage-warning.png         (images/errorpage-warning.png)
   skin/images/errorpage-larry-white.png     (images/errorpage-larry-white.png)
   skin/images/errorpage-larry-black.png     (images/errorpage-larry-black.png)
   skin/images/throbber.png                  (images/throbber.png)
-  skin/images/alert-addons-30.png           (images/alert-addons-30.png)
-  skin/images/alert-downloads-30.png        (images/alert-downloads-30.png)
-  skin/images/forward-default-hdpi.png      (images/forward-default-hdpi.png)
-  skin/images/remotetabs-32.png             (images/remotetabs-32.png)
-  skin/images/sidebarbutton-active-hdpi.png (images/sidebarbutton-active-hdpi.png)
   skin/images/search-clear-30.png           (images/search-clear-30.png)
   skin/images/play-hdpi.png                 (images/play-hdpi.png)
   skin/images/pause-hdpi.png                (images/pause-hdpi.png)
@@ -54,105 +44,3 @@ chrome.jar:
   skin/images/row-bg-light.png              (images/row-bg-light.png)
   skin/images/row-bg-normal.png             (images/row-bg-normal.png)
   skin/images/addons-amo-hdpi.png           (images/addons-amo-hdpi.png)
-
-chrome.jar:
-% skin browser classic/1.0 %skin/gingerbread/ os=Android osversion=2.3 osversion=2.3.3 osversion=2.3.4 osversion=2.3.5 osversion=2.3.6 osversion=2.3.7
-% skin browser gingerbread/1.0 %skin/gingerbread/
-  skin/gingerbread/aboutPage.css                        (aboutPage.css)
-  skin/gingerbread/about.css                            (about.css)
-  skin/gingerbread/aboutAddons.css                      (aboutAddons.css)
-* skin/gingerbread/browser.css                          (gingerbread/browser.css)
-* skin/gingerbread/content.css                          (gingerbread/content.css)
-  skin/gingerbread/config.css                           (config.css)
-  skin/gingerbread/touchcontrols.css                    (touchcontrols.css)
-  skin/gingerbread/netError.css                         (netError.css)
-% override chrome://global/skin/about.css chrome://browser/skin/about.css
-% override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css
-% override chrome://global/skin/netError.css chrome://browser/skin/netError.css
-
-  skin/gingerbread/images/urlbar-bg.png                 (gingerbread/images/urlbar-bg.png)
-  skin/gingerbread/images/addons-32.png                 (images/addons-32.png)
-  skin/gingerbread/images/arrowleft-16.png              (gingerbread/images/arrowleft-16.png)
-  skin/gingerbread/images/arrowright-16.png             (gingerbread/images/arrowright-16.png)
-  skin/gingerbread/images/arrowdown-16.png              (gingerbread/images/arrowdown-16.png)
-  skin/gingerbread/images/checkbox_checked.png          (images/checkbox_checked.png)
-  skin/gingerbread/images/checkbox_checked_disabled.png (images/checkbox_checked_disabled.png)
-  skin/gingerbread/images/checkbox_checked_pressed.png  (images/checkbox_checked_pressed.png)
-  skin/gingerbread/images/checkbox_unchecked.png          (images/checkbox_unchecked.png)
-  skin/gingerbread/images/checkbox_unchecked_disabled.png (images/checkbox_unchecked_disabled.png)
-  skin/gingerbread/images/checkbox_unchecked_pressed.png  (images/checkbox_unchecked_pressed.png)
-  skin/gingerbread/images/dropmarker.svg                (images/dropmarker.svg)
-  skin/gingerbread/images/popup-selected-item-hdpi.png  (gingerbread/images/popup-selected-item-hdpi.png)
-  skin/gingerbread/images/throbber.png                  (gingerbread/images/throbber.png)
-  skin/gingerbread/images/alert-addons-30.png           (gingerbread/images/alert-addons-30.png)
-  skin/gingerbread/images/alert-downloads-30.png        (gingerbread/images/alert-downloads-30.png)
-  skin/gingerbread/images/forward-default-hdpi.png      (gingerbread/images/forward-default-hdpi.png)
-  skin/gingerbread/images/remotetabs-32.png             (gingerbread/images/remotetabs-32.png)
-  skin/gingerbread/images/search-clear-30.png           (gingerbread/images/search-clear-30.png)
-  skin/gingerbread/images/play-hdpi.png                 (gingerbread/images/play-hdpi.png)
-  skin/gingerbread/images/pause-hdpi.png                (gingerbread/images/pause-hdpi.png)
-  skin/gingerbread/images/mute-hdpi.png                 (gingerbread/images/mute-hdpi.png)
-  skin/gingerbread/images/unmute-hdpi.png               (gingerbread/images/unmute-hdpi.png)
-  skin/gingerbread/images/scrubber-hdpi.png             (gingerbread/images/scrubber-hdpi.png)
-  skin/gingerbread/images/errorpage-warning.png         (images/errorpage-warning.png)
-  skin/gingerbread/images/errorpage-larry-white.png     (images/errorpage-larry-white.png)
-  skin/gingerbread/images/errorpage-larry-black.png     (images/errorpage-larry-black.png)
-  skin/gingerbread/images/about-bg-lightblue.png        (images/about-bg-lightblue.png)
-  skin/gingerbread/images/about-bg-darkblue.png         (images/about-bg-darkblue.png)
-  skin/gingerbread/images/about-btn-darkgrey.png        (images/about-btn-darkgrey.png)
-  skin/gingerbread/images/logo-hdpi.png                 (images/logo-hdpi.png)
-  skin/gingerbread/images/wordmark-hdpi.png             (images/wordmark-hdpi.png)
-  skin/gingerbread/images/row-bg-light.png              (images/row-bg-light.png)
-  skin/gingerbread/images/row-bg-normal.png             (images/row-bg-normal.png)
-  skin/gingerbread/images/addons-amo-hdpi.png           (images/addons-amo-hdpi.png)
-
-chrome.jar:
-% skin browser classic/1.0 %skin/honeycomb/ os=Android osversion>=3.0
-% skin browser honeycomb/1.0 %skin/honeycomb/
-  skin/honeycomb/aboutPage.css                        (aboutPage.css)
-  skin/honeycomb/about.css                            (about.css)
-  skin/honeycomb/aboutAddons.css                      (aboutAddons.css)
-* skin/honeycomb/browser.css                          (honeycomb/browser.css)
-* skin/honeycomb/content.css                          (content.css)
-  skin/honeycomb/config.css                           (config.css)
-  skin/honeycomb/touchcontrols.css                    (touchcontrols.css)
-  skin/honeycomb/netError.css                         (netError.css)
-% override chrome://global/skin/about.css chrome://browser/skin/about.css
-% override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css
-% override chrome://global/skin/netError.css chrome://browser/skin/netError.css
-
-  skin/honeycomb/images/addons-32.png                 (images/addons-32.png)
-  skin/honeycomb/images/arrowleft-16.png              (honeycomb/images/arrowleft-16.png)
-  skin/honeycomb/images/arrowright-16.png             (honeycomb/images/arrowright-16.png)
-  skin/honeycomb/images/arrowdown-16.png              (honeycomb/images/arrowdown-16.png)
-  skin/honeycomb/images/checkbox_checked.png          (images/checkbox_checked.png)
-  skin/honeycomb/images/checkbox_checked_disabled.png (images/checkbox_checked_disabled.png)
-  skin/honeycomb/images/checkbox_checked_pressed.png  (images/checkbox_checked_pressed.png)
-  skin/honeycomb/images/checkbox_unchecked.png          (images/checkbox_unchecked.png)
-  skin/honeycomb/images/checkbox_unchecked_disabled.png (images/checkbox_unchecked_disabled.png)
-  skin/honeycomb/images/checkbox_unchecked_pressed.png  (images/checkbox_unchecked_pressed.png)
-  skin/honeycomb/images/dropmarker.svg                (images/dropmarker.svg)
-  skin/honeycomb/images/popup-selected-item-hdpi.png  (honeycomb/images/popup-selected-item-hdpi.png)
-  skin/honeycomb/images/throbber.png                  (honeycomb/images/throbber.png)
-  skin/honeycomb/images/alert-addons-30.png           (honeycomb/images/alert-addons-30.png)
-  skin/honeycomb/images/alert-downloads-30.png        (honeycomb/images/alert-downloads-30.png)
-  skin/honeycomb/images/forward-default-hdpi.png      (honeycomb/images/forward-default-hdpi.png)
-  skin/honeycomb/images/remotetabs-32.png             (honeycomb/images/remotetabs-32.png)
-  skin/honeycomb/images/sidebarbutton-active-hdpi.png (honeycomb/images/sidebarbutton-active-hdpi.png)
-  skin/honeycomb/images/search-clear-30.png           (honeycomb/images/search-clear-30.png)
-  skin/honeycomb/images/play-hdpi.png                 (honeycomb/images/play-hdpi.png)
-  skin/honeycomb/images/pause-hdpi.png                (honeycomb/images/pause-hdpi.png)
-  skin/honeycomb/images/mute-hdpi.png                 (honeycomb/images/mute-hdpi.png)
-  skin/honeycomb/images/unmute-hdpi.png               (honeycomb/images/unmute-hdpi.png)
-  skin/honeycomb/images/scrubber-hdpi.png             (honeycomb/images/scrubber-hdpi.png)
-  skin/honeycomb/images/errorpage-warning.png         (images/errorpage-warning.png)
-  skin/honeycomb/images/errorpage-larry-white.png     (images/errorpage-larry-white.png)
-  skin/honeycomb/images/errorpage-larry-black.png     (images/errorpage-larry-black.png)
-  skin/honeycomb/images/about-bg-lightblue.png        (images/about-bg-lightblue.png)
-  skin/honeycomb/images/about-bg-darkblue.png         (images/about-bg-darkblue.png)
-  skin/honeycomb/images/about-btn-darkgrey.png        (images/about-btn-darkgrey.png)
-  skin/honeycomb/images/logo-hdpi.png                 (images/logo-hdpi.png)
-  skin/honeycomb/images/wordmark-hdpi.png             (images/wordmark-hdpi.png)
-  skin/honeycomb/images/row-bg-light.png              (images/row-bg-light.png)
-  skin/honeycomb/images/row-bg-normal.png             (images/row-bg-normal.png)
-  skin/honeycomb/images/addons-amo-hdpi.png           (images/addons-amo-hdpi.png)