diff --git a/app/src/blue/res/mipmap-hdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-hdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..03ac90029
Binary files /dev/null and b/app/src/blue/res/mipmap-hdpi/ic_shortcut_compose.png differ
diff --git a/app/src/blue/res/mipmap-mdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-mdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..2ba7f82bc
Binary files /dev/null and b/app/src/blue/res/mipmap-mdpi/ic_shortcut_compose.png differ
diff --git a/app/src/blue/res/mipmap-xhdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-xhdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..9ec8f40c1
Binary files /dev/null and b/app/src/blue/res/mipmap-xhdpi/ic_shortcut_compose.png differ
diff --git a/app/src/blue/res/mipmap-xxhdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-xxhdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..1ad9ff5ae
Binary files /dev/null and b/app/src/blue/res/mipmap-xxhdpi/ic_shortcut_compose.png differ
diff --git a/app/src/blue/res/mipmap-xxxhdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-xxxhdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..a1d41bcef
Binary files /dev/null and b/app/src/blue/res/mipmap-xxxhdpi/ic_shortcut_compose.png differ
diff --git a/app/src/blue/res/xml-v25/shortcuts.xml b/app/src/blue/res/xml-v25/shortcuts.xml
new file mode 100644
index 000000000..d0aaa2e80
--- /dev/null
+++ b/app/src/blue/res/xml-v25/shortcuts.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:icon="@mipmap/ic_shortcut_compose"
+        android:shortcutId="com.keylesspalace.tusky.Compose"
+        android:shortcutLongLabel="@string/compose_shortcut_long_label"
+        android:shortcutShortLabel="@string/compose_shortcut_short_label">
+
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="com.keylesspalace.tusky.SplashActivity"
+            android:targetPackage="com.keylesspalace.tusky"/>
+        <intent
+            android:action="com.keylesspalace.tusky.Compose"
+            android:targetClass="com.keylesspalace.tusky.ComposeActivity"
+            android:targetPackage="com.keylesspalace.tusky"/>
+
+    </shortcut>
+
+</shortcuts>
\ No newline at end of file
diff --git a/app/src/green/res/mipmap-hdpi/ic_shortcut_compose.png b/app/src/green/res/mipmap-hdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..422323b27
Binary files /dev/null and b/app/src/green/res/mipmap-hdpi/ic_shortcut_compose.png differ
diff --git a/app/src/green/res/mipmap-mdpi/ic_shortcut_compose.png b/app/src/green/res/mipmap-mdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..1684f2884
Binary files /dev/null and b/app/src/green/res/mipmap-mdpi/ic_shortcut_compose.png differ
diff --git a/app/src/green/res/mipmap-xhdpi/ic_shortcut_compose.png b/app/src/green/res/mipmap-xhdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..eb226e091
Binary files /dev/null and b/app/src/green/res/mipmap-xhdpi/ic_shortcut_compose.png differ
diff --git a/app/src/green/res/mipmap-xxhdpi/ic_shortcut_compose.png b/app/src/green/res/mipmap-xxhdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..3e333b9d0
Binary files /dev/null and b/app/src/green/res/mipmap-xxhdpi/ic_shortcut_compose.png differ
diff --git a/app/src/green/res/mipmap-xxxhdpi/ic_shortcut_compose.png b/app/src/green/res/mipmap-xxxhdpi/ic_shortcut_compose.png
new file mode 100644
index 000000000..415db1849
Binary files /dev/null and b/app/src/green/res/mipmap-xxxhdpi/ic_shortcut_compose.png differ
diff --git a/app/src/green/res/xml-v25/shortcuts.xml b/app/src/green/res/xml-v25/shortcuts.xml
new file mode 100644
index 000000000..130274fae
--- /dev/null
+++ b/app/src/green/res/xml-v25/shortcuts.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:icon="@mipmap/ic_shortcut_compose"
+        android:shortcutId="com.keylesspalace.tusky.Compose"
+        android:shortcutLongLabel="@string/compose_shortcut_long_label"
+        android:shortcutShortLabel="@string/compose_shortcut_short_label">
+
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="com.keylesspalace.tusky.SplashActivity"
+            android:targetPackage="com.keylesspalace.tusky.test"/>
+        <intent
+            android:action="com.keylesspalace.tusky.Compose"
+            android:targetClass="com.keylesspalace.tusky.ComposeActivity"
+            android:targetPackage="com.keylesspalace.tusky.test"/>
+
+    </shortcut>
+
+</shortcuts>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 59bc17ecc..f08523f7f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,6 +26,9 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
         </activity>
         <activity
             android:name=".SavedTootActivity"
diff --git a/app/src/main/res/drawable/ic_create_24dp.xml b/app/src/main/res/drawable/ic_create_24dp.xml
index fb3234929..d74fe13e6 100644
--- a/app/src/main/res/drawable/ic_create_24dp.xml
+++ b/app/src/main/res/drawable/ic_create_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="@color/white"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_compose.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_compose.xml
new file mode 100644
index 000000000..5ea9201d2
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_compose.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground>
+        <inset
+            android:inset="28%"
+            android:drawable="@drawable/ic_create_24dp" />
+    </foreground>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e77a9a087..51c639a50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -461,5 +461,7 @@
     <string name="edit_hashtag_hint">Hashtag without #</string>
     <string name="hashtag">Hashtag</string>
 
+    <string name="compose_shortcut_long_label">Compose Toot</string>
+    <string name="compose_shortcut_short_label">Compose</string>
 
 </resources>