diff --git a/build.gradle b/build.gradle
index 5ffa8a20..8c3074c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,12 +74,14 @@ android {
     buildTypes {
         debug {
             minifyEnabled true
+            shrinkResources true
             signingConfig signingConfigs.debug
         }
         // keep minifyEnabled false above for faster builds; set to 'true'
         // when testing to make sure ProGuard/R8 is not deleting important stuff
         release {
             minifyEnabled true
+            shrinkResources true
         }
     }
 }
diff --git a/proguard-rules.pro b/proguard-rules.pro
index c643b628..e01c358d 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -18,11 +18,6 @@
 
 -dontobfuscate
 
-# Allow obfuscation of android.support.v7.internal.view.menu.**
-# to avoid problem on Samsung 4.2.2 devices with appcompat v21
-# see https://code.google.com/p/android/issues/detail?id=78377
--keepnames class !android.support.v7.internal.view.menu.**,android.support.v7.** {*;}
-
 -dontwarn org.spongycastle.**
 -dontwarn org.apache.sshd.**
 -dontwarn org.apache.mina.**