diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 9f3e2c740..8236597ff 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -694,7 +694,6 @@ void msgBox(String id, String type, String title, String text, String link,
     buttons.insert(
         0, dialogButton('Cancel', onPressed: cancel, isOutline: true));
   }
-  // TODO: test this button
   if (type.contains("hasclose")) {
     buttons.insert(
         0,
@@ -708,8 +707,7 @@ void msgBox(String id, String type, String title, String text, String link,
   dialogManager.show(
     (setState, close) => CustomAlertDialog(
       title: null,
-      content: SelectionArea(
-          child: msgboxContent(type, title, text).paddingOnly(bottom: 10)),
+      content: SelectionArea(child: msgboxContent(type, title, text)),
       actions: buttons,
       onSubmit: hasOk ? submit : null,
       onCancel: hasCancel == true ? cancel : null,
@@ -774,7 +772,7 @@ Widget msgboxContent(String type, String title, String text) {
         ),
       ),
     ],
-  );
+  ).marginOnly(bottom: 12);
 }
 
 void msgBoxCommon(OverlayDialogManager dialogManager, String title,
@@ -1714,4 +1712,4 @@ Future<void> updateSystemWindowTheme() async {
               : SystemWindowTheme.dark);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart
index 1fc97f410..c95c62fcc 100644
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -26,7 +26,6 @@ const String kWindowEventShow = "show";
 const String kWindowConnect = "connect";
 
 const String kUniLinksPrefix = "rustdesk://";
-const String kActionNewConnection = "connection/new/";
 
 const String kTabLabelHomePage = "Home";
 const String kTabLabelSettingPage = "Settings";
diff --git a/flutter/lib/mobile/widgets/dialog.dart b/flutter/lib/mobile/widgets/dialog.dart
index bded6d069..2fbe40091 100644
--- a/flutter/lib/mobile/widgets/dialog.dart
+++ b/flutter/lib/mobile/widgets/dialog.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'package:flutter/material.dart';
-import 'package:flutter_hbb/desktop/widgets/button.dart';
 import 'package:get/get.dart';
 
 import '../../common.dart';
@@ -371,8 +370,7 @@ void showWaitUacDialog(
       tag: '$id-wait-uac',
       (setState, close) => CustomAlertDialog(
             title: null,
-            content: msgboxContent(type, 'Wait', 'wait_accept_uac_tip')
-                .marginOnly(bottom: 10),
+            content: msgboxContent(type, 'Wait', 'wait_accept_uac_tip'),
           ));
 }
 
@@ -647,7 +645,6 @@ class _PasswordWidgetState extends State<PasswordWidget> {
           icon: Icon(
             // Based on passwordVisible state choose the icon
             _passwordVisible ? Icons.visibility : Icons.visibility_off,
-            color: Theme.of(context).primaryColorDark,
           ),
           onPressed: () {
             // Update the state i.e. toggle the state of passwordVisible variable