diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f691073..ddf44959 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.keylesspalace.tusky">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -62,6 +63,17 @@
         </service>
 
         <receiver android:name=".NotificationClearBroadcastReceiver" />
+
+        <service
+            tools:targetApi="24"
+            android:name="com.keylesspalace.tusky.TuskyTileService"
+            android:icon="@drawable/ic_send_24dp"
+            android:label="Compose Toot"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+            </intent-filter>
+    </service>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/TuskyTileService.java b/app/src/main/java/com/keylesspalace/tusky/TuskyTileService.java
new file mode 100644
index 00000000..10690e6e
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/TuskyTileService.java
@@ -0,0 +1,48 @@
+package com.keylesspalace.tusky;
+
+import android.annotation.TargetApi;
+import android.content.Intent;
+import android.service.quicksettings.TileService;
+
+/**
+ * Small Addition that adds in a QuickSettings tile that opens the Compose activity when clicked
+ * Created by ztepps on 4/3/17.
+ */
+
+@TargetApi(24)
+public class TuskyTileService extends TileService {
+    public TuskyTileService() {
+        super();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void onTileAdded() {
+        super.onTileAdded();
+    }
+
+    @Override
+    public void onTileRemoved() {
+        super.onTileRemoved();
+    }
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+    }
+
+    @Override
+    public void onStopListening() {
+        super.onStopListening();
+    }
+
+    @Override
+    public void onClick() {
+        super.onClick();
+        startActivity(new Intent(this, ComposeActivity.class));
+    }
+}