diff --git a/res/color/bottom_nav_item_color.xml b/res/color/bottom_nav_item_color.xml
index 9c1f598..bf94de9 100644
--- a/res/color/bottom_nav_item_color.xml
+++ b/res/color/bottom_nav_item_color.xml
@@ -20,5 +20,5 @@
         android:color="?android:colorAccent" />
     <item
         android:state_checked="false"
-        android:color="@color/material_grey600" />
+        android:color="@color/bottom_bar_icon_unchecked_color" />
 </selector>
\ No newline at end of file
diff --git a/res/layout/fragment_grid_picker.xml b/res/layout/fragment_grid_picker.xml
index 7f35689..84c8163 100644
--- a/res/layout/fragment_grid_picker.xml
+++ b/res/layout/fragment_grid_picker.xml
@@ -38,7 +38,7 @@
                 android:layout_height="0dp"
                 android:paddingTop="@dimen/preview_content_padding_top"
                 android:paddingBottom="@dimen/preview_content_padding_bottom"
-                android:background="@color/fullscreen_preview_background"
+                android:background="@color/preview_pager_background"
                 android:clipToPadding="false"
                 app:layout_constrainedHeight="true"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/fragment_theme_picker.xml b/res/layout/fragment_theme_picker.xml
index a773207..2e3a6bb 100644
--- a/res/layout/fragment_theme_picker.xml
+++ b/res/layout/fragment_theme_picker.xml
@@ -36,7 +36,7 @@
                 android:layout_height="0dp"
                 android:paddingTop="@dimen/preview_content_padding_top"
                 android:paddingBottom="@dimen/preview_content_padding_bottom"
-                android:background="@color/fullscreen_preview_background"
+                android:background="@color/preview_pager_background"
                 android:clipToPadding="false"
                 app:layout_constrainedHeight="true"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/theme_preview_color_icons.xml b/res/layout/theme_preview_color_icons.xml
index ccfb300..f1e7522 100644
--- a/res/layout/theme_preview_color_icons.xml
+++ b/res/layout/theme_preview_color_icons.xml
@@ -19,8 +19,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/color_icons_section"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/primary_color">
+    android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -28,7 +27,8 @@
         android:paddingHorizontal="@dimen/preview_theme_color_icons_padding_horizontal"
         android:paddingTop="@dimen/preview_theme_color_icons_padding_top"
         android:paddingBottom="@dimen/preview_theme_color_icons_padding_bottom"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:background="@color/theme_preview_color_icons_background">
 
         <!-- Title -->
         <TextView
@@ -37,6 +37,7 @@
             android:layout_height="wrap_content"
             android:text="@string/theme_preview_icons_section_title"
             android:textSize="@dimen/preview_theme_color_icons_title_text_size"
+            android:textColor="@color/theme_preview_color_icons_title_color"
             android:lineHeight="16dp"
             android:gravity="center"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index e022a6e..4f369a7 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -20,6 +20,9 @@
 
     <color name="icon_thumbnail_color">@color/white_88_alpha</color>
 
+    <color name="theme_preview_color_icons_background">@color/material_black_100</color>
+    <color name="theme_preview_color_icons_title_color">@color/material_white_100</color>
+
     <color name="control_grey">#b3b3b3</color>
     <color name="switch_track_tint">#171717</color>
     <color name="switch_thumb_tint">#bdbdbd</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 33ae4ea..d5291c0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,6 +33,8 @@
     <color name="theme_preview_icon_color">@color/google_grey700</color>
     <color name="theme_preview_workspace_shadow_color_dark">#B0000000</color>
     <color name="theme_preview_workspace_shadow_color_transparent">@android:color/transparent</color>
+    <color name="theme_preview_color_icons_background">@color/material_white_100</color>
+    <color name="theme_preview_color_icons_title_color">@color/black_87_alpha</color>
 
     <color name="text_color_dark">#2d2d2d</color>
     <color name="text_color_light">@color/material_white_text</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0b61fe4..dd0f2a3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -51,7 +51,7 @@
         <item name="itemTextAppearanceActive">@style/BottomNavTextAppearanceActive</item>
         <item name="itemTextAppearanceInactive">@style/BottomNavTextAppearance</item>
         <item name="itemBackground">?android:attr/selectableItemBackgroundBorderless</item>
-        <item name="android:background">?android:colorPrimary</item>
+        <item name="android:background">@color/bottom_bar_background_color</item>
     </style>
 
     <style name="BottomNavTextAppearance" parent="TitleTextAppearance">