diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index e77d9ec73f..e063016be1 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -69,7 +69,7 @@ class MessageActionsEpoxyController @Inject constructor(
                 id("send_state")
                 showProgress(false)
                 text(stringProvider.getString(R.string.unable_to_send_message))
-                drawableStart(R.drawable.ic_warning_small)
+                drawableStart(R.drawable.ic_warning_badge)
             }
         }
 
diff --git a/vector/src/main/res/drawable/ic_warning_badge.xml b/vector/src/main/res/drawable/ic_warning_badge.xml
new file mode 100644
index 0000000000..66c2422b4a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_warning_badge.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:fillColor="#FF4B55"/>
+  <path
+      android:pathData="M8,3L8,3A1,1 0,0 1,9 4L9,8A1,1 0,0 1,8 9L8,9A1,1 0,0 1,7 8L7,4A1,1 0,0 1,8 3z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,11L8,11A1,1 0,0 1,9 12L9,12A1,1 0,0 1,8 13L8,13A1,1 0,0 1,7 12L7,12A1,1 0,0 1,8 11z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_warning_small.xml b/vector/src/main/res/drawable/ic_warning_small.xml
deleted file mode 100644
index 456491ec82..0000000000
--- a/vector/src/main/res/drawable/ic_warning_small.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="14dp"
-    android:viewportWidth="14"
-    android:viewportHeight="14">
-  <path
-      android:pathData="M7,12.852A6,6 0,1 0,7 0.852a6,6 0,0 0,0 12zM7,1.452a1.8,1.8 0,0 1,1.8 1.8L8.8,6.852a1.8,1.8 0,1 1,-3.6 0L5.2,3.252A1.8,1.8 0,0 1,7 1.452zM7,12.252a1.8,1.8 0,1 0,0 -3.6,1.8 1.8,0 0,0 0,3.6z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.44"
-      android:fillColor="#FF4B55"
-      android:fillType="evenOdd"
-      android:strokeColor="#FF4B55"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index ffe1e4680c..60d20942e1 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -83,7 +83,7 @@
         android:layout_marginEnd="16dp"
         android:text="@string/reset_secure_backup_warning"
         android:textColor="@color/riotx_destructive_accent"
-        android:drawableStart="@drawable/ic_warning_small"
+        android:drawableStart="@drawable/ic_warning_badge"
         android:drawablePadding="4dp"
         android:textSize="14sp" />
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index 10c129cf58..742fa69a7b 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_weight="1"
-        android:drawableStart="@drawable/ic_warning_small"
+        android:drawableStart="@drawable/ic_warning_badge"
         android:drawablePadding="4dp"
         android:textColor="?riotx_text_secondary"
         android:textStyle="bold"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index cf148043ec..9387f9ba75 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -55,7 +55,7 @@
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="30dp"
         tools:ignore="MissingConstraints"
-        android:src="@drawable/ic_warning_small"
+        android:src="@drawable/ic_warning_badge"
         />
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index 58496e1da4..3d87823866 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -71,7 +71,7 @@
         android:layout_width="14dp"
         android:layout_height="14dp"
         android:layout_marginStart="2dp"
-        android:src="@drawable/ic_warning_small"
+        android:src="@drawable/ic_warning_badge"
         android:visibility="gone"
         android:layout_toEndOf="@+id/viewStubContainer"
         android:layout_alignTop="@+id/viewStubContainer"
diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
index 8fe373790d..5df455b1c1 100644
--- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
@@ -23,7 +23,7 @@
         android:layout_width="14dp"
         android:layout_height="14dp"
         android:layout_marginStart="2dp"
-        android:src="@drawable/ic_warning_small"
+        android:src="@drawable/ic_warning_badge"
         android:visibility="gone"
         app:layout_constraintStart_toEndOf="@id/messageThumbnailView"
         app:layout_constraintTop_toTopOf="@id/messageThumbnailView"