diff --git a/ring-android/app/src/main/java/cx/ring/account/RingAccountSummaryFragment.java b/ring-android/app/src/main/java/cx/ring/account/RingAccountSummaryFragment.java
index d9a75ee4438ca5fd754c7d128cef63dbcc09470c..0554971e4dd7799443952546e2e21477f6fb012e 100644
--- a/ring-android/app/src/main/java/cx/ring/account/RingAccountSummaryFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/account/RingAccountSummaryFragment.java
@@ -28,6 +28,7 @@ import android.os.Bundle;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
+import android.support.v7.content.res.AppCompatResources;
 import android.support.v7.widget.SwitchCompat;
 import android.text.Layout;
 import android.text.Spannable;
@@ -196,7 +197,7 @@ public class RingAccountSummaryFragment extends BaseFragment<RingAccountSummaryP
             }
 
             mAccountStatus.setText(status);
-            Drawable drawable = ContextCompat.getDrawable(getActivity(), R.drawable.static_rounded_background);
+            Drawable drawable = AppCompatResources.getDrawable(getActivity(), R.drawable.static_rounded_background);
             Drawable wrapped = DrawableCompat.wrap(drawable);
             DrawableCompat.setTint(wrapped, color);
             mAccountStatus.setBackground(wrapped);
diff --git a/ring-android/app/src/main/java/cx/ring/contacts/AvatarFactory.java b/ring-android/app/src/main/java/cx/ring/contacts/AvatarFactory.java
index 41a98bee5e4eb071f69fb682d299e539811156a5..b921435234502a7c23cd193718f4d485c83d4fa9 100644
--- a/ring-android/app/src/main/java/cx/ring/contacts/AvatarFactory.java
+++ b/ring-android/app/src/main/java/cx/ring/contacts/AvatarFactory.java
@@ -30,6 +30,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.content.res.AppCompatResources;
 import android.util.Log;
 
 import com.bumptech.glide.request.RequestOptions;
@@ -120,7 +121,7 @@ public class AvatarFactory {
         Canvas canvas = new Canvas(canvasBitmap);
         canvas.drawColor(context.getResources().getColor(backgroundColor));
 
-        Drawable drawable = ContextCompat.getDrawable(context, R.drawable.ic_contact_picture_box_default);
+        Drawable drawable = AppCompatResources.getDrawable(context, R.drawable.ic_contact_picture_box_default);
         if (drawable == null) {
             Log.e(TAG, "Not able to get default drawable");
         } else {