diff --git a/app/src/main/res/layout-land/welcome_do_upload.xml b/app/src/main/res/layout-land/welcome_do_upload.xml
index 17db68f8f..e5c7bb3fb 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -24,6 +24,7 @@
             android:layout_width="150dp"
             android:layout_height="118dp"
             android:scaleType="fitXY"
+            android:contentDescription="@string/welcome_image_mount_zao"
             />
 
         <ImageView
@@ -32,6 +33,7 @@
             android:layout_width="150dp"
             android:layout_height="118dp"
             android:scaleType="fitXY"
+            android:contentDescription="@string/welcome_image_llamas"
             />
 
         <ImageView
@@ -40,6 +42,7 @@
             android:layout_width="150dp"
             android:layout_height="118dp"
             android:scaleType="fitXY"
+            android:contentDescription="@string/welcome_image_rainbow_bridge"
             />
 
         <ImageView
@@ -48,6 +51,7 @@
             android:layout_width="150dp"
             android:layout_height="118dp"
             android:scaleType="fitXY"
+            android:contentDescription="@string/welcome_image_tulip"
             />
 
     </GridLayout>
diff --git a/app/src/main/res/layout-land/welcome_dont_upload.xml b/app/src/main/res/layout-land/welcome_dont_upload.xml
index df7fa1e40..7ac63e560 100644
--- a/app/src/main/res/layout-land/welcome_dont_upload.xml
+++ b/app/src/main/res/layout-land/welcome_dont_upload.xml
@@ -21,6 +21,7 @@
             android:id="@+id/selfie_x"
             android:layout_width="110dp"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/welcome_image_no_selfies"
             />
 
         <ImageView
@@ -30,6 +31,7 @@
             android:layout_width="110dp"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/selfie_x"
+            android:contentDescription="@string/welcome_image_proprietary"
             />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout-land/welcome_final.xml b/app/src/main/res/layout-land/welcome_final.xml
index 62d2a9e00..a9d8c01af 100644
--- a/app/src/main/res/layout-land/welcome_final.xml
+++ b/app/src/main/res/layout-land/welcome_final.xml
@@ -17,13 +17,17 @@
         <ImageView
                 android:layout_width="150dp"
                 android:layout_height="180dp"
-                android:src="@drawable/welcome_wikipedia"/>
+                android:src="@drawable/welcome_wikipedia"
+                android:contentDescription="@string/welcome_image_welcome_wikipedia"
+            />
 
         <ImageView
                 android:layout_width="160dp"
                 android:layout_height="120dp"
                 android:layout_gravity="center"
-                android:src="@drawable/welcome_copyright"/>
+                android:src="@drawable/welcome_copyright"
+                android:contentDescription="@string/welcome_image_proprietary"
+            />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout-land/welcome_image_details.xml b/app/src/main/res/layout-land/welcome_image_details.xml
index b5dbe0824..a5ae1a762 100644
--- a/app/src/main/res/layout-land/welcome_image_details.xml
+++ b/app/src/main/res/layout-land/welcome_image_details.xml
@@ -18,6 +18,7 @@
         android:paddingBottom="24dp"
         android:adjustViewBounds="true"
         android:layout_gravity="center"
+        android:contentDescription="@string/welcome_image_sydney_opera_house"
         />
 
     <LinearLayout android:orientation="vertical"
diff --git a/app/src/main/res/layout-land/welcome_wikipedia.xml b/app/src/main/res/layout-land/welcome_wikipedia.xml
index d7c77669d..1a1531f4c 100644
--- a/app/src/main/res/layout-land/welcome_wikipedia.xml
+++ b/app/src/main/res/layout-land/welcome_wikipedia.xml
@@ -13,7 +13,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:src="@drawable/welcome_wikipedia"
-            android:adjustViewBounds="true"/>
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/welcome_image_welcome_wikipedia"
+        />
 
     <LinearLayout android:orientation="vertical"
                   android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 2af3765ae..bb053e860 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -26,7 +26,9 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_launcher" />
+                android:src="@drawable/ic_launcher"
+                android:contentDescription= "@string/commons_logo"
+                />
 
             <TextView
                 style="?android:textAppearanceLarge"
diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml
index 253e4db5f..bc5b68ce1 100644
--- a/app/src/main/res/layout/fragment_media_detail.xml
+++ b/app/src/main/res/layout/fragment_media_detail.xml
@@ -14,6 +14,7 @@
         android:layout_gravity="center"
         android:src="@android:drawable/ic_menu_close_clear_cancel"
         android:visibility="gone"
+        android:contentDescription="@string/mediaimage_failed"
         />
 
     <fr.free.nrw.commons.MediaWikiImageView
diff --git a/app/src/main/res/layout/item_place.xml b/app/src/main/res/layout/item_place.xml
index 1af7eba97..1c83aef53 100644
--- a/app/src/main/res/layout/item_place.xml
+++ b/app/src/main/res/layout/item_place.xml
@@ -17,6 +17,7 @@
             android:src="@drawable/empty_photo"
             android:background="#ffffff"
             android:scaleType="centerCrop"
+            android:contentDescription="@string/no_image_found"
             />
 
         <TextView
diff --git a/app/src/main/res/layout/layout_upload_item.xml b/app/src/main/res/layout/layout_upload_item.xml
index 4f9039a4c..c3730609f 100644
--- a/app/src/main/res/layout/layout_upload_item.xml
+++ b/app/src/main/res/layout/layout_upload_item.xml
@@ -15,7 +15,9 @@
         android:layout_height="192dp"
         app:actualImageScaleType="centerCrop"
         app:placeholderImage="@drawable/ic_image_black_24dp"
