diff --git a/Cargo.lock b/Cargo.lock
index 159eee6e5..0bc360fe7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2559,7 +2559,7 @@ dependencies = [
 [[package]]
 name = "impersonate_system"
 version = "0.1.0"
-source = "git+https://github.com/21pages/impersonate-system#af4a82050580217a434c2024e181a98de24823ec"
+source = "git+https://github.com/21pages/impersonate-system#c48f37a8fd17413b2a4ba655c3873bdc5c8d25aa"
 dependencies = [
  "cc",
 ]
diff --git a/build.py b/build.py
index 920832909..fffb22180 100755
--- a/build.py
+++ b/build.py
@@ -17,7 +17,7 @@ flutter_win_target_dir = 'flutter/build/windows/runner/Release/'
 
 
 def get_version():
-    with open("Cargo.toml") as fh:
+    with open("Cargo.toml", encoding="utf-8") as fh:
         for line in fh:
             if line.startswith("version"):
                 return line.replace("version", "").replace("=", "").replace('"', '').strip()
diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 8c927e8a1..752de582c 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
-import 'dart:ui';
 
 import 'package:back_button_interceptor/back_button_interceptor.dart';
 import 'package:desktop_multi_window/desktop_multi_window.dart';
@@ -1210,23 +1209,21 @@ Future<void> initUniLinks() async {
   }
 }
 
