diff --git a/vector/src/main/res/drawable/ic_device_type_desktop.xml b/vector/src/main/res/drawable/ic_device_type_desktop.xml
index 2230ee36bd..922073459d 100644
--- a/vector/src/main/res/drawable/ic_device_type_desktop.xml
+++ b/vector/src/main/res/drawable/ic_device_type_desktop.xml
@@ -1,8 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="22dp"
     android:height="19dp"
     android:viewportWidth="22"
-    android:viewportHeight="19">
+    android:viewportHeight="19"
+    tools:ignore="UnusedResources">
   <path
       android:pathData="M3,15.5C2.45,15.5 1.979,15.304 1.588,14.913C1.196,14.521 1,14.05 1,13.5V2.5C1,1.95 1.196,1.479 1.588,1.087C1.979,0.696 2.45,0.5 3,0.5H19C19.55,0.5 20.021,0.696 20.413,1.087C20.804,1.479 21,1.95 21,2.5V13.5C21,14.05 20.804,14.521 20.413,14.913C20.021,15.304 19.55,15.5 19,15.5H3ZM3,13.5H19V2.5H3V13.5ZM1,18.5C0.717,18.5 0.479,18.404 0.288,18.212C0.096,18.021 0,17.783 0,17.5C0,17.217 0.096,16.979 0.288,16.788C0.479,16.596 0.717,16.5 1,16.5H21C21.283,16.5 21.521,16.596 21.712,16.788C21.904,16.979 22,17.217 22,17.5C22,17.783 21.904,18.021 21.712,18.212C21.521,18.404 21.283,18.5 21,18.5H1ZM3,13.5V2.5V13.5Z"
       android:fillColor="#737D8C"/>
diff --git a/vector/src/main/res/drawable/ic_device_type_web.xml b/vector/src/main/res/drawable/ic_device_type_web.xml
index 722023c96f..dde3ce3a1f 100644
--- a/vector/src/main/res/drawable/ic_device_type_web.xml
+++ b/vector/src/main/res/drawable/ic_device_type_web.xml
@@ -1,8 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="20dp"
     android:height="17dp"
     android:viewportWidth="20"
-    android:viewportHeight="17">
+    android:viewportHeight="17"
+    tools:ignore="UnusedResources">
   <path
       android:pathData="M18,16.5H2C1.45,16.5 0.979,16.304 0.588,15.913C0.196,15.521 0,15.05 0,14.5V2.5C0,1.95 0.196,1.479 0.588,1.088C0.979,0.696 1.45,0.5 2,0.5H18C18.55,0.5 19.021,0.696 19.413,1.088C19.804,1.479 20,1.95 20,2.5V14.5C20,15.05 19.804,15.521 19.413,15.913C19.021,16.304 18.55,16.5 18,16.5ZM2,4.5V14.5H18V4.5H2Z"
       android:fillColor="#737D8C"/>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 3111bd206b..ef42403592 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3207,12 +3207,12 @@
     <!-- Device Manager -->
     <string name="device_manager_settings_active_sessions_show_all">Show All Sessions (V2, WIP)</string>
     <string name="a11y_device_manager_device_type_mobile">Mobile</string>
-    <string name="a11y_device_manager_device_type_web">Web</string>
-    <string name="a11y_device_manager_device_type_desktop">Desktop</string>
+    <string name="a11y_device_manager_device_type_web" tools:ignore="UnusedResources">Web</string>
+    <string name="a11y_device_manager_device_type_desktop" tools:ignore="UnusedResources">Desktop</string>
     <string name="device_manager_device_type_android">${app_name} Mobile: Android</string>
-    <string name="device_manager_device_type_ios">${app_name} Mobile: iOS</string>
-    <string name="device_manager_device_type_web">${app_name} Web</string>
-    <string name="device_manager_device_type_desktop">${app_name} Desktop</string>
+    <string name="device_manager_device_type_ios" tools:ignore="UnusedResources">${app_name} Mobile: iOS</string>
+    <string name="device_manager_device_type_web" tools:ignore="UnusedResources">${app_name} Web</string>
+    <string name="device_manager_device_type_desktop" tools:ignore="UnusedResources">${app_name} Desktop</string>
     <string name="device_manager_verification_status_verified">Verified session</string>
     <string name="device_manager_verification_status_unverified">Unverified session</string>
     <string name="device_manager_verification_status_detail_verified">Your current session is ready for secure messaging.</string>