-        app:failureImage="@drawable/ic_error_outline_black_24dp" />
+        app:failureImage="@drawable/ic_error_outline_black_24dp"
+        android:contentDescription="@string/upload_image"
+        />
 
     <RelativeLayout
         android:id="@+id/uploadOverlay"
diff --git a/app/src/main/res/layout/welcome_do_upload.xml b/app/src/main/res/layout/welcome_do_upload.xml
index 26b945461..553298a14 100644
--- a/app/src/main/res/layout/welcome_do_upload.xml
+++ b/app/src/main/res/layout/welcome_do_upload.xml
@@ -23,6 +23,7 @@
             android:layout_width="150dp"
             android:layout_height="118dp"
             android:scaleType="fitXY"
+            android:contentDescription="@string/welcome_image_mount_zao"
             />
 
         <ImageView
@@ -31,6 +32,7 @@
             android:layout_width="150dp"
             android:layout_height="118dp"
             android:scaleType="fitXY"
+            android:contentDescription="@string/welcome_image_llamas"
             />
 
         <ImageView
@@ -39,6 +41,7 @@
             android:layout_width="150dp"
             android:layout_height="118dp"
             android:scaleType="fitXY"
+            android:contentDescription="@string/welcome_image_rainbow_bridge"
             />
 
         <ImageView
@@ -47,6 +50,7 @@
             android:layout_width="150dp"
             android:layout_height="118dp"
             android:scaleType="fitXY"
+            android:contentDescription="@string/welcome_image_tulip"
             />
 
     </GridLayout>
diff --git a/app/src/main/res/layout/welcome_dont_upload.xml b/app/src/main/res/layout/welcome_dont_upload.xml
index 516b21c90..de748ce68 100644
--- a/app/src/main/res/layout/welcome_dont_upload.xml
+++ b/app/src/main/res/layout/welcome_dont_upload.xml
@@ -20,6 +20,7 @@
             android:id="@+id/selfie_x"
             android:layout_width="140dp"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/welcome_image_no_selfies"
             />
 
         <ImageView
@@ -27,7 +28,9 @@
             android:id="@+id/proprietary_x"
             android:layout_marginLeft="10dp"
             android:layout_width="140dp"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/welcome_image_proprietary"
+            />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml
index efe676b8c..175ddda64 100644
--- a/app/src/main/res/layout/welcome_final.xml
+++ b/app/src/main/res/layout/welcome_final.xml
@@ -21,6 +21,7 @@
             android:layout_width="150dp"
             android:layout_height="180dp"
             android:layout_marginLeft="30dp"
+            android:contentDescription="@string/welcome_image_welcome_wikipedia"
             />
 
         <ImageView
@@ -29,6 +30,7 @@
             android:layout_height="120dp"
             android:layout_gravity="center"
             android:layout_marginLeft="10dp"
+            android:contentDescription="@string/welcome_image_welcome_copyright"
             />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/welcome_image_details.xml b/app/src/main/res/layout/welcome_image_details.xml
index 4fed858ea..e11b74af2 100644
--- a/app/src/main/res/layout/welcome_image_details.xml
+++ b/app/src/main/res/layout/welcome_image_details.xml
@@ -15,7 +15,8 @@
         android:src="@drawable/sydney_opera_house"
         android:adjustViewBounds="true"
         android:layout_gravity="center"
-        android:id="@+id/imageView" />
+        android:id="@+id/imageView"
+        android:contentDescription="@string/welcome_image_sydney_opera_house"/>
 
     <TextView
         android:layout_width="295dp"
diff --git a/app/src/main/res/layout/welcome_wikipedia.xml b/app/src/main/res/layout/welcome_wikipedia.xml
index ad48eb8d9..ea0b6a92a 100644
--- a/app/src/main/res/layout/welcome_wikipedia.xml
+++ b/app/src/main/res/layout/welcome_wikipedia.xml
@@ -13,6 +13,7 @@
         android:layout_gravity="center"
         android:src="@drawable/welcome_wikipedia"
         android:adjustViewBounds="true"
+        android:contentDescription="@string/welcome_image_welcome_wikipedia"
         />
 
     <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5930cbc36..55d8bd371 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -184,6 +184,21 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="set_limit">Set Recent Upload Limit</string>
   <string name="login_failed_2fa_not_supported">Two factor authentication is currently not supported.</string>
   <string name="logout_verification">Do you really want to logout?</string>
+  <string name="commons_logo">Commons Logo</string>
+  <string name="background_image">Background Image</string>
+  <string name="mediaimage_failed">Media Image Failed</string>
+  <string name="no_image_found">No Image Found</string>
+  <string name="upload_image">Upload Image</string>
+  <string name="welcome_image_mount_zao">Mount Zao</string>
+  <string name="welcome_image_llamas">Llamas</string>
+  <string name="welcome_image_rainbow_bridge">Rainbow Bridge</string>
+  <string name="welcome_image_tulip">Tulip</string>
+  <string name="welcome_image_no_selfies">No Selfies</string>
+  <string name="welcome_image_proprietary">Proprietary Image</string>
+  <string name="welcome_image_welcome_wikipedia">Welcome Wikipedia</string>
+  <string name="welcome_image_welcome_copyright">Welcome Copyright</string>
+  <string name="welcome_image_sydney_opera_house">Sydney Opera House</string>
+>>>>>>> [Lint] Add content description to image views
 
   <string name="cancel">Cancel</string>
   <string name="navigation_drawer_open">Open</string>
diff --git a/build.gradle b/build.gradle
index 9f82985a4..b40a0b37b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:${project.gradleVersion}"
+        classpath 'com.android.tools.build:gradle:2.3.2'
     }
 }