diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index a09a6a7f2..71d5c0d64 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -156,7 +156,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:minWidth="150dp"
-                android:textColor="@color/swap_bright_blue"
+                android:textColor="?attr/colorPrimary"
                 android:textSize="16sp"
                 tools:text="wifi network name" />
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt b/app/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
index 4c4919d9e..2912d3087 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
+++ b/app/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
@@ -25,7 +25,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.End
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
@@ -88,7 +87,7 @@ fun RepoChooser(
     ) {
         Box {
             val borderColor = if (isPreferred) {
-                colorResource(id = R.color.fdroid_blue)
+                MaterialTheme.colorScheme.primary
             } else {
                 MaterialTheme.colorScheme.outline
             }
@@ -116,7 +115,7 @@ fun RepoChooser(
                         imageVector = Icons.Default.ArrowDropDown,
                         contentDescription = stringResource(R.string.app_details_repository_expand),
                         tint = if (isPreferred) {
-                            colorResource(id = R.color.fdroid_blue)
+                            MaterialTheme.colorScheme.primary
                         } else {
                             MaterialTheme.colorScheme.onSurface
                         },
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java b/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java
index 27a6f403d..7e47f4d2e 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/CategorySpan.java
@@ -12,6 +12,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
+import com.google.android.material.color.MaterialColors;
+
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.views.categories.CategoryController;
 
@@ -119,13 +121,18 @@ public class CategorySpan extends ReplacementSpan {
 
         // The background behind the category icon.
         Paint iconBackgroundPaint = new Paint();
-        iconBackgroundPaint.setColor(0xffd8d8d8);
+        int backgroundColor =
+                MaterialColors.getColor(context, com.google.android.material.R.attr.colorSurfaceContainerHigh, 0);
+        iconBackgroundPaint.setColor(backgroundColor);
         iconBackgroundPaint.setAntiAlias(true);
         RectF iconBackgroundRect = new RectF(0, 0, iconBackgroundSize, height);
         canvas.drawRoundRect(iconBackgroundRect, cornerRadius, cornerRadius, iconBackgroundPaint);
 
         // Category icon on top of the circular background which was just drawn.
         Drawable icon = ContextCompat.getDrawable(context, R.drawable.ic_categories);
+        int iconColor =
+                MaterialColors.getColor(context, com.google.android.material.R.attr.colorOnSurface, 0);
+        icon.setTint(iconColor);
         icon.setBounds(iconPadding, iconPadding, iconPadding + iconSize, iconPadding + iconSize);
         icon.draw(canvas);
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
index d5d5fd148..d9308a97e 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
+++ b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
@@ -1,7 +1,6 @@
 package org.fdroid.fdroid.views.repos
 
 import android.content.res.Configuration
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement.spacedBy
@@ -15,7 +14,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Card
+import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -213,14 +212,14 @@ fun RepoPreviewHeader(
 }
 
 @Composable
-@OptIn(ExperimentalGlideComposeApi::class, ExperimentalFoundationApi::class)
+@OptIn(ExperimentalGlideComposeApi::class)
 fun LazyItemScope.RepoPreviewApp(
     repo: Repository,
     app: MinimalApp,
     localeList: LocaleListCompat,
 ) {
     val isDevPreview = LocalInspectionMode.current
-    Card(
+    ElevatedCard(
         modifier = Modifier
             .animateItem()
             .fillMaxWidth(),
diff --git a/app/src/main/res/drawable/app_version_item_status_installed.xml b/app/src/main/res/drawable/app_version_item_status_installed.xml
index 3d4ff6756..d439f006c 100644
--- a/app/src/main/res/drawable/app_version_item_status_installed.xml
+++ b/app/src/main/res/drawable/app_version_item_status_installed.xml
@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <stroke
         android:width="1dp"
-        android:color="#19c878" />
+        android:color="?attr/colorSecondaryContainer" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/app/src/main/res/drawable/app_version_item_status_new.xml b/app/src/main/res/drawable/app_version_item_status_new.xml
index efdec52ca..bc27985f5 100644
--- a/app/src/main/res/drawable/app_version_item_status_new.xml
+++ b/app/src/main/res/drawable/app_version_item_status_new.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <stroke
         android:width="1dp"
-        android:color="#429fff" />
+        android:color="?attr/colorPrimaryContainer" />
     <corners android:radius="2dp" />
     <solid android:color="?colorSurface" />
 </shape>
diff --git a/app/src/main/res/drawable/app_version_item_status_suggested.xml b/app/src/main/res/drawable/app_version_item_status_suggested.xml
index 08cd4615a..3fb7324e4 100644
--- a/app/src/main/res/drawable/app_version_item_status_suggested.xml
+++ b/app/src/main/res/drawable/app_version_item_status_suggested.xml
@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <stroke
         android:width="1dp"
-        android:color="#777777" />
+        android:color="?attr/colorPrimaryContainer" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/app/src/main/res/layout/app_card_list_item.xml b/app/src/main/res/layout/app_card_list_item.xml
index 50764dc6b..4d2e68c42 100644
--- a/app/src/main/res/layout/app_card_list_item.xml
+++ b/app/src/main/res/layout/app_card_list_item.xml
@@ -68,4 +68,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index 3492a8794..925b5d737 100644
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -277,7 +277,6 @@
                 android:paddingRight="8dp"
                 android:scrollbars="none"
                 android:text="@string/antifeatures"
-                android:textAllCaps="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index e58a0a65a..6680c5fa2 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -62,7 +62,7 @@
                         android:id="@+id/status_installed"
                         style="@style/AppVersionStatus"
                         android:background="@drawable/app_version_item_status_installed"
-                        android:textColor="#19c878"
+                        android:textColor="?attr/colorSecondaryContainer"
                         android:textStyle="bold"
                         android:text="@string/app_installed" />
 
diff --git a/app/src/main/res/layout/app_status_new.xml b/app/src/main/res/layout/app_status_new.xml
index e62430417..46eb43787 100644
--- a/app/src/main/res/layout/app_status_new.xml
+++ b/app/src/main/res/layout/app_status_new.xml
@@ -2,5 +2,5 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="@drawable/app_version_item_status_new"
     android:text="@string/app_new"
-    android:textColor="#429fff"
-    style="@style/AppVersionStatus" />
\ No newline at end of file
+    android:textColor="?attr/colorPrimaryContainer"
+    style="@style/AppVersionStatus" />
diff --git a/app/src/main/res/layout/app_status_suggested.xml b/app/src/main/res/layout/app_status_suggested.xml
index e96aa7255..d3d823f7a 100644
--- a/app/src/main/res/layout/app_status_suggested.xml
+++ b/app/src/main/res/layout/app_status_suggested.xml
@@ -2,5 +2,5 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="@drawable/app_version_item_status_suggested"
     android:text="@string/app_suggested"
-    android:textColor="#777777"
-    style="@style/AppVersionStatus" />
\ No newline at end of file
+    android:textColor="?attr/colorPrimaryContainer"
+    style="@style/AppVersionStatus" />
diff --git a/app/src/main/res/values/theme_overlays.xml b/app/src/main/res/values/theme_overlays.xml
index 7736f8cdb..0ba267221 100644
--- a/app/src/main/res/values/theme_overlays.xml
+++ b/app/src/main/res/values/theme_overlays.xml
@@ -10,6 +10,7 @@
         </item>
     </style>
 
+    <!-- Workaround to get Material 3 for dialogs in preferences -->
     <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="dialogCornerRadius">28dp</item>
         <item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>