diff --git a/applications/main/application.fam b/applications/main/application.fam
index 459a878ed..1b179271a 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -5,7 +5,6 @@ App(
     provides=[
         "fap_loader",
         "subghz",
-        "subghz_remote",
         "lfrfid",
         "nfc",
         "infrared",
diff --git a/applications/main/subghz_remote/application.fam b/applications/plugins/subghz_remote/application.fam
similarity index 55%
rename from applications/main/subghz_remote/application.fam
rename to applications/plugins/subghz_remote/application.fam
index e09f8500f..e89f55b82 100644
--- a/applications/main/subghz_remote/application.fam
+++ b/applications/plugins/subghz_remote/application.fam
@@ -1,14 +1,16 @@
 App(
-    appid="subghz_remote",
+    appid="SubGHz_Remote",
     name="Sub-GHz Remote",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="subghz_remote_app",
     cdefines=["APP_SUBGHZREMOTE"],
     requires=[
         "gui",
         "dialogs",
     ],
-    icon="A_SubGHzRemote_14",
     stack_size=4 * 1024,
     order=11,
+    fap_icon="subghz_remote_10px.png",
+    fap_category="Sub-GHz",
+    fap_icon_assets="images",
 )
diff --git a/applications/plugins/subghz_remote/images/ButtonDown_7x4.png b/applications/plugins/subghz_remote/images/ButtonDown_7x4.png
new file mode 100644
index 000000000..2954bb6a6
Binary files /dev/null and b/applications/plugins/subghz_remote/images/ButtonDown_7x4.png differ
diff --git a/applications/plugins/subghz_remote/images/ButtonLeft_4x7.png b/applications/plugins/subghz_remote/images/ButtonLeft_4x7.png
new file mode 100644
index 000000000..0b4655d43
Binary files /dev/null and b/applications/plugins/subghz_remote/images/ButtonLeft_4x7.png differ
diff --git a/applications/plugins/subghz_remote/images/ButtonRight_4x7.png b/applications/plugins/subghz_remote/images/ButtonRight_4x7.png
new file mode 100644
index 000000000..8e1c74c1c
Binary files /dev/null and b/applications/plugins/subghz_remote/images/ButtonRight_4x7.png differ
diff --git a/applications/plugins/subghz_remote/images/ButtonUp_7x4.png b/applications/plugins/subghz_remote/images/ButtonUp_7x4.png
new file mode 100644
index 000000000..1be79328b
Binary files /dev/null and b/applications/plugins/subghz_remote/images/ButtonUp_7x4.png differ
diff --git a/applications/plugins/subghz_remote/images/Ok_btn_9x9.png b/applications/plugins/subghz_remote/images/Ok_btn_9x9.png
new file mode 100644
index 000000000..9a1539da2
Binary files /dev/null and b/applications/plugins/subghz_remote/images/Ok_btn_9x9.png differ
diff --git a/applications/plugins/subghz_remote/images/Pin_arrow_down_7x9.png b/applications/plugins/subghz_remote/images/Pin_arrow_down_7x9.png
new file mode 100644
index 000000000..9687397af
Binary files /dev/null and b/applications/plugins/subghz_remote/images/Pin_arrow_down_7x9.png differ
diff --git a/applications/plugins/subghz_remote/images/Pin_arrow_left_9x7.png b/applications/plugins/subghz_remote/images/Pin_arrow_left_9x7.png
new file mode 100644
index 000000000..fb4ded78f
Binary files /dev/null and b/applications/plugins/subghz_remote/images/Pin_arrow_left_9x7.png differ
diff --git a/applications/plugins/subghz_remote/images/Pin_arrow_right_9x7.png b/applications/plugins/subghz_remote/images/Pin_arrow_right_9x7.png
new file mode 100644
index 000000000..97648d176
Binary files /dev/null and b/applications/plugins/subghz_remote/images/Pin_arrow_right_9x7.png differ
diff --git a/applications/plugins/subghz_remote/images/Pin_arrow_up_7x9.png b/applications/plugins/subghz_remote/images/Pin_arrow_up_7x9.png
new file mode 100644
index 000000000..a91a6fd5e
Binary files /dev/null and b/applications/plugins/subghz_remote/images/Pin_arrow_up_7x9.png differ
diff --git a/applications/plugins/subghz_remote/images/Pin_cell_13x13.png b/applications/plugins/subghz_remote/images/Pin_cell_13x13.png
new file mode 100644
index 000000000..1b1ff0c2f
Binary files /dev/null and b/applications/plugins/subghz_remote/images/Pin_cell_13x13.png differ
diff --git a/applications/plugins/subghz_remote/images/Pin_star_7x7.png b/applications/plugins/subghz_remote/images/Pin_star_7x7.png
new file mode 100644
index 000000000..42fdea86e
Binary files /dev/null and b/applications/plugins/subghz_remote/images/Pin_star_7x7.png differ
diff --git a/applications/plugins/subghz_remote/images/back_10px.png b/applications/plugins/subghz_remote/images/back_10px.png
new file mode 100644
index 000000000..f9c615a99
Binary files /dev/null and b/applications/plugins/subghz_remote/images/back_10px.png differ
diff --git a/applications/plugins/subghz_remote/images/sub1_10px.png b/applications/plugins/subghz_remote/images/sub1_10px.png
new file mode 100644
index 000000000..5a25fdf4e
Binary files /dev/null and b/applications/plugins/subghz_remote/images/sub1_10px.png differ
diff --git a/applications/plugins/subghz_remote/subghz_remote_10px.png b/applications/plugins/subghz_remote/subghz_remote_10px.png
new file mode 100644
index 000000000..c6b410f4c
Binary files /dev/null and b/applications/plugins/subghz_remote/subghz_remote_10px.png differ
diff --git a/applications/main/subghz_remote/subghz_remote_app.c b/applications/plugins/subghz_remote/subghz_remote_app.c
similarity index 99%
rename from applications/main/subghz_remote/subghz_remote_app.c
rename to applications/plugins/subghz_remote/subghz_remote_app.c
index 77627f5ca..1ee4b53ed 100644
--- a/applications/main/subghz_remote/subghz_remote_app.c
+++ b/applications/plugins/subghz_remote/subghz_remote_app.c
@@ -8,7 +8,7 @@
 #include <notification/notification.h>
 #include <notification/notification_messages.h>
 
-#include <assets_icons.h>
+#include <SubGHz_Remote_icons.h>
 
 #include <flipper_format/flipper_format_i.h>
 #include <lib/toolbox/path.h>
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_0.png b/assets/icons/MainMenu/SubGHzRemote_14/frame_0.png
deleted file mode 100644
index 166d2229b..000000000
Binary files a/assets/icons/MainMenu/SubGHzRemote_14/frame_0.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_1.png b/assets/icons/MainMenu/SubGHzRemote_14/frame_1.png
deleted file mode 100644
index 8bd337c69..000000000
Binary files a/assets/icons/MainMenu/SubGHzRemote_14/frame_1.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_2.png b/assets/icons/MainMenu/SubGHzRemote_14/frame_2.png
deleted file mode 100644
index 10727049d..000000000
Binary files a/assets/icons/MainMenu/SubGHzRemote_14/frame_2.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_3.png b/assets/icons/MainMenu/SubGHzRemote_14/frame_3.png
deleted file mode 100644
index c6d314d86..000000000
Binary files a/assets/icons/MainMenu/SubGHzRemote_14/frame_3.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_4.png b/assets/icons/MainMenu/SubGHzRemote_14/frame_4.png
deleted file mode 100644
index 13f4bf553..000000000
Binary files a/assets/icons/MainMenu/SubGHzRemote_14/frame_4.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_5.png b/assets/icons/MainMenu/SubGHzRemote_14/frame_5.png
deleted file mode 100644
index c6d314d86..000000000
Binary files a/assets/icons/MainMenu/SubGHzRemote_14/frame_5.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_6.png b/assets/icons/MainMenu/SubGHzRemote_14/frame_6.png
deleted file mode 100644
index 10727049d..000000000
Binary files a/assets/icons/MainMenu/SubGHzRemote_14/frame_6.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_7.png b/assets/icons/MainMenu/SubGHzRemote_14/frame_7.png
deleted file mode 100644
index 8bd337c69..000000000
Binary files a/assets/icons/MainMenu/SubGHzRemote_14/frame_7.png and /dev/null differ
diff --git a/assets/icons/MainMenu/SubGHzRemote_14/frame_rate b/assets/icons/MainMenu/SubGHzRemote_14/frame_rate
deleted file mode 100644
index bf0d87ab1..000000000
--- a/assets/icons/MainMenu/SubGHzRemote_14/frame_rate
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 202c6a4d8..6192cafed 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -509,7 +509,7 @@ Function,+,aligned_free,void,void*
 Function,+,aligned_malloc,void*,"size_t, size_t"
 Function,-,alutech_get_custom_btn,uint8_t,
 Function,-,alutech_get_original_btn,uint8_t,
-Function,-,alutech_reset_original_btn,void,
+Function,+,alutech_reset_original_btn,void,
 Function,-,alutech_set_btn,void,uint8_t
 Function,-,arc4random,__uint32_t,
 Function,-,arc4random_buf,void,"void*, size_t"
@@ -1825,9 +1825,9 @@ Function,-,jnf,float,"int, float"
 Function,-,jrand48,long,unsigned short[3]
 Function,-,keeloq_get_custom_btn,uint8_t,
 Function,-,keeloq_get_original_btn,uint8_t,
-Function,-,keeloq_reset_kl_type,void,
-Function,-,keeloq_reset_mfname,void,
-Function,-,keeloq_reset_original_btn,void,
+Function,+,keeloq_reset_kl_type,void,
+Function,+,keeloq_reset_mfname,void,
+Function,+,keeloq_reset_original_btn,void,
 Function,-,keeloq_set_btn,void,uint8_t
 Function,-,l64a,char*,long
 Function,-,labs,long,long
@@ -2178,7 +2178,7 @@ Function,-,nfcv_read_card,_Bool,"NfcVReader*, FuriHalNfcDevData*, NfcVData*"
 Function,-,nfcv_read_sysinfo,ReturnCode,"FuriHalNfcDevData*, NfcVData*"
 Function,-,nice_flors_get_custom_btn,uint8_t,
 Function,-,nice_flors_get_original_btn,uint8_t,
-Function,-,nice_flors_reset_original_btn,void,
+Function,+,nice_flors_reset_original_btn,void,
 Function,-,nice_flors_set_btn,void,uint8_t
 Function,+,notification_internal_message,void,"NotificationApp*, const NotificationSequence*"
 Function,+,notification_internal_message_block,void,"NotificationApp*, const NotificationSequence*"
@@ -2584,7 +2584,7 @@ Function,-,sniprintf,int,"char*, size_t, const char*, ..."
 Function,+,snprintf,int,"char*, size_t, const char*, ..."
 Function,-,somfy_telis_get_custom_btn,uint8_t,
 Function,-,somfy_telis_get_original_btn,uint8_t,
-Function,-,somfy_telis_reset_original_btn,void,
+Function,+,somfy_telis_reset_original_btn,void,
 Function,-,somfy_telis_set_btn,void,uint8_t
 Function,-,sprintf,int,"char*, const char*, ..."
 Function,-,sqrt,double,double
@@ -2594,8 +2594,8 @@ Function,+,srand,void,unsigned
 Function,-,srand48,void,long
 Function,-,srandom,void,unsigned
 Function,+,sscanf,int,"const char*, const char*, ..."
-Function,-,star_line_reset_kl_type,void,
-Function,-,star_line_reset_mfname,void,
+Function,+,star_line_reset_kl_type,void,
+Function,+,star_line_reset_mfname,void,
 Function,+,storage_common_copy,FS_Error,"Storage*, const char*, const char*"
 Function,+,storage_common_exists,_Bool,"Storage*, const char*"
 Function,+,storage_common_fs_info,FS_Error,"Storage*, const char*, uint64_t*, uint64_t*"
diff --git a/lib/subghz/protocols/alutech_at_4n.h b/lib/subghz/protocols/alutech_at_4n.h
index 89adbb5c6..023fca591 100644
--- a/lib/subghz/protocols/alutech_at_4n.h
+++ b/lib/subghz/protocols/alutech_at_4n.h
@@ -1,6 +1,10 @@
 #pragma once
 #include "base.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SUBGHZ_PROTOCOL_ALUTECH_AT_4N_NAME "Alutech AT-4N"
 
 typedef struct SubGhzProtocolDecoderAlutech_at_4n SubGhzProtocolDecoderAlutech_at_4n;
@@ -132,3 +136,7 @@ SubGhzProtocolStatus
  * @param output Resulting text
  */
 void subghz_protocol_decoder_alutech_at_4n_get_string(void* context, FuriString* output);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/subghz/protocols/keeloq.h b/lib/subghz/protocols/keeloq.h
index f0715648c..a1d5b26b4 100644
--- a/lib/subghz/protocols/keeloq.h
+++ b/lib/subghz/protocols/keeloq.h
@@ -2,6 +2,10 @@
 
 #include "base.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SUBGHZ_PROTOCOL_KEELOQ_NAME "KeeLoq"
 
 typedef struct SubGhzProtocolDecoderKeeloq SubGhzProtocolDecoderKeeloq;
@@ -160,3 +164,7 @@ SubGhzProtocolStatus
  * @param output Resulting text
  */
 void subghz_protocol_decoder_keeloq_get_string(void* context, FuriString* output);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/subghz/protocols/nice_flor_s.h b/lib/subghz/protocols/nice_flor_s.h
index 679b31812..333f826e1 100644
--- a/lib/subghz/protocols/nice_flor_s.h
+++ b/lib/subghz/protocols/nice_flor_s.h
@@ -2,6 +2,10 @@
 
 #include "base.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SUBGHZ_PROTOCOL_NICE_FLOR_S_NAME "Nice FloR-S"
 
 typedef struct SubGhzProtocolDecoderNiceFlorS SubGhzProtocolDecoderNiceFlorS;
@@ -137,3 +141,7 @@ SubGhzProtocolStatus
  * @param output Resulting text
  */
 void subghz_protocol_decoder_nice_flor_s_get_string(void* context, FuriString* output);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/subghz/protocols/somfy_telis.h b/lib/subghz/protocols/somfy_telis.h
index 36f6c70b5..dc1ec2b77 100644
--- a/lib/subghz/protocols/somfy_telis.h
+++ b/lib/subghz/protocols/somfy_telis.h
@@ -2,6 +2,10 @@
 
 #include "base.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SUBGHZ_PROTOCOL_SOMFY_TELIS_NAME "Somfy Telis"
 
 typedef struct SubGhzProtocolDecoderSomfyTelis SubGhzProtocolDecoderSomfyTelis;
@@ -133,3 +137,7 @@ SubGhzProtocolStatus
  * @param output Resulting text
  */
 void subghz_protocol_decoder_somfy_telis_get_string(void* context, FuriString* output);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/subghz/protocols/star_line.h b/lib/subghz/protocols/star_line.h
index 901b82f7c..b142a4032 100644
--- a/lib/subghz/protocols/star_line.h
+++ b/lib/subghz/protocols/star_line.h
@@ -2,6 +2,10 @@
 
 #include "base.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SUBGHZ_PROTOCOL_STAR_LINE_NAME "Star Line"
 
 typedef struct SubGhzProtocolDecoderStarLine SubGhzProtocolDecoderStarLine;
@@ -131,3 +135,7 @@ SubGhzProtocolStatus
  * @param output Resulting text
  */
 void subghz_protocol_decoder_star_line_get_string(void* context, FuriString* output);
+
+#ifdef __cplusplus
+}
+#endif