diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
index 154388e13..2eab7745c 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
@@ -72,16 +72,19 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
         });
 
         sortImage = (ImageView) findViewById(R.id.sort);
+        sortImage.setImageResource(FDroidApp.getCurThemeResId() == R.style.AppThemeLight ? R.drawable.ic_last_updated_black : R.drawable.ic_last_updated_white);
         sortImage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (sortClauseSelected.equalsIgnoreCase(SortClause.LAST_UPDATED)) {
+                if (sortClauseSelected.equalsIgnoreCase(SortClause.LAST_UPDATED))
+                {
                     sortClauseSelected = SortClause.NAME;
-                    sortImage.setImageResource(R.drawable.ic_az_black);
-                } else {
+                    sortImage.setImageResource(FDroidApp.getCurThemeResId() == R.style.AppThemeLight ? R.drawable.ic_az_black : R.drawable.ic_az_white);
+                }
+                else
+                {
                     sortClauseSelected = SortClause.LAST_UPDATED;
-                    //sortImage.setImageResource(R.drawable.ic_last_updated_black);
-                    sortImage.setImageResource(R.drawable.ic_last_updated_white);
+                    sortImage.setImageResource(FDroidApp.getCurThemeResId() == R.style.AppThemeLight ? R.drawable.ic_last_updated_black : R.drawable.ic_last_updated_white);
                 }
                 getSupportLoaderManager().restartLoader(0, null, AppListActivity.this );
                 appView.scrollToPosition(0);
diff --git a/app/src/main/res/layout/activity_app_list.xml b/app/src/main/res/layout/activity_app_list.xml
index fcb29013a..12bfd0df8 100644
--- a/app/src/main/res/layout/activity_app_list.xml
+++ b/app/src/main/res/layout/activity_app_list.xml
@@ -75,7 +75,6 @@
         android:layout_marginEnd="4dp"
         android:layout_marginRight="4dp"
         android:contentDescription="@string/sort_search"
-        android:src="@drawable/ic_last_updated_white"
         app:layout_constraintTop_toTopOf="@id/search_card"
         app:layout_constraintBottom_toBottomOf="@id/search_card"
         app:layout_constraintEnd_toEndOf="parent"