diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutput.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutput.java
index d262f83462..ee4ce6b6ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutput.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutput.java
@@ -7,8 +7,8 @@ import org.thoughtcrime.securesms.R;
 
 public enum WebRtcAudioOutput {
   HANDSET(R.string.WebRtcAudioOutputToggle__phone_earpiece, R.drawable.ic_handset_solid_24),
-  SPEAKER(R.string.WebRtcAudioOutputToggle__speaker, R.drawable.ic_speaker_solid_24),
-  HEADSET(R.string.WebRtcAudioOutputToggle__bluetooth, R.drawable.ic_speaker_bt_solid_24);
+  SPEAKER(R.string.WebRtcAudioOutputToggle__speaker, R.drawable.symbol_speaker_fill_white_24),
+  HEADSET(R.string.WebRtcAudioOutputToggle__bluetooth, R.drawable.symbol_speaker_bluetooth_fill_white_24);
 
   private final @StringRes int labelRes;
   private final @DrawableRes int iconRes;
diff --git a/app/src/main/res/drawable-hdpi/ic_speaker_solid_24.xml b/app/src/main/res/drawable-hdpi/ic_speaker_solid_24.xml
deleted file mode 100644
index fe4c351f0a..0000000000
--- a/app/src/main/res/drawable-hdpi/ic_speaker_solid_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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_grey_75"
-      android:pathData="M19.78,4.22 L18.72,5.28a9.52,9.52 0,0 1,0 13.44l1.06,1.06A11,11 0,0 0,19.78 4.22ZM19,12A7,7 0,0 0,17 7.05L15.89,8.11a5.5,5.5 0,0 1,0 7.78L17,17A7,7 0,0 0,19 12ZM14,3.14V20.86a0.5,0.5 0,0 1,-0.84 0.37L8,16.5H4a2,2 0,0 1,-2 -2v-5a2,2 0,0 1,2 -2H8l5.16,-4.73A0.5,0.5 0,0 1,14 3.14Z"/>
-</vector>
diff --git a/app/src/main/res/drawable-v21/webrtc_call_screen_circle_green.xml b/app/src/main/res/drawable-v21/webrtc_call_screen_circle_green.xml
deleted file mode 100644
index da7afe39fd..0000000000
--- a/app/src/main/res/drawable-v21/webrtc_call_screen_circle_green.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/green_700" xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <shape android:shape="oval">
-            <solid android:color="@color/green_500" />
-        </shape>
-    </item>
-</ripple>
-
-
diff --git a/app/src/main/res/drawable-v21/webrtc_call_screen_circle_grey_selector.xml b/app/src/main/res/drawable-v21/webrtc_call_screen_circle_grey_selector.xml
deleted file mode 100644
index 4b1c0cae1b..0000000000
--- a/app/src/main/res/drawable-v21/webrtc_call_screen_circle_grey_selector.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/transparent_white_30" xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <shape android:shape="oval">
-            <solid android:color="@color/transparent_white_40" />
-        </shape>
-    </item>
-</ripple>
-
diff --git a/app/src/main/res/drawable-v21/webrtc_call_screen_circle_red.xml b/app/src/main/res/drawable-v21/webrtc_call_screen_circle_red.xml
deleted file mode 100644
index 394875aaa2..0000000000
--- a/app/src/main/res/drawable-v21/webrtc_call_screen_circle_red.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/red_700" xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <shape android:shape="oval">
-            <solid android:color="@color/red_500" />
-        </shape>
-    </item>
-</ripple>
diff --git a/app/src/main/res/drawable/ic_mic_off_solid_28.xml b/app/src/main/res/drawable/ic_mic_off_solid_28.xml
deleted file mode 100644
index 4c26019633..0000000000
--- a/app/src/main/res/drawable/ic_mic_off_solid_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_grey_75"
-      android:pathData="M25.56,3.56l-22,22L2.5,24.5l4.67,-4.67A9.22,9.22 0,0 1,5.5 14.5L7,14.5a7.74,7.74 0,0 0,1.25 4.25l1.37,-1.37A4.9,4.9 0,0 1,9 15L9,7A5,5 0,0 1,19 7L19,8l5.5,-5.5ZM19,15L19,12.24l-7.22,7.22A5,5 0,0 0,19 15ZM14,22a6.62,6.62 0,0 1,-3.65 -1.11L9.28,22a8.09,8.09 0,0 0,4 1.5L13.28,28h1.5L14.78,23.46a8.82,8.82 0,0 0,7.75 -9L21,14.46A7.27,7.27 0,0 1,14 22Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_mic_off_solid_28_white.xml b/app/src/main/res/drawable/ic_mic_off_solid_28_white.xml
deleted file mode 100644
index 4f0a05968d..0000000000
--- a/app/src/main/res/drawable/ic_mic_off_solid_28_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_white"
-      android:pathData="M25.56,3.56l-22,22L2.5,24.5l4.67,-4.67A9.22,9.22 0,0 1,5.5 14.5L7,14.5a7.74,7.74 0,0 0,1.25 4.25l1.37,-1.37A4.9,4.9 0,0 1,9 15L9,7A5,5 0,0 1,19 7L19,8l5.5,-5.5ZM19,15L19,12.24l-7.22,7.22A5,5 0,0 0,19 15ZM14,22a6.62,6.62 0,0 1,-3.65 -1.11L9.28,22a8.09,8.09 0,0 0,4 1.5L13.28,28h1.5L14.78,23.46a8.82,8.82 0,0 0,7.75 -9L21,14.46A7.27,7.27 0,0 1,14 22Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_phone_down_28.xml b/app/src/main/res/drawable/ic_phone_down_28.xml
deleted file mode 100644
index be65a1aa77..0000000000
--- a/app/src/main/res/drawable/ic_phone_down_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_white"
-      android:pathData="M26.92,14c-0.17,-1 -0.73,-2.64 -3.62,-4A22.94,22.94 0,0 0,4.7 10c-2.89,1.39 -3.45,3 -3.62,4a4.92,4.92 0,0 0,0.23 2.61A2.2,2.2 0,0 0,3.79 18.1l4.12,-0.73a2.18,2.18 0,0 0,1.82 -2.22c0,-0.56 0,-0.93 -0.06,-1.4a1.12,1.12 0,0 1,0.9 -1.21,23.65 23.65,0 0,1 6.86,0 1.12,1.12 0,0 1,0.9 1.21c0,0.47 0,0.84 -0.06,1.4a2.18,2.18 0,0 0,1.82 2.22l4.12,0.73a2.2,2.2 0,0 0,2.48 -1.49A4.92,4.92 0,0 0,26.92 14Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_ring_disabled_28.xml b/app/src/main/res/drawable/ic_ring_disabled_28.xml
deleted file mode 100644
index 39d75e8799..0000000000
--- a/app/src/main/res/drawable/ic_ring_disabled_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/transparent_white_40"
-      android:pathData="M25.29,19.84A2.19,2.19 0,0 1,23 22L5,22a2.19,2.19 0,0 1,-2.25 -2.11c0,-1.31 0.91,-1.89 1.9,-2.33 2,-0.89 2.43,-3.35 2.85,-6C8,8.17 8.69,4 14,4s6,4.22 6.54,7.61c0.42,2.6 0.81,5.06 2.85,6C24.38,18 25.29,18.53 25.29,19.84ZM23.65,11.68a0.86,0.86 0,0 0,0.84 -0.9c-0.13,-3.84 -1.64,-7.11 -4.14,-9A0.88,0.88 0,1 0,19.3 3.2c2.07,1.55 3.33,4.34 3.44,7.64a0.88,0.88 0,0 0,0.88 0.84ZM5.21,10.84c0.11,-3.3 1.37,-6.09 3.44,-7.64A0.88,0.88 0,1 0,7.6 1.8c-2.5,1.87 -4,5.14 -4.14,9a0.86,0.86 0,0 0,0.84 0.9h0A0.88,0.88 0,0 0,5.21 10.84ZM11.42,23.5a0.5,0.5 0,0 0,-0.44 0.73,3.46 3.46,0 0,0 6,0 0.5,0.5 0,0 0,-0.44 -0.73Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_ring_grey_28.xml b/app/src/main/res/drawable/ic_ring_grey_28.xml
deleted file mode 100644
index 94dcf793bb..0000000000
--- a/app/src/main/res/drawable/ic_ring_grey_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_grey_75"
-      android:pathData="M25.29,19.84A2.19,2.19 0,0 1,23 22L5,22a2.19,2.19 0,0 1,-2.25 -2.11c0,-1.31 0.91,-1.89 1.9,-2.33 2,-0.89 2.43,-3.35 2.85,-6C8,8.17 8.69,4 14,4s6,4.22 6.54,7.61c0.42,2.6 0.81,5.06 2.85,6C24.38,18 25.29,18.53 25.29,19.84ZM23.65,11.68a0.86,0.86 0,0 0,0.84 -0.9c-0.13,-3.84 -1.64,-7.11 -4.14,-9A0.88,0.88 0,1 0,19.3 3.2c2.07,1.55 3.33,4.34 3.44,7.64a0.88,0.88 0,0 0,0.88 0.84ZM5.21,10.84c0.11,-3.3 1.37,-6.09 3.44,-7.64A0.88,0.88 0,1 0,7.6 1.8c-2.5,1.87 -4,5.14 -4.14,9a0.86,0.86 0,0 0,0.84 0.9h0A0.88,0.88 0,0 0,5.21 10.84ZM11.42,23.5a0.5,0.5 0,0 0,-0.44 0.73,3.46 3.46,0 0,0 6,0 0.5,0.5 0,0 0,-0.44 -0.73Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_speaker_bt_solid_24.xml b/app/src/main/res/drawable/ic_speaker_bt_solid_24.xml
deleted file mode 100644
index 6d00b83bfc..0000000000
--- a/app/src/main/res/drawable/ic_speaker_bt_solid_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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_grey_75"
-      android:pathData="M14,3.14L14,20.86a0.5,0.5 0,0 1,-0.84 0.37L8,16.5L4,16.5a2,2 0,0 1,-2 -2v-5a2,2 0,0 1,2 -2L8,7.5l5.16,-4.73A0.5,0.5 0,0 1,14 3.14ZM19.82,12l2.53,-2.53a0.75,0.75 0,0 0,0 -1.06L19.29,5.35a0.76,0.76 0,0 0,-0.82 -0.16,0.74 0.74,0 0,0 -0.46,0.69v4.57l-1.78,-2L15.17,9.47 17.7,12l-2.53,2.53 1.06,1.06h0l1.78,-2v4.57h0a0.74,0.74 0,0 0,0.46 0.69,0.72 0.72,0 0,0 0.29,0.06 0.79,0.79 0,0 0,0.53 -0.22l3.06,-3.06a0.75,0.75 0,0 0,0 -1.06ZM19.51,7.69 L20.75,8.94 19.51,10.19ZM19.51,16.31v-2.5l1.24,1.25Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_speaker_bt_solid_28.xml b/app/src/main/res/drawable/ic_speaker_bt_solid_28.xml
deleted file mode 100644
index f59ef1ebc8..0000000000
--- a/app/src/main/res/drawable/ic_speaker_bt_solid_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_grey_75"
-      android:pathData="M16,4.79L16,23.21a1,1 0,0 1,-1.68 0.73L9,19L5,19a3,3 0,0 1,-3 -3L2,12A3,3 0,0 1,5 9L9,9l5.32,-4.94A1,1 0,0 1,16 4.79ZM22.53,22.53 L26.53,18.53a0.75,0.75 0,0 0,0 -1.06L23.06,14l3.47,-3.47a0.75,0.75 0,0 0,0 -1.06l-4,-4A0.75,0.75 0,0 0,21.25 6v6.19L18.53,9.47l-1.06,1.06L20.94,14l-3.47,3.47 1.06,1.06 2.72,-2.72L21.25,22a0.74,0.74 0,0 0,0.46 0.69,0.74 0.74,0 0,0 0.82,-0.16ZM24.94,18l-2.19,2.19L22.75,15.81ZM24.94,10 L22.75,12.19L22.75,7.81Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_speaker_solid_28.xml b/app/src/main/res/drawable/ic_speaker_solid_28.xml
deleted file mode 100644
index bbebce47a1..0000000000
--- a/app/src/main/res/drawable/ic_speaker_solid_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_grey_75"
-      android:pathData="M16,4.79L16,23.21a1,1 0,0 1,-1.68 0.73L9,19L5,19a3,3 0,0 1,-3 -3L2,12A3,3 0,0 1,5 9L9,9l5.32,-4.94A1,1 0,0 1,16 4.79ZM27,14A12.91,12.91 0,0 0,21.92 3.69L21,4.88a11.5,11.5 0,0 1,0 18.27l0.91,1.19A12.92,12.92 0,0 0,27 14ZM23,14a9.06,9.06 0,0 0,-3.7 -7.28l-0.89,1.22a7.5,7.5 0,0 1,0.12 12l0.91,1.19A8.94,8.94 0,0 0,23 14Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_speaker_solid_white_28.xml b/app/src/main/res/drawable/ic_speaker_solid_white_28.xml
deleted file mode 100644
index 220d9d058a..0000000000
--- a/app/src/main/res/drawable/ic_speaker_solid_white_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_white"
-      android:pathData="M16,4.79L16,23.21a1,1 0,0 1,-1.68 0.73L9,19L5,19a3,3 0,0 1,-3 -3L2,12A3,3 0,0 1,5 9L9,9l5.32,-4.94A1,1 0,0 1,16 4.79ZM27,14A12.91,12.91 0,0 0,21.92 3.69L21,4.88a11.5,11.5 0,0 1,0 18.27l0.91,1.19A12.92,12.92 0,0 0,27 14ZM23,14a9.06,9.06 0,0 0,-3.7 -7.28l-0.89,1.22a7.5,7.5 0,0 1,0.12 12l0.91,1.19A8.94,8.94 0,0 0,23 14Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_video_solid_28.xml b/app/src/main/res/drawable/ic_video_solid_28.xml
deleted file mode 100644
index 0fccfd857c..0000000000
--- a/app/src/main/res/drawable/ic_video_solid_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_white"
-      android:pathData="M22,12l3.29,-3.29a1,1 0,0 1,1.71 0.7v9.18a1,1 0,0 1,-1.71 0.7L22,16ZM20.5,19L20.5,9a3,3 0,0 0,-3 -3L6,6A3,3 0,0 0,3 9L3,19a3,3 0,0 0,3 3L17.5,22A3,3 0,0 0,20.5 19Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_video_solid_grey_28.xml b/app/src/main/res/drawable/ic_video_solid_grey_28.xml
deleted file mode 100644
index a78fb67677..0000000000
--- a/app/src/main/res/drawable/ic_video_solid_grey_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:fillColor="@color/core_grey_75"
-      android:pathData="M22,12l3.29,-3.29a1,1 0,0 1,1.71 0.7v9.18a1,1 0,0 1,-1.71 0.7L22,16ZM20.5,19L20.5,9a3,3 0,0 0,-3 -3L6,6A3,3 0,0 0,3 9L3,19a3,3 0,0 0,3 3L17.5,22A3,3 0,0 0,20.5 19Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/symbol_bell_ring_fill_24.xml b/app/src/main/res/drawable/symbol_bell_ring_fill_24.xml
new file mode 100644
index 0000000000..33960fd837
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_bell_ring_fill_24.xml
@@ -0,0 +1,18 @@
+<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/signal_light_colorOnSecondaryContainer"
+        android:pathData="M5.62 1.13c-0.34-0.34-0.9-0.34-1.24 0C3 2.51 1.9 4.43 1.63 6.9 1.58 7.38 1.93 7.82 2.4 7.87c0.48 0.05 0.92-0.3 0.97-0.77C3.6 5.06 4.5 3.5 5.62 2.37c0.34-0.34 0.34-0.9 0-1.24Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M18.38 1.13c0.34-0.34 0.9-0.34 1.24 0C21 2.51 22.1 4.43 22.37 6.9c0.05 0.48-0.3 0.92-0.77 0.97-0.48 0.05-0.92-0.3-0.97-0.77-0.23-2.04-1.13-3.6-2.25-4.73-0.34-0.34-0.34-0.9 0-1.24Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M12 1.75c-3.62 0-6.7 2.78-6.83 6.68-0.13 3.68-0.88 5.07-1.5 5.81-0.17 0.2-0.33 0.35-0.5 0.5L3.1 14.83c-0.14 0.12-0.28 0.26-0.4 0.4-0.34 0.36-0.57 0.8-0.57 1.48 0 1.12 0.9 2.05 2.02 2.05h15.7c1.13 0 2.03-0.93 2.03-2.05 0-0.68-0.24-1.12-0.57-1.49l-0.4-0.4-0.04-0.03-0.05-0.03c-0.16-0.16-0.32-0.31-0.49-0.5-0.62-0.75-1.37-2.14-1.5-5.82-0.13-3.9-3.2-6.68-6.83-6.68Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M8.95 20.5c0.09-0.16 0.25-0.25 0.43-0.25h5.24c0.18 0 0.34 0.1 0.43 0.25 0.09 0.15 0.1 0.34 0 0.5-0.59 1.06-1.72 1.75-3.05 1.75-1.33 0-2.46-0.69-3.06-1.76-0.08-0.15-0.08-0.34 0.01-0.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_bell_ring_fill_disabled_24.xml b/app/src/main/res/drawable/symbol_bell_ring_fill_disabled_24.xml
new file mode 100644
index 0000000000..9b44579435
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_bell_ring_fill_disabled_24.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:alpha="0.2"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M5.62 1.13c-0.34-0.34-0.9-0.34-1.24 0C3 2.51 1.9 4.43 1.63 6.9 1.58 7.38 1.93 7.82 2.4 7.87c0.48 0.05 0.92-0.3 0.97-0.77C3.6 5.06 4.5 3.5 5.62 2.37c0.34-0.34 0.34-0.9 0-1.24Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M18.38 1.13c0.34-0.34 0.9-0.34 1.24 0C21 2.51 22.1 4.43 22.37 6.9c0.05 0.48-0.3 0.92-0.77 0.97-0.48 0.05-0.92-0.3-0.97-0.77-0.23-2.04-1.13-3.6-2.25-4.73-0.34-0.34-0.34-0.9 0-1.24Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M12 1.75c-3.62 0-6.7 2.78-6.83 6.68-0.13 3.68-0.88 5.07-1.5 5.81-0.17 0.2-0.33 0.35-0.5 0.5L3.1 14.83c-0.14 0.12-0.28 0.26-0.4 0.4-0.34 0.36-0.57 0.8-0.57 1.48 0 1.12 0.9 2.05 2.02 2.05h15.7c1.13 0 2.03-0.93 2.03-2.05 0-0.68-0.24-1.12-0.57-1.49l-0.4-0.4-0.04-0.03-0.05-0.03c-0.16-0.16-0.32-0.31-0.49-0.5-0.62-0.75-1.37-2.14-1.5-5.82-0.13-3.9-3.2-6.68-6.83-6.68Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M8.95 20.5c0.09-0.16 0.25-0.25 0.43-0.25h5.24c0.18 0 0.34 0.1 0.43 0.25 0.09 0.15 0.1 0.34 0 0.5-0.59 1.06-1.72 1.75-3.05 1.75-1.33 0-2.46-0.69-3.06-1.76-0.08-0.15-0.08-0.34 0.01-0.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_bell_ring_fill_white_24.xml b/app/src/main/res/drawable/symbol_bell_ring_fill_white_24.xml
new file mode 100644
index 0000000000..c19874bf11
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_bell_ring_fill_white_24.xml
@@ -0,0 +1,18 @@
+<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/signal_light_colorOnPrimary"
+        android:pathData="M5.62 1.13c-0.34-0.34-0.9-0.34-1.24 0C3 2.51 1.9 4.43 1.63 6.9 1.58 7.38 1.93 7.82 2.4 7.87c0.48 0.05 0.92-0.3 0.97-0.77C3.6 5.06 4.5 3.5 5.62 2.37c0.34-0.34 0.34-0.9 0-1.24Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M18.38 1.13c0.34-0.34 0.9-0.34 1.24 0C21 2.51 22.1 4.43 22.37 6.9c0.05 0.48-0.3 0.92-0.77 0.97-0.48 0.05-0.92-0.3-0.97-0.77-0.23-2.04-1.13-3.6-2.25-4.73-0.34-0.34-0.34-0.9 0-1.24Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M12 1.75c-3.62 0-6.7 2.78-6.83 6.68-0.13 3.68-0.88 5.07-1.5 5.81-0.17 0.2-0.33 0.35-0.5 0.5L3.1 14.83c-0.14 0.12-0.28 0.26-0.4 0.4-0.34 0.36-0.57 0.8-0.57 1.48 0 1.12 0.9 2.05 2.02 2.05h15.7c1.13 0 2.03-0.93 2.03-2.05 0-0.68-0.24-1.12-0.57-1.49l-0.4-0.4-0.04-0.03-0.05-0.03c-0.16-0.16-0.32-0.31-0.49-0.5-0.62-0.75-1.37-2.14-1.5-5.82-0.13-3.9-3.2-6.68-6.83-6.68Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M8.95 20.5c0.09-0.16 0.25-0.25 0.43-0.25h5.24c0.18 0 0.34 0.1 0.43 0.25 0.09 0.15 0.1 0.34 0 0.5-0.59 1.06-1.72 1.75-3.05 1.75-1.33 0-2.46-0.69-3.06-1.76-0.08-0.15-0.08-0.34 0.01-0.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_dropdown_triangle_compat_bold_16.xml b/app/src/main/res/drawable/symbol_dropdown_triangle_compat_bold_16.xml
new file mode 100644
index 0000000000..8e61006707
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_dropdown_triangle_compat_bold_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M11.84 7.37C12.34 6.87 12 6 11.28 6H4.72c-0.7 0-1.07 0.86-0.56 1.37l3.13 3.13c0.4 0.39 1.03 0.39 1.42 0l3.13-3.13Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_mic_fill_24.xml b/app/src/main/res/drawable/symbol_mic_fill_24.xml
new file mode 100644
index 0000000000..2900bd4f8d
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_mic_fill_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M7.5 6c0-2.49 2.01-4.5 4.5-4.5s4.5 2.01 4.5 4.5v6c0 2.49-2.01 4.5-4.5 4.5S7.5 14.49 7.5 12V6Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M5.88 10.5c0-0.48-0.4-0.88-0.88-0.88s-0.88 0.4-0.88 0.88V12c0 4.05 3.07 7.4 7 7.83v1.3H8c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88h8c0.48 0 0.88-0.4 0.88-0.88s-0.4-0.88-0.88-0.88h-3.13v-1.3c3.94-0.43 7-3.77 7-7.82v-1.5c0-0.48-0.39-0.88-0.87-0.88s-0.88 0.4-0.88 0.88V12c0 3.38-2.74 6.13-6.12 6.13S5.87 15.38 5.87 12v-1.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_mic_slash_fill_24.xml b/app/src/main/res/drawable/symbol_mic_slash_fill_24.xml
new file mode 100644
index 0000000000..3d5eaad47f
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_mic_slash_fill_24.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M7.5 12v-1.14l5.52 5.52C12.7 16.46 12.35 16.5 12 16.5c-2.49 0-4.5-2.01-4.5-4.5Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M12 18.13c0.82 0 1.6-0.17 2.31-0.46L15.63 19c-0.84 0.44-1.77 0.73-2.76 0.84v1.3H16c0.48 0 0.88 0.39 0.88 0.87s-0.4 0.88-0.88 0.88H8c-0.48 0-0.88-0.4-0.88-0.88s0.4-0.88 0.88-0.88h3.13v-1.3c-3.94-0.43-7-3.77-7-7.82v-1.5c0-0.48 0.39-0.88 0.87-0.88s0.88 0.4 0.88 0.88V12c0 3.38 2.74 6.13 6.12 6.13Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M17.67 14.31L19 15.63c0.57-1.09 0.89-2.32 0.89-3.63v-1.5c0-0.48-0.4-0.88-0.88-0.88s-0.88 0.4-0.88 0.88V12c0 0.82-0.16 1.6-0.45 2.31Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M7.78 4.42l8.6 8.6c0.08-0.32 0.12-0.67 0.12-1.02V6c0-2.49-2.01-4.5-4.5-4.5-1.93 0-3.58 1.22-4.22 2.92Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M4.12 2.88c-0.34-0.34-0.9-0.34-1.24 0-0.34 0.34-0.34 0.9 0 1.24l17 17c0.34 0.34 0.9 0.34 1.24 0 0.34-0.34 0.34-0.9 0-1.24l-17-17Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_phone_down_fill_24.xml b/app/src/main/res/drawable/symbol_phone_down_fill_24.xml
new file mode 100644
index 0000000000..d8c15c6a5e
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_phone_down_fill_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/signal_light_colorOnPrimary"
+        android:pathData="M12 6.6c-3.07 0-5.98 0.71-8.56 1.98-1.96 0.96-2.94 3.04-2.94 5.13v0.6c0 1.52 1.34 2.69 2.84 2.48l3.5-0.48C8.08 16.14 9 15.1 9 13.84v-2.17c0.18-0.15 0.44-0.23 0.66-0.3 0.58-0.16 1.4-0.27 2.34-0.27 0.93 0 1.76 0.11 2.34 0.28 0.22 0.06 0.48 0.14 0.66 0.3v2.16c0 1.25 0.92 2.3 2.16 2.47l3.5 0.48c1.5 0.2 2.84-0.96 2.84-2.48v-0.6c0-2.09-0.98-4.17-2.94-5.13C17.98 7.31 15.07 6.6 12 6.6Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_speaker_bluetooth_fill_white_24.xml b/app/src/main/res/drawable/symbol_speaker_bluetooth_fill_white_24.xml
new file mode 100644
index 0000000000..2ee1f08cdb
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_speaker_bluetooth_fill_white_24.xml
@@ -0,0 +1,12 @@
+<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/signal_light_colorOnPrimary"
+        android:pathData="M10.87 3.93C11.65 3.13 13 3.7 13 4.8V19.2c0 1.11-1.35 1.67-2.13 0.88L7.29 16.5H4c-1.38 0-2.5-1.12-2.5-2.5v-4c0-1.38 1.12-2.5 2.5-2.5h3.3l3.57-3.57Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M19.76 5.45c-0.22-0.2-0.54-0.26-0.81-0.14S18.5 5.71 18.5 6v4.29l-2-1.84c-0.3-0.28-0.77-0.26-1.05 0.04s-0.26 0.78 0.04 1.06L18.14 12l-2.65 2.45c-0.3 0.28-0.32 0.75-0.04 1.06 0.28 0.3 0.75 0.32 1.06 0.04l1.99-1.84V18c0 0.3 0.18 0.57 0.45 0.69s0.59 0.06 0.8-0.14l3.26-3c0.15-0.14 0.24-0.34 0.24-0.55 0-0.2-0.09-0.4-0.24-0.55L20.36 12 23 9.55c0.15-0.14 0.24-0.34 0.24-0.55 0-0.2-0.09-0.4-0.24-0.55l-3.25-3ZM21.39 15L20 16.29V13.7L21.4 15ZM20 7.71L21.4 9 20 10.29V7.7Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_speaker_fill_24.xml b/app/src/main/res/drawable/symbol_speaker_fill_24.xml
new file mode 100644
index 0000000000..27488485ed
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_speaker_fill_24.xml
@@ -0,0 +1,15 @@
+<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/signal_light_colorOnSecondaryContainer"
+        android:pathData="M19.06 3.72c0.4-0.28 0.94-0.2 1.22 0.2 1.63 2.28 2.6 5.07 2.6 8.08s-0.97 5.8-2.6 8.08c-0.28 0.4-0.83 0.48-1.22 0.2-0.4-0.28-0.48-0.83-0.2-1.22 1.43-1.99 2.26-4.42 2.26-7.06 0-2.64-0.83-5.07-2.26-7.06-0.28-0.4-0.2-0.94 0.2-1.22Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M16.23 6.57c0.41-0.25 0.95-0.12 1.2 0.29 0.92 1.5 1.44 3.26 1.44 5.14s-0.52 3.64-1.44 5.14c-0.25 0.41-0.79 0.54-1.2 0.3-0.41-0.26-0.54-0.8-0.3-1.21 0.76-1.23 1.2-2.68 1.2-4.23 0-1.55-0.44-3-1.2-4.23-0.24-0.41-0.11-0.95 0.3-1.2Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M10.87 3.93C11.65 3.13 13 3.7 13 4.8V19.2c0 1.11-1.35 1.67-2.13 0.88L7.29 16.5H4c-1.38 0-2.5-1.12-2.5-2.5v-4c0-1.38 1.12-2.5 2.5-2.5h3.3l3.57-3.57Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_speaker_fill_white_24.xml b/app/src/main/res/drawable/symbol_speaker_fill_white_24.xml
new file mode 100644
index 0000000000..b49846c85e
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_speaker_fill_white_24.xml
@@ -0,0 +1,15 @@
+<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/signal_light_colorOnPrimary"
+        android:pathData="M19.06 3.72c0.4-0.28 0.94-0.2 1.22 0.2 1.63 2.28 2.6 5.07 2.6 8.08s-0.97 5.8-2.6 8.08c-0.28 0.4-0.83 0.48-1.22 0.2-0.4-0.28-0.48-0.83-0.2-1.22 1.43-1.99 2.26-4.42 2.26-7.06 0-2.64-0.83-5.07-2.26-7.06-0.28-0.4-0.2-0.94 0.2-1.22Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M16.23 6.57c0.41-0.25 0.95-0.12 1.2 0.29 0.92 1.5 1.44 3.26 1.44 5.14s-0.52 3.64-1.44 5.14c-0.25 0.41-0.79 0.54-1.2 0.3-0.41-0.26-0.54-0.8-0.3-1.21 0.76-1.23 1.2-2.68 1.2-4.23 0-1.55-0.44-3-1.2-4.23-0.24-0.41-0.11-0.95 0.3-1.2Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M10.87 3.93C11.65 3.13 13 3.7 13 4.8V19.2c0 1.11-1.35 1.67-2.13 0.88L7.29 16.5H4c-1.38 0-2.5-1.12-2.5-2.5v-4c0-1.38 1.12-2.5 2.5-2.5h3.3l3.57-3.57Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_switch_white_24.xml b/app/src/main/res/drawable/symbol_switch_white_24.xml
new file mode 100644
index 0000000000..54189e6a03
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_switch_white_24.xml
@@ -0,0 +1,12 @@
+<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/signal_light_colorOnPrimary"
+        android:pathData="M2.14 11.5h-0.7c-0.58 0-0.94 0.63-0.65 1.13l1.56 2.64c0.3 0.49 1 0.49 1.3 0l1.56-2.64c0.3-0.5-0.07-1.13-0.65-1.13H3.9C4.15 7.25 7.69 3.87 12 3.87c2.17 0 4.14 0.85 5.6 2.24 0.35 0.33 0.9 0.32 1.23-0.03 0.34-0.35 0.32-0.9-0.03-1.24-1.77-1.68-4.16-2.71-6.8-2.71-5.29 0-9.6 4.15-9.86 9.37Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M19.44 12.38h0.68c-0.2 4.3-3.76 7.74-8.12 7.74-2.32 0-4.4-0.97-5.9-2.52-0.32-0.35-0.88-0.37-1.23-0.04-0.35 0.34-0.36 0.9-0.03 1.24 1.8 1.9 4.34 3.07 7.16 3.07 5.33 0 9.67-4.21 9.87-9.5h0.7c0.57 0 0.93-0.63 0.64-1.13l-1.56-2.63c-0.3-0.5-1-0.5-1.3 0l-1.56 2.63c-0.3 0.5 0.07 1.13 0.65 1.13Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_video_fill_24.xml b/app/src/main/res/drawable/symbol_video_fill_24.xml
new file mode 100644
index 0000000000..212bab84af
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_video_fill_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M6.53 4h4.94c0.82 0 1.47 0 2 0.04 0.52 0.05 0.97 0.14 1.37 0.34 0.66 0.34 1.2 0.87 1.53 1.53 0.2 0.4 0.3 0.85 0.34 1.38 0.04 0.52 0.04 1.17 0.04 1.99v5.44c0 0.82 0 1.47-0.04 2-0.05 0.52-0.14 0.97-0.34 1.37-0.34 0.66-0.87 1.2-1.53 1.53-0.4 0.2-0.85 0.3-1.38 0.34C12.94 20 12.3 20 11.47 20H6.53c-0.82 0-1.47 0-2-0.04-0.52-0.05-0.97-0.14-1.37-0.34-0.66-0.34-1.2-0.87-1.53-1.53-0.2-0.4-0.3-0.85-0.34-1.38-0.04-0.52-0.04-1.17-0.04-1.99V9.28c0-0.82 0-1.47 0.04-2 0.05-0.52 0.14-0.97 0.34-1.37 0.34-0.66 0.87-1.2 1.53-1.53 0.4-0.2 0.85-0.3 1.38-0.34C5.06 4 5.7 4 6.53 4Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnPrimary"
+        android:pathData="M18.25 14.09V9.9c0-0.4 0.16-0.78 0.44-1.06L21.54 6c0.63-0.63 1.71-0.18 1.71 0.7v10.6c0 0.88-1.08 1.33-1.7 0.7l-2.86-2.85c-0.28-0.28-0.44-0.67-0.44-1.06Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_video_slash_fill_24.xml b/app/src/main/res/drawable/symbol_video_slash_fill_24.xml
new file mode 100644
index 0000000000..8a4bbeedba
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_video_slash_fill_24.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M2.37 2.13c-0.34-0.34-0.9-0.34-1.24 0-0.34 0.34-0.34 0.9 0 1.24l18.5 18.5c0.34 0.34 0.9 0.34 1.24 0 0.34-0.34 0.34-0.9 0-1.24L2.37 2.13Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M1.6 5.96C1.43 6.36 1.34 6.78 1.3 7.3 1.24 7.8 1.24 8.46 1.24 9.28v5.44c0 0.82 0 1.47 0.04 2 0.05 0.52 0.14 0.97 0.34 1.37 0.34 0.66 0.87 1.2 1.53 1.53 0.4 0.2 0.85 0.3 1.38 0.34C5.06 20 5.7 20 6.53 20h4.94c0.82 0 1.47 0 2-0.04 0.52-0.05 0.97-0.14 1.37-0.34l0.27-0.15L1.6 5.97Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M16.75 14.4V9.27c0-0.82 0-1.47-0.04-2-0.05-0.52-0.14-0.97-0.34-1.37-0.34-0.66-0.87-1.2-1.53-1.53-0.4-0.2-0.85-0.3-1.38-0.34C12.94 4 12.3 4 11.47 4H6.36l10.39 10.4Z"/>
+    <path
+        android:fillColor="@color/signal_light_colorOnSecondaryContainer"
+        android:pathData="M18.25 9.91v4.18c0 0.4 0.16 0.78 0.44 1.06L21.54 18c0.63 0.63 1.71 0.18 1.71-0.7V6.7c0-0.88-1.08-1.33-1.7-0.7l-2.86 2.85c-0.28 0.28-0.44 0.67-0.44 1.06Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/webrtc_call_screen_answer_with_video.xml b/app/src/main/res/drawable/webrtc_call_screen_answer_with_video.xml
index 8e3e6edc7b..da07dbe85b 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_answer_with_video.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_answer_with_video.xml
@@ -3,7 +3,7 @@
     <item android:drawable="@drawable/webrtc_call_screen_circle_green" />
     <item
         android:bottom="14dp"
-        android:drawable="@drawable/ic_video_solid_28"
+        android:drawable="@drawable/symbol_video_fill_24"
         android:left="14dp"
         android:right="14dp"
         android:top="14dp" />
diff --git a/app/src/main/res/drawable/webrtc_call_screen_camera_toggle.xml b/app/src/main/res/drawable/webrtc_call_screen_camera_toggle.xml
index 1b5dbfd042..b324480a53 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_camera_toggle.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_camera_toggle.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/webrtc_call_screen_circle_grey_selector" />
+    <item android:drawable="@drawable/webrtc_call_screen_circle_checked" />
     <item
         android:bottom="14dp"
-        android:drawable="@drawable/ic_switch_camera_28"
+        android:drawable="@drawable/symbol_switch_white_24"
         android:left="14dp"
         android:right="14dp"
         android:top="14dp" />
diff --git a/app/src/main/res/drawable/webrtc_call_screen_camera_toggle_small.xml b/app/src/main/res/drawable/webrtc_call_screen_camera_toggle_small.xml
index 754cbcb9e8..dedee4eee0 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_camera_toggle_small.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_camera_toggle_small.xml
@@ -5,10 +5,10 @@
         android:top="4dp"
         android:left="4dp"
         android:right="4dp"
-        android:drawable="@drawable/webrtc_call_screen_circle_grey_selector" />
+        android:drawable="@drawable/webrtc_call_screen_circle_checked" />
     <item
         android:bottom="14dp"
-        android:drawable="@drawable/ic_switch_camera_28"
+        android:drawable="@drawable/symbol_switch_white_24"
         android:left="14dp"
         android:right="14dp"
         android:top="14dp" />
diff --git a/app/src/main/res/drawable/webrtc_call_screen_circle_grey.xml b/app/src/main/res/drawable/webrtc_call_screen_circle_checked.xml
similarity index 66%
rename from app/src/main/res/drawable/webrtc_call_screen_circle_grey.xml
rename to app/src/main/res/drawable/webrtc_call_screen_circle_checked.xml
index 1f5a81ecef..1e7f8ffe78 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_circle_grey.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_circle_checked.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
-    <solid android:color="@color/transparent_white_40" />
+    <solid android:color="@color/signal_dark_colorSecondaryContainer" />
 </shape>
diff --git a/app/src/main/res/drawable/webrtc_call_screen_circle_green.xml b/app/src/main/res/drawable/webrtc_call_screen_circle_green.xml
index 10bde79f49..815fb508e2 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_circle_green.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_circle_green.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape android:shape="oval">
-            <solid android:color="@color/green_700" />
-        </shape>
-    </item>
-    <item android:state_pressed="false">
+<ripple android:color="@color/green_700" xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
         <shape android:shape="oval">
             <solid android:color="@color/green_500" />
         </shape>
     </item>
-</selector>
+</ripple>
 
diff --git a/app/src/main/res/drawable/webrtc_call_screen_circle_grey_selector.xml b/app/src/main/res/drawable/webrtc_call_screen_circle_grey_selector.xml
index a271ea1960..616e6e3cd4 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_circle_grey_selector.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_circle_grey_selector.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+<ripple android:color="@color/transparent_white_30" xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
         <shape android:shape="oval">
-            <solid android:color="@color/transparent_white_30" />
+            <solid android:color="@color/signal_light_colorSecondaryContainer" />
         </shape>
     </item>
-    <item android:state_pressed="false">
-        <shape android:shape="oval">
-            <solid android:color="@color/transparent_white_40" />
-        </shape>
-    </item>
-</selector>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_call_screen_circle_red.xml b/app/src/main/res/drawable/webrtc_call_screen_circle_red.xml
index 8c1bdf4714..22dac3f6b1 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_circle_red.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_circle_red.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+<ripple android:color="@color/red_700" xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
         <shape android:shape="oval">
-            <solid android:color="@color/red_700" />
+            <solid android:color="@color/webrtc_hangup_background" />
         </shape>
     </item>
-    <item android:state_pressed="false">
-        <shape android:shape="oval">
-            <solid android:color="@color/red_500" />
-        </shape>
-    </item>
-</selector>
+</ripple>
diff --git a/app/src/main/res/drawable/webrtc_call_screen_circle_unchecked.xml b/app/src/main/res/drawable/webrtc_call_screen_circle_unchecked.xml
new file mode 100644
index 0000000000..06e1367691
--- /dev/null
+++ b/app/src/main/res/drawable/webrtc_call_screen_circle_unchecked.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="@color/signal_light_colorSecondaryContainer" />
+</shape>
diff --git a/app/src/main/res/drawable/webrtc_call_screen_hangup.xml b/app/src/main/res/drawable/webrtc_call_screen_hangup.xml
index c514308bbe..5b957c615b 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_hangup.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_hangup.xml
@@ -3,7 +3,7 @@
     <item android:drawable="@drawable/webrtc_call_screen_circle_red" />
     <item
         android:bottom="14dp"
-        android:drawable="@drawable/ic_phone_down_28"
+        android:drawable="@drawable/symbol_phone_down_fill_24"
         android:left="14dp"
         android:right="14dp"
         android:top="14dp" />
diff --git a/app/src/main/res/drawable/webrtc_call_screen_hangup_small.xml b/app/src/main/res/drawable/webrtc_call_screen_hangup_small.xml
index 5e92c32408..f8aa5a3297 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_hangup_small.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_hangup_small.xml
@@ -8,7 +8,7 @@
         android:drawable="@drawable/webrtc_call_screen_circle_red" />
     <item
         android:bottom="14dp"
-        android:drawable="@drawable/ic_phone_down_28"
+        android:drawable="@drawable/symbol_phone_down_fill_24"
         android:left="14dp"
         android:right="14dp"
         android:top="14dp" />
diff --git a/app/src/main/res/drawable/webrtc_call_screen_mic_toggle.xml b/app/src/main/res/drawable/webrtc_call_screen_mic_toggle.xml
index 2c5ead266e..3819f37186 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_mic_toggle.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_mic_toggle.xml
@@ -2,14 +2,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <layer-list>
-            <item android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_mic_off_solid_28_white" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_mic_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item>
         <layer-list>
-            <item android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_mic_off_solid_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_unchecked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_mic_slash_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_call_screen_mic_toggle_small.xml b/app/src/main/res/drawable/webrtc_call_screen_mic_toggle_small.xml
index 28767a553e..feb7505a1c 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_mic_toggle_small.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_mic_toggle_small.xml
@@ -7,8 +7,8 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_mic_off_solid_28_white" android:left="14dp" android:right="14dp" android:top="14dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_unchecked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_mic_slash_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item>
@@ -18,8 +18,8 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_mic_off_solid_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_mic_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_call_screen_ring_toggle.xml b/app/src/main/res/drawable/webrtc_call_screen_ring_toggle.xml
index 3fd02615da..f4b93c3dae 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_ring_toggle.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_ring_toggle.xml
@@ -3,19 +3,19 @@
     <item android:state_activated="false">
         <layer-list>
             <item android:drawable="@drawable/webrtc_call_screen_circle_grey_disabled" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_ring_disabled_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_bell_ring_fill_disabled_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item android:state_checked="true">
         <layer-list>
-            <item android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_ring_grey_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_bell_ring_fill_white_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item>
         <layer-list>
-            <item android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_ring_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_unchecked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_bell_ring_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_call_screen_ring_toggle_small.xml b/app/src/main/res/drawable/webrtc_call_screen_ring_toggle_small.xml
index 05aa290dcb..4f544a8913 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_ring_toggle_small.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_ring_toggle_small.xml
@@ -3,19 +3,19 @@
     <item android:state_activated="false">
         <layer-list>
             <item android:bottom="4dp" android:drawable="@drawable/webrtc_call_screen_circle_grey_disabled" android:left="4dp" android:right="4dp" android:top="4dp" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_ring_disabled_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_bell_ring_fill_disabled_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item android:state_checked="true">
         <layer-list>
-            <item android:bottom="4dp" android:drawable="@drawable/circle_tintable" android:left="4dp" android:right="4dp" android:top="4dp" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_ring_grey_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:bottom="4dp" android:drawable="@drawable/webrtc_call_screen_circle_checked" android:left="4dp" android:right="4dp" android:top="4dp" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_bell_ring_fill_white_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item>
         <layer-list>
-            <item android:bottom="4dp" android:drawable="@drawable/webrtc_call_screen_circle_grey" android:left="4dp" android:right="4dp" android:top="4dp" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_ring_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:bottom="4dp" android:drawable="@drawable/webrtc_call_screen_circle_unchecked" android:left="4dp" android:right="4dp" android:top="4dp" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_bell_ring_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_call_screen_speaker_toggle.xml b/app/src/main/res/drawable/webrtc_call_screen_speaker_toggle.xml
index c3f05a2497..d7786d7611 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_speaker_toggle.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_speaker_toggle.xml
@@ -2,35 +2,35 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_speaker_off="true">
         <layer-list>
-            <item android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_speaker_solid_white_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_speaker_fill_white_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item app:state_speaker_on="true">
         <layer-list>
-            <item android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_speaker_solid_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_unchecked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_speaker_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item app:state_handset_selected="true">
         <layer-list>
-            <item android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_handset_solid_28" android:left="11dp" android:right="17dp" android:top="14dp" />
-            <item android:bottom="25dp" android:drawable="@drawable/webrtc_triangle_white" android:left="43dp" android:right="5dp" android:top="27dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/ic_handset_solid_28" android:left="8dp" android:right="20dp" android:top="14dp" />
+            <item android:bottom="20dp" android:drawable="@drawable/symbol_dropdown_triangle_compat_bold_16" android:left="36dp" android:right="4dp" android:top="20dp" />
         </layer-list>
     </item>
     <item app:state_headset_selected="true">
         <layer-list>
-            <item android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_speaker_bt_solid_28" android:left="11dp" android:right="17dp" android:top="14dp" />
-            <item android:bottom="25dp" android:drawable="@drawable/webrtc_triangle_grey" android:left="43dp" android:right="5dp" android:top="27dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_speaker_bluetooth_fill_white_24" android:left="8dp" android:right="20dp" android:top="14dp" />
+            <item android:bottom="20dp" android:drawable="@drawable/symbol_dropdown_triangle_compat_bold_16" android:left="36dp" android:right="4dp" android:top="20dp" />
         </layer-list>
     </item>
     <item app:state_speaker_selected="true">
         <layer-list>
-            <item android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_speaker_solid_28" android:left="11dp" android:right="17dp" android:top="14dp" />
-            <item android:bottom="25dp" android:drawable="@drawable/webrtc_triangle_grey" android:left="43dp" android:right="5dp" android:top="27dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_speaker_fill_white_24" android:left="8dp" android:right="20dp" android:top="14dp" />
+            <item android:bottom="20dp" android:drawable="@drawable/symbol_dropdown_triangle_compat_bold_16" android:left="36dp" android:right="4dp" android:top="20dp" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_call_screen_speaker_toggle_small.xml b/app/src/main/res/drawable/webrtc_call_screen_speaker_toggle_small.xml
index 76f2b8f83c..e0283ee8f2 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_speaker_toggle_small.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_speaker_toggle_small.xml
@@ -7,8 +7,8 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_speaker_solid_white_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_unchecked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_speaker_fill_white_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item app:state_speaker_on="true">
@@ -18,8 +18,8 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_speaker_solid_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_speaker_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item app:state_handset_selected="true">
@@ -29,9 +29,9 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_handset_solid_28" android:left="11dp" android:right="17dp" android:top="14dp" />
-            <item android:bottom="25dp" android:drawable="@drawable/webrtc_triangle_white" android:left="43dp" android:right="7dp" android:top="27dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="16dp" android:drawable="@drawable/ic_handset_solid_28" android:left="10.86dp" android:right="21.14dp" android:top="16dp" />
+            <item android:bottom="21.14dp" android:drawable="@drawable/symbol_dropdown_triangle_compat_bold_16" android:left="34.86dp" android:right="7.43dp" android:top="21.14dp" />
         </layer-list>
     </item>
     <item app:state_headset_selected="true">
@@ -41,9 +41,9 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_speaker_bt_solid_28" android:left="11dp" android:right="17dp" android:top="14dp" />
-            <item android:bottom="25dp" android:drawable="@drawable/webrtc_triangle_grey" android:left="43dp" android:right="7dp" android:top="27dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="16dp" android:drawable="@drawable/symbol_speaker_bluetooth_fill_white_24" android:left="10.86dp" android:right="21.14dp" android:top="16dp" />
+            <item android:bottom="21.14dp" android:drawable="@drawable/symbol_dropdown_triangle_compat_bold_16" android:left="34.86dp" android:right="7.43dp" android:top="21.14dp" />
         </layer-list>
     </item>
     <item app:state_speaker_selected="true">
@@ -53,9 +53,9 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_speaker_solid_28" android:left="11dp" android:right="17dp" android:top="14dp" />
-            <item android:bottom="25dp" android:drawable="@drawable/webrtc_triangle_grey" android:left="43dp" android:right="7dp" android:top="27dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="16dp" android:drawable="@drawable/symbol_speaker_fill_white_24" android:left="10.86dp" android:right="21.14dp" android:top="16dp" />
+            <item android:bottom="21.14dp" android:drawable="@drawable/symbol_dropdown_triangle_compat_bold_16" android:left="34.86dp" android:right="7.43dp" android:top="21.14dp" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_call_screen_video_toggle.xml b/app/src/main/res/drawable/webrtc_call_screen_video_toggle.xml
index 8a61765031..a646a31c6e 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_video_toggle.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_video_toggle.xml
@@ -2,14 +2,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <layer-list>
-            <item android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_video_solid_grey_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_video_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item>
         <layer-list>
-            <item android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_video_solid_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+            <item android:drawable="@drawable/webrtc_call_screen_circle_unchecked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_video_slash_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_call_screen_video_toggle_small.xml b/app/src/main/res/drawable/webrtc_call_screen_video_toggle_small.xml
index e65cbbbee2..0e68e0a6d7 100644
--- a/app/src/main/res/drawable/webrtc_call_screen_video_toggle_small.xml
+++ b/app/src/main/res/drawable/webrtc_call_screen_video_toggle_small.xml
@@ -7,8 +7,8 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/circle_tintable" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_video_solid_grey_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_checked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_video_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
     <item>
@@ -18,8 +18,8 @@
                 android:top="4dp"
                 android:left="4dp"
                 android:right="4dp"
-                android:drawable="@drawable/webrtc_call_screen_circle_grey" />
-            <item android:bottom="14dp" android:drawable="@drawable/ic_video_solid_28" android:left="14dp" android:right="14dp" android:top="14dp" />
+                android:drawable="@drawable/webrtc_call_screen_circle_unchecked" />
+            <item android:bottom="14dp" android:drawable="@drawable/symbol_video_slash_fill_24" android:left="14dp" android:right="14dp" android:top="14dp" />
         </layer-list>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/webrtc_triangle_grey.xml b/app/src/main/res/drawable/webrtc_triangle_grey.xml
deleted file mode 100644
index 17e5c3a73f..0000000000
--- a/app/src/main/res/drawable/webrtc_triangle_grey.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="4dp" android:viewportHeight="203.66562"
-    android:viewportWidth="203.66562" android:width="8dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="@color/core_grey_75" android:pathData="M50.919,100.832L0.999,1.002L100.839,1.002L200.669,1.002L150.759,100.832L100.839,200.662L50.919,100.832Z"/>
-    <path android:fillAlpha="0" android:fillColor="#FF000000"
-        android:pathData="M50.919,100.832L0.999,1.002L100.839,1.002L200.669,1.002L150.759,100.832L100.839,200.662L50.919,100.832Z"
-        android:strokeAlpha="1" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/main/res/drawable/webrtc_triangle_white.xml b/app/src/main/res/drawable/webrtc_triangle_white.xml
deleted file mode 100644
index 0dd10ec370..0000000000
--- a/app/src/main/res/drawable/webrtc_triangle_white.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="4dp" android:viewportHeight="203.66562"
-    android:viewportWidth="203.66562" android:width="8dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="@color/core_white" android:pathData="M50.919,100.832L0.999,1.002L100.839,1.002L200.669,1.002L150.759,100.832L100.839,200.662L50.919,100.832Z"/>
-    <path android:fillAlpha="0" android:fillColor="#FF000000"
-        android:pathData="M50.919,100.832L0.999,1.002L100.839,1.002L200.669,1.002L150.759,100.832L100.839,200.662L50.919,100.832Z"
-        android:strokeAlpha="1" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/main/res/layout/webrtc_call_view.xml b/app/src/main/res/layout/webrtc_call_view.xml
index 37f636e272..749a8f07bb 100644
--- a/app/src/main/res/layout/webrtc_call_view.xml
+++ b/app/src/main/res/layout/webrtc_call_view.xml
@@ -62,9 +62,10 @@
             android:layout_gravity="center"
             android:text="@string/WebRtcCallView__your_video_is_off"
             android:textAppearance="@style/TextAppearance.Signal.Body2"
-            android:textColor="@color/white"
+            android:textColor="@color/signal_light_colorOnPrimary"
             android:visibility="gone"
-            app:drawableTopCompat="@drawable/ic_video_off_solid_white_28"
+            app:drawableTopCompat="@drawable/symbol_video_slash_fill_24"
+            app:drawableTint="@color/signal_light_colorOnPrimary"
             tools:visibility="visible" />
 
     </FrameLayout>
@@ -557,7 +558,7 @@
                 android:text="@string/WebRtcCallView__start_call"
                 android:textAllCaps="false"
                 android:textColor="@color/core_green_text_button"
-                app:backgroundTint="@color/core_green"
+                app:backgroundTint="@color/signal_light_colorPrimary"
                 app:cornerRadius="28dp" />
 
         </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7139fdf9b8..3c8edce64f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,6 +8,8 @@
     <color name="story_gradient_start">#99000000</color>
     <color name="story_caption_gradient_start">#CC000000</color>
 
+    <color name="webrtc_hangup_background">#F07168</color>
+
     <color name="transparent_black_05">#0D000000</color>
     <color name="transparent_black_08">#14000000</color>
     <color name="transparent_black_10">#18000000</color>