diff --git a/assets/colors.png b/assets/colors.png
deleted file mode 100644
index 27c996ad..00000000
Binary files a/assets/colors.png and /dev/null differ
diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 25037b60..17a34c73 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -1225,6 +1225,7 @@
         "placeholders": {}
     },
     "messages": "Messages",
+    "messagesStyle": "Messages:",
     "@messages": {
         "type": "text",
         "placeholders": {}
@@ -2132,7 +2133,7 @@
         "type": "text",
         "placeholders": {}
     },
-    "wallpaper": "Wallpaper",
+    "wallpaper": "Wallpaper:",
     "@wallpaper": {
         "type": "text",
         "placeholders": {}
@@ -2501,5 +2502,7 @@
             "provider": {}
         }
     },
-  "profileNotFound": "The user could not be found on the server. Maybe there is a connection problem or the user doesn't exist."
+  "profileNotFound": "The user could not be found on the server. Maybe there is a connection problem or the user doesn't exist.",
+  "setTheme": "Set theme:",
+  "setColorTheme": "Set color theme:"
 }
diff --git a/lib/pages/settings_style/settings_style.dart b/lib/pages/settings_style/settings_style.dart
index 97313cc4..e46392c3 100644
--- a/lib/pages/settings_style/settings_style.dart
+++ b/lib/pages/settings_style/settings_style.dart
@@ -46,13 +46,13 @@ class SettingsStyleController extends State<SettingsStyle> {
   Color? get currentColor => ThemeController.of(context).primaryColor;
 
   static final List<Color?> customColors = [
+    null,
     AppConfig.chatColor,
     Colors.indigo,
     Colors.green,
     Colors.orange,
     Colors.pink,
     Colors.blueGrey,
-    null,
   ];
 
   void switchTheme(ThemeMode? newTheme) {
diff --git a/lib/pages/settings_style/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart
index 8967aa95..c74176fb 100644
--- a/lib/pages/settings_style/settings_style_view.dart
+++ b/lib/pages/settings_style/settings_style_view.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
+import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import '../../config/app_config.dart';
 import '../../widgets/matrix.dart';
@@ -26,6 +27,15 @@ class SettingsStyleView extends StatelessWidget {
         withScrolling: true,
         child: Column(
           children: [
+            ListTile(
+              title: Text(
+                L10n.of(context)!.setColorTheme,
+                style: TextStyle(
+                  color: Theme.of(context).colorScheme.secondary,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
             SizedBox(
               height: colorPickerSize + 24,
               child: ListView(
@@ -40,17 +50,59 @@ class SettingsStyleView extends StatelessWidget {
                           onTap: () => controller.setChatColor(color),
                           child: color == null
                               ? Material(
-                                  elevation:
-                                      AppConfig.colorSchemeSeed?.value == null
-                                          ? 100
-                                          : 0,
+                                  elevation: 6,
                                   shadowColor: AppConfig.colorSchemeSeed,
                                   borderRadius:
                                       BorderRadius.circular(colorPickerSize),
-                                  child: Image.asset(
-                                    'assets/colors.png',
-                                    width: colorPickerSize,
-                                    height: colorPickerSize,
+                                  child: DecoratedBox(
+                                    decoration: BoxDecoration(
+                                      borderRadius: BorderRadius.circular(
+                                        colorPickerSize,
+                                      ),
+                                      gradient: FluffyThemes.backgroundGradient(
+                                        context,
+                                        255,
+                                      ),
+                                    ),
+                                    child: SizedBox(
+                                      height: colorPickerSize,
+                                      child: Padding(
+                                        padding: const EdgeInsets.symmetric(
+                                          horizontal: 8.0,
+                                        ),
+                                        child: Center(
+                                          child: Row(
+                                            mainAxisSize: MainAxisSize.min,
+                                            children: [
+                                              if (controller.currentColor ==
+                                                  null)
+                                                Padding(
+                                                  padding:
+                                                      const EdgeInsets.only(
+                                                    right: 8.0,
+                                                  ),
+                                                  child: Icon(
+                                                    Icons.check,
+                                                    size: 16,
+                                                    color: Theme.of(context)
+                                                        .colorScheme
+                                                        .onBackground,
+                                                  ),
+                                                ),
+                                              Text(
+                                                L10n.of(context)!.systemTheme,
+                                                textAlign: TextAlign.center,
+                                                style: TextStyle(
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .onBackground,
+                                                ),
+                                              ),
+                                            ],
+                                          ),
+                                        ),
+                                      ),
+                                    ),
                                   ),
                                 )
                               : Material(
@@ -78,7 +130,17 @@ class SettingsStyleView extends StatelessWidget {
                     .toList(),
               ),
             ),
+            const SizedBox(height: 8),
             const Divider(height: 1),
+            ListTile(
+              title: Text(
+                L10n.of(context)!.setTheme,
+                style: TextStyle(
+                  color: Theme.of(context).colorScheme.secondary,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
             RadioListTile<ThemeMode>(
               groupValue: controller.currentTheme,
               value: ThemeMode.system,
@@ -135,7 +197,7 @@ class SettingsStyleView extends StatelessWidget {
             const Divider(height: 1),
             ListTile(
               title: Text(
-                L10n.of(context)!.messages,
+                L10n.of(context)!.messagesStyle,
                 style: TextStyle(
                   color: Theme.of(context).colorScheme.secondary,
                   fontWeight: FontWeight.bold,