-StreamSubscription listenUniLinks() {
-  if (Platform.isWindows || Platform.isMacOS) {
-    final sub = uriLinkStream.listen((Uri? uri) {
-      if (uri != null) {
-        callUniLinksUriHandler(uri);
-      } else {
-        print("uni listen error: uri is empty.");
-      }
-    }, onError: (err) {
-      print("uni links error: $err");
-    });
-    return sub;
-  } else {
-    // return empty stream subscription for uniform logic
-    final stream = Stream.empty();
-    return stream.listen((event) {/*ignore*/});
+StreamSubscription? listenUniLinks() {
+  if (!(Platform.isWindows || Platform.isMacOS)) {
+    return null;
   }
+
+  final sub = uriLinkStream.listen((Uri? uri) {
+    if (uri != null) {
+      callUniLinksUriHandler(uri);
+    } else {
+      print("uni listen error: uri is empty.");
+    }
+  }, onError: (err) {
+    print("uni links error: $err");
+  });
+  return sub;
 }
 
 void checkArguments() {
diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart
index bc5128d34..dc4dc2c94 100644
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -41,6 +41,9 @@ const Duration kTabTransitionDuration = Duration.zero;
 const double kEmptyMarginTop = 50;
 const double kDesktopIconButtonSplashRadius = 20;
 
+/// [kMinCursorSize] indicates min cursor (w, h)
+const int kMinCursorSize = 24;
+
 /// [kDefaultScrollAmountMultiplier] indicates how many rows can be scrolled after a minimum scroll action of mouse
 const kDefaultScrollAmountMultiplier = 5.0;
 const kDefaultScrollDuration = Duration(milliseconds: 50);
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index b65525159..152463c68 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -412,15 +412,6 @@ class _DesktopHomePageState extends State<DesktopHomePage>
   @override
   void initState() {
     super.initState();
-    Timer(const Duration(seconds: 1), () async {
-      final installed = bind.mainIsInstalled();
-      final root = await bind.mainIsRoot();
-      final release = await bind.mainIsRelease();
-      if (Platform.isWindows && release && !installed && !root) {
-        msgBox('custom-elevation-nocancel', 'Prompt', 'elevation_prompt', '',
-            gFFI.dialogManager);
-      }
-    });
     Timer(const Duration(seconds: 5), () async {
       updateUrl = await bind.mainGetSoftwareUpdateUrl();
       if (updateUrl.isNotEmpty) setState(() {});
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index 709d4deda..b063c3c15 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -5,7 +5,6 @@ import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
-import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_tab_page.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
diff --git a/flutter/lib/desktop/pages/desktop_tab_page.dart b/flutter/lib/desktop/pages/desktop_tab_page.dart
index 8672a1dad..794dd1c08 100644
--- a/flutter/lib/desktop/pages/desktop_tab_page.dart
+++ b/flutter/lib/desktop/pages/desktop_tab_page.dart
@@ -6,6 +6,7 @@ import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_setting_page.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
+import 'package:flutter_hbb/models/state_model.dart';
 import 'package:get/get.dart';
 import 'package:window_manager/window_manager.dart';
 
@@ -62,8 +63,6 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
 
   @override
   Widget build(BuildContext context) {
-    RxBool fullscreen = false.obs;
-    Get.put(fullscreen, tag: 'fullscreen');
     final tabWidget = Container(
       child: Overlay(initialEntries: [
         OverlayEntry(builder: (context) {
@@ -84,9 +83,11 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
     );
     return Platform.isMacOS
         ? tabWidget
-        : Obx(() => DragToResizeArea(
-            resizeEdgeSize:
-                fullscreen.value ? kFullScreenEdgeSize : kWindowEdgeSize,
-            child: tabWidget));
+        : Obx(
+            () => DragToResizeArea(
+              resizeEdgeSize: stateGlobal.resizeEdgeSize.value,
+              child: tabWidget,
+            ),
+          );
   }
 }
diff --git a/flutter/lib/desktop/pages/file_manager_tab_page.dart b/flutter/lib/desktop/pages/file_manager_tab_page.dart
index 5dd0629fb..66a14bd37 100644
--- a/flutter/lib/desktop/pages/file_manager_tab_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart
@@ -5,6 +5,7 @@ import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/consts.dart';
+import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/desktop/pages/file_manager_page.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
@@ -47,7 +48,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
 
     rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
       print(
-          "[FileTransfer] call ${call.method} with args ${call.arguments} from window ${fromWindowId} to ${windowId()}");
+          "[FileTransfer] call ${call.method} with args ${call.arguments} from window $fromWindowId to ${windowId()}");
       // for simplify, just replace connectionId
       if (call.method == "new_file_transfer") {
         final args = jsonDecode(call.arguments);
@@ -87,9 +88,9 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
     return Platform.isMacOS
         ? tabWidget
         : SubWindowDragToResizeArea(
-            resizeEdgeSize: kWindowEdgeSize,
-            windowId: windowId(),
             child: tabWidget,
+            resizeEdgeSize: stateGlobal.resizeEdgeSize.value,
+            windowId: stateGlobal.windowId,
           );
   }
 
diff --git a/flutter/lib/desktop/pages/port_forward_tab_page.dart b/flutter/lib/desktop/pages/port_forward_tab_page.dart
index de3ba0d92..c0eea86e6 100644
--- a/flutter/lib/desktop/pages/port_forward_tab_page.dart
+++ b/flutter/lib/desktop/pages/port_forward_tab_page.dart
@@ -5,6 +5,7 @@ import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/consts.dart';
+import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/desktop/pages/port_forward_page.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
@@ -50,7 +51,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
 
     rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
       debugPrint(
-          "call ${call.method} with args ${call.arguments} from window ${fromWindowId}");
+          "call ${call.method} with args ${call.arguments} from window $fromWindowId");
       // for simplify, just replace connectionId
       if (call.method == "new_port_forward") {
         final args = jsonDecode(call.arguments);
@@ -98,9 +99,9 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
     return Platform.isMacOS
         ? tabWidget
         : SubWindowDragToResizeArea(
-            resizeEdgeSize: kWindowEdgeSize,
-            windowId: windowId(),
             child: tabWidget,
+            resizeEdgeSize: stateGlobal.resizeEdgeSize.value,
+            windowId: stateGlobal.windowId,
           );
   }
 
diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart
index 01229ab2b..6fdf44dac 100644
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@@ -28,15 +28,9 @@ class RemotePage extends StatefulWidget {
   const RemotePage({
     Key? key,
     required this.id,
-    required this.windowId,
-    required this.tabBarHeight,
-    required this.windowBorderWidth,
   }) : super(key: key);
 
   final String id;
-  final int windowId;
-  final double tabBarHeight;
-  final double windowBorderWidth;
 
   @override
   State<RemotePage> createState() => _RemotePageState();
@@ -58,11 +52,6 @@ class _RemotePageState extends State<RemotePage>
 
   late FFI _ffi;
 
-  void _updateTabBarHeight() {
-    _ffi.canvasModel.tabBarHeight = widget.tabBarHeight;
-    _ffi.canvasModel.windowBorderWidth = widget.windowBorderWidth;
-  }
-
   void _initStates(String id) {
     PrivacyModeState.init(id);
     BlockInputState.init(id);
@@ -91,7 +80,6 @@ class _RemotePageState extends State<RemotePage>
 
     _ffi = FFI();
 
-    _updateTabBarHeight();
     Get.put(_ffi, tag: widget.id);
     _ffi.start(widget.id);
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -164,7 +152,6 @@ class _RemotePageState extends State<RemotePage>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    _updateTabBarHeight();
     return WillPopScope(
         onWillPop: () async {
           clientClose(_ffi.dialogManager);
@@ -241,7 +228,6 @@ class _RemotePageState extends State<RemotePage>
     paints.add(QualityMonitor(_ffi.qualityMonitorModel));
     paints.add(RemoteMenubar(
       id: widget.id,
-      windowId: widget.windowId,
       ffi: _ffi,
       onEnterOrLeaveImageSetter: (func) => _onEnterOrLeaveImage4Menubar = func,
       onEnterOrLeaveImageCleaner: () => _onEnterOrLeaveImage4Menubar = null,
@@ -284,7 +270,7 @@ class ImagePaint extends StatelessWidget {
             ? keyboardEnabled.isTrue
                 ? (remoteCursorMoved.isTrue
                     ? SystemMouseCursors.none
-                    : _buildCustomCursorLinux(context, s))
+                    : _buildCustomCursor(context, s))
                 : _buildDisabledCursor(context, s)
             : MouseCursor.defer,
         onHover: (evt) {},
@@ -333,41 +319,43 @@ class ImagePaint extends StatelessWidget {
     }
   }
 
-  MouseCursor _buildCustomCursorLinux(BuildContext context, double scale) {
+  MouseCursor _buildCustomCursor(BuildContext context, double scale) {
     final cursor = Provider.of<CursorModel>(context);
-    final cacheLinux = cursor.cacheLinux;
-    if (cacheLinux == null) {
+    final cache = cursor.cache ?? cursor.defaultCache;
+    if (cache == null) {
       return MouseCursor.defer;
     } else {
-      final key = cacheLinux.key(scale);
-      cursor.addKeyLinux(key);
+      final key = cache.updateGetKey(scale);
+      cursor.addKey(key);
       return FlutterCustomMemoryImageCursor(
-        pixbuf: cacheLinux.data,
+        pixbuf: cache.data,
         key: key,
-        hotx: cacheLinux.hotx,
-        hoty: cacheLinux.hoty,
-        imageWidth: (cacheLinux.width * scale).toInt(),
-        imageHeight: (cacheLinux.height * scale).toInt(),
+        // hotx: cache.hotx,
+        // hoty: cache.hoty,
+        hotx: 0,
+        hoty: 0,
+        imageWidth: (cache.width * cache.scale).toInt(),
+        imageHeight: (cache.height * cache.scale).toInt(),
       );
     }
   }
 
   MouseCursor _buildDisabledCursor(BuildContext context, double scale) {
     final cursor = Provider.of<CursorModel>(context);
-    final cacheLinux = cursor.cacheLinux;
-    if (cacheLinux == null) {
+    final cache = cursor.cache;
+    if (cache == null) {
       return MouseCursor.defer;
     } else {
       if (cursor.cachedForbidmemoryCursorData == null) {
         cursor.updateForbiddenCursorBuffer();
       }
       final key = 'disabled_cursor_key';
-      cursor.addKeyLinux(key);
+      cursor.addKey(key);
       return FlutterCustomMemoryImageCursor(
         pixbuf: cursor.cachedForbidmemoryCursorData,
         key: key,
-        hotx: cacheLinux.hotx,
-        hoty: cacheLinux.hoty,
+        hotx: 0,
+        hoty: 0,
         imageWidth: 32,
         imageHeight: 32,
       );
diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart
index 93008de07..29253d537 100644
--- a/flutter/lib/desktop/pages/remote_tab_page.dart
+++ b/flutter/lib/desktop/pages/remote_tab_page.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/common/shared_state.dart';
 import 'package:flutter_hbb/consts.dart';
+import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/desktop/pages/remote_page.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
@@ -34,24 +35,20 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
 
   _ConnectionTabPageState(Map<String, dynamic> params) {
     RemoteCountState.init();
-    final RxBool fullscreen = Get.find(tag: 'fullscreen');
     final peerId = params['id'];
     if (peerId != null) {
       ConnectionTypeState.init(peerId);
       tabController.add(TabInfo(
-          key: peerId,
-          label: peerId,
-          selectedIcon: selectedIcon,
-          unselectedIcon: unselectedIcon,
-          onTabCloseButton: () => tabController.closeBy(peerId),
-          page: Obx(() => RemotePage(
-                key: ValueKey(peerId),
-                id: peerId,
-                windowId: windowId(),
-                tabBarHeight:
-                    fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight,
-                windowBorderWidth: fullscreen.isTrue ? 0 : kWindowBorderWidth,
-              ))));
+        key: peerId,
+        label: peerId,
+        selectedIcon: selectedIcon,
+        unselectedIcon: unselectedIcon,
+        onTabCloseButton: () => tabController.closeBy(peerId),
+        page: RemotePage(
+          key: ValueKey(peerId),
+          id: peerId,
+        ),
+      ));
       _update_remote_count();
     }
   }
@@ -66,7 +63,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
       print(
           "call ${call.method} with args ${call.arguments} from window $fromWindowId");
 
-      final RxBool fullscreen = Get.find(tag: 'fullscreen');
       // for simplify, just replace connectionId
       if (call.method == "new_remote_desktop") {
         final args = jsonDecode(call.arguments);
@@ -75,19 +71,13 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
         window_on_top(windowId());
         ConnectionTypeState.init(id);
         tabController.add(TabInfo(
-            key: id,
-            label: id,
-            selectedIcon: selectedIcon,
-            unselectedIcon: unselectedIcon,
-            onTabCloseButton: () => tabController.closeBy(id),
-            page: Obx(() => RemotePage(
-                  key: ValueKey(id),
-                  id: id,
-                  windowId: windowId(),
-                  tabBarHeight:
-                      fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight,
-                  windowBorderWidth: fullscreen.isTrue ? 0 : kWindowBorderWidth,
-                ))));
+          key: id,
+          label: id,
+          selectedIcon: selectedIcon,
+          unselectedIcon: unselectedIcon,
+          onTabCloseButton: () => tabController.closeBy(id),
+          page: RemotePage(key: ValueKey(id), id: id),
+        ));
       } else if (call.method == "onDestroy") {
         tabController.clear();
       } else if (call.method == kWindowActionRebuild) {
@@ -102,7 +92,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
 
   @override
   Widget build(BuildContext context) {
-    final RxBool fullscreen = Get.find(tag: 'fullscreen');
     final tabWidget = Container(
       decoration: BoxDecoration(
           border: Border.all(
@@ -110,61 +99,56 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
               width: kWindowBorderWidth)),
       child: Scaffold(
           backgroundColor: Theme.of(context).backgroundColor,
-          body: Obx(() => DesktopTab(
-                controller: tabController,
-                showTabBar: fullscreen.isFalse,
-                onWindowCloseButton: handleWindowCloseButton,
-                tail: const AddButton().paddingOnly(left: 10),
-                pageViewBuilder: (pageView) {
-                  WindowController.fromWindowId(windowId())
-                      .setFullscreen(fullscreen.isTrue);
-                  return pageView;
-                },
-                tabBuilder: (key, icon, label, themeConf) => Obx(() {
-                  final connectionType = ConnectionTypeState.find(key);
-                  if (!connectionType.isValid()) {
-                    return Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        icon,
-                        label,
-                      ],
-                    );
-                  } else {
-                    final msgDirect = translate(
-                        connectionType.direct.value == ConnectionType.strDirect
-                            ? 'Direct Connection'
-                            : 'Relay Connection');
-                    final msgSecure = translate(
-                        connectionType.secure.value == ConnectionType.strSecure
-                            ? 'Secure Connection'
-                            : 'Insecure Connection');
-                    return Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        icon,
-                        Tooltip(
-                          message: '$msgDirect\n$msgSecure',
-                          child: SvgPicture.asset(
-                            'assets/${connectionType.secure.value}${connectionType.direct.value}.svg',
-                            width: themeConf.iconSize,
-                            height: themeConf.iconSize,
-                          ).paddingOnly(right: 5),
-                        ),
-                        label,
-                      ],
-                    );
-                  }
-                }),
-              ))),
+          body: DesktopTab(
+            controller: tabController,
+            onWindowCloseButton: handleWindowCloseButton,
+            tail: const AddButton().paddingOnly(left: 10),
+            pageViewBuilder: (pageView) => pageView,
+            tabBuilder: (key, icon, label, themeConf) => Obx(() {
+              final connectionType = ConnectionTypeState.find(key);
+              if (!connectionType.isValid()) {
+                return Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    icon,
+                    label,
+                  ],
+                );
+              } else {
+                final msgDirect = translate(
+                    connectionType.direct.value == ConnectionType.strDirect
+                        ? 'Direct Connection'
+                        : 'Relay Connection');
+                final msgSecure = translate(
+                    connectionType.secure.value == ConnectionType.strSecure
+                        ? 'Secure Connection'
+                        : 'Insecure Connection');
+                return Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    icon,
+                    Tooltip(
+                      message: '$msgDirect\n$msgSecure',
+                      child: SvgPicture.asset(
+                        'assets/${connectionType.secure.value}${connectionType.direct.value}.svg',
+                        width: themeConf.iconSize,
+                        height: themeConf.iconSize,
+                      ).paddingOnly(right: 5),
+                    ),
+                    label,
+                  ],
+                );
+              }
+            }),
+          )),
     );
     return Platform.isMacOS
         ? tabWidget
-        : Obx(() => SubWindowDragToResizeArea(
-            resizeEdgeSize:
-                fullscreen.value ? kFullScreenEdgeSize : kWindowEdgeSize,
-            windowId: windowId(),
-            child: tabWidget));
+        : SubWindowDragToResizeArea(
+            child: tabWidget,
+            resizeEdgeSize: stateGlobal.resizeEdgeSize.value,
+            windowId: stateGlobal.windowId,
+          );
   }
 
   void onRemoveId(String id) {
diff --git a/flutter/lib/desktop/screen/desktop_remote_screen.dart b/flutter/lib/desktop/screen/desktop_remote_screen.dart
index 4d045d02b..57886b2f2 100644
--- a/flutter/lib/desktop/screen/desktop_remote_screen.dart
+++ b/flutter/lib/desktop/screen/desktop_remote_screen.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/desktop/pages/remote_tab_page.dart';
 import 'package:flutter_hbb/desktop/widgets/refresh_wrapper.dart';
-import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 
 /// multi-tab desktop remote screen
@@ -13,8 +12,6 @@ class DesktopRemoteScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    RxBool fullscreen = false.obs;
-    Get.put(fullscreen, tag: 'fullscreen');
     return MultiProvider(
         providers: [
           ChangeNotifierProvider.value(value: gFFI.ffiModel),
diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart
index e670e5d80..6a9bbeb1a 100644
--- a/flutter/lib/desktop/widgets/remote_menubar.dart
+++ b/flutter/lib/desktop/widgets/remote_menubar.dart
@@ -6,6 +6,7 @@ import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
+import 'package:flutter_hbb/models/state_model.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:rxdart/rxdart.dart' as rxdart;
@@ -29,7 +30,6 @@ class _MenubarTheme {
 
 class RemoteMenubar extends StatefulWidget {
   final String id;
-  final int windowId;
   final FFI ffi;
   final Function(Function(bool)) onEnterOrLeaveImageSetter;
   final Function() onEnterOrLeaveImageCleaner;
@@ -37,7 +37,6 @@ class RemoteMenubar extends StatefulWidget {
   const RemoteMenubar({
     Key? key,
     required this.id,
-    required this.windowId,
     required this.ffi,
     required this.onEnterOrLeaveImageSetter,
     required this.onEnterOrLeaveImageCleaner,
@@ -55,9 +54,12 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
   bool _isCursorOverImage = false;
   window_size.Screen? _screen;
 
-  bool get isFullscreen => Get.find<RxBool>(tag: 'fullscreen').isTrue;
+  int get windowId => stateGlobal.windowId;
+
+  bool get isFullscreen => stateGlobal.fullscreen;
   void _setFullscreen(bool v) {
-    Get.find<RxBool>(tag: 'fullscreen').value = v;
+    stateGlobal.setFullscreen(v);
+    setState(() {});
   }
 
   @override
@@ -106,18 +108,24 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
             width: 100,
             height: 13,
             child: TextButton(
-                onHover: (bool v) {
-                  _hideColor.value = v ? Colors.white60 : Colors.white24;
-                },
-                onPressed: () {
-                  _show.value = !_show.value;
-                  if (_show.isTrue) {
-                    _updateScreen();
-                  }
-                },
-                child: Obx(() => Container(
+              onHover: (bool v) {
+                _hideColor.value = v ? Colors.white60 : Colors.white24;
+              },
+              onPressed: () {
+                _show.value = !_show.value;
+                _hideColor.value = Colors.white24;
+                if (_show.isTrue) {
+                  _updateScreen();
+                }
+              },
+              child: Obx(() => Container(
+                    decoration: BoxDecoration(
                       color: _hideColor.value,
-                    ).marginOnly(bottom: 8.0))))));
+                      border: Border.all(color: MyTheme.border),
+                      borderRadius: BorderRadius.all(Radius.circular(5.0)),
+                    ),
+                  ).marginOnly(bottom: 8.0)),
+            ))));
   }
 
   _updateScreen() async {
@@ -170,7 +178,11 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
             textStyle: TextStyle(color: _MenubarTheme.commonColor)),
         child: Column(mainAxisSize: MainAxisSize.min, children: [
           Container(
-              color: Colors.white,
+              decoration: BoxDecoration(
+                color: Colors.white,
+                border: Border.all(color: MyTheme.border),
+                borderRadius: BorderRadius.all(Radius.circular(10.0)),
+              ),
               child: Row(
                 mainAxisSize: MainAxisSize.min,
                 children: menubarItems,
@@ -203,7 +215,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
       onPressed: () {
         _setFullscreen(!isFullscreen);
       },
-      icon: Obx(() => isFullscreen
+      icon: isFullscreen
           ? const Icon(
               Icons.fullscreen_exit,
               color: _MenubarTheme.commonColor,
@@ -211,7 +223,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
           : const Icon(
               Icons.fullscreen,
               color: _MenubarTheme.commonColor,
-            )),
+            ),
     );
   }
 
@@ -910,8 +922,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
                 _setFullscreen(false);
                 double scale = _screen!.scaleFactor;
                 final wndRect =
-                    await WindowController.fromWindowId(widget.windowId)
-                        .getFrame();
+                    await WindowController.fromWindowId(windowId).getFrame();
                 final mediaSize = MediaQueryData.fromWindow(ui.window).size;
                 // On windows, wndRect is equal to GetWindowRect and mediaSize is equal to GetClientRect.
                 // https://stackoverflow.com/a/7561083
@@ -934,8 +945,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
                 double top = wndRect.top + (wndRect.height - height) / 2;
 
                 Rect frameRect = _screen!.frame;
-                final RxBool fullscreen = Get.find(tag: 'fullscreen');
-                if (fullscreen.isFalse) {
+                if (!isFullscreen) {
                   frameRect = _screen!.visibleFrame;
                 }
                 if (left < frameRect.left) {
@@ -950,7 +960,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
                 if ((top + height) > frameRect.bottom) {
                   top = frameRect.bottom - height;
                 }
-                await WindowController.fromWindowId(widget.windowId)
+                await WindowController.fromWindowId(windowId)
                     .setFrame(Rect.fromLTWH(left, top, width, height));
               }
             }();
diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart
index 7fae47e69..6643183f5 100644
--- a/flutter/lib/desktop/widgets/tabbar_widget.dart
+++ b/flutter/lib/desktop/widgets/tabbar_widget.dart
@@ -9,6 +9,7 @@ import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/main.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
+import 'package:flutter_hbb/models/state_model.dart';
 import 'package:get/get.dart';
 import 'package:get/get_rx/src/rx_workers/utils/debouncer.dart';
 import 'package:scroll_pos/scroll_pos.dart';
@@ -176,10 +177,10 @@ typedef TabBuilder = Widget Function(
 typedef LabelGetter = Rx<String> Function(String key);
 
 /// [_lastClickTime], help to handle double click
-int _lastClickTime = DateTime.now().millisecondsSinceEpoch;
+int _lastClickTime =
+    DateTime.now().millisecondsSinceEpoch - kDesktopDoubleClickTimeMilli - 1000;
 
 class DesktopTab extends StatelessWidget {
-  final bool showTabBar;
   final bool showLogo;
   final bool showTitle;
   final bool showMinimize;
@@ -206,7 +207,6 @@ class DesktopTab extends StatelessWidget {
   DesktopTab({
     Key? key,
     required this.controller,
-    this.showTabBar = true,
     this.showLogo = true,
     this.showTitle = true,
     this.showMinimize = true,
@@ -229,8 +229,8 @@ class DesktopTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Column(children: [
-      Offstage(
-          offstage: !showTabBar,
+      Obx(() => Offstage(
+          offstage: !stateGlobal.showTabBar.isTrue,
           child: SizedBox(
             height: _kTabBarHeight,
             child: Column(
@@ -245,7 +245,7 @@ class DesktopTab extends StatelessWidget {
                 ),
               ],
             ),
-          )),
+          ))),
       Expanded(
           child: pageViewBuilder != null
               ? pageViewBuilder!(_buildPageView())
diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index b3f74f930..df314396f 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_tab_page.dart';
 import 'package:flutter_hbb/desktop/pages/server_page.dart';
 import 'package:flutter_hbb/desktop/pages/install_page.dart';
@@ -15,7 +15,6 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:uni_links_desktop/uni_links_desktop.dart';
 import 'package:window_manager/window_manager.dart';
 
 // import 'package:window_manager/window_manager.dart';
@@ -41,11 +40,14 @@ Future<void> main(List<String> args) async {
   // main window
   if (args.isNotEmpty && args.first == 'multi_window') {
     windowId = int.parse(args[1]);
+    stateGlobal.setWindowId(windowId!);
     WindowController.fromWindowId(windowId!).showTitleBar(false);
     final argument = args[2].isEmpty
         ? <String, dynamic>{}
         : jsonDecode(args[2]) as Map<String, dynamic>;
     int type = argument['type'] ?? -1;
+    // to-do: No need to parse window id ?
+    // Because stateGlobal.windowId is a global value.
     argument['windowId'] = windowId;
     WindowType wType = type.windowType;
     switch (wType) {
diff --git a/flutter/lib/models/input_model.dart b/flutter/lib/models/input_model.dart
index 21278367f..2469ee0d9 100644
--- a/flutter/lib/models/input_model.dart
+++ b/flutter/lib/models/input_model.dart
@@ -10,6 +10,7 @@ import '../../models/model.dart';
 import '../../models/platform_model.dart';
 import '../common.dart';
 import '../consts.dart';
+import './state_model.dart';
 import 'dart:ui' as ui;
 
 /// Mouse button enum.
@@ -321,9 +322,7 @@ class InputModel {
     double x = evt['x'];
     double y = max(0.0, evt['y']);
     if (isDesktop) {
-      final RxBool fullscreen = Get.find(tag: 'fullscreen');
-      final tabBarHeight = fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight;
-      y = y - tabBarHeight;
+      y = y - stateGlobal.tabBarHeight;
     }
     final canvasModel = parent.target!.canvasModel;
     final ffiModel = parent.target!.ffiModel;
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index aa9dfd8e2..ff26296da 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -14,9 +14,11 @@ import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:flutter_hbb/models/file_model.dart';
 import 'package:flutter_hbb/models/server_model.dart';
 import 'package:flutter_hbb/models/user_model.dart';
+import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:tuple/tuple.dart';
+import 'package:image/image.dart' as img2;
 import 'package:flutter_custom_cursor/flutter_custom_cursor.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
@@ -482,9 +484,9 @@ class CanvasModel with ChangeNotifier {
   // image scale
   double _scale = 1.0;
   // the tabbar over the image
-  double tabBarHeight = 0.0;
+  // double tabBarHeight = 0.0;
   // the window border's width
-  double windowBorderWidth = 0.0;
+  // double windowBorderWidth = 0.0;
   // remote id
   String id = '';
   // scroll offset x percent
@@ -570,6 +572,9 @@ class CanvasModel with ChangeNotifier {
     return parent.target?.ffiModel.display.height ?? defaultHeight;
   }
 
+  double get windowBorderWidth => stateGlobal.windowBorderWidth;
+  double get tabBarHeight => stateGlobal.tabBarHeight;
+
   Size get size {
     final size = MediaQueryData.fromWindow(ui.window).size;
     return Size(size.width - windowBorderWidth * 2,
@@ -665,15 +670,19 @@ class CanvasModel with ChangeNotifier {
 class CursorData {
   final String peerId;
   final int id;
-  final Uint8List? data;
-  final double hotx;
-  final double hoty;
+  final img2.Image? image;
+  double scale;
+  Uint8List? data;
+  double hotx;
+  double hoty;
   final int width;
   final int height;
 
   CursorData({
     required this.peerId,
     required this.id,
+    required this.image,
+    required this.scale,
     required this.data,
     required this.hotx,
     required this.hoty,
@@ -683,16 +692,46 @@ class CursorData {
 
   int _doubleToInt(double v) => (v * 10e6).round().toInt();
 
-  String key(double scale) =>
-      '${peerId}_${id}_${_doubleToInt(width * scale)}_${_doubleToInt(height * scale)}';
+  double _checkUpdateScale(double scale) {
+    // Update data if scale changed.
+    if (Platform.isWindows) {
+      final tgtWidth = (width * scale).toInt();
+      final tgtHeight = (width * scale).toInt();
+      if (tgtWidth < kMinCursorSize || tgtHeight < kMinCursorSize) {
+        double sw = kMinCursorSize.toDouble() / width;
+        double sh = kMinCursorSize.toDouble() / height;
+        scale = sw < sh ? sh : sw;
+      }
+      if (_doubleToInt(this.scale) != _doubleToInt(scale)) {
+        data = img2
+            .copyResize(
+              image!,
+              width: (width * scale).toInt(),
+              height: (height * scale).toInt(),
+            )
+            .getBytes(format: img2.Format.bgra);
+        hotx = (width * scale) / 2;
+        hoty = (height * scale) / 2;
+      }
+    }
+    this.scale = scale;
+    return scale;
+  }
+
+  String updateGetKey(double scale) {
+    scale = _checkUpdateScale(scale);
+    return '${peerId}_${id}_${_doubleToInt(width * scale)}_${_doubleToInt(height * scale)}';
+  }
 }
 
 class CursorModel with ChangeNotifier {
   ui.Image? _image;
   final _images = <int, Tuple3<ui.Image, double, double>>{};
-  CursorData? _cacheLinux;
-  final _cacheMapLinux = <int, CursorData>{};
-  final _cacheKeysLinux = <String>{};
+  CursorData? _cache;
+  final _defaultCacheId = -1;
+  CursorData? _defaultCache;
+  final _cacheMap = <int, CursorData>{};
+  final _cacheKeys = <String>{};
   double _x = -10000;
   double _y = -10000;
   double _hotx = 0;
@@ -703,7 +742,8 @@ class CursorModel with ChangeNotifier {
   WeakReference<FFI> parent;
 
   ui.Image? get image => _image;
-  CursorData? get cacheLinux => _cacheLinux;
+  CursorData? get cache => _cache;
+  CursorData? get defaultCache => _getDefaultCache();
 
   double get x => _x - _displayOriginX;
 
@@ -717,8 +757,31 @@ class CursorModel with ChangeNotifier {
 
   CursorModel(this.parent);
 
-  Set<String> get cachedKeysLinux => _cacheKeysLinux;
-  addKeyLinux(String key) => _cacheKeysLinux.add(key);
+  Set<String> get cachedKeys => _cacheKeys;
+  addKey(String key) => _cacheKeys.add(key);
+
+  CursorData? _getDefaultCache() {
+    if (_defaultCache == null) {
+      if (Platform.isWindows) {
+        Uint8List data = defaultCursorImage!.getBytes(format: img2.Format.bgra);
+        _hotx = defaultCursorImage!.width / 2;
+        _hoty = defaultCursorImage!.height / 2;
+
+        _defaultCache = CursorData(
+          peerId: id,
+          id: _defaultCacheId,
+          image: defaultCursorImage?.clone(),
+          scale: 1.0,
+          data: data,
+          hotx: _hotx,
+          hoty: _hoty,
+          width: defaultCursorImage!.width,
+          height: defaultCursorImage!.height,
+        );
+      }
+    }
+    return _defaultCache;
+  }
 
   // remote physical display coordinate
   Rect getVisibleRect() {
@@ -863,27 +926,48 @@ class CursorModel with ChangeNotifier {
   }
 
   _updateCacheLinux(ui.Image image, int id, int w, int h) async {
-    ByteData? data;
+    Uint8List? data;
+    img2.Image? image2;
     if (Platform.isWindows) {
-      data = await image.toByteData(format: ui.ImageByteFormat.rawRgba);
+      ByteData? data2 =
+          await image.toByteData(format: ui.ImageByteFormat.rawRgba);
+      if (data2 != null) {
+        data = data2.buffer.asUint8List();
+        image2 = img2.Image.fromBytes(w, h, data);
+      } else {
+        data = defaultCursorImage?.getBytes(format: img2.Format.bgra);
+        image2 = defaultCursorImage?.clone();
+        _hotx = defaultCursorImage!.width / 2;
+        _hoty = defaultCursorImage!.height / 2;
+      }
     } else {
-      data = await image.toByteData(format: ui.ImageByteFormat.png);
+      ByteData? data2 = await image.toByteData(format: ui.ImageByteFormat.png);
+      if (data2 != null) {
+        data = data2.buffer.asUint8List();
+      } else {
+        data = Uint8List.fromList(img2.encodePng(defaultCursorImage!));
+        _hotx = defaultCursorImage!.width / 2;
+        _hoty = defaultCursorImage!.height / 2;
+      }
     }
-    _cacheLinux = CursorData(
+
+    _cache = CursorData(
       peerId: this.id,
-      data: data?.buffer.asUint8List(),
       id: id,
+      image: image2,
+      scale: 1.0,
+      data: data,
       hotx: _hotx,
       hoty: _hoty,
       width: w,
       height: h,
     );
-    _cacheMapLinux[id] = _cacheLinux!;
+    _cacheMap[id] = _cache!;
   }
 
   updateCursorId(Map<String, dynamic> evt) async {
     final id = int.parse(evt['id']);
-    _cacheLinux = _cacheMapLinux[id];
+    _cache = _cacheMap[id];
     final tmp = _images[id];
     if (tmp != null) {
       _image = tmp.item1;
@@ -931,15 +1015,15 @@ class CursorModel with ChangeNotifier {
     _image = null;
     _images.clear();
 
-    _clearCacheLinux();
-    _cacheLinux = null;
-    _cacheMapLinux.clear();
+    _clearCache();
+    _cache = null;
+    _cacheMap.clear();
   }
 
-  _clearCacheLinux() {
-    final cachedKeys = {...cachedKeysLinux};
-    for (var key in cachedKeys) {
-      customCursorController.freeCache(key);
+  _clearCache() {
+    final keys = {...cachedKeys};
+    for (var k in keys) {
+      customCursorController.freeCache(k);
     }
   }
 
@@ -948,6 +1032,9 @@ class CursorModel with ChangeNotifier {
     cachedForbidmemoryCursorData ??= base64Decode(
         'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAkZQTFRFAAAA2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4G2B4GWAwCAAAAAAAA2B4GAAAAMTExAAAAAAAA2B4G2B4G2B4GAAAAmZmZkZGRAQEBAAAA2B4G2B4G2B4G////oKCgAwMDag8D2B4G2B4G2B4Gra2tBgYGbg8D2B4G2B4Gubm5CQkJTwsCVgwC2B4GxcXFDg4OAAAAAAAA2B4G2B4Gz8/PFBQUAAAAAAAA2B4G2B4G2B4G2B4G2B4G2B4G2B4GDgIA2NjYGxsbAAAAAAAA2B4GFwMB4eHhIyMjAAAAAAAA2B4G6OjoLCwsAAAAAAAA2B4G2B4G2B4G2B4G2B4GCQEA4ODgv7+/iYmJY2NjAgICAAAA9PT0Ojo6AAAAAAAAAAAA+/v7SkpKhYWFr6+vAAAAAAAA8/PzOTk5ERER9fX1KCgoAAAAgYGBKioqAAAAAAAApqamlpaWAAAAAAAAAAAAAAAAAAAAAAAALi4u/v7+GRkZAAAAAAAAAAAAAAAAAAAAfn5+AAAAAAAAV1dXkJCQAAAAAAAAAQEBAAAAAAAAAAAA7Hz6BAAAAMJ0Uk5TAAIWEwEynNz6//fVkCAatP2fDUHs6cDD8d0mPfT5fiEskiIR584A0gejr3AZ+P4plfALf5ZiTL85a4ziD6697fzN3UYE4v/4TwrNHuT///tdRKZh///+1U/ZBv///yjb///eAVL//50Cocv//6oFBbPvpGZCbfT//7cIhv///8INM///zBEcWYSZmO7//////1P////ts/////8vBv//////gv//R/z///QQz9sevP///2waXhNO/+fc//8mev/5gAe2r90MAAAByUlEQVR4nGNggANGJmYWBpyAlY2dg5OTi5uHF6s0H78AJxRwCAphyguLgKRExcQlQLSkFLq8tAwnp6ycPNABjAqKQKNElVDllVU4OVVhVquJA81Q10BRoAkUUYbJa4Edoo0sr6PLqaePLG/AyWlohKTAmJPTBFnelAFoixmSAnNOTgsUeQZLTk4rJAXWnJw2EHlbiDyDPCenHZICe04HFrh+RydnBgYWPU5uJAWinJwucPNd3dw9GDw5Ob2QFHBzcnrD7ffx9fMPCOTkDEINhmC4+3x8Q0LDwlEDIoKTMzIKKg9SEBIdE8sZh6SAJZ6Tkx0qD1YQkpCYlIwclCng0AXLQxSEpKalZyCryATKZwkhKQjJzsnNQ1KQXwBUUVhUXBJYWgZREFJeUVmFpMKlWg+anmqgCkJq6+obkG1pLEBTENLU3NKKrIKhrb2js8u4G6Kgpze0r3/CRAZMAHbkpJDJU6ZMmTqtFbuC6TNmhsyaMnsOFlmwgrnzpsxfELJwEXZ5Bp/FS3yWLlsesmLlKuwKVk9Ys5Zh3foN0zduwq5g85atDAzbpqSGbN9RhV0FGOzctWH3lD14FOzdt3H/gQw8Cg4u2gQPAwBYDXXdIH+wqAAAAABJRU5ErkJggg==');
   }
+
+  img2.Image? defaultCursorImage = img2.decodePng(base64Decode(
+      'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAFmSURBVFiF7dWxSlxREMbx34QFDRowYBchZSxSCWlMCOwD5FGEFHap06UI7KPsAyyEEIQFqxRaCqYTsqCJFsKkuAeRXb17wrqV918dztw55zszc2fo6Oh47MR/e3zO1/iAHWmznHKGQwx9ip/LEbCfazbsoY8j/JLOhcC6sCW9wsjEwJf483AC9nPNc1+lFRwI13d+l3rYFS799rFGxJMqARv2pBXh+72XQ7gWvklPS7TmMl9Ak/M+DqrENvxAv/guKKApuKPWl0/TROK4+LbSqzhuB+OZ3fRSeFPWY+Fkyn56Y29hfgTSpnQ+s98cvorVey66uPlNFxKwZOYLCGfCs5n9NMYVrsp6mvXSoFqpqYFDvMBkStgJJe93dZOwVXxbqUnBENulydSReqUrDhcX0PT2EXarBYS3GNXMhboinBgIl9K71kg0L3+PvyYGdVpruT2MwrF0iotiXfIwus0Dj+OOjo6Of+e7ab74RkpgAAAAAElFTkSuQmCC'));
 }
 
 class QualityMonitorData {
diff --git a/flutter/lib/models/state_model.dart b/flutter/lib/models/state_model.dart
new file mode 100644
index 000000000..f6e3820b9
--- /dev/null
+++ b/flutter/lib/models/state_model.dart
@@ -0,0 +1,35 @@
+import 'package:desktop_multi_window/desktop_multi_window.dart';
+import 'package:get/get.dart';
+
+import '../consts.dart';
+
+class StateGlobal {
+  int _windowId = -1;
+  bool _fullscreen = false;
+  final RxBool _showTabBar = true.obs;
+  final RxDouble _resizeEdgeSize = 8.0.obs;
+
+  int get windowId => _windowId;
+  bool get fullscreen => _fullscreen;
+  double get tabBarHeight => fullscreen ? 0 : kDesktopRemoteTabBarHeight;
+  double get windowBorderWidth => fullscreen ? 0 : kWindowBorderWidth;
+  RxBool get showTabBar => _showTabBar;
+  RxDouble get resizeEdgeSize => _resizeEdgeSize;
+
+  setWindowId(int id) => _windowId = id;
+  setFullscreen(bool v) {
+    if (_fullscreen != v) {
+      _fullscreen = v;
+      _showTabBar.value = !_fullscreen;
+      _resizeEdgeSize.value =
+          fullscreen ? kFullScreenEdgeSize : kWindowEdgeSize;
+      WindowController.fromWindowId(windowId).setFullscreen(_fullscreen);
+    }
+  }
+
+  StateGlobal._();
+
+  static final StateGlobal instance = StateGlobal._();
+}
+
+final stateGlobal = StateGlobal.instance;
diff --git a/flutter/lib/models/user_model.dart b/flutter/lib/models/user_model.dart
index 163efaebc..721aac5b5 100644
--- a/flutter/lib/models/user_model.dart
+++ b/flutter/lib/models/user_model.dart
@@ -77,7 +77,9 @@ class UserModel {
       return "";
     }
     final m = jsonDecode(userInfo);
-    userName.value = m['name'] ?? '';
+    if (m != null) {
+      userName.value = m['name'] ?? '';
+    }
     return userName.value;
   }
 
diff --git a/flutter/lib/utils/multi_window_manager.dart b/flutter/lib/utils/multi_window_manager.dart
index 8fd71540d..a88f19a57 100644
--- a/flutter/lib/utils/multi_window_manager.dart
+++ b/flutter/lib/utils/multi_window_manager.dart
@@ -154,7 +154,7 @@ class RustDeskMultiWindowManager {
     int? wId = findWindowByType(type);
     if (wId != null) {
       debugPrint("closing multi window: ${type.toString()}");
-      saveWindowPosition(type, windowId: wId);
+      await saveWindowPosition(type, windowId: wId);
       try {
         final ids = await DesktopMultiWindow.getAllSubWindowIds();
         if (!ids.contains(wId)) {
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index eb9c336cc..43eba9976 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -64,7 +64,7 @@ dependencies:
     desktop_multi_window:
         git:
             url: https://github.com/Kingtous/rustdesk_desktop_multi_window
-            ref: bf278fc8a8ff787e46fa3ab97674373bfaa20f23
+            ref: 39a8a5b8aed059a89a1694ed2dffe69e31da2ac1
     freezed_annotation: ^2.0.3
     tray_manager:
         git:
@@ -96,7 +96,10 @@ dependencies:
         #     url: https://github.com/Kingtous/flutter_improved_scrolling
         #     ref: 62f09545149f320616467c306c8c5f71714a18e6
     uni_links: ^0.5.1
-    uni_links_desktop: ^0.1.3
+    uni_links_desktop:
+        git:
+            url: https://github.com/fufesou/uni_links_desktop.git
+            ref: 5be5113d59c753989dbf1106241379e3fd4c9b18
     path: ^1.8.1
     auto_size_text: ^3.0.0
 
diff --git a/flutter/windows/runner/main.cpp b/flutter/windows/runner/main.cpp
index 19556a1f1..5680ab5d3 100644
--- a/flutter/windows/runner/main.cpp
+++ b/flutter/windows/runner/main.cpp
@@ -1,6 +1,7 @@
 #include <flutter/dart_project.h>
 #include <flutter/flutter_view_controller.h>
 #include <windows.h>
+#include <tchar.h>
 #include <iostream>
 
 #include "flutter_window.h"
@@ -54,7 +55,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
   // only do uni links when dispatch a rustdesk links
   auto prefix = std::string(uniLinksPrefix);
   if (!command_line_arguments.empty() && command_line_arguments.front().compare(0, prefix.size(), prefix.c_str()) == 0) {
-     HWND hwnd = ::FindWindow(L"FLUTTER_RUNNER_WIN32_WINDOW", L"rustdesk");
+     HWND hwnd = ::FindWindow(_T("FLUTTER_RUNNER_WIN32_WINDOW"), _T("RustDesk"));
     if (hwnd != NULL) {
       DispatchToUniLinksDesktop(hwnd);
 
diff --git a/libs/clipboard/src/windows/wf_cliprdr.c b/libs/clipboard/src/windows/wf_cliprdr.c
index 7374b27c1..00ef7254e 100644
--- a/libs/clipboard/src/windows/wf_cliprdr.c
+++ b/libs/clipboard/src/windows/wf_cliprdr.c
@@ -135,14 +135,14 @@ typedef struct _FORMAT_IDS FORMAT_IDS;
 
 #define TAG "windows"
 
-// #ifdef WITH_DEBUG_CLIPRDR
+#ifdef WITH_DEBUG_CLIPRDR
 #define DEBUG_CLIPRDR(fmt, ...) fprintf(stderr, "DEBUG %s[%d] %s() " fmt "\n",  __FILE__, __LINE__, __func__, ##__VA_ARGS__);fflush(stderr)
-// #else
-// #define DEBUG_CLIPRDR(fmt, ...) \
-// 	do                     \
-// 	{                      \
-// 	} while (0)
-// #endif
+#else
+#define DEBUG_CLIPRDR(fmt, ...) \
+	do                     \
+	{                      \
+	} while (0)
+#endif
 
 typedef BOOL(WINAPI *fnAddClipboardFormatListener)(HWND hwnd);
 typedef BOOL(WINAPI *fnRemoveClipboardFormatListener)(HWND hwnd);
diff --git a/libs/enigo/src/win/win_impl.rs b/libs/enigo/src/win/win_impl.rs
index 56fc4caef..e7512399e 100644
--- a/libs/enigo/src/win/win_impl.rs
+++ b/libs/enigo/src/win/win_impl.rs
@@ -21,19 +21,21 @@ static mut LAYOUT: HKL = std::ptr::null_mut();
 pub const ENIGO_INPUT_EXTRA_VALUE: ULONG_PTR = 100;
 
 fn mouse_event(flags: u32, data: u32, dx: i32, dy: i32) -> DWORD {
-    let mut input = INPUT {
-        type_: INPUT_MOUSE,
-        u: unsafe {
-            transmute(MOUSEINPUT {
-                dx,
-                dy,
-                mouseData: data,
-                dwFlags: flags,
-                time: 0,
-                dwExtraInfo: ENIGO_INPUT_EXTRA_VALUE,
-            })
-        },
-    };
+    let mut input: INPUT = unsafe { std::mem::MaybeUninit::zeroed().assume_init() };
+    input.type_ = INPUT_MOUSE;
+    unsafe {
+        let dst_ptr = (&mut input.u as *mut _) as *mut u8;
+        let m = MOUSEINPUT {
+            dx,
+            dy,
+            mouseData: data,
+            dwFlags: flags,
+            time: 0,
+            dwExtraInfo: ENIGO_INPUT_EXTRA_VALUE,
+        };
+        let src_ptr = (&m as *const _) as *const u8;
+        std::ptr::copy_nonoverlapping(src_ptr, dst_ptr, size_of::<MOUSEINPUT>());
+    }
     unsafe { SendInput(1, &mut input as LPINPUT, size_of::<INPUT>() as c_int) }
 }
 
@@ -50,18 +52,20 @@ fn keybd_event(flags: u32, vk: u16, scan: u16) -> DWORD {
             scan = MapVirtualKeyExW(vk as _, 0, LAYOUT) as _;
         }
     }
-    let mut input = INPUT {
-        type_: INPUT_KEYBOARD,
-        u: unsafe {
-            transmute_copy(&KEYBDINPUT {
-                wVk: vk,
-                wScan: scan,
-                dwFlags: flags,
-                time: 0,
-                dwExtraInfo: ENIGO_INPUT_EXTRA_VALUE,
-            })
-        },
-    };
+    let mut input: INPUT = unsafe { std::mem::MaybeUninit::zeroed().assume_init() };
+    input.type_ = INPUT_KEYBOARD;
+    unsafe {
+        let dst_ptr = (&mut input.u as *mut _) as *mut u8;
+        let k = KEYBDINPUT {
+            wVk: vk,
+            wScan: scan,
+            dwFlags: flags,
+            time: 0,
+            dwExtraInfo: ENIGO_INPUT_EXTRA_VALUE,
+        };
+        let src_ptr = (&k as *const _) as *const u8;
+        std::ptr::copy_nonoverlapping(src_ptr, dst_ptr, size_of::<KEYBDINPUT>());
+    }
     unsafe { SendInput(1, &mut input as LPINPUT, size_of::<INPUT>() as c_int) }
 }
 
diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs
index ad0585549..9eb9cd369 100644
--- a/libs/hbb_common/src/config.rs
+++ b/libs/hbb_common/src/config.rs
@@ -795,7 +795,7 @@ const PEERS: &str = "peers";
 
 impl PeerConfig {
     pub fn load(id: &str) -> PeerConfig {
-        let _ = CONFIG.read().unwrap(); // for lock
+        let _lock = CONFIG.read().unwrap();
         match confy::load_path(&Self::path(id)) {
             Ok(config) => {
                 let mut config: PeerConfig = config;
@@ -827,7 +827,7 @@ impl PeerConfig {
     }
 
     pub fn store(&self, id: &str) {
-        let _ = CONFIG.read().unwrap(); // for lock
+        let _lock = CONFIG.read().unwrap();
         let mut config = self.clone();
         config.password = encrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION);
         config
@@ -999,7 +999,7 @@ pub struct LanPeers {
 
 impl LanPeers {
     pub fn load() -> LanPeers {
-        let _ = CONFIG.read().unwrap(); // for lock
+        let _lock = CONFIG.read().unwrap();
         match confy::load_path(&Config::file_("_lan_peers")) {
             Ok(peers) => peers,
             Err(err) => {
diff --git a/res/PKGBUILD b/res/PKGBUILD
index 2ab82f9ea..7c97d419e 100644
--- a/res/PKGBUILD
+++ b/res/PKGBUILD
@@ -7,7 +7,7 @@ arch=('x86_64')
 url=""
 license=('AGPL-3.0')
 groups=()
-depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'pipewire' 'ttf-arphic-uming' 'curl' 'libappindicator-gtk3' 'libva' 'libvdpau' 'libayatana-appindicator')
+depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'pipewire' 'curl' 'libva' 'libvdpau' 'libayatana-appindicator')
 makedepends=()
 checkdepends=()
 optdepends=()
diff --git a/res/rpm-suse.spec b/res/rpm-suse.spec
index 85f01e37e..c328f42aa 100644
--- a/res/rpm-suse.spec
+++ b/res/rpm-suse.spec
@@ -3,7 +3,7 @@ Version:    1.1.9
 Release:    0
 Summary:    RPM package
 License:    GPL-3.0
-Requires:   gtk3 libxcb1 xdotool libXfixes3 pulseaudio-utils alsa-utils arphic-uming-fonts curl libXtst6 
+Requires:   gtk3 libxcb1 xdotool libXfixes3 pipewire alsa-utils curl libXtst6 libayatana-appindicator3-1 libvdpau1 libva2
 
 %description
 The best open-source remote desktop client software, written in Rust. 
diff --git a/res/rpm.spec b/res/rpm.spec
index 80887de96..e88fe1fda 100644
--- a/res/rpm.spec
+++ b/res/rpm.spec
@@ -3,7 +3,7 @@ Version:    1.1.9
 Release:    0
 Summary:    RPM package
 License:    GPL-3.0
-Requires:   gtk3 libxcb libxdo libXfixes pulseaudio-libs alsa-lib cjkuni-uming-fonts curl 
+Requires:   gtk3 libxcb libxdo libXfixes pipewire alsa-lib curl libayatana-appindicator3-1 libvdpau1 libva2
 
 %description
 The best open-source remote desktop client software, written in Rust. 
diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs
index b108c1ad0..e4e604cde 100644
--- a/src/client/io_loop.rs
+++ b/src/client/io_loop.rs
@@ -1,5 +1,5 @@
 use crate::client::{
-    Client, CodecFormat, FileManager, MediaData, MediaSender, QualityStatus, MILLI1, SEC30,
+    Client, CodecFormat, MediaData, MediaSender, QualityStatus, MILLI1, SEC30,
     SERVER_CLIPBOARD_ENABLED, SERVER_FILE_TRANSFER_ENABLED, SERVER_KEYBOARD_ENABLED,
 };
 use crate::common;
@@ -15,7 +15,7 @@ use crate::{client::Data, client::Interface};
 use hbb_common::config::{PeerConfig, TransferSerde};
 use hbb_common::fs::{
     can_enable_overwrite_detection, get_job, get_string, new_send_confirm, DigestCheckResult,
-    RemoveJobMeta, TransferJobMeta,
+    RemoveJobMeta,
 };
 use hbb_common::message_proto::permission_info::Permission;
 use hbb_common::protobuf::Message as _;
@@ -23,6 +23,7 @@ use hbb_common::rendezvous_proto::ConnType;
 use hbb_common::tokio::{
     self,
     sync::mpsc,
+    sync::Mutex as TokioMutex,
     time::{self, Duration, Instant, Interval},
 };
 use hbb_common::{
@@ -113,15 +114,23 @@ impl<T: InvokeUiSession> Remote<T> {
                 // just build for now
                 #[cfg(not(windows))]
                 let (_tx_holder, mut rx_clip_client) = mpsc::unbounded_channel::<i32>();
+
                 #[cfg(windows)]
-                let (client_conn_id, rx_clip_client1) =
-                    clipboard::get_rx_cliprdr_client(&self.handler.id);
+                let (_tx_holder, rx) = mpsc::unbounded_channel();
                 #[cfg(windows)]
-                let mut rx_clip_client = rx_clip_client1.lock().await;
+                let mut rx_clip_client_lock = Arc::new(TokioMutex::new(rx));
                 #[cfg(windows)]
                 {
-                    self.client_conn_id = client_conn_id;
+                    let is_conn_not_default = self.handler.is_file_transfer()
+                        || self.handler.is_port_forward()
+                        || self.handler.is_rdp();
+                    if !is_conn_not_default {
+                        (self.client_conn_id, rx_clip_client_lock) =
+                            clipboard::get_rx_cliprdr_client(&self.handler.id);
+                    };
                 }
+                #[cfg(windows)]
+                let mut rx_clip_client = rx_clip_client_lock.lock().await;
 
                 let mut status_timer = time::interval(Duration::new(1, 0));
 
diff --git a/src/common.rs b/src/common.rs
index 3022e5b56..78e3147ec 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,5 +1,4 @@
 use std::{
-    collections::HashMap,
     future::Future,
     sync::{Arc, Mutex},
 };
@@ -27,6 +26,9 @@ pub type NotifyMessageBox = fn(String, String, String, String) -> dyn Future<Out
 pub const CLIPBOARD_NAME: &'static str = "clipboard";
 pub const CLIPBOARD_INTERVAL: u64 = 333;
 
+// the executable name of the portable version 
+pub const PORTABLE_APPNAME_RUNTIME_ENV_KEY: &str = "RUSTDESK_APPNAME";
+
 lazy_static::lazy_static! {
     pub static ref CONTENT: Arc<Mutex<String>> = Default::default();
     pub static ref SOFTWARE_UPDATE_URL: Arc<Mutex<String>> = Default::default();
diff --git a/src/core_main.rs b/src/core_main.rs
index 8c6430ef8..46088da5c 100644
--- a/src/core_main.rs
+++ b/src/core_main.rs
@@ -85,11 +85,6 @@ pub fn core_main() -> Option<Vec<String>> {
                 .ok();
         }
     }
-    #[cfg(windows)]
-    #[cfg(not(debug_assertions))]
-    if !crate::platform::is_installed() && args.is_empty() {
-        crate::platform::elevate_or_run_as_system(is_setup, _is_elevate, _is_run_as_system);
-    }
     if args.is_empty() {
         std::thread::spawn(move || crate::start_server(false));
     } else {
diff --git a/src/flutter.rs b/src/flutter.rs
index 5e844f910..5b8504b4d 100644
--- a/src/flutter.rs
+++ b/src/flutter.rs
@@ -418,6 +418,7 @@ pub fn session_start_(id: &str, event_stream: StreamSink<EventToUI>) -> ResultTy
 pub mod connection_manager {
     use std::collections::HashMap;
 
+    #[cfg(any(target_os = "android"))]
     use hbb_common::log;
     #[cfg(any(target_os = "android"))]
     use scrap::android::call_main_service_set_by_name;
diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs
index cddaf4d79..45bcd12e3 100644
--- a/src/flutter_ffi.rs
+++ b/src/flutter_ffi.rs
@@ -7,13 +7,14 @@ use std::{
 use flutter_rust_bridge::{StreamSink, SyncReturn, ZeroCopyBuffer};
 use serde_json::json;
 
+use hbb_common::ResultType;
 use hbb_common::{
     config::{self, LocalConfig, PeerConfig, ONLINE},
     fs, log,
 };
-use hbb_common::{message_proto::Hash, ResultType};
 
 use crate::flutter::{self, SESSIONS};
+#[cfg(target_os = "android")]
 use crate::start_server;
 use crate::ui_interface::{self, *};
 use crate::{
@@ -362,7 +363,7 @@ pub fn session_create_dir(id: String, act_id: i32, path: String, is_remote: bool
     }
 }
 
-pub fn session_read_local_dir_sync(id: String, path: String, show_hidden: bool) -> String {
+pub fn session_read_local_dir_sync(_id: String, path: String, show_hidden: bool) -> String {
     if let Ok(fd) = fs::read_dir(&fs::get_path(&path), show_hidden) {
         return make_fd_to_json(fd.id, path, &fd.entries);
     }
diff --git a/src/lang/en.rs b/src/lang/en.rs
index 7c95f8abb..72aa45853 100644
--- a/src/lang/en.rs
+++ b/src/lang/en.rs
@@ -34,5 +34,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("uac_warning", "Temporarily denied access due to elevation request, please wait for the remote user to accept the UAC dialog. To avoid this problem, it is recommended to install the software on the remote device or run it with administrator privileges."),
         ("elevated_foreground_window_warning", "Temporarily unable to use the mouse and keyboard, because the current window of the remote desktop requires higher privilege to operate, you can request the remote user to minimize the current window. To avoid this problem, it is recommended to install the software on the remote device or run it with administrator privileges."),
         ("JumpLink", "View"),
+        ("Stop service", "Stop Service"),
         ].iter().cloned().collect();
 }
diff --git a/src/platform/windows.rs b/src/platform/windows.rs
index 53fb60bd8..ae9574f33 100644
--- a/src/platform/windows.rs
+++ b/src/platform/windows.rs
@@ -1,4 +1,5 @@
 use super::{CursorData, ResultType};
+use crate::common::PORTABLE_APPNAME_RUNTIME_ENV_KEY;
 use crate::ipc;
 use crate::license::*;
 use hbb_common::{
@@ -21,7 +22,10 @@ use winapi::{
         errhandlingapi::GetLastError,
         handleapi::CloseHandle,
         minwinbase::STILL_ACTIVE,
-        processthreadsapi::{GetCurrentProcess, GetExitCodeProcess, OpenProcess, OpenProcessToken},
+        processthreadsapi::{
+            GetCurrentProcess, GetCurrentProcessId, GetExitCodeProcess, OpenProcess,
+            OpenProcessToken,
+        },
         securitybaseapi::GetTokenInformation,
         shellapi::ShellExecuteA,
         winbase::*,
@@ -878,23 +882,35 @@ fn get_install_info_with_subkey(subkey: String) -> (String, String, String, Stri
     (subkey, path, start_menu, exe)
 }
 
-pub fn copy_exe_cmd(src_exe: &str, _exe: &str, _path: &str) -> String {
+pub fn copy_exe_cmd(src_exe: &str, _exe: &str, path: &str) -> String {
     #[cfg(feature = "flutter")]
-    return format!(
+    let main_exe = format!(
         "XCOPY \"{}\" \"{}\" /Y /E /H /C /I /K /R /Z",
         PathBuf::from(src_exe)
             .parent()
             .unwrap()
             .to_string_lossy()
             .to_string(),
-        _path
+        path
     );
     #[cfg(not(feature = "flutter"))]
-    return format!(
+    let main_exe = format!(
         "copy /Y \"{src_exe}\" \"{exe}\"",
         src_exe = src_exe,
         exe = _exe
     );
+
+    return format!(
+        "
+        {main_exe}
+        copy /Y \"{ORIGIN_PROCESS_EXE}\" \"{path}\\{broker_exe}\"
+        \"{src_exe}\" --extract \"{path}\"
+        ",
+        main_exe = main_exe,
+        path = path,
+        ORIGIN_PROCESS_EXE = crate::ui::win_privacy::ORIGIN_PROCESS_EXE,
+        broker_exe = crate::ui::win_privacy::INJECTED_PROCESS_EXE,
+    );
 }
 
 pub fn update_me() -> ResultType<()> {
@@ -905,18 +921,16 @@ pub fn update_me() -> ResultType<()> {
         chcp 65001
         sc stop {app_name}
         taskkill /F /IM {broker_exe}
-        taskkill /F /IM {app_name}.exe
+        taskkill /F /IM {app_name}.exe /FI \"PID ne {cur_pid}\"
         {copy_exe}
-        \"{src_exe}\" --extract \"{path}\"
         sc start {app_name}
         {lic}
     ",
-        src_exe = src_exe,
         copy_exe = copy_exe_cmd(&src_exe, &exe, &path),
         broker_exe = crate::ui::win_privacy::INJECTED_PROCESS_EXE,
-        path = path,
         app_name = crate::get_app_name(),
         lic = register_licence(),
+        cur_pid = get_current_pid(),
     );
     std::thread::sleep(std::time::Duration::from_millis(1000));
     run_cmds(cmds, false, "update")?;
@@ -1087,8 +1101,6 @@ if exist \"{tmp_path}\\{app_name} Tray.lnk\" del /f /q \"{tmp_path}\\{app_name}
 chcp 65001
 md \"{path}\"
 {copy_exe}
-copy /Y \"{ORIGIN_PROCESS_EXE}\" \"{path}\\{broker_exe}\"
-\"{src_exe}\" --extract \"{path}\"
 reg add {subkey} /f
 reg add {subkey} /f /v DisplayIcon /t REG_SZ /d \"{exe}\"
 reg add {subkey} /f /v DisplayName /t REG_SZ /d \"{app_name}\"
@@ -1119,10 +1131,7 @@ sc delete {app_name}
     ",
         uninstall_str=uninstall_str,
         path=path,
-        src_exe=src_exe,
         exe=exe,
-        ORIGIN_PROCESS_EXE = crate::ui::win_privacy::ORIGIN_PROCESS_EXE,
-        broker_exe=crate::ui::win_privacy::INJECTED_PROCESS_EXE,
         subkey=subkey,
         app_name=crate::get_app_name(),
         version=crate::VERSION,
@@ -1178,13 +1187,14 @@ fn get_before_uninstall() -> String {
     sc stop {app_name}
     sc delete {app_name}
     taskkill /F /IM {broker_exe}
-    taskkill /F /IM {app_name}.exe
+    taskkill /F /IM {app_name}.exe /FI \"PID ne {cur_pid}\"
     reg delete HKEY_CLASSES_ROOT\\.{ext} /f
     netsh advfirewall firewall delete rule name=\"{app_name} Service\"
     ",
         app_name = app_name,
         broker_exe = crate::ui::win_privacy::INJECTED_PROCESS_EXE,
-        ext = ext
+        ext = ext,
+        cur_pid = get_current_pid(),
     )
 }
 
@@ -1324,7 +1334,12 @@ fn get_reg_of(subkey: &str, name: &str) -> String {
 }
 
 fn get_license_from_exe_name() -> ResultType<License> {
-    let exe = std::env::current_exe()?.to_str().unwrap_or("").to_owned();
+    let mut exe = std::env::current_exe()?.to_str().unwrap_or("").to_owned();
+    // if defined portable appname entry, replace original executable name with it.
+    if let Ok(portable_exe) = std::env::var(PORTABLE_APPNAME_RUNTIME_ENV_KEY) {
+        exe = portable_exe;
+        log::debug!("update portable executable name to {}", exe);
+    }
     get_license_from_string(&exe)
 }
 
@@ -1613,3 +1628,7 @@ pub fn is_foreground_window_elevated() -> ResultType<bool> {
         is_elevated(Some(process_id))
     }
 }
+
+fn get_current_pid() -> u32 {
+    unsafe { GetCurrentProcessId() }
+}
diff --git a/src/server/input_service.rs b/src/server/input_service.rs
index 2f2dd7743..546013673 100644
--- a/src/server/input_service.rs
+++ b/src/server/input_service.rs
@@ -725,7 +725,7 @@ fn legacy_keyboard_mode(evt: &KeyEvent) {
     // disable numlock if press home etc when numlock is on,
     // because we will get numpad value (7,8,9 etc) if not
     #[cfg(windows)]
-    let mut disable_numlock = false;
+    let mut _disable_numlock = false;
     #[cfg(target_os = "macos")]
     en.reset_flag();
     // When long-pressed the command key, then press and release
@@ -775,8 +775,8 @@ fn legacy_keyboard_mode(evt: &KeyEvent) {
             if let Some(key) = KEY_MAP.get(&ck.value()) {
                 #[cfg(windows)]
                 if let Some(_) = NUMPAD_KEY_MAP.get(&ck.value()) {
-                    disable_numlock = en.get_key_state(Key::NumLock);
-                    if disable_numlock {
+                    _disable_numlock = en.get_key_state(Key::NumLock);
+                    if _disable_numlock {
                         en.key_down(Key::NumLock).ok();
                         en.key_up(Key::NumLock);
                     }
diff --git a/src/server/video_service.rs b/src/server/video_service.rs
index b583a0ae3..5927bddec 100644
--- a/src/server/video_service.rs
+++ b/src/server/video_service.rs
@@ -468,6 +468,7 @@ fn run(sp: GenericService) -> ResultType<()> {
     #[cfg(windows)]
     start_uac_elevation_check();
 
+    #[cfg(target_os = "linux")]
     let mut would_block_count = 0u32;
 
     while sp.ok() {
@@ -570,9 +571,9 @@ fn run(sp: GenericService) -> ResultType<()> {
                     try_gdi += 1;
                 }
 
-                would_block_count += 1;
                 #[cfg(target_os = "linux")]
                 {
+                    would_block_count += 1;
                     if !scrap::is_x11() {
                         if would_block_count >= 100 {
                             // For now, the user should choose and agree screen sharing agiain.
@@ -600,7 +601,10 @@ fn run(sp: GenericService) -> ResultType<()> {
                 return Err(err.into());
             }
             _ => {
-                would_block_count = 0;
+                #[cfg(target_os = "linux")]
+                {
+                    would_block_count = 0;
+                }
             }
         }
 
diff --git a/src/server/wayland.rs b/src/server/wayland.rs
index de304c459..7fd6f106b 100644
--- a/src/server/wayland.rs
+++ b/src/server/wayland.rs
@@ -17,18 +17,18 @@ pub fn set_wayland_scrap_map_err() {
 }
 
 fn map_err_scrap(err: String) -> io::Error {
-    // REMOVE ME ===================================== uncomment to handle error
-    // // to-do: Handle error better, do not restart server
-    // if err.starts_with("Did not receive a reply") {
-    //     log::error!("Fatal pipewire error, {}", &err);
-    //     std::process::exit(-1);
-    // }
-
+    // to-do: Remove this the following log
     log::error!(
         "REMOVE ME ===================================== wayland scrap error {}",
         &err
     );
 
+    // to-do: Handle error better, do not restart server
+    if err.starts_with("Did not receive a reply") {
+        log::error!("Fatal pipewire error, {}", &err);
+        std::process::exit(-1);
+    }
+
     if DISTRO.name.to_uppercase() == "Ubuntu".to_uppercase() {
         if DISTRO.version_id < "21".to_owned() {
             io::Error::new(io::ErrorKind::Other, SCRAP_UBUNTU_HIGHER_REQUIRED)
diff --git a/src/ui.rs b/src/ui.rs
index c25aaf670..b11e574ba 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -15,7 +15,7 @@ use hbb_common::{
     protobuf::Message as _,
     rendezvous_proto::*,
     tcp::FramedStream,
-    tokio::{self, sync::mpsc, time},
+    tokio::{self, sync::mpsc},
 };
 
 use crate::common::get_app_name;
diff --git a/src/ui/index.tis b/src/ui/index.tis
index 45e881096..31781c35e 100644
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -1242,9 +1242,3 @@ function refreshCurrentUser() {
 function getHttpHeaders() {
     return "Authorization: Bearer " + handler.get_local_option("access_token");
 }
-
-$(body).timer(1000, function check_elevation(){
-    if (is_win && handler.is_release() && !handler.is_installed() && !handler.is_root()) {
-        msgbox("custom-elevation-nocancel", "Prompt", "elevation_prompt");
-    }
-});
\ No newline at end of file
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index ce10827c4..62df85250 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -18,8 +18,6 @@ use hbb_common::{
     allow_err, fs::TransferJobMeta, log, message_proto::*, rendezvous_proto::ConnType,
 };
 
-#[cfg(windows)]
-use crate::clipboard_file::*;
 use crate::{
     client::*,
     ui_interface::has_hwcodec,
diff --git a/src/ui_cm_interface.rs b/src/ui_cm_interface.rs
index 7296f8738..5fb3c76fd 100644
--- a/src/ui_cm_interface.rs
+++ b/src/ui_cm_interface.rs
@@ -11,7 +11,7 @@ use std::{
 };
 
 #[cfg(windows)]
-use clipboard::{cliprdr::CliprdrClientContext, empty_clipboard, ContextSend};
+use clipboard::{cliprdr::CliprdrClientContext, empty_clipboard, set_conn_enabled, ContextSend};
 use serde_derive::Serialize;
 
 use crate::ipc::{self, new_listener, Connection, Data};
@@ -247,10 +247,10 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
                     .await
             );
         }
-        clipboard::set_conn_enabled(conn_id, enabled);
+        set_conn_enabled(conn_id, enabled);
         if !enabled {
             ContextSend::proc(|context: &mut Box<CliprdrClientContext>| -> u32 {
-                clipboard::empty_clipboard(context, conn_id);
+                empty_clipboard(context, conn_id);
                 0
             });
         }
diff --git a/src/ui_interface.rs b/src/ui_interface.rs
index 0f7db9a1d..cb2c178d6 100644
--- a/src/ui_interface.rs
+++ b/src/ui_interface.rs
@@ -141,6 +141,11 @@ pub fn has_rendezvous_service() -> bool {
 pub fn get_license() -> String {
     #[cfg(windows)]
     if let Some(lic) = crate::platform::windows::get_license() {
+        #[cfg(feature = "flutter")]
+        {
+            return format!("Key: {}\nHost: {}\nApi: {}", lic.key, lic.host, lic.api);
+        }
+        // default license format is html formed (sciter)
         return format!(
             "<br /> Key: {} <br /> Host: {} Api: {}",
             lic.key, lic.host, lic.api