diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c
index 624d940de..d8287c692 100644
--- a/applications/services/desktop/animations/animation_storage.c
+++ b/applications/services/desktop/animations/animation_storage.c
@@ -14,7 +14,7 @@
 #include <xtreme.h>
 #define ANIMATION_META_FILE "meta.txt"
 #define TAG "AnimationStorage"
-char ANIMATION_DIR[26 /*"/ext/asset_packs//Anims"*/ + XTREME_ASSETS_PACK_NAME_LEN + 1];
+char ANIMATION_DIR[23 /*"/ext/asset_packs//Anims"*/ + XTREME_ASSETS_PACK_NAME_LEN + 1];
 char ANIMATION_MANIFEST_FILE[sizeof(ANIMATION_DIR) + 13 /*"/manifest.txt"*/];
 
 static void animation_storage_free_bubbles(BubbleAnimation* animation);
diff --git a/assets/.gitignore b/assets/.gitignore
index a559e3b4c..88095e97b 100644
--- a/assets/.gitignore
+++ b/assets/.gitignore
@@ -1,7 +1,6 @@
 /core2_firmware
 /resources/Manifest
 /resources/apps/*
-/resources/dolphin/*
-/resources/dolphin_custom/*
 /resources/asset_packs/*
+/resources/dolphin/*
 /resources/apps_data/**/*.fal
diff --git a/assets/ReadMe.md b/assets/ReadMe.md
index 3fb746e36..5c5c0f3b6 100644
--- a/assets/ReadMe.md
+++ b/assets/ReadMe.md
@@ -34,7 +34,7 @@ Don't include assets that you are not using, compiler is not going to strip unus
 # Structure
 - `compiled`            - Output folder made for compiled assets, after building project, in `build` directory.
 - `dolphin`             - Dolphin game assets sources. Goes to `compiled` and `resources` folders in `build` directory.
-- `packs`               - User-made Asset packs used for basically all scenes. Compiled to `.bmx` and found at `SD/asset_packs`
+- `packs`               - Hot-swappable asset packs used system wide, both animations and icons. Compiled to `.bm` and `.bmx`, then put at `SD/asset_packs`
 - `icons`               - Icons sources. Goes to `compiled` folder in `build` directory.
 - `protobuf`            - Protobuf sources. Goes to `compiled` folder in `build` directory.
 - `resources`           - Assets that is going to be provisioned to SD card.
diff --git a/furi/flipper.c b/furi/flipper.c
index 03aa194ff..14a25e7ed 100644
--- a/furi/flipper.c
+++ b/furi/flipper.c
@@ -74,7 +74,7 @@ void flipper_migrate_files() {
     }
     storage_common_copy(storage, U2F_KEY_OLD_FILE, U2F_KEY_FILE); // Ext -> Int
 
-    storage_common_migrate(storage, EXT_PATH("dolphin_custom"), EXT_PATH("asset_packs"));
+    storage_common_migrate(storage, XTREME_ASSETS_OLD_PATH, XTREME_ASSETS_PATH);
 
     furi_record_close(RECORD_STORAGE);
 }
diff --git a/lib/xtreme/xtreme.h b/lib/xtreme/xtreme.h
index 6fec84786..103ec0443 100644
--- a/lib/xtreme/xtreme.h
+++ b/lib/xtreme/xtreme.h
@@ -8,6 +8,7 @@ extern "C" {
 #endif
 
 #define XTREME_SETTINGS_PATH CFG_PATH("xtreme_settings.txt")
+#define XTREME_ASSETS_OLD_PATH EXT_PATH("dolphin_custom")
 #define XTREME_ASSETS_PATH EXT_PATH("asset_packs")
 #define XTREME_MENU_OLD_PATH CFG_PATH("xtreme_apps.txt")
 #define XTREME_MENU_PATH CFG_PATH("xtreme_menu.txt")