diff --git a/lib/models/isar/sw_theme.dart b/lib/models/isar/sw_theme.dart
index 191479b15..af1362c87 100644
--- a/lib/models/isar/sw_theme.dart
+++ b/lib/models/isar/sw_theme.dart
@@ -2057,73 +2057,73 @@ class ThemeAssets {
   }) {
     return ThemeAssets(
       bellNew:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["bell_new"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["bell_new"] as String}",
       personaIncognito:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["persona_incognito"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["persona_incognito"] as String}",
       personaEasy:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["persona_easy"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["persona_easy"] as String}",
       stack:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["stack"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["stack"] as String}",
       stackIcon:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["stack_icon"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["stack_icon"] as String}",
       receive:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["receive"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["receive"] as String}",
       receivePending:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["receive_pending"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["receive_pending"] as String}",
       receiveCancelled:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["receive_cancelled"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["receive_cancelled"] as String}",
       send:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["send"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["send"] as String}",
       sendPending:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["send_pending"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["send_pending"] as String}",
       sendCancelled:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["send_cancelled"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["send_cancelled"] as String}",
       themePreview:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]["theme_preview"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["theme_preview"] as String}",
       bitcoin:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["bitcoin"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["bitcoin"] as String}",
       litecoin:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["litecoin"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["litecoin"] as String}",
       bitcoincash:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["bitcoincash"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["bitcoincash"] as String}",
       dogecoin:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["dogecoin"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["dogecoin"] as String}",
       epicCash:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["epicCash"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["epicCash"] as String}",
       ethereum:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["ethereum"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["ethereum"] as String}",
       firo:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["firo"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["firo"] as String}",
       monero:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["monero"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["monero"] as String}",
       wownero:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["wownero"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["wownero"] as String}",
       namecoin:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["namecoin"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["namecoin"] as String}",
       particl:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['small']["particl"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["particl"] as String}",
       bitcoinImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["bitcoin"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["bitcoin_image"] as String}",
       bitcoincashImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["bitcoincash"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["bitcoincash_image"] as String}",
       dogecoinImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["dogecoin"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["dogecoin_image"] as String}",
       epicCashImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["epicCash"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["epicCash_image"] as String}",
       ethereumImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["ethereum"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["ethereum_image"] as String}",
       firoImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["firo"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["firo_image"] as String}",
       litecoinImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["litecoin"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["litecoin_image"] as String}",
       moneroImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["monero"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["monero_image"] as String}",
       wowneroImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["wownero"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["wownero_image"] as String}",
       namecoinImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["namecoin"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["namecoin_image"] as String}",
       particlImage:
-          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["svg"]['coin_icons']['big']["particl"] as String}",
+          "$applicationThemesDirectoryPath/$internalThemeUuid/${json["assets"]["particl_image"] as String}",
     );
   }
 }
