diff --git a/CHANGES.md b/CHANGES.md
index 6ebe743405..56155efc38 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Other changes:
- -
+ - Accessibility improvements to the attachment file type chooser
 
 Bugfix 🐛:
  - Fix issues with some member events rendering (#498)
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index 2af86d6c0d..f713561084 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -30,10 +30,12 @@
                 android:id="@+id/attachmentCameraButton"
                 style="@style/AttachmentTypeSelectorButton"
                 android:src="@drawable/ic_attachment_camera_white_24dp"
+                android:contentDescription="@string/attachment_type_camera"
                 tools:background="@color/colorAccent" />
 
             <TextView
                 style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
                 android:text="@string/attachment_type_camera" />
 
         </LinearLayout>
@@ -50,10 +52,12 @@
                 android:id="@+id/attachmentGalleryButton"
                 style="@style/AttachmentTypeSelectorButton"
                 android:src="@drawable/ic_attachment_gallery_white_24dp"
+                android:contentDescription="@string/attachment_type_gallery"
                 tools:background="@color/colorAccent" />
 
             <TextView
                 style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
                 android:text="@string/attachment_type_gallery" />
 
         </LinearLayout>
@@ -70,10 +74,12 @@
                 android:id="@+id/attachmentFileButton"
                 style="@style/AttachmentTypeSelectorButton"
                 android:src="@drawable/ic_attachment_file_white_24dp"
+                android:contentDescription="@string/attachment_type_file"
                 tools:background="@color/colorAccent" />
 
             <TextView
                 style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
                 android:text="@string/attachment_type_file" />
 
         </LinearLayout>
@@ -99,10 +105,12 @@
                 android:id="@+id/attachmentAudioButton"
                 style="@style/AttachmentTypeSelectorButton"
                 android:src="@drawable/ic_attachment_audio_white_24dp"
+                android:contentDescription="@string/attachment_type_audio"
                 tools:background="@color/colorAccent" />
 
             <TextView
                 style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
                 android:text="@string/attachment_type_audio" />
 
         </LinearLayout>
@@ -119,10 +127,12 @@
                 android:id="@+id/attachmentContactButton"
                 style="@style/AttachmentTypeSelectorButton"
                 android:src="@drawable/ic_attachment_contact_white_24dp"
+                android:contentDescription="@string/attachment_type_contact"
                 tools:background="@color/colorAccent" />
 
             <TextView
                 style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
                 android:text="@string/attachment_type_contact" />
 
         </LinearLayout>
@@ -139,14 +149,16 @@
                 android:id="@+id/attachmentStickersButton"
                 style="@style/AttachmentTypeSelectorButton"
                 android:src="@drawable/ic_attachment_stickers_white_24dp"
+                android:contentDescription="@string/attachment_type_sticker"
                 tools:background="@color/colorAccent" />
 
             <TextView
                 style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
                 android:text="@string/attachment_type_sticker" />
 
         </LinearLayout>
     </LinearLayout>
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>