diff --git a/app/src/main/res/drawable-hdpi/ic_az_white.png b/app/src/main/res/drawable-hdpi/ic_az_white.png
new file mode 100644
index 000000000..0a988e88c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_last_updated_black.png b/app/src/main/res/drawable-hdpi/ic_last_updated_black.png
index 0579b860c..ab7c530ab 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-hdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_last_updated_white.png b/app/src/main/res/drawable-hdpi/ic_last_updated_white.png
new file mode 100644
index 000000000..4f9d5122d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_az_white.png b/app/src/main/res/drawable-mdpi/ic_az_white.png
new file mode 100644
index 000000000..4d968ce4e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_last_updated_black.png b/app/src/main/res/drawable-mdpi/ic_last_updated_black.png
index d7a8ecfc7..49f8ba055 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-mdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_last_updated_white.png b/app/src/main/res/drawable-mdpi/ic_last_updated_white.png
new file mode 100644
index 000000000..50847f0a5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_az_white.png b/app/src/main/res/drawable-xhdpi/ic_az_white.png
new file mode 100644
index 000000000..595a4a447
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png
index 3565b2b68..cf727c3a5 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png
new file mode 100644
index 000000000..5fde29b9a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_az_white.png b/app/src/main/res/drawable-xxhdpi/ic_az_white.png
new file mode 100644
index 000000000..c509cd2a3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png
index d13c2deaf..5f9ee5613 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png
new file mode 100644
index 000000000..31d603e6d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_az_white.png b/app/src/main/res/drawable-xxxhdpi/ic_az_white.png
new file mode 100644
index 000000000..6efdc7a33
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png
index 85e37cdc4..70e27b7c2 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png
new file mode 100644
index 000000000..7212497b9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/layout/activity_app_list.xml b/app/src/main/res/layout/activity_app_list.xml
index 98e6def4b..1440d19b8 100644
--- a/app/src/main/res/layout/activity_app_list.xml
+++ b/app/src/main/res/layout/activity_app_list.xml
@@ -10,18 +10,23 @@
         android:id="@+id/search_card"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintEnd_toStartOf="@+id/sort"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintTop_toTopOf="parent">
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="8dp"
-            android:paddingLeft="8dp"
             android:paddingEnd="8dp"
-            android:paddingRight="8dp">
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:paddingStart="8dp">
 
             <ImageView
                 android:id="@+id/back"
@@ -30,25 +35,24 @@
                 android:contentDescription="@string/back"
                 android:src="@drawable/ic_back_black_24dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/search"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"/>
 
             <EditText
+                android:id="@+id/search"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/back"
-                app:layout_constraintEnd_toStartOf="@+id/clear"
-                android:padding="12dp"
-                android:id="@+id/search"
+                android:background="@android:color/transparent"
+                android:hint="@string/search_hint"
                 android:imeOptions="actionSearch"
                 android:inputType="text"
-                android:hint="@string/search_hint"
                 android:maxLines="1"
-                android:background="@android:color/transparent"
-                android:textSize="18sp" />
+                android:padding="12dp"
+                android:textSize="18sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/clear"
+                app:layout_constraintStart_toEndOf="@+id/back"
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
                 android:id="@+id/clear"
@@ -56,30 +60,27 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/clear_search"
                 android:src="@drawable/ic_close_black_24dp"
-                android:paddingStart="8dp"
-                android:paddingLeft="8dp"
-                android:paddingEnd="8dp"
-                android:paddingRight="8dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/sort"
-                app:layout_constraintStart_toEndOf="@id/search"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-            <ImageView
-                android:id="@+id/sort"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/sort_search"
-                android:src="@drawable/ic_last_updated_black"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/clear"
                 app:layout_constraintTop_toTopOf="parent"/>
 
         </android.support.constraint.ConstraintLayout>
 
     </android.support.v7.widget.CardView>
 
+    <ImageView
+        android:id="@+id/sort"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="4dp"
+        android:layout_marginRight="4dp"
+        android:contentDescription="@string/sort_search"
+        android:src="@drawable/ic_last_updated_black"
+        app:layout_constraintTop_toTopOf="@id/search_card"
+        app:layout_constraintBottom_toBottomOf="@id/search_card"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/search_card"/>
+
     <!-- Don't center, only show it at the top because a keyboard will usually be shown at the bottom of the screen,
          covering most of this layout. -->
     <TextView