diff --git a/app/build.gradle b/app/build.gradle
index 5449e9fc..e851189d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'android-apt'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     def VERSION_CODE = 15
     def VERSION_NAME = "0.2.5"
@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         minSdkVersion 17
-        targetSdkVersion 24
+        targetSdkVersion 25
 
         buildConfigField "boolean", "IS_TEST_BUILD", "false"
         buildConfigField "boolean", "IS_GPLAY_BUILD", "false"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 150e8241..59f17036 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,6 +54,7 @@
 
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
+                <action android:name="app_shortcut" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/plain" />
             </intent-filter>
@@ -227,6 +228,9 @@
                 <!--@@@ PODLIST END-->
             </intent-filter>
 
+            <meta-data android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+
         </activity>
 
     </application>
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 08c6a541..d0919ce9 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -548,6 +548,8 @@ public class MainActivity extends ThemedActivity
         } else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {
             /* TODO: Implement and add filter to manifest */
             return;
+        }  else if ("app_shortcut".equals(action)) {
+            openDiasporaUrl(urls.getNewPostUrl());
         }
         //Catch split screen recreation
         if (action != null && action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) {
diff --git a/app/src/main/res/drawable-hdpi/qc_post_plus.png b/app/src/main/res/drawable-hdpi/qc_post_plus.png
new file mode 100644
index 00000000..3e1f7698
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/qc_post_plus.png differ
diff --git a/app/src/main/res/drawable-ldpi/qc_post_plus.png b/app/src/main/res/drawable-ldpi/qc_post_plus.png
new file mode 100644
index 00000000..42edc6c4
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/qc_post_plus.png differ
diff --git a/app/src/main/res/drawable-mdpi/qc_post_plus.png b/app/src/main/res/drawable-mdpi/qc_post_plus.png
new file mode 100644
index 00000000..2f38283b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/qc_post_plus.png differ
diff --git a/app/src/main/res/drawable-xhdpi/qc_post_plus.png b/app/src/main/res/drawable-xhdpi/qc_post_plus.png
new file mode 100644
index 00000000..fbb2cd6b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/qc_post_plus.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/qc_post_plus.png b/app/src/main/res/drawable-xxhdpi/qc_post_plus.png
new file mode 100644
index 00000000..c584c0b1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/qc_post_plus.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/qc_post_plus.png b/app/src/main/res/drawable-xxxhdpi/qc_post_plus.png
new file mode 100644
index 00000000..b17fa42b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/qc_post_plus.png differ
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
new file mode 100755
index 00000000..6d59a1cd
--- /dev/null
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@@ -0,0 +1,22 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <shortcut
+        android:shortcutId="shortcut_new_post"
+        android:enabled="true"
+        android:icon="@drawable/qc_post_plus"
+        android:shortcutShortLabel="@string/new_post"
+        android:shortcutLongLabel="@string/new_post"
+        android:shortcutDisabledMessage="@string/new_post">
+        <intent
+            android:action="app_shortcut"
+            android:targetPackage="com.github.dfa.diaspora_android"
+            android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the list is what the user sees when they
+             launch this shortcut. -->
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+
+</shortcuts>
+        
+