diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXFlashToggleView.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXFlashToggleView.java
index 28646bf954..828b47d392 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXFlashToggleView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXFlashToggleView.java
@@ -127,7 +127,7 @@ public final class CameraXFlashToggleView extends AppCompatImageView {
   }
 
   public interface OnFlashModeChangedListener {
-    void flashModeChanged(@ImageCapture.CaptureMode int flashMode);
+    void flashModeChanged(int flashMode);
   }
 
   private enum FlashMode {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt
index 997509aeb0..f9aece2d46 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaSelectionGalleryFragment.kt
@@ -5,7 +5,6 @@ import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.navigation.Navigation
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator
diff --git a/app/src/main/res/drawable-hdpi/flash_off_32.webp b/app/src/main/res/drawable-hdpi/flash_off_32.webp
deleted file mode 100644
index 83133ae838..0000000000
Binary files a/app/src/main/res/drawable-hdpi/flash_off_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/flash_on_32.webp b/app/src/main/res/drawable-hdpi/flash_on_32.webp
deleted file mode 100644
index 65a6ee2092..0000000000
Binary files a/app/src/main/res/drawable-hdpi/flash_on_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/flash_off_32.webp b/app/src/main/res/drawable-mdpi/flash_off_32.webp
deleted file mode 100644
index 5751024aa7..0000000000
Binary files a/app/src/main/res/drawable-mdpi/flash_off_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/flash_on_32.webp b/app/src/main/res/drawable-mdpi/flash_on_32.webp
deleted file mode 100644
index 386de74f1c..0000000000
Binary files a/app/src/main/res/drawable-mdpi/flash_on_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/flash_off_32.webp b/app/src/main/res/drawable-xhdpi/flash_off_32.webp
deleted file mode 100644
index 649fd43249..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/flash_off_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/flash_on_32.webp b/app/src/main/res/drawable-xhdpi/flash_on_32.webp
deleted file mode 100644
index f12dd80959..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/flash_on_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/flash_off_32.webp b/app/src/main/res/drawable-xxhdpi/flash_off_32.webp
deleted file mode 100644
index 9147665a9f..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/flash_off_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/flash_on_32.webp b/app/src/main/res/drawable-xxhdpi/flash_on_32.webp
deleted file mode 100644
index d1d8424b83..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/flash_on_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/flash_off_32.webp b/app/src/main/res/drawable-xxxhdpi/flash_off_32.webp
deleted file mode 100644
index ab1edbeef0..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/flash_off_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/flash_on_32.webp b/app/src/main/res/drawable-xxxhdpi/flash_on_32.webp
deleted file mode 100644
index a2d36e2258..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/flash_on_32.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/camerax_flash_toggle.xml b/app/src/main/res/drawable/camerax_flash_toggle.xml
index 4831029918..8540548e0d 100644
--- a/app/src/main/res/drawable/camerax_flash_toggle.xml
+++ b/app/src/main/res/drawable/camerax_flash_toggle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_flash_auto="true" android:drawable="@drawable/flash_auto_32" />
-    <item app:state_flash_off="true" android:drawable="@drawable/flash_off_32" />
-    <item app:state_flash_on="true" android:drawable="@drawable/flash_on_32" />
+    <item app:state_flash_off="true" android:drawable="@drawable/ic_flash_24" />
+    <item app:state_flash_on="true" android:drawable="@drawable/ic_flash_filled_24" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_flash_24.xml b/app/src/main/res/drawable/ic_flash_24.xml
new file mode 100644
index 0000000000..2148febaf8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flash_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:fillColor="@color/core_white"
+        android:pathData="M12,4.9 L11,8.6l-0.4,1.9h8.7L12,19.1l1,-3.7 0.4,-1.9H4.7L12,4.9m1.7,-4 l-0.5,0.2L2.5,13.8A0.7,0.7 0,0 0,3.1 15h8.4L9.7,22.3a0.6,0.6 0,0 0,0.6 0.8l0.5,-0.2L21.5,10.2A0.7,0.7 0,0 0,20.9 9H12.5l1.8,-7.3a0.6,0.6 0,0 0,-0.6 -0.8"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_flash_filled_24.xml b/app/src/main/res/drawable/ic_flash_filled_24.xml
new file mode 100644
index 0000000000..32121cc087
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flash_filled_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/core_white"
+      android:pathData="M20.9,9H12.5l1.8,-7.3a0.6,0.6 0,0 0,-0.6 -0.8l-0.5,0.2L2.5,13.8A0.7,0.7 0,0 0,3.1 15h8.4L9.7,22.3a0.6,0.6 0,0 0,0.6 0.8l0.5,-0.2L21.5,10.2A0.7,0.7 0,0 0,20.9 9Z"/>
+</vector>