3 files changed, 43 insertions, 21 deletions
diff --git a/web/app/Style.js b/web/app/Style.js
index 034d2fb0b..b3b296b75 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -75,7 +75,5 @@ Ext.define('Traccar.Style', {
     coordinatePrecision: 6,
     numberPrecision: 2,
 
-    reportTagfieldWidth: 375,
-
-    inFormButtonMargin: '0 0 9 0'
+    reportTagfieldWidth: 375
 });
diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js
index 0f8dbd2eb..83f9c47f2 100644
--- a/web/app/view/ServerDialog.js
+++ b/web/app/view/ServerDialog.js
@@ -66,9 +66,8 @@ Ext.define('Traccar.view.ServerDialog', {
             displayField: 'name',
             valueField: 'key'
         }, {
-            xtype: 'fieldset',
+            xtype: 'fieldcontainer',
             reference: 'mapCenter',
-            title: Strings.sharedMapCenter,
             defaultType: 'numberfield',
             items: [{
                 name: 'latitude',
@@ -81,12 +80,6 @@ Ext.define('Traccar.view.ServerDialog', {
             }, {
                 name: 'zoom',
                 fieldLabel: Strings.serverZoom
-            }, {
-                xtype: 'button',
-                margin: Traccar.Style.inFormButtonMargin,
-                enableToggle: false,
-                text: Strings.sharedGetFromMap,
-                handler: 'getFromMap'
             }]
         }, {
             xtype: 'checkboxfield',
@@ -94,5 +87,24 @@ Ext.define('Traccar.view.ServerDialog', {
             fieldLabel: Strings.settingsTwelveHourFormat,
             allowBlank: false
         }]
-    }
+    },
+
+    buttons: [{
+        text: Strings.sharedAttributes,
+        handler: 'showAttributesView'
+    }, {
+        glyph: 'xf276@FontAwesome',
+        minWidth: 0,
+        handler: 'getFromMap',
+        tooltip: Strings.sharedGetFromMap,
+        tooltipType: 'title'
+    }, {
+        xtype: 'tbfill'
+    }, {
+        text: Strings.sharedSave,
+        handler: 'onSaveClick'
+    }, {
+        text: Strings.sharedCancel,
+        handler: 'closeView'
+    }]
 });
diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js
index c6b732513..46b86dd5d 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/UserDialog.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.UserDialog', {
     controller: 'userDialog',
     title: Strings.settingsUser,
 
-    items: [{
+    items: {
         xtype: 'form',
         items: [{
             xtype: 'textfield',
@@ -70,9 +70,8 @@ Ext.define('Traccar.view.UserDialog', {
             displayField: 'name',
             valueField: 'key'
         }, {
-            xtype: 'fieldset',
+            xtype: 'fieldcontainer',
             reference: 'mapCenter',
-            title: Strings.sharedMapCenter,
             defaultType: 'numberfield',
             items: [{
                 name: 'latitude',
@@ -85,12 +84,6 @@ Ext.define('Traccar.view.UserDialog', {
             }, {
                 name: 'zoom',
                 fieldLabel: Strings.serverZoom
-            }, {
-                xtype: 'button',
-                margin: Traccar.Style.inFormButtonMargin,
-                enableToggle: false,
-                text: Strings.sharedGetFromMap,
-                handler: 'getFromMap'
             }]
         }, {
             xtype: 'checkboxfield',
@@ -98,5 +91,24 @@ Ext.define('Traccar.view.UserDialog', {
             fieldLabel: Strings.settingsTwelveHourFormat,
             allowBlank: false
         }]
+    },
+
+    buttons: [{
+        text: Strings.sharedAttributes,
+        handler: 'showAttributesView'
+    }, {
+        glyph: 'xf276@FontAwesome',
+        minWidth: 0,
+        handler: 'getFromMap',
+        tooltip: Strings.sharedGetFromMap,
+        tooltipType: 'title'
+    }, {
+        xtype: 'tbfill'
+    }, {
+        text: Strings.sharedSave,
+        handler: 'onSaveClick'
+    }, {
+        text: Strings.sharedCancel,
+        handler: 'closeView'
     }]
 });