diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e554002..f6c380c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,7 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:theme="@style/AppTheme.AppBar"
-        app:backgroundTint="@color/surface"
+        app:backgroundTint="@color/elevatedSurface"
         app:layout_insetEdge="bottom"
         app:navigationIcon="@drawable/funkwhaleshape"
         tools:menu="@menu/toolbar" />
diff --git a/app/src/main/res/layout/fragment_artists.xml b/app/src/main/res/layout/fragment_artists.xml
index 0b54283..f51629d 100644
--- a/app/src/main/res/layout/fragment_artists.xml
+++ b/app/src/main/res/layout/fragment_artists.xml
@@ -1,59 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-  <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    android:id="@+id/swiper"
-    style="@style/AppTheme.Fragment"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    android:background="@color/surface">
 
-    <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/artists"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      tools:listitem="@layout/row_artist" />
-
-  </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-  <com.google.android.material.appbar.AppBarLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@android:color/transparent">
-
-    <com.google.android.material.appbar.CollapsingToolbarLayout
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:fitsSystemWindows="true"
-      app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-      <LinearLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swiper"
+        style="@style/AppTheme.Fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:orientation="vertical">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <TextView
-          style="@style/AppTheme.Title"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="16dp"
-          android:layout_marginTop="16dp"
-          android:layout_marginEnd="16dp"
-          android:layout_marginBottom="16dp"
-          android:text="@string/artists" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/artists"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/row_artist" />
 
-      </LinearLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    </com.google.android.material.appbar.CollapsingToolbarLayout>
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent">
 
-  </com.google.android.material.appbar.AppBarLayout>
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/AppTheme.Title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:text="@string/artists" />
+
+            </LinearLayout>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_browse.xml b/app/src/main/res/layout/fragment_browse.xml
index f9da308..b58b4d1 100644
--- a/app/src/main/res/layout/fragment_browse.xml
+++ b/app/src/main/res/layout/fragment_browse.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:id="@+id/root"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:clipChildren="false"
-  android:clipToPadding="false"
-  android:orientation="vertical">
-
-  <com.google.android.material.tabs.TabLayout
-    android:id="@+id/tabs"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:elevation="4dp"
-    app:tabMode="scrollable"
-    app:tabSelectedTextColor="@color/controlColor" />
-
-  <androidx.viewpager.widget.ViewPager
-    android:id="@+id/pager"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clipChildren="false"
-    android:clipToPadding="false" />
+    android:clipToPadding="false"
+    android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="4dp"
+        app:tabMode="scrollable"
+        app:tabSelectedTextColor="@color/controlColor"
+        app:tabTextColor="@color/colorPrimary" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface"
+        android:clipChildren="false"
+        android:clipToPadding="false" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_artist.xml b/app/src/main/res/layout/row_artist.xml
index 4eabd5d..165d9af 100644
--- a/app/src/main/res/layout/row_artist.xml
+++ b/app/src/main/res/layout/row_artist.xml
@@ -1,48 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_marginHorizontal="8dp"
-  android:layout_marginVertical="5dp"
-  android:background="@drawable/ripple"
-  android:padding="8dp"
-  android:gravity="center_vertical"
-  android:orientation="horizontal"
-  android:transitionGroup="true"
-  tools:showIn="@layout/fragment_artists">
-
-  <org.funkwhale.ffa.views.SquareImageView
-    android:id="@+id/art"
-    android:layout_width="48dp"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="16dp"
-    android:scaleType="centerCrop"
-    tools:src="@tools:sample/avatars" />
-
-  <LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:layout_marginHorizontal="8dp"
+    android:layout_marginVertical="5dp"
+    android:background="@drawable/ripple"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:padding="8dp"
+    android:transitionGroup="true"
+    tools:showIn="@layout/fragment_artists">
 
-    <TextView
-      android:id="@+id/name"
-      style="@style/AppTheme.ItemTitle"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="4dp"
-      android:ellipsize="end"
-      android:lines="1"
-      tools:text="Muse" />
+    <org.funkwhale.ffa.views.SquareImageView
+        android:id="@+id/art"
+        android:layout_width="48dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:scaleType="centerCrop"
+        tools:src="@tools:sample/avatars" />
 
-    <TextView
-      android:id="@+id/albums"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:ellipsize="end"
-      android:lines="1"
-      tools:text="2 album(s)" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-  </LinearLayout>
+        <TextView
+            android:id="@+id/name"
+            style="@style/AppTheme.ItemTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:ellipsize="end"
+            android:lines="1"
+            tools:text="Muse" />
+
+        <TextView
+            android:id="@+id/albums"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
+            android:textColor="@color/colorPrimaryDark"
+            tools:text="2 album(s)" />
+
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index f8a4514..eb70df4 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="surface">#202020</color>
-  <color name="elevatedSurface">#2f2f2f</color>
+  <color name="surface">#151515</color>
+  <color name="elevatedSurface">#303030</color>
 
   <color name="colorPrimary">#949fa7</color>
+  <color name="colorPrimaryDark">#8a8b8f</color>
+
   <color name="colorAccent">#d35400</color>
 
   <color name="colorSelected">#525252</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 138b6b6..a0c0b10 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="surface">#eeeeee</color>
-  <color name="elevatedSurface">#f6f6f6</color>
+  <color name="surface">#f6f6f6</color>
+  <color name="elevatedSurface">#d0d0d0</color>
 
   <color name="colorPrimary">#476d85</color>
   <color name="colorPrimaryDark">#646568</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e03e008..2f30113 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,7 +6,7 @@
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
     <item name="colorAccent">@color/colorAccent</item>
-    <item name="android:navigationBarColor">@color/surface</item>
+    <item name="android:navigationBarColor">@color/elevatedSurface</item>
 
     <item name="materialButtonStyle">@style/AppTheme.ButtonStyle</item>
 
@@ -66,8 +66,8 @@
   </style>
 
   <style name="AppTheme.AppBar" parent="ThemeOverlay.MaterialComponents.Toolbar.Primary">
-    <item name="android:drawableTint" tools:targetApi="m">@android:color/white</item>
-    <item name="android:tint">@android:color/white</item>
+    <item name="android:drawableTint" tools:targetApi="m">@color/colorPrimary</item>
+    <item name="android:tint">@color/colorPrimary</item>
 
     <item name="actionBarPopupTheme">@style/AppTheme.PopupMenu</item>
     <item name="popupTheme">@style/AppTheme.PopupMenu</item>