diff --git a/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml b/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
index 1096267124..cfeb5e9cc6 100644
--- a/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/imageView"
-        android:visibility="visible"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:importantForAccessibility="no"
+        android:visibility="visible" />
 
     <ProgressBar
-        android:layout_centerInParent="true"
         android:id="@+id/imageLoaderProgress"
         style="?android:attr/progressBarStyle"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:layout_centerInParent="true"
         android:visibility="visible"
         tools:visibility="gone" />
 
diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
index 7dd13ea460..cd55be5cb4 100644
--- a/attachment-viewer/src/main/res/layout/item_video_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
@@ -9,6 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
+        android:importantForAccessibility="no"
         android:scaleType="centerInside" />
 
     <VideoView
@@ -22,6 +23,7 @@
         android:layout_width="44dp"
         android:layout_height="44dp"
         android:layout_centerInParent="true"
+        android:contentDescription="@string/a11y_play_pause"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/attachment-viewer/src/main/res/values/strings.xml b/attachment-viewer/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..3b32209868
--- /dev/null
+++ b/attachment-viewer/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- TODO Create a dedicated module for translations to be able to translate this string like the others (See #3955) -->
+    <string name="a11y_play_pause">Play or pause the video</string>
+</resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/AndroidManifest.xml b/library/ui-styles/src/main/AndroidManifest.xml
index 19aa89e2e7..254827465d 100644
--- a/library/ui-styles/src/main/AndroidManifest.xml
+++ b/library/ui-styles/src/main/AndroidManifest.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.lib.ui.styles"/>
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="im.vector.lib.ui.styles">
+
+    <application android:supportsRtl="true" />
+
+</manifest>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/layout/dialog_progress_material.xml b/library/ui-styles/src/main/res/layout/dialog_progress_material.xml
index 09c88cc50b..32c4f666c7 100644
--- a/library/ui-styles/src/main/res/layout/dialog_progress_material.xml
+++ b/library/ui-styles/src/main/res/layout/dialog_progress_material.xml
@@ -2,7 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:ignore="UselessParent">
 
     <!-- Inspired from https://android.googlesource.com/platform/frameworks/base/+/master/core/res/res/layout/progress_dialog.xml -->
     <LinearLayout