diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml
index 8451a2a19..53e502e5e 100644
--- a/.github/workflows/flutter-build.yml
+++ b/.github/workflows/flutter-build.yml
@@ -9,10 +9,10 @@ on:
 
 env:
   LLVM_VERSION: "15.0.6"
-  FLUTTER_VERSION: "3.10.0"
+  FLUTTER_VERSION: "3.10.1"
   # for arm64 linux
-  FLUTTER_ELINUX_VERSION: "3.7.0"
-  FLUTTER_ELINUX_COMMIT_ID: "51a1d685901f79fbac51665a967c3a1a789ecee5"
+  FLUTTER_ELINUX_VERSION: "3.10.1"
+  FLUTTER_ELINUX_COMMIT_ID: "410b3ca42f2cd0c485edf517a1666652bab442d4"
   TAG_NAME: "nightly"
   # vcpkg version: 2023.04.15
   # for multiarch gcc compatibility
@@ -1169,7 +1169,7 @@ jobs:
           # disable git safe.directory
           git config --global --add safe.directory "*"
           pushd /opt
-          # clone repo and reset to flutter 3.7.0
+          # clone repo and reset to flutter ${{ env.FLUTTER_VERSION }}
           git clone https://github.com/sony/flutter-elinux.git || true
           pushd flutter-elinux
             git fetch
@@ -1205,8 +1205,8 @@ jobs:
             # Patch arm64 engine for flutter 3.6.0+
             flutter-elinux precache --linux
             pushd /tmp
-            curl -O https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.7.0-stable.tar.xz
-            tar -xvf flutter_linux_3.7.0-stable.tar.xz flutter/bin/cache/artifacts/engine/linux-x64/shader_lib
+            curl -O https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${{ env.FLUTTER_ELINUX_VERSION }}-stable.tar.xz
+            tar -xvf flutter_linux_${{ env.FLUTTER_ELINUX_VERSION }}-stable.tar.xz flutter/bin/cache/artifacts/engine/linux-x64/shader_lib
             cp -R flutter/bin/cache/artifacts/engine/linux-x64/shader_lib /opt/flutter-elinux/flutter/bin/cache/artifacts/engine/linux-arm64
             popd
             # edit to corresponding arch
diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle
index f7ab9782c..8dccca448 100644
--- a/flutter/android/build.gradle
+++ b/flutter/android/build.gradle
@@ -27,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index 2b0a62730..c829afa89 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -56,9 +56,10 @@ dependencies:
   back_button_interceptor: ^6.0.1
   flutter_rust_bridge: ^1.61.1
   window_manager:
-    git:
-      url: https://github.com/Kingtous/rustdesk_window_manager
-      ref: 94ff0eeb7e20e93f50022b2090f0b6ffb725c7df
+    # git:
+    # url: https://github.com/Kingtous/rustdesk_window_manager
+    path: ../../rustdesk_window_manager
+    # ref: 94ff0eeb7e20e93f50022b2090f0b6ffb725c7df
   desktop_multi_window:
     git:
       url: https://github.com/Kingtous/rustdesk_desktop_multi_window
@@ -106,6 +107,7 @@ dependencies:
   texture_rgba_renderer: ^0.0.16
   percent_indicator: ^4.2.2
   dropdown_button2: ^2.0.0
+  fluentui_system_icons: ^1.1.201
 
 dev_dependencies:
   icons_launcher: ^2.0.4