diff --git a/app/build.gradle b/app/build.gradle
index 4969b5499..97f2e71cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,6 +20,9 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            applicationIdSuffix ".test"
+        }
     }
 
     flavorDimensions "store"
diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/app/src/debug/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..7fef14448
--- /dev/null
+++ b/app/src/debug/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+<size android:width="108dp" android:height="108dp" />
+<gradient
+    android:type="radial"
+    android:centerX="50%"
+    android:centerY="50%"
+    android:startColor="#25d069"
+    android:endColor="#19a341"
+    android:gradientRadius="100"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..eddd426d3
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..d56d05c13
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..b1a89a86c
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..73a09c230
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..a043331fd
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5e80ba3b5..e46c52730 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,7 +40,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="@string/oauth_redirect_host"
+                    android:host="${applicationId}"
                     android:scheme="@string/oauth_scheme" />
             </intent-filter>
         </activity>
@@ -111,7 +111,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.keylesspalace.tusky.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
index defa1ca49..0c8c0a52b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
@@ -145,7 +145,7 @@ public class LoginActivity extends AppCompatActivity {
 
     private String getOauthRedirectUri() {
         String scheme = getString(R.string.oauth_scheme);
-        String host = getString(R.string.oauth_redirect_host);
+        String host = BuildConfig.APPLICATION_ID;
         return scheme + "://" + host + "/";
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
index 33be2ce9d..6f46b09d1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
@@ -18,6 +18,7 @@ package com.keylesspalace.tusky;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -371,6 +372,16 @@ public class MainActivity extends BaseActivity implements ActionButtonActivity {
                     return false;
                 })
                 .build();
+
+        if(BuildConfig.DEBUG) {
+            IDrawerItem debugItem = new SecondaryDrawerItem()
+                    .withIdentifier(1337)
+                    .withName("debug")
+                    .withDisabledTextColor(Color.GREEN)
+                    .withSelectable(false)
+                    .withEnabled(false);
+            drawer.addItem(debugItem);
+        }
     }
 
     private void logout() {
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index f964ce9da..aa4b88492 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -4,7 +4,6 @@
     <string name="app_website" translatable="false">https://tusky.keylesspalace.com</string>
 
     <string name="oauth_scheme" translatable="false">oauth2redirect</string>
-    <string name="oauth_redirect_host" translatable="false">com.keylesspalace.tusky</string>
     <string name="preferences_file_key" translatable="false">com.keylesspalace.tusky.PREFERENCES</string>
 
     <string name="status_sensitive_media_template" translatable="false">&lt;b>%1$s&lt;/b>&lt;br>%2$s</string>
diff --git a/app/src/main/res/drawable-v26/ic_launcher_background.xml b/app/src/release/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/main/res/drawable-v26/ic_launcher_background.xml
rename to app/src/release/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/release/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/release/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/release/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/release/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/release/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/release/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/release/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/release/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/release/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/release/res/mipmap-xxxhdpi/ic_launcher.png