diff --git a/packages/neon/lib/src/pages/home.dart b/packages/neon/lib/src/pages/home.dart
index 6fb99254..6e1fb595 100644
--- a/packages/neon/lib/src/pages/home.dart
+++ b/packages/neon/lib/src/pages/home.dart
@@ -201,7 +201,6 @@ class _HomePageState extends State<HomePage> {
                         width: isQuickBar ? kQuickBarWidth : null,
                         child: Container(
                           padding: isQuickBar ? const EdgeInsets.all(5) : null,
-                          color: isQuickBar ? Theme.of(context).appBarTheme.backgroundColor : null,
                           child: Column(
                             children: [
                               Expanded(
diff --git a/packages/neon/lib/src/utils/theme.dart b/packages/neon/lib/src/utils/theme.dart
index f79df05f..c989ffd1 100644
--- a/packages/neon/lib/src/utils/theme.dart
+++ b/packages/neon/lib/src/utils/theme.dart
@@ -31,7 +31,6 @@ ThemeData getThemeFromNextcloudTheme(
     brightness: selectBrightness,
   ).copyWith(
     background: oledBackgroundOverride,
-    surface: oledBackgroundOverride,
     primary: keepOriginalAccentColorOverride,
     secondary: keepOriginalAccentColorOverride,
   );
@@ -40,7 +39,7 @@ ThemeData getThemeFromNextcloudTheme(
     useMaterial3: true,
     colorScheme: colorScheme,
     scaffoldBackgroundColor: colorScheme.background,
-    canvasColor: colorScheme.background, // For Drawer
+    canvasColor: colorScheme.surface, // For Drawer
     cardColor: colorScheme.background, // For LicensePage
     snackBarTheme: const SnackBarThemeData(
       behavior: SnackBarBehavior.floating,