diff --git a/RM11031820-0.70.2-78e1e00.tgz b/RM11031820-0.70.2-78e1e00.tgz
deleted file mode 100644
index 4a6213d94..000000000
Binary files a/RM11031820-0.70.2-78e1e00.tgz and /dev/null differ
diff --git a/RM11031820-0.70.2-78e1e00.zip b/RM11031820-0.70.2-78e1e00.zip
deleted file mode 100644
index b1d4719e9..000000000
Binary files a/RM11031820-0.70.2-78e1e00.zip and /dev/null differ
diff --git a/ReadMe.md b/ReadMe.md
index 0d82b1707..4e4a240de 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -19,7 +19,8 @@
 - Updated: [IFTTT Virtual Button (By Ferrazzi)](https://github.com/Ferrazzi/FlipperZero_IFTTT_Virtual_Button) `Req: ESP8266 w/ IFTTT FW Flashed`
 - Fixes for slower animations to be MUCH faster
 - [BadUSB: BadUSB as FAP #396 (By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/396)
-- [RFID: LFRFID AS FAP #397 (By ROgueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/397) (With Thanks to ESurge)
+- [RFID: LFRFID AS FAP #397 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/397) (With Thanks to @ESurge)
+- [Infrared: Infrared AS FAP #398 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/398) (With Thanks to @ESurge)
 
 <details>
   <summary><B>TO DO / REMOVED</b></summary><br/>
@@ -137,7 +138,8 @@ $ ./fbt plugin_dist
 - iButton: [Fixed issue when loading iButton keys or U2F token from Archive app #382 (By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/382)
 - iButton: iButton.fap loader apps and available as Favorites [Thanks to ESurge](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/336)
 - Icon Decode/Encode [(Thanks to PixlEmly)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/55/files)
-- IR: Universal AC, Audio, Fans & Projectors from [Unleashed/Eng1n33r](https://github.com/DarkFlippers/unleashed-firmware)
+- [Infrared: Infrared AS FAP #398 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/398) (With Thanks to @ESurge)
+- Infrared: Universal AC, Audio, Fans & Projectors from [Unleashed/Eng1n33r](https://github.com/DarkFlippers/unleashed-firmware)
 - Plugins: 2048, Arkanoid, Snake, and Tetris show score. Thanks to [whoamins](https://github.com/flipperdevices/flipperzero-firmware/commit/7feda832ede1ba8468eff2ca055fef3ddbdc16ac) and [DevMilanIan](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/188) With position changes by RogueMaster. Also all + Tic Tac Toe updated by [Unleashed/Eng1n33r](https://github.com/DarkFlippers/unleashed-firmware) for stability.
 - Plugins: Icon for Clock [Thanks to Redlink](https://github.com/redlink2/flipperzero-firmware/tree/menuChanges)
 - [RFID: LFRFID AS FAP #397 (By ROgueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/397) (With Thanks to ESurge)
diff --git a/applications/main/application.fam b/applications/main/application.fam
index c618f42b9..906f70322 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -7,7 +7,8 @@ App(
         "gpio",
         # "ibutton",
         "ibutton_loader",
-        "infrared",
+        # "infrared",
+        "infrared_loader",
         # "lfrfid",
         "lfrfid_loader",
         "nfc",
diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c
index 5304747cb..4eca0218e 100644
--- a/applications/main/archive/scenes/archive_scene_browser.c
+++ b/applications/main/archive/scenes/archive_scene_browser.c
@@ -79,6 +79,14 @@ static void archive_run_in_app(ArchiveBrowserView* browser, ArchiveFile_t* selec
             char* result =
                 malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1);
 
+            strcpy(result, tmpType);
+            strcat(result, furi_string_get_cstr(selected->path));
+            status = loader_start(loader, "Applications", result);
+        } else if(strcmp(flipper_app_name[selected->type], "Infrared") == 0) {
+            char* tmpType = "/ext/apps/Main/infrared.fap¯";
+            char* result =
+                malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1);
+
             strcpy(result, tmpType);
             strcat(result, furi_string_get_cstr(selected->path));
             status = loader_start(loader, "Applications", result);
diff --git a/applications/plugins/clock_app/ClockIcon.png b/applications/main/clock/ClockIcon.png
similarity index 100%
rename from applications/plugins/clock_app/ClockIcon.png
rename to applications/main/clock/ClockIcon.png
diff --git a/applications/plugins/clock_app/application.fam b/applications/main/clock/application.fam
similarity index 100%
rename from applications/plugins/clock_app/application.fam
rename to applications/main/clock/application.fam
diff --git a/applications/plugins/clock_app/clock_app.c b/applications/main/clock/clock_app.c
similarity index 100%
rename from applications/plugins/clock_app/clock_app.c
rename to applications/main/clock/clock_app.c
diff --git a/applications/plugins/clock_app/icons/GameMode_11x8.png b/applications/main/clock/icons/GameMode_11x8.png
similarity index 100%
rename from applications/plugins/clock_app/icons/GameMode_11x8.png
rename to applications/main/clock/icons/GameMode_11x8.png
diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
index 897afdeb8..291b3eadd 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="infrared",
     name="Infrared",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="infrared_app",
     cdefines=["APP_INFRARED"],
     requires=[
@@ -9,11 +9,12 @@ App(
         "dialogs",
     ],
     provides=["infrared_start"],
-    icon="A_Infrared_14",
+    # icon="A_Infrared_14",
     stack_size=3 * 1024,
     order=40,
-    # fap_icon="irIcon.png",
-    # fap_category="Main",
+    fap_category="Main",
+    fap_icon="ir_10px.png",
+    fap_icon_assets="images",
 )
 
 App(
diff --git a/applications/main/infrared/images/DolphinMafia_115x62.png b/applications/main/infrared/images/DolphinMafia_115x62.png
new file mode 100644
index 000000000..53dffb4fa
Binary files /dev/null and b/applications/main/infrared/images/DolphinMafia_115x62.png differ
diff --git a/applications/main/infrared/images/DolphinNice_96x59.png b/applications/main/infrared/images/DolphinNice_96x59.png
new file mode 100644
index 000000000..b111196c7
Binary files /dev/null and b/applications/main/infrared/images/DolphinNice_96x59.png differ
diff --git a/applications/main/infrared/images/DolphinReadingSuccess_59x63.png b/applications/main/infrared/images/DolphinReadingSuccess_59x63.png
new file mode 100644
index 000000000..46f559f65
Binary files /dev/null and b/applications/main/infrared/images/DolphinReadingSuccess_59x63.png differ
diff --git a/applications/main/infrared/images/Down_25x27.png b/applications/main/infrared/images/Down_25x27.png
new file mode 100644
index 000000000..c13097778
Binary files /dev/null and b/applications/main/infrared/images/Down_25x27.png differ
diff --git a/applications/main/infrared/images/Down_hvr_25x27.png b/applications/main/infrared/images/Down_hvr_25x27.png
new file mode 100644
index 000000000..76d181924
Binary files /dev/null and b/applications/main/infrared/images/Down_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/InfraredArrowDown_4x8.png b/applications/main/infrared/images/InfraredArrowDown_4x8.png
new file mode 100644
index 000000000..2ac7bcdbe
Binary files /dev/null and b/applications/main/infrared/images/InfraredArrowDown_4x8.png differ
diff --git a/applications/main/infrared/images/InfraredArrowUp_4x8.png b/applications/main/infrared/images/InfraredArrowUp_4x8.png
new file mode 100644
index 000000000..4c9a16b3f
Binary files /dev/null and b/applications/main/infrared/images/InfraredArrowUp_4x8.png differ
diff --git a/applications/main/infrared/images/InfraredLearnShort_128x31.png b/applications/main/infrared/images/InfraredLearnShort_128x31.png
new file mode 100644
index 000000000..783ad0877
Binary files /dev/null and b/applications/main/infrared/images/InfraredLearnShort_128x31.png differ
diff --git a/applications/main/infrared/images/Mode_25x27.png b/applications/main/infrared/images/Mode_25x27.png
new file mode 100644
index 000000000..381ba8296
Binary files /dev/null and b/applications/main/infrared/images/Mode_25x27.png differ
diff --git a/applications/main/infrared/images/Mode_hvr_25x27.png b/applications/main/infrared/images/Mode_hvr_25x27.png
new file mode 100644
index 000000000..64f459f55
Binary files /dev/null and b/applications/main/infrared/images/Mode_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/Mute_25x27.png b/applications/main/infrared/images/Mute_25x27.png
new file mode 100644
index 000000000..d8812dd4f
Binary files /dev/null and b/applications/main/infrared/images/Mute_25x27.png differ
diff --git a/applications/main/infrared/images/Mute_hvr_25x27.png b/applications/main/infrared/images/Mute_hvr_25x27.png
new file mode 100644
index 000000000..155bd9004
Binary files /dev/null and b/applications/main/infrared/images/Mute_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/Pin_back_arrow_10x8.png b/applications/main/infrared/images/Pin_back_arrow_10x8.png
new file mode 100644
index 000000000..3bafabd14
Binary files /dev/null and b/applications/main/infrared/images/Pin_back_arrow_10x8.png differ
diff --git a/applications/main/infrared/images/Power_25x27.png b/applications/main/infrared/images/Power_25x27.png
new file mode 100644
index 000000000..5ae493fbe
Binary files /dev/null and b/applications/main/infrared/images/Power_25x27.png differ
diff --git a/applications/main/infrared/images/Power_hvr_25x27.png b/applications/main/infrared/images/Power_hvr_25x27.png
new file mode 100644
index 000000000..9425072c0
Binary files /dev/null and b/applications/main/infrared/images/Power_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/RFIDDolphinSend_97x61.png b/applications/main/infrared/images/RFIDDolphinSend_97x61.png
new file mode 100644
index 000000000..343b9f734
Binary files /dev/null and b/applications/main/infrared/images/RFIDDolphinSend_97x61.png differ
diff --git a/applications/main/infrared/images/Rotate_25x27.png b/applications/main/infrared/images/Rotate_25x27.png
new file mode 100644
index 000000000..648634a09
Binary files /dev/null and b/applications/main/infrared/images/Rotate_25x27.png differ
diff --git a/applications/main/infrared/images/Rotate_hvr_25x27.png b/applications/main/infrared/images/Rotate_hvr_25x27.png
new file mode 100644
index 000000000..a2b5cf93d
Binary files /dev/null and b/applications/main/infrared/images/Rotate_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/SDQuestion_35x43.png b/applications/main/infrared/images/SDQuestion_35x43.png
new file mode 100644
index 000000000..9b9c9a58e
Binary files /dev/null and b/applications/main/infrared/images/SDQuestion_35x43.png differ
diff --git a/applications/main/infrared/images/Swing_25x27.png b/applications/main/infrared/images/Swing_25x27.png
new file mode 100644
index 000000000..38a6c9040
Binary files /dev/null and b/applications/main/infrared/images/Swing_25x27.png differ
diff --git a/applications/main/infrared/images/Swing_hvr_25x27.png b/applications/main/infrared/images/Swing_hvr_25x27.png
new file mode 100644
index 000000000..6e65b4e2e
Binary files /dev/null and b/applications/main/infrared/images/Swing_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/Timer_25x27.png b/applications/main/infrared/images/Timer_25x27.png
new file mode 100644
index 000000000..2f1853a34
Binary files /dev/null and b/applications/main/infrared/images/Timer_25x27.png differ
diff --git a/applications/main/infrared/images/Timer_hvr_25x27.png b/applications/main/infrared/images/Timer_hvr_25x27.png
new file mode 100644
index 000000000..d4dffa544
Binary files /dev/null and b/applications/main/infrared/images/Timer_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/Up_25x27.png b/applications/main/infrared/images/Up_25x27.png
new file mode 100644
index 000000000..b81a02e8a
Binary files /dev/null and b/applications/main/infrared/images/Up_25x27.png differ
diff --git a/applications/main/infrared/images/Up_hvr_25x27.png b/applications/main/infrared/images/Up_hvr_25x27.png
new file mode 100644
index 000000000..cf71e5965
Binary files /dev/null and b/applications/main/infrared/images/Up_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/Vol_down_25x27.png b/applications/main/infrared/images/Vol_down_25x27.png
new file mode 100644
index 000000000..d7ae44558
Binary files /dev/null and b/applications/main/infrared/images/Vol_down_25x27.png differ
diff --git a/applications/main/infrared/images/Vol_down_hvr_25x27.png b/applications/main/infrared/images/Vol_down_hvr_25x27.png
new file mode 100644
index 000000000..c556a037a
Binary files /dev/null and b/applications/main/infrared/images/Vol_down_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/Vol_up_25x27.png b/applications/main/infrared/images/Vol_up_25x27.png
new file mode 100644
index 000000000..c4d9e87a0
Binary files /dev/null and b/applications/main/infrared/images/Vol_up_25x27.png differ
diff --git a/applications/main/infrared/images/Vol_up_hvr_25x27.png b/applications/main/infrared/images/Vol_up_hvr_25x27.png
new file mode 100644
index 000000000..90c2df47d
Binary files /dev/null and b/applications/main/infrared/images/Vol_up_hvr_25x27.png differ
diff --git a/applications/main/infrared/images/ir_10px.png b/applications/main/infrared/images/ir_10px.png
new file mode 100644
index 000000000..22c986180
Binary files /dev/null and b/applications/main/infrared/images/ir_10px.png differ
diff --git a/applications/main/infrared/infrared_i.h b/applications/main/infrared/infrared_i.h
index 5b555e4bb..4bf0631f5 100644
--- a/applications/main/infrared/infrared_i.h
+++ b/applications/main/infrared/infrared_i.h
@@ -2,7 +2,6 @@
 
 #include <gui/gui.h>
 #include <gui/view.h>
-#include <assets_icons.h>
 #include <gui/view_stack.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
@@ -33,6 +32,8 @@
 
 #include "rpc/rpc_app.h"
 
+#include <infrared_icons.h>
+
 #define INFRARED_FILE_NAME_SIZE 100
 #define INFRARED_TEXT_STORE_NUM 2
 #define INFRARED_TEXT_STORE_SIZE 128
diff --git a/applications/main/infrared/irIcon.png b/applications/main/infrared/irIcon.png
deleted file mode 100644
index ccfcee9c8..000000000
Binary files a/applications/main/infrared/irIcon.png and /dev/null differ
diff --git a/applications/main/infrared/ir_10px.png b/applications/main/infrared/ir_10px.png
new file mode 100644
index 000000000..22c986180
Binary files /dev/null and b/applications/main/infrared/ir_10px.png differ
diff --git a/applications/main/infrared/views/infrared_progress_view.c b/applications/main/infrared/views/infrared_progress_view.c
index 3c50f89e4..bb1f982c5 100644
--- a/applications/main/infrared/views/infrared_progress_view.c
+++ b/applications/main/infrared/views/infrared_progress_view.c
@@ -1,6 +1,5 @@
 #include <core/check.h>
 #include "furi_hal_resources.h"
-#include "assets_icons.h"
 #include "gui/canvas.h"
 #include "gui/view.h"
 #include "input/input.h"
@@ -9,6 +8,7 @@
 #include "infrared_progress_view.h"
 #include "gui/modules/button_panel.h"
 #include <stdint.h>
+#include <infrared_icons.h>
 
 struct InfraredProgressView {
     View* view;
diff --git a/applications/main/infrared_loader/application.fam b/applications/main/infrared_loader/application.fam
new file mode 100644
index 000000000..648c4986c
--- /dev/null
+++ b/applications/main/infrared_loader/application.fam
@@ -0,0 +1,14 @@
+App(
+    appid="infrared_loader",
+    name="Infrared",
+    apptype=FlipperAppType.APP,
+    entry_point="infrared_loader_app",
+    requires=[
+        "gui",
+        "dialogs",
+    ],
+    stack_size=int(2 * 1024),
+    icon="A_Infrared_14",
+    order=80,
+	link="/ext/apps/Main/infrared.fap",
+)
diff --git a/applications/main/infrared_loader/infrared_loader_app.c b/applications/main/infrared_loader/infrared_loader_app.c
new file mode 100644
index 000000000..1fd2a59ed
--- /dev/null
+++ b/applications/main/infrared_loader/infrared_loader_app.c
@@ -0,0 +1,9 @@
+#include <applications/services/loader/loader_i.h>
+
+#define TAG "infrared_loader_app"
+
+int32_t infrared_loader_app(void* p) {
+    UNUSED(p);
+
+    return 0;
+}
\ No newline at end of file