diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
index bbf9d5c4e..3b45d12ee 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
@@ -143,6 +143,10 @@ public class FDroidApp extends Application {
         }
     }
 
+    public static boolean isAppThemeLight() {
+        return curTheme == Theme.light;
+    }
+
     public void applyDialogTheme(Activity activity) {
         activity.setTheme(getCurDialogThemeResId());
         setSecureWindow(activity);
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 be74064d8..4476c5a8f 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
@@ -42,7 +42,8 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
 
     private interface SortClause {
         String NAME = Schema.AppMetadataTable.NAME + "." + Schema.AppMetadataTable.Cols.NAME + " asc";
-        String LAST_UPDATED = Schema.AppMetadataTable.NAME + "." + Schema.AppMetadataTable.Cols.LAST_UPDATED + " desc";
+        String LAST_UPDATED = Schema.AppMetadataTable.NAME + "."
+                + Schema.AppMetadataTable.Cols.LAST_UPDATED + " desc";
     }
 
     @Override
@@ -71,16 +72,28 @@ 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);
+        if (FDroidApp.isAppThemeLight()) {
+            sortImage.setImageResource(R.drawable.ic_last_updated_black);
+        } else {
+            sortImage.setImageResource(R.drawable.ic_last_updated_white);
+        }
         sortImage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 if (sortClauseSelected.equalsIgnoreCase(SortClause.LAST_UPDATED)) {
                     sortClauseSelected = SortClause.NAME;
-                    sortImage.setImageResource(FDroidApp.getCurThemeResId() == R.style.AppThemeLight ? R.drawable.ic_az_black : R.drawable.ic_az_white);
+                    if (FDroidApp.isAppThemeLight()) {
+                        sortImage.setImageResource(R.drawable.ic_az_black);
+                    } else {
+                        sortImage.setImageResource(R.drawable.ic_az_white);
+                    }
                 } else {
                     sortClauseSelected = SortClause.LAST_UPDATED;
-                    sortImage.setImageResource(FDroidApp.getCurThemeResId() == R.style.AppThemeLight ? R.drawable.ic_last_updated_black : R.drawable.ic_last_updated_white);
+                    if (FDroidApp.isAppThemeLight()) {
+                        sortImage.setImageResource(R.drawable.ic_last_updated_black);
+                    } else {
+                        sortImage.setImageResource(R.drawable.ic_last_updated_white);
+                    }
                 }
                 getSupportLoaderManager().restartLoader(0, null, AppListActivity.this);
                 appView.scrollToPosition(0);