diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
index 51b8699a22..0da6f69848 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
@@ -127,17 +127,12 @@ public final class AvatarUtil {
    */
   @WorkerThread
   public static @NonNull IconCompat getIconCompatForShortcut(@NonNull Context context, @NonNull Recipient recipient) {
-    int    size  = AdaptiveBitmapMetrics.getInnerWidth();
-    Bitmap inner;
-
+    int size = AdaptiveBitmapMetrics.getInnerWidth();
     if (recipient.isSelf()) {
-      inner = DrawableUtil.toBitmap(getNoteToSelfDrawable(context, recipient.getAvatarColor(), size), size, size);
-    } else {
-      inner = getBitmapForNotification(context, recipient, size);
+      Drawable noteToSelfDrawable = getNoteToSelfDrawable(context, recipient.getAvatarColor(), size);
+      return IconCompat.createWithBitmap(DrawableUtil.toBitmap(noteToSelfDrawable, size, size));
     }
-
-    Bitmap wrapped = DrawableUtil.wrapBitmapForShortcutInfo(inner);
-    return IconCompat.createWithAdaptiveBitmap(wrapped);
+    return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient, size));
   }
 
   @WorkerThread