diff --git a/applications/applications.c b/applications/applications.c
index 53bbf730e..c932f86ce 100644
--- a/applications/applications.c
+++ b/applications/applications.c
@@ -45,6 +45,7 @@ extern int32_t vibro_test_app(void* p);
 extern int32_t bt_hid_app(void* p);
 extern int32_t battery_test_app(void* p);
 extern int32_t text_box_test_app(void* p);
+extern int32_t file_browser_app(void* p);
 
 // Plugins
 extern int32_t music_player_app(void* p);
@@ -479,6 +480,14 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = {
      .flags = FlipperApplicationFlagDefault},
 #endif
 
+#ifdef APP_FILE_BROWSER_TEST
+    {.app = file_browser_app,
+     .name = "File Browser test",
+     .stack_size = 2048,
+     .icon = &A_BadUsb_14,
+     .flags = FlipperApplicationFlagDefault},
+#endif
+
 #ifdef APP_BATTERY_TEST
     {.app = battery_test_app,
      .name = "Battery Test",
diff --git a/applications/applications.mk b/applications/applications.mk
index 873cc6077..30dffbcaf 100644
--- a/applications/applications.mk
+++ b/applications/applications.mk
@@ -64,6 +64,7 @@ APP_USB_MOUSE = 1
 APP_BAD_USB = 1
 APP_U2F = 1
 APP_UART_ECHO = 1
+APP_FILE_BROWSER_TEST = 1
 endif
 
 
@@ -209,6 +210,11 @@ CFLAGS		+= -DAPP_KEYPAD_TEST
 SRV_GUI		= 1
 endif
 
+APP_FILE_BROWSER_TEST ?= 0
+ifeq ($(APP_FILE_BROWSER_TEST), 1)
+CFLAGS		+= -DAPP_FILE_BROWSER_TEST
+SRV_GUI = 1
+endif
 
 APP_ACCESSOR ?= 0
 ifeq ($(APP_ACCESSOR), 1)
diff --git a/assets/icons/Archive/back_10px.png b/assets/icons/Archive/back_10px.png
new file mode 100644
index 000000000..008efe82f
Binary files /dev/null and b/assets/icons/Archive/back_10px.png differ
diff --git a/assets/icons/Archive/loading_10px.png b/assets/icons/Archive/loading_10px.png
new file mode 100644
index 000000000..9cc33b7fd
Binary files /dev/null and b/assets/icons/Archive/loading_10px.png differ