diff --git a/lib/themes/defaults/dark.dart b/lib/themes/defaults/dark.dart
index 4cfefa6f4..c52dcc694 100644
--- a/lib/themes/defaults/dark.dart
+++ b/lib/themes/defaults/dark.dart
@@ -215,48 +215,40 @@ final Map<String, dynamic> darkJson = {
     }
   },
   "assets": {
-    "svg": {
-      "background": "",
-      "coin_icons": {
-        "small": {
-          "bitcoin": "svg/coin_icons/small/Bitcoin.svg",
-          "litecoin": "svg/coin_icons/small/Litecoin.svg",
-          "bitcoincash": "svg/coin_icons/small/Bitcoincash.svg",
-          "dogecoin": "svg/coin_icons/small/Dogecoin.svg",
-          "epicCash": "svg/coin_icons/small/EpicCash.svg",
-          "ethereum": "svg/coin_icons/small/Ethereum.svg",
-          "firo": "svg/coin_icons/small/Firo.svg",
-          "monero": "svg/coin_icons/small/Monero.svg",
-          "wownero": "svg/coin_icons/small/Wownero.svg",
-          "namecoin": "svg/coin_icons/small/Namecoin.svg",
-          "particl": "svg/coin_icons/small/Particl.svg",
-        },
-        "big": {
-          "bitcoin": "svg/coin_icons/big/bitcoin.svg",
-          "litecoin": "svg/coin_icons/big/litecoin.svg",
-          "bitcoincash": "svg/coin_icons/big/bitcoincash.svg",
-          "dogecoin": "svg/coin_icons/big/doge.svg",
-          "epicCash": "svg/coin_icons/big/epic-cash.svg",
-          "ethereum": "svg/coin_icons/big/ethereum.svg",
-          "firo": "svg/coin_icons/big/firo.svg",
-          "monero": "svg/coin_icons/big/monero.svg",
-          "wownero": "svg/coin_icons/big/wownero.svg",
-          "namecoin": "svg/coin_icons/big/namecoin.svg",
-          "particl": "svg/coin_icons/big/particl.svg",
-        }
-      },
-      "bell_new": "svg/bell-new.svg",
-      "persona_incognito": "svg/persona-incognito-1.svg",
-      "persona_easy": "svg/persona-easy-1.svg",
-      "stack": "svg/stack.svg",
-      "stack_icon": "svg/stack-icon1.svg",
-      "receive": "svg/tx-icon-receive.svg",
-      "receive_pending": "svg/tx-icon-receive-pending.svg",
-      "receive_cancelled": "svg/tx-icon-receive-failed.svg",
-      "send": "svg/tx-icon-send.svg",
-      "send_pending": "svg/tx-icon-send-pending.svg",
-      "send_cancelled": "svg/tx-icon-send-failed.svg",
-      "theme_preview": "svg/dark-theme.svg",
-    },
+    "background": "",
+    "bitcoin": "svg/coin_icons/small/Bitcoin.svg",
+    "litecoin": "svg/coin_icons/small/Litecoin.svg",
+    "bitcoincash": "svg/coin_icons/small/Bitcoincash.svg",
+    "dogecoin": "svg/coin_icons/small/Dogecoin.svg",
+    "epicCash": "svg/coin_icons/small/EpicCash.svg",
+    "ethereum": "svg/coin_icons/small/Ethereum.svg",
+    "firo": "svg/coin_icons/small/Firo.svg",
+    "monero": "svg/coin_icons/small/Monero.svg",
+    "wownero": "svg/coin_icons/small/Wownero.svg",
+    "namecoin": "svg/coin_icons/small/Namecoin.svg",
+    "particl": "svg/coin_icons/small/Particl.svg",
+    "bitcoin_image": "svg/coin_icons/big/bitcoin.svg",
+    "litecoin_image": "svg/coin_icons/big/litecoin.svg",
+    "bitcoincash_image": "svg/coin_icons/big/bitcoincash.svg",
+    "dogecoin_image": "svg/coin_icons/big/doge.svg",
+    "epicCash_image": "svg/coin_icons/big/epic-cash.svg",
+    "ethereum_image": "svg/coin_icons/big/ethereum.svg",
+    "firo_image": "svg/coin_icons/big/firo.svg",
+    "monero_image": "svg/coin_icons/big/monero.svg",
+    "wownero_image": "svg/coin_icons/big/wownero.svg",
+    "namecoin_image": "svg/coin_icons/big/namecoin.svg",
+    "particl_image": "svg/coin_icons/big/particl.svg",
+    "bell_new": "svg/bell-new.svg",
+    "persona_incognito": "svg/persona-incognito-1.svg",
+    "persona_easy": "svg/persona-easy-1.svg",
+    "stack": "svg/stack.svg",
+    "stack_icon": "svg/stack-icon1.svg",
+    "receive": "svg/tx-icon-receive.svg",
+    "receive_pending": "svg/tx-icon-receive-pending.svg",
+    "receive_cancelled": "svg/tx-icon-receive-failed.svg",
+    "send": "svg/tx-icon-send.svg",
+    "send_pending": "svg/tx-icon-send-pending.svg",
+    "send_cancelled": "svg/tx-icon-send-failed.svg",
+    "theme_preview": "svg/dark-theme.svg",
   }
 };
