diff --git a/res/color/indicator_arrow_color.xml b/res/color/indicator_arrow_color.xml
index 4c73307..198d002 100644
--- a/res/color/indicator_arrow_color.xml
+++ b/res/color/indicator_arrow_color.xml
@@ -20,5 +20,5 @@
         android:color="@color/preview_pager_arrow_disabled" />
     <item
         android:state_enabled="true"
-        android:color="?android:attr/colorForeground" />
-</selector>
\ No newline at end of file
+        android:color="?android:attr/colorAccent" />
+</selector>
diff --git a/res/drawable/ic_font.xml b/res/drawable/ic_font.xml
index 206b5b0..7309815 100644
--- a/res/drawable/ic_font.xml
+++ b/res/drawable/ic_font.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <!-- This path represents a square with rounded corners -->
diff --git a/src/com/android/customization/widget/PreviewPager.java b/src/com/android/customization/widget/PreviewPager.java
index 7146d6b..7819b7c 100644
--- a/src/com/android/customization/widget/PreviewPager.java
+++ b/src/com/android/customization/widget/PreviewPager.java
@@ -211,12 +211,8 @@
     private void updateIndicator(int position) {
         int adapterCount = mAdapter.getCount();
         if (adapterCount > 1) {
-            mPreviousArrow.setVisibility(View.VISIBLE);
-            mNextArrow.setVisibility(View.VISIBLE);
-            mPreviousArrow.setEnabled(position != 0);
-            ((ViewGroup) mPreviousArrow).getChildAt(0).setEnabled(position != 0);
-            mNextArrow.setEnabled(position != (adapterCount - 1));
-            ((ViewGroup) mNextArrow).getChildAt(0).setEnabled(position != (adapterCount - 1));
+            mPreviousArrow.setVisibility(position != 0 ? View.VISIBLE : View.GONE);
+            mNextArrow.setVisibility(position != (adapterCount - 1) ? View.VISIBLE : View.GONE);
         } else {
             mPageIndicator.setVisibility(View.GONE);
             mPreviousArrow.setVisibility(View.GONE);