diff --git a/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java b/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java
deleted file mode 100644
index acfb5569c..000000000
--- a/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.thoughtcrime.securesms.components;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-
-import androidx.appcompat.widget.AppCompatImageView;
-
-import org.thoughtcrime.securesms.R;
-
-public class ImageDivet extends AppCompatImageView {
-  private Drawable drawable;
-  private int drawableIntrinsicWidth;
-  private int drawableIntrinsicHeight;
-
-  public ImageDivet(Context context, AttributeSet attrs, int defStyle) {
-    super(context, attrs, defStyle);
-    setDrawable();
-  }
-
-  public ImageDivet(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    setDrawable();
-  }
-
-  public ImageDivet(Context context) {
-    super(context);
-    setDrawable();
-  }
-
-  private void setDrawable() {
-    int[] attributes = new int[] {R.attr.lower_right_divet};
-
-    try (TypedArray drawables = getContext().obtainStyledAttributes(attributes)) {
-      drawable = drawables.getDrawable(0);
-      drawableIntrinsicWidth = drawable != null ? drawable.getIntrinsicWidth() : 0;
-      drawableIntrinsicHeight = drawable != null ? drawable.getIntrinsicHeight() : 0;
-    }
-  }
-
-  @Override
-  public void onDraw(Canvas c) {
-    super.onDraw(c);
-    c.save();
-
-    final int right = getWidth();
-    final int bottom = getHeight();
-    drawable.setBounds(
-      right - drawableIntrinsicWidth,
-      bottom - drawableIntrinsicHeight,
-      right,
-      bottom);
-
-    drawable.draw(c);
-    c.restore();
-  }
-}
diff --git a/src/main/res/drawable-hdpi/divet_lower_right_dark.png b/src/main/res/drawable-hdpi/divet_lower_right_dark.png
deleted file mode 100644
index d37eece35..000000000
Binary files a/src/main/res/drawable-hdpi/divet_lower_right_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/divet_lower_right_light.png b/src/main/res/drawable-hdpi/divet_lower_right_light.png
deleted file mode 100644
index f5a8ea6ae..000000000
Binary files a/src/main/res/drawable-hdpi/divet_lower_right_light.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/divet_lower_right_dark.png b/src/main/res/drawable-mdpi/divet_lower_right_dark.png
deleted file mode 100644
index 8d2bc439e..000000000
Binary files a/src/main/res/drawable-mdpi/divet_lower_right_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/divet_lower_right_light.png b/src/main/res/drawable-mdpi/divet_lower_right_light.png
deleted file mode 100644
index 6e7fa1fe6..000000000
Binary files a/src/main/res/drawable-mdpi/divet_lower_right_light.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/divet_lower_right_dark.png b/src/main/res/drawable-xhdpi/divet_lower_right_dark.png
deleted file mode 100644
index e4a3d77a0..000000000
Binary files a/src/main/res/drawable-xhdpi/divet_lower_right_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/divet_lower_right_light.png b/src/main/res/drawable-xhdpi/divet_lower_right_light.png
deleted file mode 100644
index 9757f0f09..000000000
Binary files a/src/main/res/drawable-xhdpi/divet_lower_right_light.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png b/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png
deleted file mode 100644
index f07336f56..000000000
Binary files a/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/divet_lower_right_light.png b/src/main/res/drawable-xxhdpi/divet_lower_right_light.png
deleted file mode 100644
index 788898011..000000000
Binary files a/src/main/res/drawable-xxhdpi/divet_lower_right_light.png and /dev/null differ
diff --git a/src/main/res/layout/group_create_activity.xml b/src/main/res/layout/group_create_activity.xml
index 20f7052de..71598439d 100644
--- a/src/main/res/layout/group_create_activity.xml
+++ b/src/main/res/layout/group_create_activity.xml
@@ -15,7 +15,7 @@
         android:orientation="horizontal"
         android:gravity="center_vertical">
 
-        <org.thoughtcrime.securesms.components.ImageDivet android:id="@+id/avatar"
+        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/avatar"
             android:layout_width="70dp"
             android:layout_height="70dp"
             android:layout_marginEnd="10dp"
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 9f4fd3ca1..706be4654 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -20,7 +20,6 @@
 
     <attr name="fab_color" format="reference|color" />
     <attr name="input_panel_bg_color" format="reference|color" />
-    <attr name="lower_right_divet" format="reference" />
     <attr name="close_icon_color" format="reference|color" />
 
     <attr name="conversation_background" format="reference|color"/>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 5c17b99d5..1d665fc92 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -66,7 +66,6 @@
 
         <item name="fab_color">@color/delta_primary_lite</item>
         <item name="input_panel_bg_color">@color/white</item>
-        <item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
         <item name="close_icon_color">#A4A6A9</item>
 
         <!-- light theme -->
@@ -207,7 +206,6 @@
 
         <item name="fab_color">@color/gray78</item>
         <item name="input_panel_bg_color">@color/gray95</item>
-        <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
         <item name="close_icon_color">@color/gray70</item>
 
         <!-- dark theme -->