diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index ceff7480e..dc91e9414 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -156,8 +156,7 @@ class ColorThemeExtension extends ThemeExtension<ColorThemeExtension> {
 class MyTheme {
   MyTheme._();
 
-  static const Color grayBg = Color(0xFFEEEEEE);
-  static const Color white = Color(0xFFFFFFFF);
+  static const Color grayBg = Color(0xFFEFEFF2);
   static const Color accent = Color(0xFF0071FF);
   static const Color accent50 = Color(0x770071FF);
   static const Color accent80 = Color(0xAA0071FF);
@@ -173,20 +172,20 @@ class MyTheme {
   static ThemeData lightTheme = ThemeData(
     brightness: Brightness.light,
     hoverColor: Color.fromARGB(255, 224, 224, 224),
-    scaffoldBackgroundColor: Color(0xFFFFFFFF),
-    dialogBackgroundColor: Color(0xFFFFFFFF),
+    scaffoldBackgroundColor: Colors.white,
+    dialogBackgroundColor: Colors.white,
     dialogTheme: DialogTheme(
       elevation: 15,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(18.0),
         side: BorderSide(
           width: 1,
-          color: Color(0xFFEEEEEE),
+          color: grayBg,
         ),
       ),
     ),
     inputDecorationTheme: InputDecorationTheme(
-      fillColor: Color(0xFFEEEEEE),
+      fillColor: grayBg,
       filled: true,
       isDense: true,
       contentPadding: EdgeInsets.all(15),
@@ -202,7 +201,7 @@ class MyTheme {
         bodyMedium:
             TextStyle(fontSize: 14, color: Colors.black87, height: 1.25),
         labelLarge: TextStyle(fontSize: 16.0, color: MyTheme.accent80)),
-    cardColor: Color(0xFFEEEEEE),
+    cardColor: grayBg,
     hintColor: Color(0xFFAAAAAA),
     visualDensity: VisualDensity.adaptivePlatformDensity,
     tabBarTheme: const TabBarTheme(
@@ -231,9 +230,7 @@ class MyTheme {
     ),
     outlinedButtonTheme: OutlinedButtonThemeData(
       style: OutlinedButton.styleFrom(
-        backgroundColor: Color(
-          0xFFEEEEEE,
-        ),
+        backgroundColor: grayBg,
         foregroundColor: Colors.black87,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(8.0),
@@ -259,7 +256,7 @@ class MyTheme {
       primarySwatch: Colors.blue,
     ).copyWith(
       brightness: Brightness.light,
-      background: Color(0xFFEEEEEE),
+      background: grayBg,
     ),
   ).copyWith(
     extensions: <ThemeExtension<dynamic>>[
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index 8f16e3652..541ec6aa8 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'dart:convert';
 
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/material.dart' hide MenuItem;
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/common/widgets/custom_password.dart';
@@ -14,7 +14,6 @@ import 'package:flutter_hbb/desktop/pages/desktop_tab_page.dart';
 import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
 import 'package:flutter_hbb/models/server_model.dart';
-import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
@@ -55,10 +54,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         buildLeftPane(context),
-        const VerticalDivider(
-          width: 1,
-          thickness: 1,
-        ),
+        const VerticalDivider(width: 1),
         Expanded(
           child: buildRightPane(context),
         ),
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index 0aafd48bb..f4d77c79b 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -120,7 +120,7 @@ class _DesktopSettingPageState extends State<DesktopSettingPage>
               ],
             ),
           ),
-          const VerticalDivider(thickness: 1, width: 1),
+          const VerticalDivider(width: 1),
           Expanded(
             child: Container(
               color: Theme.of(context).scaffoldBackgroundColor,
diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart
index edc779fba..1e62fb33d 100644
--- a/flutter/lib/desktop/widgets/tabbar_widget.dart
+++ b/flutter/lib/desktop/widgets/tabbar_widget.dart
@@ -280,7 +280,6 @@ class DesktopTab extends StatelessWidget {
                 ),
                 const Divider(
                   height: 1,
-                  thickness: 1,
                 ),
               ],
             ),
@@ -957,7 +956,6 @@ class _TabState extends State<_Tab> with RestorationMixin {
                   indent: _kDividerIndent,
                   endIndent: _kDividerIndent,
                   color: MyTheme.tabbar(context).dividerColor,
-                  thickness: 1,
                 ),
               )
             ],