diff --git a/lib/themes/defaults/light.dart b/lib/themes/defaults/light.dart
index 7278a37cc..ec6e4cd2f 100644
--- a/lib/themes/defaults/light.dart
+++ b/lib/themes/defaults/light.dart
@@ -215,48 +215,40 @@ final Map<String, dynamic> lightJson = {
     }
   },
   "assets": {
-    "svg": {
-      "background": "",
-      "coin_icons": {
-        "small": {
-          "bitcoin": "svg/coin_icons/small/Bitcoin.svg",
-          "litecoin": "svg/coin_icons/small/Litecoin.svg",
-          "bitcoincash": "svg/coin_icons/small/Bitcoincash.svg",
-          "dogecoin": "svg/coin_icons/small/Dogecoin.svg",
-          "epicCash": "svg/coin_icons/small/EpicCash.svg",
-          "ethereum": "svg/coin_icons/small/Ethereum.svg",
-          "firo": "svg/coin_icons/small/Firo.svg",
-          "monero": "svg/coin_icons/small/Monero.svg",
-          "wownero": "svg/coin_icons/small/Wownero.svg",
-          "namecoin": "svg/coin_icons/small/Namecoin.svg",
-          "particl": "svg/coin_icons/small/Particl.svg",
-        },
-        "big": {
-          "bitcoin": "svg/coin_icons/big/bitcoin.svg",
-          "litecoin": "svg/coin_icons/big/litecoin.svg",
-          "bitcoincash": "svg/coin_icons/big/bitcoincash.svg",
-          "dogecoin": "svg/coin_icons/big/doge.svg",
-          "epicCash": "svg/coin_icons/big/epic-cash.svg",
-          "ethereum": "svg/coin_icons/big/ethereum.svg",
-          "firo": "svg/coin_icons/big/firo.svg",
-          "monero": "svg/coin_icons/big/monero.svg",
-          "wownero": "svg/coin_icons/big/wownero.svg",
-          "namecoin": "svg/coin_icons/big/namecoin.svg",
-          "particl": "svg/coin_icons/big/particl.svg",
-        }
-      },
-      "bell_new": "svg/bell-new.svg",
-      "persona_incognito": "svg/persona-incognito-1.svg",
-      "persona_easy": "svg/persona-easy-1.svg",
-      "stack": "svg/stack.svg",
-      "stack_icon": "svg/stack-icon1.svg",
-      "receive": "svg/tx-icon-receive.svg",
-      "receive_pending": "svg/tx-icon-receive-pending.svg",
-      "receive_cancelled": "svg/tx-icon-receive-failed.svg",
-      "send": "svg/tx-icon-send.svg",
-      "send_pending": "svg/tx-icon-send-pending.svg",
-      "send_cancelled": "svg/tx-icon-send-failed.svg",
-      "theme_preview": "svg/light-mode.svg",
-    },
+    "background": "",
+    "bitcoin": "svg/coin_icons/small/Bitcoin.svg",
+    "litecoin": "svg/coin_icons/small/Litecoin.svg",
+    "bitcoincash": "svg/coin_icons/small/Bitcoincash.svg",
+    "dogecoin": "svg/coin_icons/small/Dogecoin.svg",
+    "epicCash": "svg/coin_icons/small/EpicCash.svg",
+    "ethereum": "svg/coin_icons/small/Ethereum.svg",
+    "firo": "svg/coin_icons/small/Firo.svg",
+    "monero": "svg/coin_icons/small/Monero.svg",
+    "wownero": "svg/coin_icons/small/Wownero.svg",
+    "namecoin": "svg/coin_icons/small/Namecoin.svg",
+    "particl": "svg/coin_icons/small/Particl.svg",
+    "bitcoin_image": "svg/coin_icons/big/bitcoin.svg",
+    "litecoin_image": "svg/coin_icons/big/litecoin.svg",
+    "bitcoincash_image": "svg/coin_icons/big/bitcoincash.svg",
+    "dogecoin_image": "svg/coin_icons/big/doge.svg",
+    "epicCash_image": "svg/coin_icons/big/epic-cash.svg",
+    "ethereum_image": "svg/coin_icons/big/ethereum.svg",
+    "firo_image": "svg/coin_icons/big/firo.svg",
+    "monero_image": "svg/coin_icons/big/monero.svg",
+    "wownero_image": "svg/coin_icons/big/wownero.svg",
+    "namecoin_image": "svg/coin_icons/big/namecoin.svg",
+    "particl_image": "svg/coin_icons/big/particl.svg",
+    "bell_new": "svg/bell-new.svg",
+    "persona_incognito": "svg/persona-incognito-1.svg",
+    "persona_easy": "svg/persona-easy-1.svg",
+    "stack": "svg/stack.svg",
+    "stack_icon": "svg/stack-icon1.svg",
+    "receive": "svg/tx-icon-receive.svg",
+    "receive_pending": "svg/tx-icon-receive-pending.svg",
+    "receive_cancelled": "svg/tx-icon-receive-failed.svg",
+    "send": "svg/tx-icon-send.svg",
+    "send_pending": "svg/tx-icon-send-pending.svg",
+    "send_cancelled": "svg/tx-icon-send-failed.svg",
+    "theme_preview": "svg/light-mode.svg",
   }
 };