diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f64c948c6..17d45026e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,6 +6,7 @@ import mihon.buildlogic.getGitSha
 plugins {
     id("mihon.android.application")
     id("mihon.android.application.compose")
+    id("com.github.zellius.shortcut-helper")
     kotlin("plugin.parcelize")
     kotlin("plugin.serialization")
     alias(libs.plugins.aboutLibraries)
@@ -19,6 +20,8 @@ if (Config.includeTelemetry) {
     }
 }
 
+shortcutHelper.setFilePath("./shortcuts.xml")
+
 android {
     namespace = "eu.kanade.tachiyomi"
 
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/shortcuts.xml
similarity index 91%
rename from app/src/main/res/xml/shortcuts.xml
rename to app/shortcuts.xml
index 6692bedc8..48936aafe 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/shortcuts.xml
@@ -8,7 +8,6 @@
         android:shortcutShortLabel="@string/label_library">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_LIBRARY"
-            android:targetPackage="app.komikku"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
     </shortcut>
     <shortcut
@@ -20,7 +19,6 @@
         android:shortcutShortLabel="@string/label_recent_updates">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
-            android:targetPackage="app.komikku"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
     </shortcut>
     <shortcut
@@ -32,7 +30,6 @@
         android:shortcutShortLabel="@string/label_recent_manga">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_READ"
-            android:targetPackage="app.komikku"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
     </shortcut>
     <shortcut
@@ -44,7 +41,6 @@
         android:shortcutShortLabel="@string/browse">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_CATALOGUES"
-            android:targetPackage="app.komikku"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
     </shortcut>
 </shortcuts>
diff --git a/app/src/beta/res/xml/shortcuts.xml b/app/src/beta/res/xml/shortcuts.xml
deleted file mode 100644
index c1de3f041..000000000
--- a/app/src/beta/res/xml/shortcuts.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/sc_collections_bookmark_48dp"
-        android:shortcutDisabledMessage="@string/app_not_available"
-        android:shortcutId="show_library"
-        android:shortcutLongLabel="@string/label_library"
-        android:shortcutShortLabel="@string/label_library">
-        <intent
-            android:action="eu.kanade.tachiyomi.SHOW_LIBRARY"
-            android:targetPackage="app.komikku.beta"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/sc_new_releases_48dp"
-        android:shortcutDisabledMessage="@string/app_not_available"
-        android:shortcutId="show_recently_updated"
-        android:shortcutLongLabel="@string/label_recent_updates"
-        android:shortcutShortLabel="@string/label_recent_updates">
-        <intent
-            android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
-            android:targetPackage="app.komikku.beta"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/sc_history_48dp"
-        android:shortcutDisabledMessage="@string/app_not_available"
-        android:shortcutId="show_recently_read"
-        android:shortcutLongLabel="@string/label_recent_manga"
-        android:shortcutShortLabel="@string/label_recent_manga">
-        <intent
-            android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_READ"
-            android:targetPackage="app.komikku.beta"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/sc_explore_48dp"
-        android:shortcutDisabledMessage="@string/app_not_available"
-        android:shortcutId="show_catalogues"
-        android:shortcutLongLabel="@string/browse"
-        android:shortcutShortLabel="@string/browse">
-        <intent
-            android:action="eu.kanade.tachiyomi.SHOW_CATALOGUES"
-            android:targetPackage="app.komikku.beta"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-    </shortcut>
-</shortcuts>
diff --git a/build.gradle.kts b/build.gradle.kts
index 0a26d50e6..0d5a71dfd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        // classpath(libs.android.shortcut.gradle)
+        classpath(libs.android.shortcut.gradle)
         classpath(sylibs.gradleversionsx)
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4ef915fc2..dfd1f8a65 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,6 +16,7 @@ materialKolor = "5.0.0-alpha06"
 
 [libraries]
 desugar = "com.android.tools:desugar_jdk_libs:2.1.5"
+android-shortcut-gradle = "com.github.komikku-app:android-shortcut-gradle-plugin:0.2.0"
 
 rxjava = "io.reactivex:rxjava:1.3.8"