6 files changed, 11 insertions, 6 deletions
diff --git a/web/app/view/BaseDialog.js b/web/app/view/BaseDialog.js
index 8d832245..273b620d 100644
--- a/web/app/view/BaseDialog.js
+++ b/web/app/view/BaseDialog.js
@@ -21,6 +21,6 @@ Ext.define('Traccar.view.BaseDialog', {
     bodyPadding: Traccar.Style.normalPadding,
     resizable: false,
     modal: true,
-    maxHeight: screen.height ? screen.height - Traccar.Style.normalPadding * 2 : null,
+    maxHeight: window.innerHeight ? window.innerHeight - Traccar.Style.normalPadding * 2 : null,
     autoScroll: true
 });
diff --git a/web/app/view/BaseWindow.js b/web/app/view/BaseWindow.js
index 689f2057..cb4879fc 100644
--- a/web/app/view/BaseWindow.js
+++ b/web/app/view/BaseWindow.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.BaseWindow', {
     modal: true,
 
     initComponent: function () {
-        if (screen.width < Traccar.Style.windowWidth || screen.height < Traccar.Style.windowHeight) {
+        if (window.innerWidth < Traccar.Style.windowWidth || window.innerHeight < Traccar.Style.windowHeight) {
             this.maximized = true;
             this.style = 'border-width: 0';
         }
diff --git a/web/app/view/Main.js b/web/app/view/Main.js
index 29db8297..7989adca 100644
--- a/web/app/view/Main.js
+++ b/web/app/view/Main.js
@@ -39,6 +39,8 @@ Ext.define('Traccar.view.Main', {
         layout: 'border',
         width: Traccar.Style.deviceWidth,
         title: Strings.devicesAndState,
+        titleCollapse: true,
+        floatable: false,
 
         defaults: {
             split: true,
diff --git a/web/app/view/MainMobile.js b/web/app/view/MainMobile.js
index 0e302aa9..e3e67426 100644
--- a/web/app/view/MainMobile.js
+++ b/web/app/view/MainMobile.js
@@ -50,6 +50,9 @@ Ext.define('Traccar.view.MainMobile', {
         region: 'south',
         xtype: 'devicesView',
         title: Strings.deviceTitle,
-        flex: 1
+        flex: 1,
+        collapsed: true,
+        titleCollapse: true,
+        floatable: false
     }]
 });
diff --git a/web/app/view/SettingsMenu.js b/web/app/view/SettingsMenu.js
index 8d40a8d7..db436b33 100644
--- a/web/app/view/SettingsMenu.js
+++ b/web/app/view/SettingsMenu.js
@@ -66,13 +66,13 @@ Ext.define('Traccar.view.SettingsMenu', {
         }, {
             hidden: true,
             text: Strings.sharedAttributeAliases,
-            glyph: 'xf07e@FontAwesome',
+            glyph: 'xf02c@FontAwesome',
             handler: 'onAttributeAliasesClick',
             reference: 'settingsAttributeAliasesButton'
         }, {
             hidden: true,
             text: Strings.sharedDeviceDistance,
-            glyph: 'xf1b9@FontAwesome',
+            glyph: 'xf0e4@FontAwesome',
             handler: 'onDeviceDistanceClick',
             reference: 'settingsDeviceDistanceButton'
         }, {
diff --git a/web/app/view/State.js b/web/app/view/State.js
index 5dbe0352..67cd0753 100644
--- a/web/app/view/State.js
+++ b/web/app/view/State.js
@@ -39,7 +39,7 @@ Ext.define('Traccar.view.State', {
             disabled: true,
             handler: 'onAliasEditClick',
             reference: 'aliasEditButton',
-            glyph: 'xf07e@FontAwesome',
+            glyph: 'xf02b@FontAwesome',
             tooltip: Strings.sharedEdit,
             tooltipType: 'title'
         }]