diff --git a/assets/default_themes/dark.zip b/assets/default_themes/dark.zip
index e2291ba2b..70bc24340 100644
Binary files a/assets/default_themes/dark.zip and b/assets/default_themes/dark.zip differ
diff --git a/assets/default_themes/light.zip b/assets/default_themes/light.zip
index 7a88cd3d9..f4544f179 100644
Binary files a/assets/default_themes/light.zip and b/assets/default_themes/light.zip differ
diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart
index dd0ecea0a..d5c1bb1a9 100644
--- a/lib/models/isar/stack_theme.dart
+++ b/lib/models/isar/stack_theme.dart
@@ -1517,7 +1517,7 @@ class StackTheme {
               themeId: json["id"] as String,
             )
           : null
-      ..assetsV2 = version == 2
+      ..assetsV2 = version >= 2
           ? ThemeAssetsV2.fromJson(
               json: Map<String, dynamic>.from(json["assets"] as Map),
               applicationThemesDirectoryPath: applicationThemesDirectoryPath,
@@ -2222,6 +2222,36 @@ class ThemeAssetsV2 implements IThemeAssets {
 
     return result;
   }
+
+  @override
+  String toString() {
+    return 'ThemeAssetsV2('
+        'bellNew: $bellNew, '
+        'buy: $buy, '
+        'exchange: $exchange, '
+        'personaIncognito: $personaIncognito, '
+        'personaEasy: $personaEasy, '
+        'stack: $stack, '
+        'stackIcon: $stackIcon, '
+        'receive: $receive, '
+        'receivePending: $receivePending, '
+        'receiveCancelled: $receiveCancelled, '
+        'send: $send, '
+        'sendPending: $sendPending, '
+        'sendCancelled: $sendCancelled, '
+        'themeSelector: $themeSelector, '
+        'themePreview: $themePreview, '
+        'txExchange: $txExchange, '
+        'txExchangePending: $txExchangePending, '
+        'txExchangeFailed: $txExchangeFailed, '
+        'loadingGif: $loadingGif, '
+        'background: $background, '
+        'coinPlaceholder: $coinPlaceholder, '
+        'coinIcons: $coinIcons, '
+        'coinImages: $coinImages, '
+        'coinSecondaryImages: $coinSecondaryImages'
+        ')';
+  }
 }
 
 abstract class IThemeAssets {
diff --git a/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
index 06adb392e..d71dba011 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
@@ -177,7 +177,7 @@ class ThemeToggle extends ConsumerStatefulWidget {
 
 class _ThemeToggle extends ConsumerState<ThemeToggle> {
   late final StreamSubscription<void> _subscription;
-  late int _current;
+  int _current = 0;
 
   List<Tuple3<String, String, String>> installedThemeIdNames = [];