diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index d48bd500e6..64d34e715d 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -57,19 +57,11 @@
 
         <!-- Fast scroller popup -->
         <TextView
-            android:background="@drawable/container_fastscroll_popup_bg"
-            android:layout_width="@dimen/container_fastscroll_popup_size"
-            android:layout_height="@dimen/container_fastscroll_popup_size"
-            android:textSize="@dimen/container_fastscroll_popup_text_size"
+            style="@style/FastScrollerPopup"
             android:layout_below="@+id/search_container"
             android:id="@+id/fast_scroller_popup"
             android:layout_alignParentEnd="true"
-            android:gravity="center"
-            android:alpha="0"
-            android:elevation="3dp"
-            android:saveEnabled="false"
-            android:layout_marginEnd="@dimen/container_fastscroll_popup_margin"
-            android:textColor="@android:color/white" />
+            android:layout_marginEnd="@dimen/container_fastscroll_popup_margin" />
 
         <FrameLayout
             android:id="@+id/search_container"
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index 2cf9519382..d193a5ef43 100644
--- a/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@ -51,19 +51,11 @@
 
         <!-- Fast scroller popup -->
         <TextView
-            android:background="@drawable/container_fastscroll_popup_bg"
-            android:layout_width="@dimen/container_fastscroll_popup_size"
-            android:layout_height="@dimen/container_fastscroll_popup_size"
-            android:textSize="@dimen/container_fastscroll_popup_text_size"
+            style="@style/FastScrollerPopup"
             android:layout_below="@+id/search_container"
             android:id="@+id/fast_scroller_popup"
-            android:elevation="3dp"
-            android:gravity="center"
-            android:alpha="0"
-            android:saveEnabled="false"
             android:layout_gravity="top|end"
-            android:layout_marginEnd="@dimen/container_fastscroll_popup_margin"
-            android:textColor="@android:color/white" />
+            android:layout_marginEnd="@dimen/container_fastscroll_popup_margin" />
 
         <ProgressBar
             android:layout_width="wrap_content"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cd06b7560d..90338ae444 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,6 +30,20 @@
 
     <style name="Theme" parent="@style/LauncherTheme"></style>
 
+    <style name="FastScrollerPopup" >
+        <item name="android:background">@drawable/container_fastscroll_popup_bg</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:minWidth">@dimen/container_fastscroll_popup_size</item>
+        <item name="android:layout_height">@dimen/container_fastscroll_popup_size</item>
+        <item name="android:textSize">@dimen/container_fastscroll_popup_text_size</item>
+        <item name="android:gravity">center</item>
+        <item name="android:alpha">0</item>
+        <item name="android:elevation">3dp</item>
+        <item name="android:saveEnabled">false</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:includeFontPadding">false</item>
+    </style>
+
     <!-- Theme for the widget container. Overridden on API 25. -->
     <style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="colorSecondary">@color/fallback_secondary_color</item>