diff --git a/mobile/src/main/res/layout/dialog_wps.xml b/mobile/src/main/res/layout/dialog_wps.xml
index 60d90c32..b692ce25 100644
--- a/mobile/src/main/res/layout/dialog_wps.xml
+++ b/mobile/src/main/res/layout/dialog_wps.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
+        android:hint="@null"
         android:inputType="number"
         android:imeOptions="flagNoExtractUi"
         android:importantForAutofill="no"
diff --git a/mobile/src/main/res/layout/listitem_client.xml b/mobile/src/main/res/layout/listitem_client.xml
index b578f6dc..b5be40d8 100644
--- a/mobile/src/main/res/layout/listitem_client.xml
+++ b/mobile/src/main/res/layout/listitem_client.xml
@@ -22,6 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:importantForAccessibility="no"
             android:src="@{client.icon}"
             android:tint="?android:attr/textColorPrimary"
             tools:src="@drawable/ic_device_network_wifi"/>
diff --git a/mobile/src/main/res/layout/listitem_interface.xml b/mobile/src/main/res/layout/listitem_interface.xml
index 45831c0b..e82cd307 100644
--- a/mobile/src/main/res/layout/listitem_interface.xml
+++ b/mobile/src/main/res/layout/listitem_interface.xml
@@ -18,6 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:importantForAccessibility="no"
             android:src="@{data.icon}"
             android:tint="?android:attr/textColorPrimary"
             tools:src="@drawable/ic_device_network_wifi"/>
diff --git a/mobile/src/main/res/layout/listitem_manage.xml b/mobile/src/main/res/layout/listitem_manage.xml
index 4451ae05..809cb344 100644
--- a/mobile/src/main/res/layout/listitem_manage.xml
+++ b/mobile/src/main/res/layout/listitem_manage.xml
@@ -17,6 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:importantForAccessibility="no"
             android:src="@drawable/ic_content_add"
             android:tint="@color/colorSecondary"/>
 
diff --git a/mobile/src/main/res/layout/listitem_repeater.xml b/mobile/src/main/res/layout/listitem_repeater.xml
index a1b10079..3e4969dc 100644
--- a/mobile/src/main/res/layout/listitem_repeater.xml
+++ b/mobile/src/main/res/layout/listitem_repeater.xml
@@ -24,6 +24,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:importantForAccessibility="no"
                 android:src="@drawable/ic_action_settings_input_antenna"
                 android:tint="?android:attr/textColorPrimary"/>
 
@@ -84,6 +85,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:importantForAccessibility="no"
                 android:src="@drawable/ic_wps"
                 android:tint="?android:attr/textColorPrimary"/>