diff --git a/ReadMe.md b/ReadMe.md
index 6e7747130..e32f88bb2 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -21,6 +21,7 @@
 - [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)
 - [Infrared: Infrared AS FAP #398 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/398) (With Thanks to @ESurge)
+- [GPIO: GPIO AS FAP #402 (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/402) (With Thanks to @ESurge)
 
 <details>
   <summary><B>TO DO / REMOVED</b></summary><br/>
diff --git a/applications/main/application.fam b/applications/main/application.fam
index 906f70322..4c9145766 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -4,7 +4,8 @@ App(
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
         "clock_loader",
-        "gpio",
+        # "gpio",
+        "gpio_loader",
         # "ibutton",
         "ibutton_loader",
         # "infrared",
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index 1d7deb6f1..ae666cdbd 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -1,13 +1,14 @@
 App(
     appid="gpio",
     name="GPIO",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="gpio_app",
     cdefines=["APP_GPIO"],
     requires=["gui"],
     stack_size=1 * 1024,
-    icon="A_GPIO_14",
+    # icon="A_GPIO_14",
     order=50,
-    # fap_icon="gpioIcon.png",
-    # fap_category="Main",
+    fap_icon="gpioIcon.png",
+    fap_category="Main",
+    fap_icon_assets="images",
 )
diff --git a/applications/main/gpio/gpio_app_i.h b/applications/main/gpio/gpio_app_i.h
index ee1d3fc9b..05a3fcccd 100644
--- a/applications/main/gpio/gpio_app_i.h
+++ b/applications/main/gpio/gpio_app_i.h
@@ -17,7 +17,7 @@
 #include "views/gpio_usb_uart.h"
 #include "views/gpio_i2c_scanner.h"
 #include "views/gpio_i2c_sfp.h"
-#include <assets_icons.h>
+#include <gpio_icons.h>
 
 struct GpioApp {
     Gui* gui;
diff --git a/applications/main/gpio/images/ActiveConnection_50x64.png b/applications/main/gpio/images/ActiveConnection_50x64.png
new file mode 100644
index 000000000..1d7686ddd
Binary files /dev/null and b/applications/main/gpio/images/ActiveConnection_50x64.png differ
diff --git a/applications/main/gpio/images/ArrowDownEmpty_14x15.png b/applications/main/gpio/images/ArrowDownEmpty_14x15.png
new file mode 100644
index 000000000..8c6d54f9c
Binary files /dev/null and b/applications/main/gpio/images/ArrowDownEmpty_14x15.png differ
diff --git a/applications/main/gpio/images/ArrowDownFilled_14x15.png b/applications/main/gpio/images/ArrowDownFilled_14x15.png
new file mode 100644
index 000000000..6cef0f4a7
Binary files /dev/null and b/applications/main/gpio/images/ArrowDownFilled_14x15.png differ
diff --git a/applications/main/gpio/images/ArrowUpEmpty_14x15.png b/applications/main/gpio/images/ArrowUpEmpty_14x15.png
new file mode 100644
index 000000000..261c6d89e
Binary files /dev/null and b/applications/main/gpio/images/ArrowUpEmpty_14x15.png differ
diff --git a/applications/main/gpio/images/ArrowUpFilled_14x15.png b/applications/main/gpio/images/ArrowUpFilled_14x15.png
new file mode 100644
index 000000000..fa35eb2f8
Binary files /dev/null and b/applications/main/gpio/images/ArrowUpFilled_14x15.png differ
diff --git a/applications/main/gpio_loader/application.fam b/applications/main/gpio_loader/application.fam
new file mode 100644
index 000000000..08a5b7967
--- /dev/null
+++ b/applications/main/gpio_loader/application.fam
@@ -0,0 +1,14 @@
+App(
+    appid="gpio_loader",
+    name="GPIO",
+    apptype=FlipperAppType.APP,
+    entry_point="gpio_loader_app",
+    requires=[
+        "gui",
+        "storage",
+    ],
+    stack_size=int(1.5 * 1024),
+    icon="A_GPIO_14",
+    order=50,
+	link="/ext/apps/Main/gpio.fap",
+)
diff --git a/applications/main/gpio_loader/gpio_loader_app.c b/applications/main/gpio_loader/gpio_loader_app.c
new file mode 100644
index 000000000..ba7fb4e31
--- /dev/null
+++ b/applications/main/gpio_loader/gpio_loader_app.c
@@ -0,0 +1,9 @@
+#include <applications/services/loader/loader_i.h>
+
+#define TAG "gpio_loader_app"
+
+int32_t gpio_loader_app(void* p) {
+    UNUSED(p);
+
+    return 0;
+}
\ No newline at end of file