3 files changed, 39 insertions, 14 deletions
diff --git a/web/app/Style.js b/web/app/Style.js
index 27243531..252bfbd4 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -27,6 +27,7 @@ Ext.define('Traccar.Style', {
     windowHeight: 600,
 
     formFieldWidth: 275,
+    formFieldWithButtonWidth: 170 - 3 - 32,
 
     dateTimeFormat24: 'Y-m-d H:i:s',
     dateTimeFormat12: 'Y-m-d g:i:s a',
diff --git a/web/app/view/dialog/Device.js b/web/app/view/dialog/Device.js
index ba78ca96..07d846c5 100644
--- a/web/app/view/dialog/Device.js
+++ b/web/app/view/dialog/Device.js
@@ -42,14 +42,26 @@ Ext.define('Traccar.view.dialog.Device', {
             collapsible: true,
             collapsed: true,
             items: [{
-                xtype: 'combobox',
-                name: 'groupId',
+                xtype: 'fieldcontainer',
+                layout: 'hbox',
                 fieldLabel: Strings.groupParent,
-                store: 'Groups',
-                queryMode: 'local',
-                displayField: 'name',
-                valueField: 'id',
-                editable: false
+                items: [{
+                    xtype: 'combobox',
+                    name: 'groupId',
+                    store: 'Groups',
+                    queryMode: 'local',
+                    displayField: 'name',
+                    valueField: 'id',
+                    width: Traccar.Style.formFieldWithButtonWidth,
+                    editable: false
+                }, {
+                    xtype:'button',
+                    glyph: 'xf00d@FontAwesome',
+                    margin: '0 0 0 3px',
+                    handler: function (button) {
+                        button.up().down().clearValue();
+                    }
+                }]
             }, {
                 xtype: 'textfield',
                 name: 'phone',
diff --git a/web/app/view/dialog/Group.js b/web/app/view/dialog/Group.js
index b517bbfb..16253fbe 100644
--- a/web/app/view/dialog/Group.js
+++ b/web/app/view/dialog/Group.js
@@ -37,14 +37,26 @@ Ext.define('Traccar.view.dialog.Group', {
             collapsible: true,
             collapsed: true,
             items: [{
-                xtype: 'combobox',
-                name: 'groupId',
+                xtype: 'fieldcontainer',
+                layout: 'hbox',
                 fieldLabel: Strings.groupParent,
-                store: 'Groups',
-                queryMode: 'local',
-                displayField: 'name',
-                valueField: 'id',
-                editable: false
+                items: [{
+                    xtype: 'combobox',
+                    name: 'groupId',
+                    store: 'Groups',
+                    queryMode: 'local',
+                    displayField: 'name',
+                    valueField: 'id',
+                    width: Traccar.Style.formFieldWithButtonWidth,
+                    editable: false
+                }, {
+                    xtype:'button',
+                    glyph: 'xf00d@FontAwesome',
+                    margin: '0 0 0 3px',
+                    handler: function (button) {
+                        button.up().down().clearValue();
+                    }
+                }]
             }]
         }]
     }