--- a/mobile/android/base/resources/layout/home_remote_tabs_group.xml
+++ b/mobile/android/base/resources/layout/home_remote_tabs_group.xml
@@ -3,17 +3,17 @@
    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"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:gecko="http://schemas.android.com/apk/res-auto"
-    style="@style/Widget.RemoteTabsClientView"
+    style="@style/Widget.TwoLinePageRow.RemoteTabsClientView"
     android:gravity="center_vertical"
     android:layout_width="match_parent"
     android:layout_height="@dimen/home_header_item_height"
     android:minHeight="@dimen/home_header_item_height">
 
     <ImageView
         android:id="@+id/device_type"
         android:layout_width="@dimen/favicon_bg"

--- a/mobile/android/base/resources/layout/home_smartfolder.xml
+++ b/mobile/android/base/resources/layout/home_smartfolder.xml
@@ -3,17 +3,17 @@
    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"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:gecko="http://schemas.android.com/apk/res-auto"
-    style="@style/Widget.RemoteTabsClientView"
+    style="@style/Widget.TwoLinePageRow.RemoteTabsClientView"
     android:gravity="center_vertical"
     android:layout_width="match_parent"
     android:layout_height="@dimen/home_header_item_height"
     android:minHeight="@dimen/home_header_item_height">
 
     <ImageView
         android:id="@+id/device_type"
         android:layout_width="@dimen/favicon_bg"

--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -121,17 +121,17 @@
     <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" >
+    <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>
 
@@ -523,17 +523,17 @@
     <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">
+    <style name="Widget.TwoLinePageRow.RemoteTabsClientView">
         <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">