diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 279de389d..0843a522c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,9 +82,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity>
 
         <activity-alias
@@ -104,9 +101,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -126,9 +120,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -148,9 +139,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -170,9 +158,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -190,9 +175,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -212,9 +194,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -234,9 +213,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -256,9 +232,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity
diff --git a/app/src/main/java/com/github/libretube/LibreTubeApp.kt b/app/src/main/java/com/github/libretube/LibreTubeApp.kt
index 2fab6a40f..791d5771d 100644
--- a/app/src/main/java/com/github/libretube/LibreTubeApp.kt
+++ b/app/src/main/java/com/github/libretube/LibreTubeApp.kt
@@ -17,6 +17,7 @@ import com.github.libretube.util.ImageHelper
 import com.github.libretube.util.NotificationHelper
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ProxyHelper
+import com.github.libretube.util.ShortcutHelper
 
 class LibreTubeApp : Application() {
     override fun onCreate() {
@@ -69,6 +70,11 @@ class LibreTubeApp : Application() {
         val defaultExceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
         val exceptionHandler = ExceptionHandler(defaultExceptionHandler)
         Thread.setDefaultUncaughtExceptionHandler(exceptionHandler)
+
+        /**
+         * Dynamically create App Shortcuts
+         */
+        ShortcutHelper.createShortcuts(this)
     }
 
     /**
diff --git a/app/src/main/java/com/github/libretube/constants/IntentData.kt b/app/src/main/java/com/github/libretube/constants/IntentData.kt
index 6d9352f1c..c10d30549 100644
--- a/app/src/main/java/com/github/libretube/constants/IntentData.kt
+++ b/app/src/main/java/com/github/libretube/constants/IntentData.kt
@@ -17,4 +17,5 @@ object IntentData {
     const val subtitleCode = "subtitleCode"
     const val downloading = "downloading"
     const val openAudioPlayer = "openAudioPlayer"
+    const val fragmentToOpen = "fragmentToOpen"
 }
diff --git a/app/src/main/java/com/github/libretube/obj/AppShortcut.kt b/app/src/main/java/com/github/libretube/obj/AppShortcut.kt
new file mode 100644
index 000000000..b268ea381
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/obj/AppShortcut.kt
@@ -0,0 +1,10 @@
+package com.github.libretube.obj
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+
+data class AppShortcut(
+    val action: String,
+    @StringRes val label: Int,
+    @DrawableRes val drawable: Int
+)
diff --git a/app/src/main/java/com/github/libretube/util/ShortcutHelper.kt b/app/src/main/java/com/github/libretube/util/ShortcutHelper.kt
new file mode 100644
index 000000000..ea1b14279
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/util/ShortcutHelper.kt
@@ -0,0 +1,45 @@
+package com.github.libretube.util
+
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
+import com.github.libretube.R
+import com.github.libretube.constants.IntentData
+import com.github.libretube.obj.AppShortcut
+import com.github.libretube.ui.activities.MainActivity
+
+object ShortcutHelper {
+    private val shortcuts = listOf(
+        AppShortcut("home", R.string.startpage, R.drawable.ic_home),
+        AppShortcut("trends", R.string.trends, R.drawable.ic_trending),
+        AppShortcut("subscriptions", R.string.subscriptions, R.drawable.ic_subscriptions),
+        AppShortcut("library", R.string.library, R.drawable.ic_library)
+    ).reversed()
+
+    private fun createShortcut(context: Context, action: String, label: String, icon: IconCompat) {
+        val shortcut = ShortcutInfoCompat.Builder(context, action)
+            .setShortLabel(label)
+            .setLongLabel(label)
+            .setIcon(icon)
+            .setIntent(
+                Intent(context, MainActivity::class.java).apply {
+                    this.action = Intent.ACTION_VIEW
+                    putExtra(IntentData.fragmentToOpen, action)
+                }
+            )
+            .build()
+
+        ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
+    }
+
+    fun createShortcuts(context: Context) {
+        ShortcutManagerCompat.getDynamicShortcuts(context).takeIf { it.isEmpty() } ?: return
+
+        shortcuts.forEach {
+            val icon = IconCompat.createWithResource(context, it.drawable)
+            createShortcut(context, it.action, context.getString(it.label), icon)
+        }
+    }
+}
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
deleted file mode 100644
index 54387f153..000000000
--- a/app/src/main/res/xml/shortcuts.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="25">
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/ic_home"
-        android:shortcutId="home"
-        android:shortcutShortLabel="@string/startpage">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetClass="com.github.libretube.ui.activities.MainActivity"
-            android:targetPackage="com.github.libretube" />
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/ic_trending"
-        android:shortcutId="trends"
-        android:shortcutShortLabel="@string/trends">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetClass="com.github.libretube.ui.activities.MainActivity"
-            android:targetPackage="com.github.libretube" />
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/ic_subscriptions"
-        android:shortcutId="subscriptions"
-        android:shortcutShortLabel="@string/subscriptions">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetClass="com.github.libretube.ui.activities.MainActivity"
-            android:targetPackage="com.github.libretube">
-            <extra
-                android:name="fragmentToOpen"
-                android:value="subscriptions" />
-        </intent>
-    </shortcut>
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/ic_library"
-        android:shortcutId="library"
-        android:shortcutShortLabel="@string/library">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetClass="com.github.libretube.ui.activities.MainActivity"
-            android:targetPackage="com.github.libretube">
-            <extra
-                android:name="fragmentToOpen"
-                android:value="library" />
-        </intent>
-    </shortcut>
-</shortcuts>
\ No newline at end of file