diff --git a/ReadMe.md b/ReadMe.md
index 07a9724cc..2a095b3f2 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -30,6 +30,7 @@ Thank you to all the supporters!
 - Added: [Dice (By Ka3u6y6a)](https://github.com/Ka3u6y6a/flipper-zero-dice)
 - Added: [VB Lab Migration Assistant (By GMMan)](https://github.com/GMMan/flipperzero-vb-migrate) `Req: Vital Bracelet`
 - Updated: [nfc: NTAG password auto capture (and other password-related changes) #1843 (By GMMan)](https://github.com/flipperdevices/flipperzero-firmware/pull/1843)
+- Renamed some FAPs to fix ordering in Applications, delete your `/ext/apps` folder to get rid of duplicates
 
 ## Install from Release
 FLASH STOCK FIRST BEFORE UPDATING TO CUSTOM FIRMWARE!
diff --git a/applications/plugins/counter/application.fam b/applications/plugins/counter/application.fam
index 0bec27076..bb2e58df1 100644
--- a/applications/plugins/counter/application.fam
+++ b/applications/plugins/counter/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="Counter",
     name="Counter",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="counterapp",
     requires=[
         "gui",
diff --git a/applications/plugins/dap_link/application.fam b/applications/plugins/dap_link/application.fam
index 3b99d5ef3..5489c3b19 100644
--- a/applications/plugins/dap_link/application.fam
+++ b/applications/plugins/dap_link/application.fam
@@ -1,7 +1,7 @@
 App(
-    appid="dap_link",
+    appid="DAP_Link",
     name="DAP Link",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="dap_link_app",
     requires=[
         "gui",
diff --git a/applications/plugins/dap_link/dap_link.c b/applications/plugins/dap_link/dap_link.c
index 5c30e85c5..3386894d5 100644
--- a/applications/plugins/dap_link/dap_link.c
+++ b/applications/plugins/dap_link/dap_link.c
@@ -14,7 +14,7 @@
 #include "gui/dap_gui.h"
 #include "usb/dap_v2_usb.h"
 #include <dialogs/dialogs.h>
-#include "dap_link_icons.h"
+#include "DAP_Link_icons.h"
 
 /***************************************************************************/
 /****************************** DAP COMMON *********************************/
diff --git a/applications/plugins/dap_link/gui/views/dap_main_view.c b/applications/plugins/dap_link/gui/views/dap_main_view.c
index c5c8f9dff..58bfcf316 100644
--- a/applications/plugins/dap_link/gui/views/dap_main_view.c
+++ b/applications/plugins/dap_link/gui/views/dap_main_view.c
@@ -1,5 +1,5 @@
 #include "dap_main_view.h"
-#include "dap_link_icons.h"
+#include "DAP_Link_icons.h"
 #include <gui/elements.h>
 
 // extern const Icon I_ArrowDownEmpty_12x18;
diff --git a/applications/plugins/dtmf_dolphin/application.fam b/applications/plugins/dtmf_dolphin/application.fam
index 0727f5f52..98fbe7363 100644
--- a/applications/plugins/dtmf_dolphin/application.fam
+++ b/applications/plugins/dtmf_dolphin/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="dtmf_dolphin",
+    appid="DTMF_Dolphin",
     name="DTMF Dolphin",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="dtmf_dolphin_app",
diff --git a/applications/plugins/ibtn_fuzzer/application.fam b/applications/plugins/ibtn_fuzzer/application.fam
index b27f47ba9..93a9bad23 100644
--- a/applications/plugins/ibtn_fuzzer/application.fam
+++ b/applications/plugins/ibtn_fuzzer/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="iBtn_Fuzzer",
+    appid="IBtn_Fuzzer",
     name="iButton Fuzzer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="ibtnfuzzer_start",
diff --git a/applications/plugins/ibtn_fuzzer/ibtnfuzzer.h b/applications/plugins/ibtn_fuzzer/ibtnfuzzer.h
index 1af5e9ff1..6c40c795a 100644
--- a/applications/plugins/ibtn_fuzzer/ibtnfuzzer.h
+++ b/applications/plugins/ibtn_fuzzer/ibtnfuzzer.h
@@ -15,7 +15,7 @@
 #include <toolbox/stream/file_stream.h>
 #include <toolbox/stream/buffered_file_stream.h>
 
-#include <iBtn_Fuzzer_icons.h>
+#include <IBtn_Fuzzer_icons.h>
 
 #include <lib/one_wire/ibutton/ibutton_worker.h>
 #include <lib/one_wire/ibutton/ibutton_key.h>
diff --git a/applications/plugins/nfc_magic/application.fam b/applications/plugins/nfc_magic/application.fam
index 1f324e85f..cc85cd386 100644
--- a/applications/plugins/nfc_magic/application.fam
+++ b/applications/plugins/nfc_magic/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="nfc_magic",
+    appid="NFC_Magic",
     name="NFC Magic",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="nfc_magic_app",
diff --git a/applications/plugins/nfc_magic/nfc_magic_i.h b/applications/plugins/nfc_magic/nfc_magic_i.h
index 01b300826..78f7256ac 100644
--- a/applications/plugins/nfc_magic/nfc_magic_i.h
+++ b/applications/plugins/nfc_magic/nfc_magic_i.h
@@ -25,7 +25,7 @@
 #include <lib/toolbox/path.h>
 
 #include <lib/nfc/nfc_device.h>
-#include "nfc_magic_icons.h"
+#include "NFC_Magic_icons.h"
 
 enum NfcMagicCustomEvent {
     // Reserve first 100 events for button types and indexes, starting from 0
diff --git a/applications/plugins/passgen/application.fam b/applications/plugins/passgen/application.fam
index 89b7b9d33..277f6fdaf 100644
--- a/applications/plugins/passgen/application.fam
+++ b/applications/plugins/passgen/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="passgen",
+    appid="Password_Generator",
     name="Password Generator",
     apptype=FlipperAppType.PLUGIN,
     entry_point="passgenapp",
diff --git a/applications/plugins/passgen/passgen.c b/applications/plugins/passgen/passgen.c
index 12cdc10fb..c0f9c6e59 100644
--- a/applications/plugins/passgen/passgen.c
+++ b/applications/plugins/passgen/passgen.c
@@ -4,7 +4,7 @@
 #include <input/input.h>
 #include <notification/notification_messages.h>
 #include <stdlib.h>
-#include <passgen_icons.h>
+#include <Password_Generator_icons.h>
 
 #define PASSGEN_MAX_LENGTH 16
 #define PASSGEN_CHARACTERS_LENGTH (26 * 4)
diff --git a/applications/plugins/weather_station/application.fam b/applications/plugins/weather_station/application.fam
index 1074fc040..1e87f4e7a 100644
--- a/applications/plugins/weather_station/application.fam
+++ b/applications/plugins/weather_station/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="weather_station",
+    appid="Weather_Station",
     name="Weather Station",
     apptype=FlipperAppType.PLUGIN,
     entry_point="weather_station_app",
diff --git a/applications/plugins/weather_station/views/weather_station_receiver.c b/applications/plugins/weather_station/views/weather_station_receiver.c
index 61b152602..7c002f96d 100644
--- a/applications/plugins/weather_station/views/weather_station_receiver.c
+++ b/applications/plugins/weather_station/views/weather_station_receiver.c
@@ -1,6 +1,6 @@
 #include "weather_station_receiver.h"
 #include "../weather_station_app_i.h"
-#include <weather_station_icons.h>
+#include <Weather_Station_icons.h>
 #include <math.h>
 
 #include <input/input.h>
diff --git a/applications/plugins/weather_station/views/weather_station_receiver_info.c b/applications/plugins/weather_station/views/weather_station_receiver_info.c
index 49b447f10..19307b36f 100644
--- a/applications/plugins/weather_station/views/weather_station_receiver_info.c
+++ b/applications/plugins/weather_station/views/weather_station_receiver_info.c
@@ -1,6 +1,6 @@
 #include "weather_station_receiver.h"
 #include "../weather_station_app_i.h"
-#include "weather_station_icons.h"
+#include "Weather_Station_icons.h"
 #include "../protocols/ws_generic.h"
 #include <input/input.h>
 #include <gui/elements.h>