diff --git a/app/src/main/res/layout/activity_book_search.xml b/app/src/main/res/layout/activity_book_search.xml
index 0c5eb04a1..8bd430d67 100644
--- a/app/src/main/res/layout/activity_book_search.xml
+++ b/app/src/main/res/layout/activity_book_search.xml
@@ -96,7 +96,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
-                app:tint="?attr/colorTertiary"
+                app:tint="?attr/colorOnTertiaryContainer"
                 app:backgroundTint="?attr/colorTertiaryContainer"
                 android:contentDescription="@string/stop"
                 android:src="@drawable/ic_stop_black_24dp"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bb18a0ffc..b855c22e8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -20,6 +20,7 @@
         android:id="@+id/bottom_navigation_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:elevation="0dp"
         android:minHeight="56dp"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_search.xml b/app/src/main/res/layout/item_search.xml
index 920921158..d7711ab75 100644
--- a/app/src/main/res/layout/item_search.xml
+++ b/app/src/main/res/layout/item_search.xml
@@ -54,7 +54,7 @@
                     android:paddingHorizontal="4dp"
                     android:paddingVertical="2dp"
                     android:text="@string/remove_from_bookshelf"
-                    android:textColor="?attr/colorTertiary"
+                    android:textColor="?attr/colorOnTertiaryContainer"
                     android:textStyle="bold"
                     android:textSize="10sp"
                     tools:ignore="SmallSp" />
diff --git a/app/src/main/res/layout/item_search_history.xml b/app/src/main/res/layout/item_search_history.xml
index b869e71cf..dcdbce1b4 100644
--- a/app/src/main/res/layout/item_search_history.xml
+++ b/app/src/main/res/layout/item_search_history.xml
@@ -30,6 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         app:backgroundTint="@android:color/transparent"
+        app:iconTint="?attr/colorOnSurface"
         app:icon="@drawable/ic_baseline_close" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 8426488b4..ca6406315 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -573,7 +573,7 @@
     <color name="elink_theme_surfaceBright">#3A3939</color>
     <color name="elink_theme_surfaceContainerLowest">#0E0E0E</color>
     <color name="elink_theme_surfaceContainerLow">#1C1B1B</color>
-    <color name="elink_theme_surfaceContainer">#201F1F</color>
+    <color name="elink_theme_surfaceContainer">#000000</color>
     <color name="elink_theme_surfaceContainerHigh">#2A2A2A</color>
     <color name="elink_theme_surfaceContainerHighest">#353434</color>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 92d0d3a2b..a2d5c2068 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -564,9 +564,9 @@
     <color name="elink_theme_outlineVariant">#000000</color>
     <color name="elink_theme_scrim">#000000</color>
     <color name="elink_theme_inverseSurface">#313030</color>
-    <color name="elink_theme_inverseOnSurface">#F4F0EF</color>
-    <color name="elink_theme_inversePrimary">#C6C6C7</color>
-    <color name="elink_theme_primaryFixed">#E2E2E2</color>
+    <color name="elink_theme_inverseOnSurface">#FFFFFF</color>
+    <color name="elink_theme_inversePrimary">#FFFFFF</color>
+    <color name="elink_theme_primaryFixed">#FFFFFF</color>
     <color name="elink_theme_onPrimaryFixed">#1A1C1C</color>
     <color name="elink_theme_primaryFixedDim">#C6C6C7</color>
     <color name="elink_theme_onPrimaryFixedVariant">#454747</color>
@@ -574,17 +574,17 @@
     <color name="elink_theme_onSecondaryFixed">#1B1B1B</color>
     <color name="elink_theme_secondaryFixedDim">#C6C6C6</color>
     <color name="elink_theme_onSecondaryFixedVariant">#474747</color>
-    <color name="elink_theme_tertiaryFixed">#E2E2E2</color>
+    <color name="elink_theme_tertiaryFixed">#FFFFFF</color>
     <color name="elink_theme_onTertiaryFixed">#1B1B1B</color>
     <color name="elink_theme_tertiaryFixedDim">#C6C6C6</color>
     <color name="elink_theme_onTertiaryFixedVariant">#474747</color>
-    <color name="elink_theme_surfaceDim">#DDD9D9</color>
-    <color name="elink_theme_surfaceBright">#FCF8F8</color>
+    <color name="elink_theme_surfaceDim">#FFFFFF</color>
+    <color name="elink_theme_surfaceBright">#FFFFFF</color>
     <color name="elink_theme_surfaceContainerLowest">#FFFFFF</color>
-    <color name="elink_theme_surfaceContainerLow">#F6F3F2</color>
-    <color name="elink_theme_surfaceContainer">#F1EDEC</color>
-    <color name="elink_theme_surfaceContainerHigh">#EBE7E7</color>
-    <color name="elink_theme_surfaceContainerHighest">#E5E2E1</color>
+    <color name="elink_theme_surfaceContainerLow">#FFFFFF</color>
+    <color name="elink_theme_surfaceContainer">#FFFFFF</color>
+    <color name="elink_theme_surfaceContainerHigh">#FFFFFF</color>
+    <color name="elink_theme_surfaceContainerHighest">#FFFFFF</color>
 
     <color name="disabled">@color/md_light_disabled</color>