deleted file mode 100644
--- a/mobile/android/base/resources/anim/grow_fade_in_center.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/. -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:duration="250">
-
-    <scale android:fromXScale="0.5"
-           android:toXScale="1.0"
-           android:fromYScale="0.5"
-           android:toYScale="1.0"
-           android:pivotX="50%"
-           android:pivotY="50%"/>
-
-    <alpha android:fromAlpha="0.0"
-           android:toAlpha="1.0"/>
-
-</set>

deleted file mode 100644
--- a/mobile/android/base/resources/color/floating_hint_text.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Holo blue for focus -->
-    <item android:state_focused="true" android:color="@color/text_color_hint_floating_focused" />
-
-    <!-- Default gray for all other states -->
-    <item android:color="@color/text_color_hint"/>
-</selector>

deleted file mode 100644
index 6affe57a90f7ce373060d9030695a3ca8bb4064d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100644
index 57840c7bf894dd3acc3cd895e46483bf8e8c7b49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100644
index ce74be7d0a6eb3205fbbfc5e229ba36303ce4130..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100644
--- a/mobile/android/base/resources/drawable/divider_horizontal.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/. -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-    <solid android:color="@color/toolbar_divider_grey"/>
-    <size android:height="1dp" />
-
-</shape>

deleted file mode 100644
--- a/mobile/android/base/resources/drawable/ic_menu_bookmark_remove.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/. -->
-
-<!-- This asset is properly available in large-* dirs so this null
-     reference exists for build time on API 9 builds. -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-    <solid android:color="@android:color/transparent"/>
-
-</shape>

deleted file mode 100644
--- a/mobile/android/base/resources/drawable/ic_menu_quit.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-
-     <solid android:color="@android:color/transparent"/>
-
-</shape>

deleted file mode 100644
--- a/mobile/android/base/resources/layout/notification_icon_text.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:paddingLeft="5dp">
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal">
-
-        <ImageView android:id="@+id/notification_image"
-                   android:layout_width="25dp"
-                   android:layout_height="25dp"
-                   android:scaleType="fitCenter"/>
-
-        <TextView android:id="@+id/notification_title"
-                  android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
-                  android:layout_width="0dp"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1"
-                  android:singleLine="true"
-                  android:ellipsize="marquee"
-                  android:fadingEdge="horizontal"
-                  android:paddingLeft="4dp"/>
-
-    </LinearLayout>
-
-    <TextView android:id="@+id/notification_text"
-              android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingLeft="4dp"/>
-
-</LinearLayout>

deleted file mode 100644
--- a/mobile/android/base/resources/layout/notification_progress.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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/. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:paddingTop="7dp"
-              android:paddingLeft="5dp">
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal">
-
-        <ImageView android:id="@+id/notification_image"
-                   android:layout_width="25dp"
-                   android:layout_height="25dp"
-                   android:scaleType="fitCenter"/>
-
-        <TextView android:id="@+id/notification_title"
-                  android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
-                  android:layout_width="0dp"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1"
-                  android:singleLine="true"
-                  android:ellipsize="marquee"
-                  android:fadingEdge="horizontal"
-                  android:paddingLeft="10dp"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal">
-        <TextView android:id="@+id/notification_text"
-                  android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:paddingLeft="3dp"/>
-        <ProgressBar android:id="@+id/notification_progressbar"
-                     style="?android:attr/progressBarStyleHorizontal"
-                     android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:layout_marginTop="1dip"
-                     android:layout_marginBottom="1dip"
-                     android:layout_marginLeft="4dip"
-                     android:layout_marginRight="10dip" />
-    </LinearLayout>
-
-</LinearLayout>

deleted file mode 100644
--- a/mobile/android/base/resources/layout/notification_progress_text.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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/. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:paddingLeft="5dp">
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal">
-
-        <ImageView android:id="@+id/notification_image"
-                   android:layout_width="25dp"
-                   android:layout_height="25dp"
-                   android:scaleType="fitCenter"/>
-
-        <TextView android:id="@+id/notification_title"
-                  android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
-                  android:layout_width="0dp"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1"
-                  android:singleLine="true"
-                  android:ellipsize="marquee"
-                  android:fadingEdge="horizontal"
-                  android:paddingLeft="4dp"/>
-
-    </LinearLayout>
-
-    <ProgressBar android:id="@+id/notification_progressbar"
-                 style="?android:attr/progressBarStyleHorizontal"
-                 android:layout_width="match_parent"
-                 android:layout_height="16dip"
-                 android:layout_marginTop="1dip"
-                 android:layout_marginBottom="1dip"
-                 android:layout_marginLeft="10dip"
-                 android:layout_marginRight="10dip" />
-
-    <TextView android:id="@+id/notification_text"
-              android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingLeft="4dp"/>
-
-</LinearLayout>

deleted file mode 100644
--- a/mobile/android/base/resources/layout/overlay_share_toast.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/. -->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/dropshadow"
-    android:padding="3dp">
-
-    <TextView
-        android:id="@+id/overlay_toast_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="20dp"
-        android:background="@drawable/toolbar_grey_round"
-        android:textColor="@color/text_and_tabs_tray_grey"
-        android:textSize="14sp"
-        android:drawablePadding="15dp"
-        android:drawableLeft="@drawable/overlay_check"/>
-
-</FrameLayout>

deleted file mode 100644
--- a/mobile/android/base/resources/layout/simple_dropdown_item_1line.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     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.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    style="?android:attr/dropDownItemStyle"
-    android:textAppearance="@style/TextAppearance.Widget.TextView"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeightSmall"
-    android:ellipsize="marquee"/>

--- a/mobile/android/base/resources/values/arrays.xml
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -72,20 +72,16 @@
     <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_import_android_keys">
-        <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>

--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -35,17 +35,16 @@
   <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="background_tabs">#FF363B40</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>
 
@@ -83,17 +82,16 @@
   <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>
-  <color name="text_color_hint_floating_focused">#33b5e5</color>
 
   <!-- Highlight colors -->
   <color name="text_color_highlight_inverse">#D06BFF</color>
 
   <!-- Link colors -->
   <color name="text_color_link">#22629E</color>
 
   <!-- Divider colors -->
@@ -108,18 +106,16 @@
   <color name="textbox_background">#FFF</color>
   <color name="textbox_background_disabled">#DDD</color>
   <color name="textbox_stroke">#000</color>
   <color name="textbox_stroke_disabled">#666</color>
 
   <color name="url_bar_blockedtext">#b14646</color>
   <color name="url_bar_shadow">#12000000</color>
 
-  <color name="home_button_bar_bg">#FFF5F7F9</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. -->

--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -148,20 +148,16 @@
     <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>
-    <dimen name="tab_title_height">22dp</dimen>
-    <dimen name="tab_vertical_padding">6dp</dimen>
-    <dimen name="tab_thumbnail_padding">4dp</dimen>
-    <dimen name="tab_thumbnail_margin">6dp</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>