diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9a9b2045..b5f18c253 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased - 100
 
 - Hide search, expand and sort icons until there is at least 1 card
+- Various theming fixes
 
 ## v2.14.0 - 99 (2022-01-14)
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
index 4ed97eb92..3b817c540 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
@@ -16,5 +16,6 @@ public class LoyaltyCardLockerApplication extends Application {
 
         Settings settings = new Settings(this);
         AppCompatDelegate.setDefaultNightMode(settings.getTheme());
+        DynamicColors.applyToActivitiesIfAvailable(this);
     }
 }
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 1498e46a2..e5721a3c5 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -367,7 +367,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         View folder = findViewById(R.id.action_unfold);
         View sort = findViewById(R.id.action_sort);
 
-        if (search != null) {
+        if (search != null && mSearchView.isIconified()) {
             search.setVisibility(shouldShow ? View.VISIBLE : View.GONE);
         }
         if (folder != null) {
diff --git a/app/src/main/res/layout/about_activity.xml b/app/src/main/res/layout/about_activity.xml
index 885a9490f..f5a05fe34 100644
--- a/app/src/main/res/layout/about_activity.xml
+++ b/app/src/main/res/layout/about_activity.xml
@@ -16,7 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_manage_group.xml b/app/src/main/res/layout/activity_manage_group.xml
index 102e3d525..4be42c39d 100644
--- a/app/src/main/res/layout/activity_manage_group.xml
+++ b/app/src/main/res/layout/activity_manage_group.xml
@@ -28,7 +28,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+                style="?attr/toolbarStyle" />
 
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/groups"
diff --git a/app/src/main/res/layout/barcode_selector_activity.xml b/app/src/main/res/layout/barcode_selector_activity.xml
index bcf8c11bb..30a8bb6ec 100644
--- a/app/src/main/res/layout/barcode_selector_activity.xml
+++ b/app/src/main/res/layout/barcode_selector_activity.xml
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/import_export_activity.xml b/app/src/main/res/layout/import_export_activity.xml
index bed46b6b5..384764242 100644
--- a/app/src/main/res/layout/import_export_activity.xml
+++ b/app/src/main/res/layout/import_export_activity.xml
@@ -13,7 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml
index d15a53acd..c9f5f4161 100644
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -24,7 +24,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index a3abfd7f6..b9a960aad 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -25,7 +25,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/groups"
diff --git a/app/src/main/res/layout/manage_groups_activity.xml b/app/src/main/res/layout/manage_groups_activity.xml
index d1acd186c..4142e5e8e 100644
--- a/app/src/main/res/layout/manage_groups_activity.xml
+++ b/app/src/main/res/layout/manage_groups_activity.xml
@@ -25,7 +25,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/scan_activity.xml b/app/src/main/res/layout/scan_activity.xml
index f5044ca2b..fb9bcfdf2 100644
--- a/app/src/main/res/layout/scan_activity.xml
+++ b/app/src/main/res/layout/scan_activity.xml
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
index 5b88023fd..8630f2c4a 100644
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -13,7 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/simple_toolbar_list_activity.xml b/app/src/main/res/layout/simple_toolbar_list_activity.xml
index ef41ae0be..d445616f3 100644
--- a/app/src/main/res/layout/simple_toolbar_list_activity.xml
+++ b/app/src/main/res/layout/simple_toolbar_list_activity.xml
@@ -13,7 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
index 551d0822c..cf3b57915 100644
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
index 92d1a05ea..0f615edd0 100644
Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png
index 6a4c13a67..32200e702 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png
index 975f00469..f66dc0a3c 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png
index 969c56791..96c48ed1d 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png
index 41eca6d99..9b04fea29 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png
index 0b125108a..6f62de971 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png
index 6859a16f3..b8936074c 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png
index eeb06a33e..7d8a955fe 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png
index 9b0301894..286426beb 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png differ