Add m-esr52 at 52.6.0

15 files changed, 1943 insertions, 0 deletions

diff --git a/mobile/android/base/resources/values/arrays.xml b/mobile/android/base/resources/values/arrays.xml
new file mode 100644
index 000000000..d220ca9bb
--- /dev/null
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
+<resources>
+    <string-array name="pref_home_updates_entries">
+        <item>@string/pref_home_updates_enabled</item>
+        <item>@string/pref_home_updates_wifi</item>
+    </string-array>
+    <string-array name="pref_home_updates_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string-array name="pref_plugins_entries">
+        <item>@string/pref_plugins_enabled</item>
+        <item>@string/pref_plugins_tap_to_play</item>
+        <item>@string/pref_plugins_disabled</item>
+    </string-array>
+    <string-array name="pref_plugins_values">
+        <item>1</item>
+        <item>2</item>
+        <item>0</item>
+    </string-array>
+    <string-array name="pref_font_size_entries">
+        <item>@string/pref_font_size_tiny</item>
+        <item>@string/pref_font_size_small</item>
+        <item>@string/pref_font_size_medium</item>
+        <item>@string/pref_font_size_large</item>
+        <item>@string/pref_font_size_xlarge</item>
+    </string-array>
+    <string-array name="pref_font_size_values">
+        <item>0</item>
+        <item>80</item>
+        <item>120</item>
+        <item>160</item>
+        <item>240</item>
+    </string-array>
+    <string-array name="pref_char_encoding_entries">
+        <item>@string/pref_char_encoding_on</item>
+        <item>@string/pref_char_encoding_off</item>
+    </string-array>
+    <string-array name="pref_char_encoding_values">
+        <item>true</item>
+        <item>false</item>
+    </string-array>
+    <string-array name="pref_cookies_entries">
+        <item>@string/pref_cookies_accept_all</item>
+        <item>@string/pref_cookies_not_accept_foreign</item>
+        <item>@string/pref_cookies_disabled</item>
+    </string-array>
+    <string-array name="pref_tracking_protection_values">
+        <item>2</item>
+        <item>1</item>
+        <item>0</item>
+    </string-array>
+    <string-array name="pref_tracking_protection_entries">
+        <item>@string/pref_tracking_protection_enabled</item>
+        <item>@string/pref_tracking_protection_enabled_pb</item>
+        <item>@string/pref_tracking_protection_disabled</item>
+    </string-array>
+    <string-array name="pref_cookies_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+    <string-array name="pref_import_android_entries">
+        <item>@string/bookmarks_title</item>
+        <item>@string/history_title</item>
+    </string-array>
+    <string-array name="pref_import_android_defaults">
+        <item>true</item>
+        <item>true</item>
+    </string-array>
+    <string-array name="pref_import_android_values">
+        <item>android_import.data.bookmarks</item>
+        <item>android_import.data.history</item>
+    </string-array>
+    <string-array name="pref_private_data_entries">
+        <item>@string/pref_private_data_history2</item>
+        <item>@string/pref_private_data_searchHistory</item>
+        <item>@string/pref_private_data_downloadFiles2</item>
+        <item>@string/pref_private_data_formdata2</item>
+        <item>@string/pref_private_data_cookies2</item>
+        <item>@string/pref_private_data_cache</item>
+        <item>@string/pref_private_data_offlineApps</item>
+        <item>@string/pref_private_data_siteSettings</item>
+        <item>@string/pref_private_data_syncedTabs</item>
+        <item>@string/pref_private_data_passwords</item>
+    </string-array>
+    <string-array name="pref_private_data_defaults">
+        <item>true</item>
+        <item>true</item>
+        <item>true</item>
+        <item>true</item>
+        <item>true</item>
+        <item>true</item>
+        <item>true</item>
+        <item>true</item>
+        <item>true</item>
+        <item>false</item>
+    </string-array>
+    <string-array name="pref_private_data_values">
+        <item>private.data.history</item>
+        <item>private.data.searchHistory</item>
+        <item>private.data.downloadFiles</item>
+        <item>private.data.formdata</item>
+        <item>private.data.cookies_sessions</item>
+        <item>private.data.cache</item>
+        <item>private.data.offlineApps</item>
+        <item>private.data.siteSettings</item>
+        <item>private.data.syncedTabs</item>
+        <item>private.data.passwords</item>
+    </string-array>
+    <string-array name="pref_private_data_keys">
+        <item>private.data.history</item>
+        <item>private.data.searchHistory</item>
+        <item>private.data.downloadFiles</item>
+        <item>private.data.formdata</item>
+        <item>private.data.cookies_sessions</item>
+        <item>private.data.cache</item>
+        <item>private.data.offlineApps</item>
+        <item>private.data.siteSettings</item>
+        <item>private.data.syncedTabs</item>
+        <item>private.data.passwords</item>
+    </string-array>
+    <string-array name="pref_clear_on_exit_defaults">
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+    </string-array>
+    <string-array name="pref_restore_entries">
+        <item>@string/pref_restore_always</item>
+        <item>@string/pref_restore_quit</item>
+    </string-array>
+    <string-array name="pref_restore_values">
+        <item>always</item>
+        <item>quit</item>
+    </string-array>
+    <string-array name="pref_update_autodownload_entries">
+        <item>@string/pref_update_autodownload_enabled</item>
+        <item>@string/pref_update_autodownload_wifi</item>
+        <item>@string/pref_update_autodownload_disabled</item>
+    </string-array>
+    <string-array name="pref_update_autodownload_values">
+        <item>enabled</item>
+        <item>wifi</item>
+        <item>disabled</item>
+    </string-array>
+    <!-- This value is similar to config_longPressVibePattern in android frameworks/base/core/res/res/values/config.xml-->
+    <integer-array name="long_press_vibrate_msec">
+        <item>0</item>
+        <item>1</item>
+        <item>20</item>
+        <item>21</item>
+    </integer-array>
+    <!-- browser.image_blocking -->
+    <string-array name="pref_browser_image_blocking_entries">
+        <item>@string/pref_tap_to_load_images_enabled</item>
+        <item>@string/pref_tap_to_load_images_data</item>
+        <item>@string/pref_tap_to_load_images_disabled2</item>
+    </string-array>
+    <string-array name="pref_browser_image_blocking_values">
+        <item>1</item> <!-- Always -->
+        <item>2</item> <!-- Wifi-only -->
+        <item>0</item> <!-- Blocked -->
+    </string-array>
+</resources>
diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml
new file mode 100644
index 000000000..0a75f9884
--- /dev/null
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Theme level attributes -->
+    <declare-styleable name="GeckoTheme">
+
+        <!-- Style for GeckoMenu ListView -->
+        <attr name="geckoMenuListViewStyle" format="reference"/>
+
+        <!-- Style for MenuItemActionBar -->
+        <attr name="menuItemActionBarStyle" format="reference"/>
+
+        <!-- Style for MenuItemActionBar -->
+        <attr name="menuItemActionModeStyle" format="reference"/>
+
+        <!-- Style for MenuItemSwitcherLayout -->
+        <attr name="menuItemSwitcherLayoutStyle" format="reference"/>
+
+        <!-- Style for MenuItemDefault -->
+        <attr name="menuItemDefaultStyle" format="reference"/>
+
+        <!-- Style for MenuItemActionBar when shown in SecondaryActionBar -->
+        <attr name="menuItemSecondaryActionBarStyle" format="reference"/>
+
+        <!-- Default style for the BookmarksListView -->
+        <attr name="bookmarksListViewStyle" format="reference" />
+
+        <!-- Default style for the TopSitesGridItemView -->
+        <attr name="topSitesGridItemViewStyle" format="reference" />
+
+        <!-- Styles for dynamic panel grid views -->
+        <attr name="panelIconViewStyle" format="reference" />
+
+        <!-- Style for the TabsGridLayout -->
+        <attr name="tabGridLayoutViewStyle" format="reference" />
+
+        <!-- Default style for the TopSitesGridView -->
+        <attr name="topSitesGridViewStyle" format="reference" />
+
+        <!-- Default style for the TopSitesThumbnailView -->
+        <attr name="topSitesThumbnailViewStyle" format="reference" />
+
+        <!-- Default style for the HomeListView -->
+        <attr name="homeListViewStyle" format="reference" />
+
+    </declare-styleable>
+
+    <declare-styleable name="MenuItem">
+        <attr name="android:id"/>
+        <attr name="android:orderInCategory"/>
+        <attr name="android:title"/>
+        <attr name="android:icon"/>
+        <attr name="android:checkable"/>
+        <attr name="android:checked"/>
+        <attr name="android:visible"/>
+        <attr name="android:enabled"/>
+        <attr name="android:showAsAction"/>
+    </declare-styleable>
+
+    <declare-styleable name="MenuItemDefault">
+        <attr name="state_more" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="TabThumbnailWrapper">
+        <attr name="state_recording" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="FlowLayout">
+        <attr name="spacing" format="dimension"/>
+    </declare-styleable>
+
+    <declare-styleable name="MultiChoicePreference">
+        <attr name="entries" format="string"/>
+        <attr name="entryValues" format="string"/>
+        <attr name="initialValues" format="string"/>
+    </declare-styleable>
+
+    <declare-styleable name="MultiPrefMultiChoicePreference">
+        <attr name="entryKeys" format="string"/>
+    </declare-styleable>
+
+    <declare-styleable name="TabsLayout">
+        <attr name="tabs">
+            <flag name="tabs_normal" value="0x00" />
+            <flag name="tabs_private" value ="0x01" />
+        </attr>
+    </declare-styleable>
+
+    <declare-styleable name="TabCounter">
+        <attr name="android:layout"/>
+    </declare-styleable>
+
+    <declare-styleable name="PrivateBrowsing">
+        <attr name="state_private" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="LightweightTheme">
+        <attr name="state_light" format="boolean"/>
+        <attr name="state_dark" format="boolean"/>
+        <attr name="autoUpdateTheme" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="TwoWayView">
+        <attr name="android:orientation"/>
+        <attr name="android:choiceMode"/>
+        <attr name="android:listSelector"/>
+        <attr name="android:drawSelectorOnTop"/>
+    </declare-styleable>
+
+    <declare-styleable name="HomeListView">
+        <!-- Draws a divider on top of the list, if true. Defaults to false. -->
+        <attr name="topDivider" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="FadedTextView">
+        <attr name="fadeWidth" format="dimension"/>
+    </declare-styleable>
+
+    <declare-styleable name="FadedMultiColorTextView">
+        <!-- The background color we should be fading over. Useful because the
+             background is full alpha and we need to copy the background underneath. -->
+        <attr name="fadeBackgroundColor" format="dimension"/>
+    </declare-styleable>
+
+    <declare-styleable name="IconTabWidget">
+        <attr name="android:layout"/>
+
+        <!-- Sets the tab's content type. Defaults to icon. -->
+        <attr name="display">
+            <enum name="icon" value="0x00" />
+            <enum name="text" value="0x01" />
+        </attr>
+    </declare-styleable>
+
+    <declare-styleable name="TopSitesGridView">
+        <attr name="android:horizontalSpacing"/>
+        <attr name="android:verticalSpacing"/>
+    </declare-styleable>
+
+    <declare-styleable name="TabMenuStrip">
+        <attr name="strip" format="reference"/>
+        <attr name="tabsMarginLeft" format="dimension" />
+        <attr name="activeTextColor" format="color" />
+        <attr name="inactiveTextColor" format="color" />
+        <attr name="titlebarFill" format="boolean" />
+    </declare-styleable>
+
+    <declare-styleable name="CustomColorPreference">
+        <attr name="titleColor" format="color" />
+        <attr name="summaryColor" format="color" />
+    </declare-styleable>
+
+    <declare-styleable name="TabPanelBackButton">
+        <attr name="rightDivider" format="reference"/>
+        <attr name="dividerVerticalPadding" format="dimension"/>
+    </declare-styleable>
+
+    <declare-styleable name="EllipsisTextView">
+        <attr name="ellipsizeAtLine" format="integer"/>
+    </declare-styleable>
+
+    <declare-styleable name="FaviconView">
+        <attr name="dominantBorderEnabled" format="boolean" />
+        <attr name="overrideScaleType" format="boolean" />
+        <attr name="enableRoundCorners" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="OverlayDialogButton">
+        <attr name="drawable" format="reference" />
+        <attr name="enabledText" format="string" />
+        <attr name="disabledText" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="ThemedView">
+        <!-- A reimplementation of android:tintList which is
+             otherwise only available on API 21+.
+
+             Using this attribute is mutually exclusive with android:tint
+             and setting colorFilters in code. This is because on pre-Lollipop,
+             android:tint and DrawableCompat.tint* uses colorFilters under the hood. -->
+        <attr name="drawableTintList" format="color" />
+    </declare-styleable>
+
+</resources>
+
diff --git a/mobile/android/base/resources/values/bool.xml b/mobile/android/base/resources/values/bool.xml
new file mode 100644
index 000000000..6ef7090c6
--- /dev/null
+++ b/mobile/android/base/resources/values/bool.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, you can obtain one at http://mozilla.org/MPL/2.0/.
+  -->
+
+<resources>
+    <!-- Some devices use resources based on configuration (e.g. large, xlarge) that are inconsistent
+         with the configuration retrieved by HardwareUtils (e.g. some custom ROMs allow the user to
+         choose a phone or tablet version of the UI even though the hardware stays the same). This
+         can cause crashes when we branch on the value returned by HardwareUtils.
+
+         In order to work around this, we define the resource size in resources with the expectation that
+         we branch on that value, rather than HardwareUtils, so our code is consistent with the used resources.
+         See bug 1277379 for a initiative to move all of the HardwareUtils code over. -->
+    <bool name="is_large_resource">false</bool>
+</resources>
diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
new file mode 100644
index 000000000..318ad5026
--- /dev/null
+++ b/mobile/android/base/resources/values/colors.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+  <!-- Fennec color palette (bug 1127517) -->
+  <color name="fennec_ui_orange">#FF9500</color>
+  <color name="affirmative_green">#6FBE4A</color>
+  <color name="rejection_red">#D23228</color>
+  <color name="action_orange">#E66000</color>
+  <color name="action_orange_pressed">#DC5600</color>
+  <color name="link_blue">#0096DD</color>
+  <color name="link_blue_pressed">#0082C6</color>
+  <color name="private_browsing_purple">#CF68FF</color>
+
+  <color name="placeholder_active_grey">#222222</color>
+  <color name="placeholder_grey">#777777</color>
+  <color name="private_toolbar_grey">#292C29</color>
+  <color name="text_and_tabs_tray_grey">#363B40</color>
+  <color name="tabs_tray_grey_pressed">#45494E</color>
+  <color name="toolbar_icon_grey">#5F6368</color>
+
+  <color name="tabs_tray_icon_grey">#AFB1B3</color>
+  <color name="disabled_grey">#BFBFBF</color>
+  <color name="toolbar_grey_pressed">#D7D7DC</color>
+  <color name="toolbar_menu_dark_grey">#E1E1E6</color>
+  <color name="toolbar_grey">#EBEBF0</color>
+  <color name="about_page_header_grey">#F5F5F5</color>
+
+  <color name="url_bar_shadow_private">#7878A5</color>
+
+  <!-- Restricted profiles palette -->
+
+  <color name="restricted_profile_background_gold">#ffffcb51</color>
+  <color name="restricted_profile_background_green">#1aaa86</color>
+
+  <!-- Non-palette colors -->
+
+  <!-- Synced w/ toolbar_grey -->
+  <color name="background_normal_lwt">#DDEBEBF0</color>
+
+  <color name="highlight">#33000000</color>
+  <color name="highlight_focused">#1A000000</color>
+  <color name="highlight_dark">#33FFFFFF</color>
+  <color name="highlight_dark_focused">#1AFFFFFF</color>
+
+  <!-- Synced w/ toolbar_grey_pressed -->
+  <color name="tablet_highlight_lwt">#AAD7D7DC</color>
+
+  <!-- Synced w/ tabs_tray_grey_pressed -->
+  <color name="tablet_highlight_dark_lwt">#AA45494E</color>
+
+  <!-- (bug 1077195) Focused state values are temporary. -->
+  <color name="tablet_highlight_focused">#C0C9D0</color>
+
+  <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey -->
+  <color name="highlight_shaped">#FF696D71</color>
+
+  <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_grey -->
+  <color name="highlight_shaped_focused">#FF565B60</color>
+
+  <!-- highlight on private nav button: 20% white over private_toolbar_grey -->
+  <color name="highlight_nav_pb">#FF545654</color>
+
+  <color name="dark_transparent_overlay">#99000000</color>
+
+  <!-- Firstrun tour -->
+  <color name="firstrun_pager_header">#E8E8E8</color>
+
+  <!-- Tab Queue -->
+  <color name="tab_queue_dismiss_button_foreground">#16A3DF</color>
+  <color name="tab_queue_dismiss_button_foreground_pressed">#1193CB</color>
+
+  <!--
+      Application theme colors
+  -->
+  <!-- Default colors -->
+  <color name="text_color_tertiary">#9198A1</color>
+
+  <!-- Default inverse colors -->
+  <color name="text_color_secondary_inverse">#DDDDDD</color>
+
+  <!-- Disabled colors -->
+  <color name="text_color_primary_disable_only">#999999</color>
+
+  <!-- Hint colors -->
+  <color name="text_color_hint">#666666</color>
+  <color name="text_color_hint_inverse">#7F828A</color>
+
+  <!-- Highlight colors -->
+  <color name="text_color_highlight_inverse">#D06BFF</color>
+
+  <!-- Link colors -->
+  <color name="text_color_link">#22629E</color>
+
+  <!-- Divider colors -->
+  <color name="toolbar_divider_grey">#D7D9DB</color>
+
+  <color name="doorhanger_link">#FF2AA1FE</color>
+
+  <color name="validation_message_text">#ffffff</color>
+  <color name="url_bar_text_highlight_pb">#FFD06BFF</color>
+  <color name="tab_row_pressed">#4D000000</color>
+
+  <color name="url_bar_urltext">#AFB1B3</color>
+  <color name="url_bar_urltext_private">#777777</color>
+  <color name="url_bar_domaintext">#363B40</color>
+  <color name="url_bar_domaintext_private">#FFFFFF</color>
+  <color name="url_bar_blockedtext">#b14646</color>
+  <color name="url_bar_shadow">#12000000</color>
+
+  <color name="panel_image_item_background">#D1D9E1</color>
+  <color name="panel_icon_item_title_background">#32000000</color>
+  <color name="panel_tab_text_normal">#FFBFBFBF</color>
+
+  <!-- Remote tabs setup -->
+  <color name="remote_tabs_setup_button_background_hit">#D95300</color>
+
+  <!-- Button toast colors. -->
+  <color name="toast_background">#DD222222</color>
+  <color name="toast_button_background">#00000000</color>
+  <color name="toast_button_pressed">#DD2C3136</color>
+  <color name="toast_button_text">#FFFFFFFF</color>
+
+  <!-- Tab History colors. -->
+  <color name="tab_history_timeline_separator">#D7D9DB</color>
+  <color name="tab_history_favicon_border">#D7D9DB</color>
+  <color name="tab_history_favicon_background">#FFFFFF</color>
+  <color name="tab_history_border_color">#DADADF</color>
+
+  <!-- Canvas delegate paint color -->
+  <color name="canvas_delegate_paint">#FFFF0000</color>
+
+  <!-- Top sites thumbnail colors -->
+  <color name="top_site_default">#FFECF0F3</color>
+  <color name="top_site_border">#FFCFD9E1</color>
+
+  <color name="private_active_text">#FFFFFF</color>
+
+  <color name="action_bar_bg_color">@color/toolbar_grey</color>
+
+  <color name="activity_stream_divider">#FFD2D2D2</color>
+  <color name="activity_stream_subtitle">#FF919191</color>
+  <color name="activity_stream_timestamp">#FFD3D3D3</color>
+  <color name="activity_stream_icon">#FF919191</color>
+
+</resources>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
new file mode 100644
index 000000000..b730f9671
--- /dev/null
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <dimen name="standard_corner_radius">4dp</dimen>
+
+    <dimen name="autocomplete_min_width">200dp</dimen>
+    <dimen name="autocomplete_row_height">32dp</dimen>
+
+    <dimen name="browser_toolbar_height">48dp</dimen>
+    <!-- This value is the height of the Tabs Panel header view
+         (browser_toolbar_height) minus the height of the indicator
+         (6dp). This value should change when the height of the view changes. -->
+    <dimen name="tabs_panel_indicator_selected_padding_top">42dp</dimen>
+
+    <!-- We use two different values for browser_toolbar_height on tablet
+         which is inconsistent. Temporary value until bug 1150730 is fixed. -->
+    <dimen name="browser_toolbar_height_flipper">48dp</dimen>
+    <dimen name="browser_toolbar_button_padding">12dp</dimen>
+    <dimen name="browser_toolbar_icon_width">48dp</dimen>
+    <dimen name="browser_toolbar_menu_icon_height">16dp</dimen>
+
+    <!-- favicon_size includes 4dp of right padding. We can't use margin (which would allow us to
+         specify the actual size) because that would decrease the size of our hit target. -->
+    <dimen name="browser_toolbar_favicon_size">21.33dip</dimen>
+    <dimen name="browser_toolbar_shadow_size">2dp</dimen>
+
+    <!-- If you update one of these values, update the others. -->
+    <dimen name="tablet_nav_button_width">42dp</dimen>
+    <dimen name="tablet_nav_button_width_half">21dp</dimen>
+    <dimen name="tablet_nav_button_width_plus_half">63dp</dimen>
+
+    <!-- This is the system default for the vertical padding for the divider of the TabWidget.
+         Used to mimic the divider padding on the tablet tabs panel back button. -->
+    <dimen name="tab_panel_divider_vertical_padding">12dp</dimen>
+
+    <dimen name="tablet_tab_strip_height">48dp</dimen>
+    <dimen name="tablet_tab_strip_item_width">208dp</dimen>
+    <dimen name="tablet_tab_strip_item_margin">-28dp</dimen>
+    <dimen name="tablet_tab_strip_fading_edge_size">15dp</dimen>
+    <dimen name="tablet_browser_toolbar_menu_item_width">56dp</dimen>
+    <!-- Padding combines with an 18dp image to form the menu item width and height. -->
+    <dimen name="tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
+    <dimen name="tablet_browser_toolbar_menu_item_inset_vertical">5dp</dimen>
+    <dimen name="tablet_browser_toolbar_menu_item_inset_horizontal">3dp</dimen>
+    <dimen name="tablet_tab_strip_button_inset">5dp</dimen>
+
+    <!-- Dimensions used by Favicons and FaviconView -->
+    <dimen name="favicon_bg">32dp</dimen>
+    <dimen name="favicon_corner_radius">4dp</dimen>
+    <!-- Set the upper limit on the size of favicon that will be processed. Favicons larger than
+         this will be downscaled to this value. If you need to use larger Favicons (Due to a UI
+         redesign sometime after this is written) you should increase this value to the largest
+         commonly-used size of favicon and, performance permitting, fetch the remainder from the
+         database. The largest available size is always stored in the database, regardless of this
+         value.-->
+    <dimen name="favicon_largest_interesting_size">32dp</dimen>
+
+    <dimen name="firstrun_content_width">300dp</dimen>
+    <dimen name="firstrun_min_height">120dp</dimen>
+    <dimen name="firstrun_background_height">120dp</dimen>
+
+    <dimen name="overlay_prompt_content_width">260dp</dimen>
+    <dimen name="overlay_prompt_button_width">148dp</dimen>
+    <dimen name="overlay_prompt_container_width">@dimen/match_parent</dimen>
+
+    <!-- Site security icon -->
+    <dimen name="browser_toolbar_site_security_height">32dp</dimen>
+    <dimen name="browser_toolbar_site_security_width">32dp</dimen>
+    <dimen name="browser_toolbar_site_security_margin_right">0dp</dimen>
+    <dimen name="browser_toolbar_site_security_padding_vertical">7dp</dimen>
+    <dimen name="browser_toolbar_site_security_padding_horizontal">7dp</dimen>
+
+    <!-- If one of these values changes, they all should. -->
+    <dimen name="browser_toolbar_site_security_margin_bottom">.5dp</dimen>
+    <dimen name="site_security_unknown_inset_top">1dp</dimen>
+    <dimen name="site_security_unknown_inset_bottom">-1dp</dimen>
+
+    <dimen name="home_folder_title_oneline_textsize">16sp</dimen>
+    <dimen name="home_folder_title_twoline_textsize">14sp</dimen>
+    <dimen name="home_twolinepagerow_title_textsize">16sp</dimen>
+
+    <dimen name="page_row_edge_padding">16dp</dimen>
+
+    <!-- Regular page row on about:home -->
+    <dimen name="page_row_height">64dp</dimen>
+
+    <!-- Group/heading page row on about:home -->
+    <dimen name="page_group_height">56dp</dimen>
+    <dimen name="home_header_item_height">56dp</dimen>
+    <dimen name="page_row_divider_height">1dp</dimen>
+
+    <!-- Remote Tabs static view top padding. Less in landscape on phones. -->
+    <dimen name="home_remote_tabs_top_padding">48dp</dimen>
+
+    <!-- Remote Tabs Hidden devices row height -->
+    <dimen name="home_remote_tabs_hidden_footer_height">40dp</dimen>
+
+    <!-- Search Engine Row height -->
+    <dimen name="search_row_height">48dp</dimen>
+
+    <dimen name="doorhanger_width">300dp</dimen>
+    <dimen name="doorhanger_input_width">250dp</dimen>
+    <dimen name="doorhanger_offsetX">12dp</dimen>
+    <dimen name="doorhanger_offsetY">67dp</dimen>
+    <dimen name="doorhanger_drawable_padding">5dp</dimen>
+    <dimen name="doorhanger_subsection_padding">8dp</dimen>
+    <dimen name="doorhanger_section_padding_small">10dp</dimen>
+    <dimen name="doorhanger_section_padding_medium">20dp</dimen>
+    <dimen name="doorhanger_section_padding_large">30dp</dimen>
+    <dimen name="doorhanger_icon_size">60dp</dimen>
+    <dimen name="doorhanger_rounded_corner_radius">4dp</dimen>
+
+    <dimen name="context_menu_item_horizontal_padding">10dp</dimen>
+
+    <dimen name="flow_layout_spacing">6dp</dimen>
+    <dimen name="menu_item_icon">21dp</dimen>
+    <dimen name="menu_item_textsize">16sp</dimen>
+    <dimen name="menu_item_state_icon">18dp</dimen>
+    <!-- This is chosen to match Android's listPreferredItemHeight.
+         TODO: We should inherit these from the system.
+         http://androidxref.com/4.2.2_r1/xref/frameworks/base/core/res/res/values/themes.xml#123 -->
+    <dimen name="menu_item_row_height">64dip</dimen>
+    <dimen name="menu_item_row_width">240dp</dimen>
+    <dimen name="menu_popup_width">256dp</dimen>
+    <dimen name="nav_button_border_width">1dp</dimen>
+    <dimen name="prompt_service_group_padding_size">32dp</dimen>
+    <dimen name="prompt_service_icon_size">36dp</dimen>
+    <dimen name="prompt_service_icon_text_padding">10dp</dimen>
+    <dimen name="prompt_service_inputs_padding">16dp</dimen>
+    <dimen name="prompt_service_left_right_text_with_icon_padding">10dp</dimen>
+    <dimen name="prompt_service_top_bottom_text_with_icon_padding">8dp</dimen>
+    <dimen name="tabs_panel_indicator_width">60dp</dimen>
+    <dimen name="tabs_panel_button_width">48dp</dimen>
+    <dimen name="tabs_strip_height">48dp</dimen>
+    <dimen name="tabs_strip_button_width">100dp</dimen>
+    <dimen name="tabs_strip_button_padding">18dp</dimen>
+    <dimen name="tabs_strip_shadow_size">1dp</dimen>
+    <dimen name="validation_message_height">50dp</dimen>
+    <dimen name="validation_message_margin_top">6dp</dimen>
+
+    <dimen name="tab_thumbnail_width">121dp</dimen>
+    <dimen name="tab_thumbnail_height">90dp</dimen>
+    <dimen name="tab_panel_column_width">129dp</dimen>
+    <dimen name="tab_panel_grid_padding">20dp</dimen>
+    <dimen name="tab_panel_grid_vspacing">20dp</dimen>
+    <dimen name="tab_panel_grid_padding_top">19dp</dimen>
+
+    <dimen name="tab_highlight_stroke_width">4dp</dimen>
+
+    <!-- PageActionButtons dimensions -->
+    <dimen name="page_action_button_width">32dp</dimen>
+
+    <!-- Banner -->
+    <dimen name="home_banner_height">72dp</dimen>
+    <dimen name="home_banner_close_width">42dp</dimen>
+    <dimen name="home_banner_icon_height">48dip</dimen>
+    <dimen name="home_banner_icon_width">48dip</dimen>
+
+    <!-- Icon Grid -->
+    <dimen name="icongrid_columnwidth">128dp</dimen>
+    <dimen name="icongrid_padding">16dp</dimen>
+
+    <!-- PanelRecyclerView dimensions -->
+    <dimen name="panel_grid_view_column_width">150dp</dimen>
+    <dimen name="panel_grid_view_horizontal_spacing">3dp</dimen>
+    <dimen name="panel_grid_view_vertical_spacing">3dp</dimen>
+    <dimen name="panel_grid_view_outer_spacing">3dp</dimen>
+
+    <!-- PanelItemView dimensions -->
+    <dimen name="panel_article_item_height">95dp</dimen>
+
+    <!-- Button toast dimenstions. -->
+    <dimen name="toast_button_corner_radius">2dp</dimen>
+
+    <!-- TabHistoryItemRow dimensions. -->
+    <dimen name="tab_history_timeline_width">3dp</dimen>
+    <dimen name="tab_history_timeline_height">14dp</dimen>
+    <dimen name="tab_history_favicon_bg">32dp</dimen>
+    <dimen name="tab_history_favicon_padding">5dp</dimen>
+    <dimen name="tab_history_favicon_border_enabled">3dp</dimen>
+    <dimen name="tab_history_favicon_border_disabled">1dp</dimen>
+    <dimen name="tab_history_combo_margin_left">15dp</dimen>
+    <dimen name="tab_history_combo_margin_right">15dp</dimen>
+    <dimen name="tab_history_title_fading_width">50dp</dimen>
+    <dimen name="tab_history_title_margin_right">15dp</dimen>
+    <dimen name="tab_history_title_text_size">14sp</dimen>
+    <dimen name="tab_history_bg_width">2dp</dimen>
+    <dimen name="tab_history_border_padding">2dp</dimen>
+
+    <!-- ZoomedView dimensions. -->
+    <dimen name="zoomed_view_toolbar_height">44dp</dimen>
+    <dimen name="drawable_dropshadow_size">3dp</dimen>
+
+    <!-- Find-In-Page dialog dimensions. -->
+    <dimen name="find_in_page_text_margin_left">5dip</dimen>
+    <dimen name="find_in_page_text_margin_right">12dip</dimen>
+    <dimen name="find_in_page_text_padding_left">10dip</dimen>
+    <dimen name="find_in_page_text_padding_right">10dip</dimen>
+    <dimen name="find_in_page_status_margin_right">10dip</dimen>
+    <dimen name="find_in_page_control_margin_top">2dip</dimen>
+    <dimen name="progress_bar_scroll_offset">1.5dp</dimen>
+
+    <!-- Matches the built-in divider height. fwiw, in the framework
+         I suspect this is a drawable rather than a dimen.  -->
+    <dimen name="action_bar_divider_height">2dp</dimen>
+
+    <!-- http://blog.danlew.net/2015/01/06/handling-android-resources-with-non-standard-formats/ -->
+    <item name="match_parent" type="dimen">-1</item>
+    <item name="wrap_content" type="dimen">-2</item>
+
+    <item name="tab_strip_content_start" type="dimen">12dp</item>
+    <item name="firstrun_tab_strip_content_start" type="dimen">15dp</item>
+
+    <item name="notification_media_cover" type="dimen">128dp</item>
+
+    <item name="activity_stream_base_margin" type="dimen">10dp</item>
+    <item name="activity_stream_desired_tile_width" type="dimen">90dp</item>
+    <item name="activity_stream_desired_tile_height" type="dimen">70dp</item>
+    <item name="activity_stream_top_sites_text_height" type="dimen">30dp</item>
+
+    <!-- Default touch target size for buttons/imageviews that might be of small size -->
+    <item name="touch_target_size" type="dimen">48dp</item>
+</resources>
diff --git a/mobile/android/base/resources/values/ids.xml b/mobile/android/base/resources/values/ids.xml
new file mode 100644
index 000000000..2fe1ca793
--- /dev/null
+++ b/mobile/android/base/resources/values/ids.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <item type="id" name="tabQueueNotification"/>
+    <item type="id" name="tabQueueSettingsNotification" />
+    <item type="id" name="guestNotification"/>
+    <item type="id" name="original_height"/>
+    <item type="id" name="menu_items"/>
+    <item type="id" name="menu_margin"/>
+    <item type="id" name="recycler_view_click_support" />
+    <item type="id" name="range_list"/>
+    <item type="id" name="pref_header_general"/>
+    <item type="id" name="pref_header_privacy"/>
+    <item type="id" name="pref_header_search"/>
+    <item type="id" name="updateServicePermissionNotification" />
+    <item type="id" name="websiteContentNotification" />
+    <item type="id" name="foregroundNotification" />
+
+</resources>
diff --git a/mobile/android/base/resources/values/integers.xml b/mobile/android/base/resources/values/integers.xml
new file mode 100644
index 000000000..b3451e05d
--- /dev/null
+++ b/mobile/android/base/resources/values/integers.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <integer name="number_of_top_sites">6</integer>
+    <integer name="number_of_top_sites_cols">2</integer>
+    <integer name="max_icon_grid_columns">4</integer>
+    <integer name="panel_icon_grid_view_columns">3</integer>
+    <integer name="number_of_inline_share_devices">2</integer>
+    <integer name="max_search_suggestions">2</integer>
+    <integer name="max_saved_suggestions">2</integer>
+    <integer name="search_assist_launch_res">0</integer>
+
+</resources>
diff --git a/mobile/android/base/resources/values/search_attrs.xml b/mobile/android/base/resources/values/search_attrs.xml
new file mode 100644
index 000000000..d1b0ded59
--- /dev/null
+++ b/mobile/android/base/resources/values/search_attrs.xml
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <declare-styleable name="FacetButton"/>
+
+    <!--This attribute is required so that we can create a facet button-->
+    <!--pragmatically. The defStyle param used in the View constructor-->
+    <!--must be an attr, see: https://code.google.com/p/android/issues/detail?id=12683-->
+    <attr name="facetButtonStyle" />
+</resources>
diff --git a/mobile/android/base/resources/values/search_colors.xml b/mobile/android/base/resources/values/search_colors.xml
new file mode 100644
index 000000000..8718d1b51
--- /dev/null
+++ b/mobile/android/base/resources/values/search_colors.xml
@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <!-- card colors -->
+    <color name="row_background">#ffffff</color>
+    <color name="row_background_pressed">#DCDCE1</color>
+
+    <color name="widget_button_pressed">#33000000</color>
+
+    <!--Facet button colors-->
+    <color name="facet_button_background_color_default">@android:color/white</color>
+    <color name="facet_button_background_color_pressed">#FAFAFA</color>
+
+    <color name="facet_button_text_color_default">#ADB0B1</color>
+    <color name="facet_button_text_color_selected">#383E42</color>
+
+    <color name="network_error_link">#0092DB</color>
+
+    <!-- Suggestion highlight color -->
+    <color name="suggestion_highlight">#FF999999</color>
+</resources>
diff --git a/mobile/android/base/resources/values/search_dimens.xml b/mobile/android/base/resources/values/search_dimens.xml
new file mode 100644
index 000000000..d35641a16
--- /dev/null
+++ b/mobile/android/base/resources/values/search_dimens.xml
@@ -0,0 +1,30 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <!-- The height of the search bar is also used to offset the PreSearchFragment
+         and PostSearchFragment contents -->
+    <dimen name="search_bar_height">65dp</dimen>
+    <dimen name="progress_bar_height">3dp</dimen>
+
+    <!-- Size of the text for query input and suggestions -->
+    <dimen name="query_text_size">16sp</dimen>
+
+    <dimen name="search_row_padding">15dp</dimen>
+    <dimen name="search_bar_padding_y">10dp</dimen>
+
+    <!-- Padding to account for search engine icon/clear button -->
+    <dimen name="search_bar_padding_right">25dp</dimen>
+
+    <dimen name="search_history_drawable_padding">10dp</dimen>
+
+    <!-- Widget Buttons -->
+    <dimen name="widget_header_height">70dp</dimen>
+    <dimen name="widget_text_size">14sp</dimen>
+    <dimen name="widget_padding">7dp</dimen>
+    <dimen name="widget_drawable_corner_radius">4dp</dimen>
+    <dimen name="widget_bg_border_offset">3dp</dimen>
+
+    <dimen name="facet_button_underline_thickness">5dp</dimen>
+</resources>
diff --git a/mobile/android/base/resources/values/search_styles.xml b/mobile/android/base/resources/values/search_styles.xml
new file mode 100644
index 000000000..bc5adcd2e
--- /dev/null
+++ b/mobile/android/base/resources/values/search_styles.xml
@@ -0,0 +1,40 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">@color/toolbar_grey</item>
+        <item name="android:colorBackground">@color/toolbar_grey</item>
+
+        <!--This attribute is required so that we can create a facet button-->
+        <!--pragmatically. The defStyle param used in the View constructor-->
+        <!--must be an attr, see: https://code.google.com/p/android/issues/detail?id=12683-->
+        <item name="facetButtonStyle">@style/FacetButtonStyle</item>
+    </style>
+
+    <style name="SettingsTheme" parent="@android:style/Theme.Light" />
+
+    <style name="FacetButtonStyle">
+        <!--Since we're not inflating xml, we have to apply the layout params -->
+        <!--after instantiation. See FacetBar.addFacet.-->
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">@color/facet_button_text_color</item>
+        <item name="android:background">@drawable/facet_button_background</item>
+        <item name="android:gravity">center</item>
+        <item name="android:clickable">true</item>
+    </style>
+
+    <style name="TextAppearance.EmptyView.Title" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="TextAppearance.EmptyView.Message" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">@color/placeholder_grey</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
new file mode 100644
index 000000000..dd22ef00b
--- /dev/null
+++ b/mobile/android/base/resources/values/styles.xml
@@ -0,0 +1,832 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Base application styles. This could be overridden in other res/values-XXX/themes.xml.
+    -->
+    <style name="Widget"/>
+
+    <style name="Widget.BaseButton" parent="android:style/Widget.Button"/>
+
+    <style name="Widget.BaseDropDownItem" parent="android:style/Widget.DropDownItem"/>
+
+    <style name="Widget.BaseEditText" parent="android:style/Widget.EditText"/>
+
+    <style name="Widget.BaseListView" parent="android:style/Widget.ListView"/>
+
+    <style name="Widget.BaseGridView" parent="android:style/Widget.GridView"/>
+
+    <style name="Widget.BaseTextView" parent="android:style/Widget.TextView"/>
+
+    <style name="Widget.ProgressBar.Horizontal" parent="android:style/Widget.ProgressBar.Horizontal"/>
+
+    <!--
+        Application styles. All customizations that are not specific
+        to a particular API level can go here.
+    -->
+    <style name="Widget.Button" parent="Widget.BaseButton">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.Button</item>
+    </style>
+
+    <style name="Widget.DropDownItem" parent="Widget.BaseDropDownItem">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.DropDownItem</item>
+    </style>
+
+    <style name="Widget.EditText" parent="Widget.BaseEditText">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.EditText</item>
+    </style>
+
+    <style name="Widget.TextView" parent="Widget.BaseTextView">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.TextView</item>
+    </style>
+
+    <style name="Widget.ListView" parent="Widget.BaseListView">
+        <item name="android:divider">@color/toolbar_divider_grey</item>
+        <item name="android:dividerHeight">@dimen/page_row_divider_height</item>
+        <item name="android:cacheColorHint">@android:color/transparent</item>
+        <item name="android:listSelector">@drawable/action_bar_button</item>
+    </style>
+
+    <style name="Widget.ExpandableListView" parent="Widget.ListView">
+        <item name="android:groupIndicator">@android:color/transparent</item>
+    </style>
+
+    <style name="Widget.GridView" parent="Widget.BaseGridView">
+        <item name="android:verticalSpacing">0dip</item>
+        <item name="android:horizontalSpacing">0dip</item>
+        <item name="android:cacheColorHint">@android:color/transparent</item>
+        <item name="android:listSelector">@drawable/action_bar_button</item>
+    </style>
+
+    <style name="Widget.Home.HomeList">
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="Widget.ListItem">
+        <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceLargeInverse</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingLeft">12dip</item>
+        <item name="android:paddingRight">7dip</item>
+        <item name="android:checkMark">?android:attr/listChoiceIndicatorMultiple</item>
+        <item name="android:ellipsize">marquee</item>
+    </style>
+
+    <style name="Widget.Spinner" parent="android:style/Widget.Spinner">
+        <item name="android:minWidth">@dimen/doorhanger_input_width</item>
+    </style>
+
+    <style name="Widget.GeckoMenuListView" parent="Widget.ListView">
+        <item name="android:listSelector">@drawable/menu_item_action_bar_bg</item>
+        <item name="android:divider">@null</item>
+        <item name="android:dividerHeight">0dp</item>
+    </style>
+
+    <style name="Widget.MenuItemActionBar">
+        <item name="android:padding">10dip</item>
+        <item name="android:background">@drawable/menu_item_action_bar_bg</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="drawableTintList">@color/action_bar_menu_item_colors</item>"
+    </style>
+
+    <style name="Widget.MenuItemSecondaryActionBar">
+        <item name="android:padding">8dip</item>
+        <item name="android:background">@drawable/menu_item_action_bar_bg</item>
+        <item name="android:scaleType">centerInside</item>
+        <item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
+    </style>
+
+    <style name="Widget.MenuItemSwitcherLayout">
+        <item name="android:gravity">left</item>
+    </style>
+
+    <style name="Widget.MenuItemDefault">
+        <item name="android:paddingLeft">15dip</item>
+        <item name="android:paddingRight">10dip</item>
+        <item name="android:drawablePadding">6dip</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textAppearance">@style/TextAppearance</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">middle</item>
+        <item name="android:textSize">@dimen/menu_item_textsize</item>
+    </style>
+
+    <style name="Widget.FolderTitle">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemTitle</item>
+    </style>
+
+    <style name="Widget.FolderTitle.OneLine">
+        <item name="android:textSize">@dimen/home_folder_title_oneline_textsize</item>
+    </style>
+
+    <style name="Widget.FolderTitle.TwoLine">
+        <item name="android:textSize">@dimen/home_folder_title_twoline_textsize</item>
+    </style>
+
+    <style name="Widget.TwoLinePageRow" >
+        <item name="android:background">@color/pressed_about_page_header_grey</item>
+    </style>
+
+    <style name="Widget.TwoLinePageRow.Title">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemTitle</item>
+        <item name="android:textSize">@dimen/home_twolinepagerow_title_textsize</item>
+    </style>
+
+    <style name="Widget.TwoLinePageRow.Url">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemDescription</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:singleLine">true</item>
+    </style>
+
+    <style name="Widget.FolderView" parent="Widget.FolderTitle.OneLine">
+        <item name="android:layout_height">@dimen/page_group_height</item>
+        <item name="android:minHeight">@dimen/page_group_height</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">none</item>
+        <item name="android:background">@color/about_page_header_grey</item>
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:drawablePadding">20dp</item>
+    </style>
+
+    <style name="Widget.PanelItemView" />
+
+    <style name="Widget.PanelItemView.Title">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemTitle</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="Widget.PanelItemView.Description">
+        <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemDescription</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="Widget.TopSitesGridView" parent="Widget.GridView">
+        <item name="android:padding">7dp</item>
+        <item name="android:horizontalSpacing">0dp</item>
+        <item name="android:verticalSpacing">7dp</item>
+    </style>
+
+    <style name="Widget.TopSitesGridItemView">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:padding">5dip</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="Widget.TabsGridLayout" parent="Widget.GridView">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:stretchMode">spacingWidth</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+        <item name="android:gravity">center</item>
+        <item name="android:numColumns">auto_fit</item>
+        <item name="android:columnWidth">@dimen/tab_panel_column_width</item>
+        <item name="android:horizontalSpacing">2dp</item>
+        <item name="android:verticalSpacing">@dimen/tab_panel_grid_vspacing</item>
+        <item name="android:drawSelectorOnTop">true</item>
+        <item name="android:clipToPadding">false</item>
+    </style>
+
+    <style name="Widget.BookmarkItemView" parent="Widget.TwoLinePageRow"/>
+
+    <style name="Widget.BookmarksListView" parent="Widget.HomeListView"/>
+
+    <style name="Widget.TopSitesThumbnailView">
+      <item name="android:padding">0dip</item>
+      <item name="android:scaleType">centerCrop</item>
+    </style>
+
+    <style name="Widget.TopSitesGridItemPin">
+      <item name="android:minWidth">30dip</item>
+      <item name="android:minHeight">30dip</item>
+      <item name="android:padding">0dip</item>
+    </style>
+
+    <style name="Widget.TopSitesGridItemTitle">
+      <item name="android:textColor">@color/top_sites_grid_item_title</item>
+      <item name="android:textSize">12sp</item>
+      <item name="android:paddingTop">5dip</item>
+      <item name="android:gravity">left</item>
+    </style>
+
+    <style name="Widget.HomeListView" parent="Widget.ListView">
+        <item name="android:divider">@color/toolbar_divider_grey</item>
+    </style>
+
+    <style name="Widget.TopSitesListView" parent="Widget.BookmarksListView"/>
+
+    <style name="Widget.HomeBanner"/>
+
+    <style name="Widget.Home" />
+
+    <style name="Widget.Home.HeaderItem">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">36dp</item>
+        <item name="android:textAppearance">@style/TextAppearance.Widget.Home.Header</item>
+        <item name="android:background">@android:color/white</item>
+        <item name="android:focusable">false</item>
+        <item name="android:gravity">center|left</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingTop">11dp</item>
+        <item name="android:paddingBottom">11dp</item>
+        <item name="android:includeFontPadding">false</item>
+    </style>
+
+    <style name="Widget.Home.ActionButton">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:background">@drawable/home_history_clear_button_bg</item>
+        <item name="android:focusable">true</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingLeft">10dip</item>
+        <item name="android:paddingRight">10dip</item>
+    </style>
+
+    <style name="Widget.Home.ActionItem">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">40dip</item>
+        <item name="android:textColor">#000000</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="Widget.Firstrun.Button" parent="Widget.BaseButton">
+        <item name="android:layout_width">@dimen/firstrun_content_width</item>
+        <item name="android:layout_height">60dp</item>
+        <item name="android:textColor">@color/android:white</item>
+        <item name="android:background">@color/action_orange</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="Widget.Doorhanger.Button" parent="Widget.BaseButton">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:minHeight">48dp</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <!--
+        We are overriding the snackbar message style to guarantee a consistent style across Android versions (bug 1217416).
+    -->
+    <style name="TextAppearance.Design.Snackbar.Message" parent="android:TextAppearance" tools:override="true">
+        <item name="android:textSize">@dimen/design_snackbar_text_size</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <!--
+        TextAppearance
+        Note: Gecko uses light theme as default, while Android uses dark.
+        If Android convention has to be followd, the list of colors specified 
+        in themes.xml would be inverse, and things would get confusing.
+        Hence, Gecko's TextAppearance is based on text over light theme and
+        TextAppearance.Inverse is based on text over dark theme.
+    -->
+    <style name="TextAppearance">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
+        <item name="android:textColorHint">?android:attr/textColorHint</item>
+        <item name="android:textColorLink">?android:attr/textColorLink</item>
+        <item name="android:textSize">@dimen/menu_item_textsize</item>
+        <item name="android:textStyle">normal</item>
+    </style>
+
+    <style name="TextAppearance.Inverse">
+        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+        <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+        <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+        <item name="android:textColorLink">?android:attr/textColorLink</item>
+    </style>
+
+    <style name="TextAppearance.Large">
+        <item name="android:textSize">22sp</item>
+    </style>
+
+    <style name="TextAppearance.Large.Inverse">
+        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+        <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+        <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+        <item name="android:textColorLink">?android:attr/textColorLink</item>
+    </style>
+
+    <style name="TextAppearance.Medium">
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="TextAppearance.Medium.Inverse">
+        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+        <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+        <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+        <item name="android:textColorLink">?android:attr/textColorLink</item>
+    </style>
+
+    <style name="TextAppearance.Small">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
+    <style name="TextAppearance.Small.Inverse">
+        <item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
+        <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+        <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+        <item name="android:textColorLink">?android:attr/textColorLink</item>
+    </style>
+
+    <style name="TextAppearance.EmptyMessage" parent="TextAppearance.Large"/>
+
+    <style name="TextAppearance.EmptyHint" parent="TextAppearance.Medium">
+        <item name="android:textColor">#FFA62F</item>
+        <item name="android:textStyle">italic</item>
+    </style>
+
+    <style name="TextAppearance.Micro">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">?android:attr/textColorTertiary</item>
+    </style>
+
+    <style name="TextAppearance.Micro.Inverse">
+        <item name="android:textColor">?android:attr/textColorTertiaryInverse</item>
+        <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+        <item name="android:textColorHighlight">@color/text_color_highlight_inverse</item>
+        <item name="android:textColorLink">?android:attr/textColorLink</item>
+    </style>
+
+    <style name="TextAppearance.Widget" />
+
+    <style name="TextAppearance.Widget.Button" parent="TextAppearance.Small">
+        <item name="android:textColor">@color/primary_text</item>
+    </style>
+
+    <style name="TextAppearance.Widget.DropDownItem">
+        <item name="android:textColor">@color/primary_text</item>
+    </style>
+
+    <style name="TextAppearance.Widget.EditText">
+        <item name="android:textColor">@color/primary_text</item>
+    </style>
+
+    <style name="TextAppearance.Widget.TextView">
+        <item name="android:textColor">@color/primary_text</item>
+    </style>
+
+    <style name="TextAppearance.Widget.HomePagerTabMenuStrip" parent="TextAppearance.Small">
+        <item name="android:textColor">?android:attr/textColorHint</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="TextAppearance.Widget.Home" />
+
+    <style name="TextAppearance.Widget.Home.Header" parent="TextAppearance.Small">
+        <item name="android:textColor">@color/disabled_grey</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance">
+        <item name="android:textSize">16dp</item>
+    </style>
+
+    <style name="TextAppearance.Widget.Home.ItemDescription" parent="TextAppearance.Micro">
+        <item name="android:textColor">@color/tabs_tray_icon_grey</item>
+    </style>
+
+    <style name="TextAppearance.Widget.HomeBanner" parent="TextAppearance.Small">
+        <item name="android:textColor">?android:attr/textColorHint</item>
+    </style>
+
+    <style name="TextAppearance.DoorHanger">
+        <item name="android:textColor">@color/placeholder_active_grey</item>
+        <item name="android:textColorLink">@color/doorhanger_link</item>
+    </style>
+
+    <style name="TextAppearance.DoorHanger.Medium">
+        <item name="android:textSize">16dp</item>
+    </style>
+
+    <style name="TextAppearance.DoorHanger.Medium.Bold">
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <style name="TextAppearance.DoorHanger.Medium.Light">
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+
+    <style name="TextAppearance.DoorHanger.Small">
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="TextAppearance.UrlBar.Title" parent="TextAppearance.Small">
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <!-- BrowserToolbar -->
+    <style name="BrowserToolbar">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/browser_toolbar_height</item>
+        <item name="android:orientation">horizontal</item>
+    </style>
+
+    <!-- URL bar -->
+    <style name="UrlBar">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:orientation">horizontal</item>
+    </style>
+
+    <!-- URL bar - Button -->
+    <style name="UrlBar.Button">
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
+    <!-- URL bar - Button -->
+    <style name="UrlBar.Title" parent="UrlBar.Button">
+        <item name="android:textAppearance">@style/TextAppearance.UrlBar.Title</item>
+        <item name="android:textColor">@color/url_bar_title</item>
+        <item name="android:textColorHint">@color/url_bar_title_hint</item>
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
+        <item name="android:textSelectHandle">@drawable/handle_middle</item>
+        <item name="android:textSelectHandleLeft">@drawable/handle_start</item>
+        <item name="android:textSelectHandleRight">@drawable/handle_end</item>
+        <item name="android:textCursorDrawable">@null</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:gravity">center_vertical|left</item>
+        <item name="android:hint">@string/url_bar_default_text</item>
+    </style>
+
+    <!-- URL bar - Image Button -->
+    <style name="UrlBar.ImageButtonBase" parent="UrlBar.Button">
+        <item name="android:scaleType">center</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
+    <style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
+        <item name="android:layout_width">@dimen/browser_toolbar_height</item>
+    </style>
+
+    <!-- TabsLayout -->
+    <style name="TabsLayoutBase">
+         <item name="android:background">@android:color/transparent</item>
+         <item name="android:listSelector">@android:color/transparent</item>
+    </style>
+
+    <style name="TabsLayout" parent="TabsLayoutBase">
+         <item name="android:orientation">vertical</item>
+         <item name="android:scrollbars">vertical</item>
+    </style>
+
+    <style name="TabsItem">
+         <item name="android:nextFocusRight">@+id/close</item>
+    </style>
+
+    <style name="TabsItemClose">
+         <item name="android:nextFocusLeft">@+id/info</item>
+    </style>
+
+    <!-- Tabs panel -->
+    <style name="TabsPanelSectionBase">
+        <item name="android:orientation">vertical</item>
+        <item name="android:layout_marginLeft">40dp</item>
+        <item name="android:layout_marginRight">40dp</item>
+    </style>
+
+    <style name="TabsPanelSection" parent="TabsPanelSectionBase">
+        <!-- We set values in landscape. -->
+    </style>
+
+    <style name="TabsPanelItemBase">
+        <item name="android:layout_marginBottom">28dp</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="TabsPanelItem" parent="TabsPanelItemBase">
+        <!-- We set values in landscape. -->
+    </style>
+
+    <style name="TabsPanelItem.TextAppearance">
+        <item name="android:textColor">#C0C9D0</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:lineSpacingMultiplier">1.35</item>
+    </style>
+
+    <style name="TabsPanelItem.TextAppearance.Header">
+        <item name="android:textSize">18sp</item>
+        <item name="android:layout_marginBottom">16dp</item>
+    </style>
+
+    <style name="TabsPanelItem.TextAppearance.Linkified">
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:textColor">#0292D6</item>
+    </style>
+
+    <style name="Widget.RemoteTabsItemView" parent="Widget.TwoLinePageRow"/>
+
+    <style name="Widget.RemoteTabsClientView" parent="Widget.TwoLinePageRow">
+        <item name="android:background">@color/about_page_header_grey</item>
+    </style>
+
+    <style name="Widget.RemoteTabsListView" parent="Widget.HomeListView">
+        <item name="android:childDivider">@color/toolbar_divider_grey</item>
+    </style>
+
+    <style name="Widget.HistoryListView" parent="Widget.HomeListView">
+        <item name="android:childDivider">@color/toolbar_divider_grey</item>
+        <item name="android:drawSelectorOnTop">true</item>
+    </style>
+
+    <!-- TabsLayout Row -->
+    <style name="TabLayoutItemTextAppearance">
+        <item name="android:textColor">#FFFFFFFF</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">middle</item>
+    </style>
+
+    <!-- TabsLayout RemoteTabs Row Url -->
+    <style name="TabLayoutItemTextAppearance.Url">
+        <item name="android:textColor">#FFA4A7A9</item>
+    </style>
+
+    <!-- TabWidget --> 
+    <style name="TabWidget">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">40dip</item>
+        <item name="android:layout_weight">1.0</item>
+    </style>
+
+    <!-- Find bar -->
+    <style name="FindBar">
+        <item name="android:background">@color/text_and_tabs_tray_grey</item>
+        <item name="android:paddingLeft">3dip</item>
+        <item name="android:paddingRight">3dip</item>
+        <item name="android:paddingTop">6dip</item>
+        <item name="android:paddingBottom">6dip</item>
+    </style>
+
+    <!-- Find bar - Image Button -->
+    <style name="FindBar.ImageButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">5dip</item>
+        <item name="android:layout_marginRight">5dip</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:background">@drawable/action_bar_button_inverse</item>
+    </style>
+
+    <style name="GeckoDialogTitle">
+        <item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
+    </style>
+
+    <style name="GeckoDialogTitle.SubTitle" />
+
+    <style name="PopupAnimation">
+        <item name="@android:windowEnterAnimation">@anim/popup_show</item>
+        <item name="@android:windowExitAnimation">@anim/popup_hide</item>
+    </style>
+
+    <style name="ToastBase">
+        <item name="android:background">@drawable/toast_background</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_gravity">bottom|center_horizontal</item>
+        <item name="android:layout_marginBottom">64dp</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:clickable">true</item>
+    </style>
+
+    <style name="Toast" parent="ToastBase">
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
+    </style>
+
+    <style name="ToastElementBase">
+        <item name="android:background">@null</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:paddingTop">11dp</item>
+        <item name="android:paddingBottom">11dp</item>
+    </style>
+
+    <style name="ToastDividerBase">
+        <item name="android:background">@color/toolbar_divider_grey</item>
+        <item name="android:layout_width">1dp</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+
+    <style name="ToastMessageBase" parent="ToastElementBase">
+        <item name="android:textColor">@color/toast_button_text</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:clickable">false</item>
+        <item name="android:focusable">false</item>
+    </style>
+
+    <style name="ToastButtonBase" parent="ToastElementBase">
+        <item name="android:background">@drawable/toast_button_background</item>
+        <item name="android:textColor">@color/toast_button_text</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:drawablePadding">12dp</item>
+        <item name="android:maxWidth">160dp</item>
+    </style>
+
+    <style name="ToastDivider" parent="ToastDividerBase">
+        <item name="android:layout_marginTop">14dp</item>
+        <item name="android:layout_marginBottom">14dp</item>
+    </style>
+
+    <style name="ToastMessage" parent="ToastMessageBase">
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+    </style>
+
+    <style name="ToastButton" parent="ToastButtonBase">
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <!-- Ideally, we use the same style for the action bar & action mode, but unfortunately
+         some attrs that share a purpose have different names so instead we inherit. -->
+    <style name="GeckoActionBar" parent="ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:colorBackground">@color/action_bar_bg_color</item>
+        <item name="colorAccent">@color/fennec_ui_orange</item>
+        <item name="colorControlNormal">@color/toolbar_icon_grey</item>
+    </style>
+    <style name="GeckoActionBar.ActionMode">
+        <item name="android:background">@color/action_bar_bg_color</item>
+        <!-- Note: the bottom divider is drawn in code. -->
+    </style>
+
+    <style name="PreferencesActionBar" parent="Widget.AppCompat.ActionBar.Solid">
+        <item name="displayOptions">showHome|homeAsUp|showTitle</item>
+    </style>
+
+    <style name="GeckoActionBar.Title">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textAppearance">@style/TextAppearance.Medium</item>
+        <item name="android:drawableLeft">@drawable/ab_done</item>
+        <item name="android:paddingLeft">15dp</item>
+        <item name="android:paddingRight">15dp</item>
+        <item name="android:contentDescription">@string/actionbar_done</item>
+    </style>
+
+    <style name="GeckoActionBar.Button" parent="Widget.MenuItemActionBar">
+        <item name="android:padding">8dp</item>
+    </style>
+
+    <style name="GeckoActionBar.Button.MenuButton">
+        <item name="android:scaleType">center</item>
+        <item name="android:src">@drawable/menu</item>
+        <item name="android:tint">@color/toolbar_icon_grey</item>
+        <item name="android:contentDescription">@string/actionbar_menu</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
+    <style name="GeckoActionBar.Buttons">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@color/placeholder_active_grey</item>
+        <item name="android:gravity">right</item>
+    </style>
+
+    <style name="ShareOverlayTitle">
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:paddingLeft">15dp</item>
+        <item name="android:paddingRight">15dp</item>
+    </style>
+
+    <style name="TextAppearance.ShareOverlay">
+        <item name="android:fontFamily">sans-serif</item>
+    </style>
+
+    <style name="TextAppearance.ShareOverlay.Header">
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:textStyle">normal</item>
+    </style>
+
+    <style name="ShareOverlayRow">
+        <item name="android:minHeight">60dp</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:background">@drawable/overlay_share_button_background</item>
+        <item name="android:focusableInTouchMode">false</item>
+    </style>
+
+    <style name="TabInput"></style>
+
+    <style name="TabInput.TabWidget">
+        <item name="android:divider">@drawable/divider_vertical</item>
+        <item name="android:background">@drawable/tab_indicator_background</item>
+    </style>
+
+    <style name="TabInput.Tab">
+        <item name="android:background">@drawable/tabs_strip_indicator</item>
+        <item name="android:gravity">center</item>
+        <item name="android:minHeight">@dimen/menu_item_row_height</item>
+    </style>
+
+    <style name="TextAppearance.FirstrunLight"/>
+    <style name="TextAppearance.FirstrunRegular"/>
+
+    <style name="TextAppearance.FirstrunLight.Main">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
+    </style>
+
+    <style name="TextAppearance.FirstrunRegular.Body">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/placeholder_grey</item>
+        <item name="android:lineSpacingMultiplier">1.25</item>
+    </style>
+
+    <style name="TextAppearance.FirstrunRegular.Link">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/link_blue</item>
+    </style>
+
+    <!-- Remote Tabs home panel -->
+    <style name="RemoteTabsPanelFrame">
+        <item name="android:paddingLeft">32dp</item>
+        <item name="android:paddingRight">32dp</item>
+        <item name="android:paddingTop">@dimen/home_remote_tabs_top_padding</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="RemoteTabsPanelItem">
+        <item name="android:layout_gravity">center</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_marginBottom">16dp</item>
+        <item name="android:maxWidth">320dp</item>
+    </style>
+
+    <style name="RemoteTabsPanelItem.TextAppearance">
+        <item name="android:textColor">@color/placeholder_grey</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:lineSpacingMultiplier">1.25</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+    </style>
+
+    <style name="RemoteTabsPanelItem.TextAppearance.Header">
+        <item name="android:textColor">@color/placeholder_active_grey</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+    </style>
+
+    <style name="RemoteTabsPanelItem.TextAppearance.Linkified">
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:textColor">#0092DB</item>
+    </style>
+
+    <style name="RemoteTabsPanelItem.Button">
+        <item name="android:background">@drawable/remote_tabs_setup_button_background</item>
+        <item name="android:textColor">#FFFFFF</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingTop">16dp</item>
+        <item name="android:paddingBottom">16dp</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingRight">8dp</item>
+
+        <!-- AppCompat sets Button text to all caps so we override that here. -->
+        <item name="textAllCaps">false</item>
+    </style>
+
+    <style name="TabQueueActivity" parent="android:style/Theme.NoDisplay" />
+
+    <style name="ActivityStreamContextMenuText">
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <!-- We use this style to provide our own divider that has an inset on the left side -->
+    <style name="ActivityStreamContextMenuStyle">
+        <item name="android:listDivider">@drawable/as_contextmenu_divider</item>
+    </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
new file mode 100644
index 000000000..f62a9d454
--- /dev/null
+++ b/mobile/android/base/resources/values/themes.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+
+    <!--
+        Base application theme. This could be overridden by GeckoBaseTheme
+        in other res/values-XXX/themes.xml.
+    -->
+    <style name="GeckoBase" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+    <style name="GeckoDialogBase" parent="@android:style/Theme.Dialog">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
+    <style name="GeckoTitleDialogBase" parent="@android:style/Theme.Dialog" />
+
+    <style name="Gecko.Preferences">
+        <item name="windowActionBar">true</item>
+        <item name="windowNoTitle">false</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="actionBarStyle">@style/PreferencesActionBar</item>
+    </style>
+
+    <!--
+        Application Theme. All customizations that are not specific
+        to a particular API level can go here.
+    -->
+    <style name="Gecko" parent="GeckoBase">
+        <!-- Default colors -->
+        <item name="android:textColorPrimary">@color/primary_text</item>
+        <item name="android:textColorSecondary">@color/secondary_text</item>
+        <item name="android:textColorTertiary">@color/tertiary_text</item>
+
+        <!-- Default inverse colors -->
+        <item name="android:textColorPrimaryInverse">@color/primary_text</item>
+        <item name="android:textColorSecondaryInverse">@color/secondary_text</item>
+        <item name="android:textColorTertiaryInverse">@color/tertiary_text</item>
+
+        <!-- Disabled colors -->
+        <item name="android:textColorPrimaryDisableOnly">@color/text_color_primary_disable_only</item>
+
+        <!-- Hint colors -->
+        <item name="android:textColorHint">@color/text_color_hint</item>
+        <item name="android:textColorHintInverse">@color/text_color_hint_inverse</item>
+
+        <!-- Highlight colors -->
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
+        <item name="android:textColorHighlightInverse">@color/text_color_highlight_inverse</item>
+
+        <!-- Link colors -->
+        <item name="android:textColorLink">@color/text_color_link</item>
+
+        <!-- TextAppearances -->
+        <item name="android:textAppearance">@style/TextAppearance</item>
+        <item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>
+        <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
+        <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
+        <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
+
+        <item name="colorAccent">@color/action_orange</item>
+
+        <item name="actionBarTheme">@style/GeckoActionBar</item>
+    </style>
+
+    <style name="Gecko.Dialog" parent="GeckoDialogBase"/>
+
+    <style name="Gecko.TitleDialog" parent="GeckoTitleDialogBase"/>
+
+    <!--
+        Activity based themes, dependent on API level. This theme is replaced
+        by GeckoAppBase from res/values-vXX/themes.xml on newer devices.
+    -->
+    <style name="GeckoAppBase" parent="Gecko">
+        <item name="android:buttonStyle">@style/Widget.Button</item>
+        <item name="android:dropDownItemStyle">@style/Widget.DropDownItem</item>
+        <item name="android:editTextStyle">@style/Widget.EditText</item>
+        <item name="android:textViewStyle">@style/Widget.TextView</item>
+        <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
+    </style>
+
+    <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    <style name="Gecko.App" parent="GeckoAppBase">
+        <item name="android:gridViewStyle">@style/Widget.GridView</item>
+        <item name="android:spinnerStyle">@style/Widget.Spinner</item>
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="bookmarksListViewStyle">@style/Widget.BookmarksListView</item>
+        <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
+        <item name="geckoMenuListViewStyle">@style/Widget.GeckoMenuListView</item>
+        <item name="homeListViewStyle">@style/Widget.HomeListView</item>
+        <item name="menuItemActionBarStyle">@style/Widget.MenuItemActionBar</item>
+        <item name="menuItemActionModeStyle">@style/GeckoActionBar.Button</item>
+        <item name="topSitesGridItemViewStyle">@style/Widget.TopSitesGridItemView</item>
+        <item name="topSitesGridViewStyle">@style/Widget.TopSitesGridView</item>
+        <item name="topSitesThumbnailViewStyle">@style/Widget.TopSitesThumbnailView</item>
+    </style>
+
+    <!-- Make an activity appear like an overlay. -->
+    <style name="OverlayActivity" parent="Gecko">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:backgroundDimEnabled">true</item>
+
+        <!-- Set the app's title bar color in the recent app switcher.
+
+             Note: We'd prefer not to show up in the recent app switcher (bug 1137928). -->
+        <item name="android:colorPrimary">@color/text_and_tabs_tray_grey</item>
+        <!-- We display the overlay on top of other Activities so show their status bar. -->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+</resources>
diff --git a/mobile/android/base/resources/values/vpi__attrs.xml b/mobile/android/base/resources/values/vpi__attrs.xml
new file mode 100644
index 000000000..ffe895f22
--- /dev/null
+++ b/mobile/android/base/resources/values/vpi__attrs.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 Jake Wharton
+     Copyright (C) 2011 Patrik Åkerfeldt
+
+     Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <declare-styleable name="ViewPagerIndicator">
+        <!-- Style of the circle indicator. -->
+        <attr name="vpiCirclePageIndicatorStyle" format="reference"/>
+        <!-- Style of the icon indicator's views. -->
+        <attr name="vpiIconPageIndicatorStyle" format="reference"/>
+        <!-- Style of the line indicator. -->
+        <attr name="vpiLinePageIndicatorStyle" format="reference"/>
+        <!-- Style of the title indicator. -->
+        <attr name="vpiTitlePageIndicatorStyle" format="reference"/>
+        <!-- Style of the tab indicator's tabs. -->
+        <attr name="vpiTabPageIndicatorStyle" format="reference"/>
+        <!-- Style of the underline indicator. -->
+        <attr name="vpiUnderlinePageIndicatorStyle" format="reference"/>
+    </declare-styleable>
+
+    <attr name="centered" format="boolean" />
+    <attr name="selectedColor" format="color" />
+    <attr name="strokeWidth" format="dimension" />
+    <attr name="unselectedColor" format="color" />
+
+    <declare-styleable name="CirclePageIndicator">
+        <!-- Whether or not the indicators should be centered. -->
+        <attr name="centered" />
+        <!-- Color of the filled circle that represents the current page. -->
+        <attr name="fillColor" format="color" />
+        <!-- Color of the filled circles that represents pages. -->
+        <attr name="pageColor" format="color" />
+        <!-- Orientation of the indicator. -->
+        <attr name="android:orientation"/>
+        <!-- Radius of the circles. This is also the spacing between circles. -->
+        <attr name="radius" format="dimension" />
+        <!-- Whether or not the selected indicator snaps to the circles. -->
+        <attr name="snap" format="boolean" />
+        <!-- Color of the open circles. -->
+        <attr name="strokeColor" format="color" />
+        <!-- Width of the stroke used to draw the circles. -->
+        <attr name="strokeWidth" />
+        <!-- View background -->
+        <attr name="android:background"/>
+    </declare-styleable>
+</resources>
diff --git a/mobile/android/base/resources/values/vpi__defaults.xml b/mobile/android/base/resources/values/vpi__defaults.xml
new file mode 100644
index 000000000..f902f48a8
--- /dev/null
+++ b/mobile/android/base/resources/values/vpi__defaults.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 Jake Wharton
+
+     Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <bool name="default_circle_indicator_centered">true</bool>
+    <color name="default_circle_indicator_fill_color">#FFFFFFFF</color>
+    <color name="default_circle_indicator_page_color">#00000000</color>
+    <integer name="default_circle_indicator_orientation">0</integer>
+    <dimen name="default_circle_indicator_radius">3dp</dimen>
+    <bool name="default_circle_indicator_snap">false</bool>
+    <color name="default_circle_indicator_stroke_color">#FFDDDDDD</color>
+    <dimen name="default_circle_indicator_stroke_width">1dp</dimen>
+</resources>
\ No newline at end of file