diff --git a/Clover/app/build.gradle b/Clover/app/build.gradle
index effb565e..f6a2992a 100644
--- a/Clover/app/build.gradle
+++ b/Clover/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "20.0.0"
+    buildToolsVersion "21.0.2"
 
     defaultConfig {
         minSdkVersion 14
diff --git a/Clover/app/proguard.cfg b/Clover/app/proguard.cfg
index 7f3763cc..4faf19ff 100644
--- a/Clover/app/proguard.cfg
+++ b/Clover/app/proguard.cfg
@@ -132,3 +132,8 @@
 }
 
 -keep public class pl.droidsonroids.gif.GifIOException{*;}
+
+# Remove these when targetSdkVersion >= 21
+-dontwarn pl.droidsonroids.gif.GifImageButton
+-dontwarn pl.droidsonroids.gif.GifImageView
+-dontwarn pl.droidsonroids.gif.GifTextView