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 8d66c6788..48c5f7f2d 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -12,7 +12,7 @@
     <RelativeLayout
         android:gravity="center"
         android:layout_width="300dp"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         >
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 957c00c6b..1b20625d9 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -29,8 +29,8 @@
             />
 
         <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_margin="16dip"
             android:gravity="center"
             android:orientation="vertical"
@@ -38,13 +38,13 @@
 
             <FrameLayout
                 android:id="@+id/loginErrors"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="48dp"
                 />
 
             <EditText
                 android:id="@+id/loginUsername"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/username"
                 android:inputType="textNoSuggestions"
@@ -55,7 +55,7 @@
 
             <EditText
                 android:id="@+id/loginPassword"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/password"
                 android:inputType="textPassword"
@@ -64,7 +64,7 @@
 
             <Button
                 android:id="@+id/loginButton"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:enabled="false"
                 android:text="@string/login"
@@ -72,7 +72,7 @@
 
             <Button
                 android:id="@+id/signupButton"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/signup"
                 android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 14fc7836e..e1e58d8dd 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -1,13 +1,13 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="#000"
     >
 
     <ImageView
         android:id="@+id/backgroundImage"
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:scaleType="centerCrop"
         />
 
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index fb7967e95..165447f8c 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WebView  xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/webview"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 27e241cae..d6fb4c760 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -7,15 +7,15 @@
 
     <android.support.v4.view.ViewPager
         android:id="@+id/welcomePager"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:fadingEdge="none"
         />
 
     <com.viewpagerindicator.CirclePageIndicator
         android:id="@+id/welcomePagerIndicator"
         android:layout_height="24dp"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_gravity="bottom"
         />
 
diff --git a/app/src/main/res/layout/detail_category_item.xml b/app/src/main/res/layout/detail_category_item.xml
index be4e1743f..c5dec7db7 100644
--- a/app/src/main/res/layout/detail_category_item.xml
+++ b/app/src/main/res/layout/detail_category_item.xml
@@ -18,7 +18,7 @@
         />
 
     <fr.free.nrw.commons.media.MediaDetailSpacer
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="8dp"
         />
 
diff --git a/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml
index b6be1cc03..2ca9ae14b 100644
--- a/app/src/main/res/layout/fragment_contributions.xml
+++ b/app/src/main/res/layout/fragment_contributions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="#000000"
     >
 
@@ -26,8 +26,8 @@
 
     <GridView
         android:id="@+id/contributionsList"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
         android:stretchMode="columnWidth"
         android:columnWidth="240dp"
         android:numColumns="auto_fit"
diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml
index f3a735c76..a311fb3c2 100644
--- a/app/src/main/res/layout/fragment_media_detail.xml
+++ b/app/src/main/res/layout/fragment_media_detail.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@android:color/background_dark"
     >
 
@@ -26,13 +26,13 @@
 
     <fr.free.nrw.commons.MediaWikiImageView
         android:id="@+id/mediaDetailImage"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:scaleType="fitCenter"
         />
 
     <ScrollView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/mediaDetailScrollView"
         android:fillViewport="true"
@@ -42,21 +42,21 @@
 
         <LinearLayout
             android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             >
 
             <!-- Placeholder. Height gets set at runtime based on container size; the initial value is a hack to keep
                  the detail info offscreen until it's placed properly. May be a better way to do this. -->
             <fr.free.nrw.commons.media.MediaDetailSpacer
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="16dp"
                 android:id="@+id/mediaDetailSpacer"
                 />
 
             <LinearLayout
                 android:orientation="vertical"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="#AA000000"
                 android:padding="16dp"
@@ -64,7 +64,7 @@
 
                 <LinearLayout
                     android:orientation="vertical"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#20ffffff"
                     android:padding="16dp"
@@ -92,13 +92,13 @@
                 </LinearLayout>
 
                 <fr.free.nrw.commons.media.MediaDetailSpacer
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="8dp"
                     />
 
                 <LinearLayout
                     android:orientation="vertical"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#20ffffff"
                     android:padding="16dp"
@@ -126,13 +126,13 @@
                 </LinearLayout>
 
                 <fr.free.nrw.commons.media.MediaDetailSpacer
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="8dp"
                     />
 
                 <LinearLayout
                     android:orientation="vertical"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#20ffffff"
                     android:padding="16dp"
@@ -160,13 +160,13 @@
                 </LinearLayout>
 
                 <fr.free.nrw.commons.media.MediaDetailSpacer
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="8dp"
                     />
 
                 <LinearLayout
                     android:orientation="vertical"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#20ffffff"
                     android:padding="16dp"
diff --git a/app/src/main/res/layout/fragment_media_detail_pager.xml b/app/src/main/res/layout/fragment_media_detail_pager.xml
index adc375a5d..d9dc70a22 100644
--- a/app/src/main/res/layout/fragment_media_detail_pager.xml
+++ b/app/src/main/res/layout/fragment_media_detail_pager.xml
@@ -7,8 +7,8 @@
 
     <android.support.v4.view.ViewPager
         android:id="@+id/mediaDetailsPager"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:fadingEdge="none"
         />
 
