diff --git a/app/build.gradle b/app/build.gradle
index f8f3c07f4..1fd1e56d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "com.keylesspalace.tusky"
         minSdkVersion 15
@@ -19,9 +19,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    flavorDimensions "store"
     productFlavors {
-        google {}
-        fdroid {}
+        google {
+            dimension "store"
+        }
+        fdroid {
+            dimension "store"
+        }
     }
     lintOptions {
         disable 'MissingTranslation'
@@ -60,7 +66,7 @@ dependencies {
 
     //room
     compile "android.arch.persistence.room:runtime:1.0.0-rc1"
-    annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-beta2'
+    annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-rc1'
 
     testCompile "junit:junit:4.12"
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
diff --git a/app/src/main/res/drawable-hdpi-v11/ic_notify.png b/app/src/main/res/drawable-hdpi/ic_notify.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi-v11/ic_notify.png
rename to app/src/main/res/drawable-hdpi/ic_notify.png
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_notify.png b/app/src/main/res/drawable-mdpi/ic_notify.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi-v11/ic_notify.png
rename to app/src/main/res/drawable-mdpi/ic_notify.png
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_notify.png b/app/src/main/res/drawable-xhdpi/ic_notify.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi-v11/ic_notify.png
rename to app/src/main/res/drawable-xhdpi/ic_notify.png
diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_notify.png b/app/src/main/res/drawable-xxhdpi/ic_notify.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi-v11/ic_notify.png
rename to app/src/main/res/drawable-xxhdpi/ic_notify.png
diff --git a/app/src/main/res/raw/keystore_tusky_api.bks b/app/src/main/res/raw/keystore_tusky_api.bks
deleted file mode 100644
index bc47c3317..000000000
Binary files a/app/src/main/res/raw/keystore_tusky_api.bks and /dev/null differ
diff --git a/build.gradle b/build.gradle
index 24700cb00..866a02f78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 19330f4dd..954dff793 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 06 17:29:49 CET 2017
+#Wed Oct 25 20:21:12 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip