diff --git a/lib/main.dart b/lib/main.dart
index e67a323a2..b2290edd4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -12,7 +12,7 @@ import 'package:redux_logging/redux_logging.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
-import 'package:bitsdojo_window/bitsdojo_window.dart';
+// import 'package:bitsdojo_window/bitsdojo_window.dart';
 
 // Project imports:
 import 'package:invoiceninja_flutter/.env.dart';
@@ -155,6 +155,7 @@ void main({bool isTesting = false}) async {
     );
   }
 
+  /*
   if (isWindows()) {
     doWhenWindowReady(() {
       final win = appWindow;
@@ -162,6 +163,7 @@ void main({bool isTesting = false}) async {
       win.show();
     });
   }
+  */
 }
 
 Future<AppState> _initialState(bool isTesting) async {
diff --git a/lib/ui/app/app_title_bar.dart b/lib/ui/app/app_title_bar.dart
index 15dd47baf..1a23b15d8 100644
--- a/lib/ui/app/app_title_bar.dart
+++ b/lib/ui/app/app_title_bar.dart
@@ -1,16 +1,21 @@
 import 'package:flutter/material.dart';
 
+/*
 import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
+*/
 
 class AppTitleBar extends StatelessWidget {
   const AppTitleBar({Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    return SizedBox();
+
+    /*
     if (!isWindows()) {
       return SizedBox();
     }
@@ -74,5 +79,6 @@ class AppTitleBar extends StatelessWidget {
         ),
       ),
     );
+    */
   }
 }
diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index ae47b4896..90eb36c9f 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -138,7 +138,7 @@ class _MenuDrawerState extends State<MenuDrawer> {
                                 );
                             }
                           },
-                    icon: Icon(Icons.arrow_left_outlined))
+                    icon: Icon(Icons.chevron_left))
                 : Padding(
                     padding: const EdgeInsets.only(right: 2),
                     child: _companyLogo(company),
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index d07164676..1c77e4cfe 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -6,7 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
 #include <printing/printing_plugin.h>
 #include <screen_retriever/screen_retriever_plugin.h>
 #include <sentry_flutter/sentry_flutter_plugin.h>
@@ -15,9 +14,6 @@
 #include <window_manager/window_manager_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) bitsdojo_window_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "BitsdojoWindowPlugin");
-  bitsdojo_window_plugin_register_with_registrar(bitsdojo_window_linux_registrar);
   g_autoptr(FlPluginRegistrar) printing_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "PrintingPlugin");
   printing_plugin_register_with_registrar(printing_registrar);
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 56a3040c2..afb7b4f1f 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  bitsdojo_window_linux
   printing
   screen_retriever
   sentry_flutter
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 83f805bcb..0b82410cd 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,7 +5,6 @@
 import FlutterMacOS
 import Foundation
 
-import bitsdojo_window_macos
 import in_app_review
 import package_info
 import package_info_plus_macos
@@ -21,7 +20,6 @@ import url_launcher_macos
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  BitsdojoWindowPlugin.register(with: registry.registrar(forPlugin: "BitsdojoWindowPlugin"))
   InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin"))
   FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
   FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index b84f59f5e..806b0fda2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -50,41 +50,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
-  bitsdojo_window:
-    dependency: "direct main"
-    description:
-      name: bitsdojo_window
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.2"
-  bitsdojo_window_linux:
-    dependency: transitive
-    description:
-      name: bitsdojo_window_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.2"
-  bitsdojo_window_macos:
-    dependency: transitive
-    description:
-      name: bitsdojo_window_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.2"
-  bitsdojo_window_platform_interface:
-    dependency: transitive
-    description:
-      name: bitsdojo_window_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.2"
-  bitsdojo_window_windows:
-    dependency: transitive
-    description:
-      name: bitsdojo_window_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.2"
   boardview:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index fede244d5..ab09fdc9a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -75,7 +75,7 @@ dependencies:
   msal_js: ^2.14.0
   sign_in_with_apple: ^4.0.0
   window_manager: ^0.2.5
-  bitsdojo_window: ^0.1.2
+  # bitsdojo_window: ^0.1.2
   intl_phone_field: ^3.1.0
   pinput: ^2.2.11
   flutter_staggered_grid_view: ^0.6.2
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 6bb19cb30..01d24e64b 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,7 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <printing/printing_plugin.h>
 #include <screen_retriever/screen_retriever_plugin.h>
@@ -16,8 +15,6 @@
 #include <window_manager/window_manager_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  BitsdojoWindowPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("BitsdojoWindowPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   PrintingPluginRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index b274e5cd7..28fa06825 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  bitsdojo_window_windows
   permission_handler_windows
   printing
   screen_retriever
diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp
index 99cfa6453..54ca92a44 100644
--- a/windows/runner/main.cpp
+++ b/windows/runner/main.cpp
@@ -1,5 +1,5 @@
-#include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
-auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP);
+//#include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
+//auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP);
 
 #include <flutter/dart_project.h>
 #include <flutter/flutter_view_controller.h>