diff --git a/app/src/main/res/layout/fragment_multiple_uploads_list.xml b/app/src/main/res/layout/fragment_multiple_uploads_list.xml
index 1c753c4be..08638a834 100644
--- a/app/src/main/res/layout/fragment_multiple_uploads_list.xml
+++ b/app/src/main/res/layout/fragment_multiple_uploads_list.xml
@@ -15,8 +15,8 @@
 
     <GridView
         android:id="@+id/multipleShareBackground"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
         android:stretchMode="columnWidth"
         android:numColumns="auto_fit"
         android:listSelector="@null"
diff --git a/app/src/main/res/layout/fragment_nearby.xml b/app/src/main/res/layout/fragment_nearby.xml
index 67bb9e336..2f8d6fc9b 100644
--- a/app/src/main/res/layout/fragment_nearby.xml
+++ b/app/src/main/res/layout/fragment_nearby.xml
@@ -6,15 +6,15 @@
 
     <ProgressBar
         android:id="@+id/progressBar"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         />
 
     <ListView
         android:id="@+id/listview"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
index f378d530e..09aa1c2d0 100644
--- a/app/src/main/res/layout/fragment_single_upload.xml
+++ b/app/src/main/res/layout/fragment_single_upload.xml
@@ -15,7 +15,7 @@
 
     <EditText
         android:id="@+id/titleEdit"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scrollHorizontally="false"
         android:singleLine="true"
@@ -25,7 +25,7 @@
 
     <EditText
         android:id="@+id/descEdit"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="textMultiLine"
         android:hint="@string/share_description_hint"
diff --git a/app/src/main/res/layout/layout_contribution.xml b/app/src/main/res/layout/layout_contribution.xml
index 2e18a1c99..d97f6f838 100644
--- a/app/src/main/res/layout/layout_contribution.xml
+++ b/app/src/main/res/layout/layout_contribution.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="2dp"
     android:paddingBottom="0dp"
@@ -20,14 +20,14 @@
 
     <fr.free.nrw.commons.MediaWikiImageView
         android:id="@+id/contributionImage"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="240dp"
         android:scaleType="centerCrop"
         custom:isThumbnail="true"
         />
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center|bottom"
         android:background="#AA000000"
@@ -36,7 +36,7 @@
         >
         <ProgressBar
             android:id="@+id/contributionProgress"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/ProgressBar"
             android:indeterminateOnly="false"
diff --git a/app/src/main/res/layout/layout_upload_item.xml b/app/src/main/res/layout/layout_upload_item.xml
index ab5b3ef6d..8065cd2d9 100644
--- a/app/src/main/res/layout/layout_upload_item.xml
+++ b/app/src/main/res/layout/layout_upload_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="2dp"
     android:paddingBottom="0dp"
@@ -10,14 +10,14 @@
 
     <ImageView
         android:id="@+id/uploadImage"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="192dp"
         android:scaleType="centerCrop"
         />
 
     <RelativeLayout
         android:id="@+id/uploadOverlay"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center|bottom"
         android:background="#77000000"
diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml
index 99d3ea5b7..69b5844cc 100644
--- a/app/src/main/res/layout/login.xml
+++ b/app/src/main/res/layout/login.xml
@@ -20,8 +20,8 @@
             />
 
         <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_below="@+id/commonsLogo"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="20dp"
@@ -31,7 +31,7 @@
 
             <EditText
                 android:id="@+id/loginUsername"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/username"
                 >
@@ -41,7 +41,7 @@
 
             <EditText
                 android:id="@+id/loginPassword"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/password"
                 android:inputType="textPassword"
@@ -49,7 +49,7 @@
 
            <Button
                 android:id="@+id/loginButton"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="20dp"
                 android:text="@string/login"
diff --git a/app/src/main/res/layout/welcome_do_upload.xml b/app/src/main/res/layout/welcome_do_upload.xml
index 4d67c720f..c2d5d0b8a 100644
--- a/app/src/main/res/layout/welcome_do_upload.xml
+++ b/app/src/main/res/layout/welcome_do_upload.xml
@@ -11,7 +11,7 @@
 
     <RelativeLayout
         android:gravity="center"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="240dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
diff --git a/app/src/main/res/layout/welcome_dont_upload.xml b/app/src/main/res/layout/welcome_dont_upload.xml
index d168f1840..855b77cd6 100644
--- a/app/src/main/res/layout/welcome_dont_upload.xml
+++ b/app/src/main/res/layout/welcome_dont_upload.xml
@@ -9,7 +9,7 @@
 
     <RelativeLayout
         android:gravity="center"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="240dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
diff --git a/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml
index 81a71d9fc..7faabb553 100644
--- a/app/src/main/res/layout/welcome_final.xml
+++ b/app/src/main/res/layout/welcome_final.xml
@@ -9,7 +9,7 @@
 
     <!-- Sorry about the hardcoded sizes here. They're image-related. -->
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="180dp"
         android:gravity="center_horizontal"
         >