diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index c8a8898d8..7ce4b51cc 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -49,6 +49,7 @@ class MenuDrawer extends StatelessWidget {
     final state = store.state;
     final enableDarkMode = state.prefState.enableDarkMode;
     final localization = AppLocalization.of(context);
+    final account = state.account;
     final company = viewModel.selectedCompany;
 
     if (company == null) {
@@ -60,7 +61,7 @@ class MenuDrawer extends StatelessWidget {
                 company.settings.companyLogo.isNotEmpty
             ? CachedImage(
                 width: 32,
-                url: company.settings.companyLogo,
+                url: account.defaultUrl + company.settings.companyLogo,
               )
             : Image.asset('assets/images/logo.png', width: 32);
 
diff --git a/lib/ui/settings/company_details.dart b/lib/ui/settings/company_details.dart
index 29027d41e..d37fef12e 100644
--- a/lib/ui/settings/company_details.dart
+++ b/lib/ui/settings/company_details.dart
@@ -446,7 +446,7 @@ class _CompanyDetailsState extends State<CompanyDetails>
                       padding: const EdgeInsets.symmetric(vertical: 20),
                       child: CachedImage(
                         width: double.infinity,
-                        url: settings.companyLogo,
+                        url: state.account.defaultUrl + settings.companyLogo,
                         //url: '${settings.logoUrl}?clear_cache=${state.selectedCompany.updatedAt}',
                       )),
               ],
diff --git a/lib/ui/settings/settings_list.dart b/lib/ui/settings/settings_list.dart
index 0eb7695c7..3b438aade 100644
--- a/lib/ui/settings/settings_list.dart
+++ b/lib/ui/settings/settings_list.dart
@@ -148,16 +148,16 @@ class _SettingsListState extends State<SettingsList> {
               section: kSettingsImportExport,
               viewModel: widget.viewModel,
             ),
-          if (showAll && state.userCompany.isOwner)
-            SettingsListTile(
-              section: kSettingsAccountManagement,
-              viewModel: widget.viewModel,
-            ),
           if (showAll)
             SettingsListTile(
               section: kSettingsDeviceSettings,
               viewModel: widget.viewModel,
             ),
+          if (showAll && state.userCompany.isOwner)
+            SettingsListTile(
+              section: kSettingsAccountManagement,
+              viewModel: widget.viewModel,
+            ),
           Container(
             color: Theme.of(context).backgroundColor,
             padding: const EdgeInsets.only(left: 19, top: 16, bottom: 16),
@@ -376,6 +376,15 @@ class SettingsSearch extends StatelessWidget {
         'export',
       ],
     ],
+    kSettingsDeviceSettings: [
+      [
+        'rows_per_page',
+        'dark_mode',
+        'long_press_multiselect',
+        'biometric_authentication',
+        'refresh_data',
+      ],
+    ],
     kSettingsAccountManagement: [
       [
         'api_tokens',
@@ -387,15 +396,6 @@ class SettingsSearch extends StatelessWidget {
         'enabeled_modules',
       ],
     ],
-    kSettingsDeviceSettings: [
-      [
-        'rows_per_page',
-        'dark_mode',
-        'long_press_multiselect',
-        'biometric_authentication',
-        'refresh_data',
-      ],
-    ],
     kSettingsGroupSettings: [
       [
         'groups',