diff --git a/web/pgadmin/browser/server_groups/servers/templates/css/servers.css b/web/pgadmin/browser/server_groups/servers/templates/css/servers.css
index a5951e9d3..981cd9d41 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/css/servers.css
+++ b/web/pgadmin/browser/server_groups/servers/templates/css/servers.css
@@ -1,6 +1,5 @@
 .icon-server {
   background-image: url('{{ url_for('NODE-server.static', filename='img/server.png') }}') !important;
-  border-radius: 10px;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js b/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
index 1f146fe58..667e1add5 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
+++ b/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
@@ -145,26 +145,22 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
           role: null
         },
         schema: [{
-          id: 'id', label: '{{ _('ID') }}', type: 'int', group: null,
-          mode: ['properties']
+          id: 'id', label: '{{ _('ID') }}', type: 'int', mode: ['properties']
         },{
-          id: 'name', label:'{{ _('Name') }}', type: 'text', group: null,
+          id: 'name', label:'{{ _('Name') }}', type: 'text',
           mode: ['properties', 'edit', 'create']
         },{
-          id: 'connected', label:'{{ _('Connected') }}', type: 'switch', group: null,
+          id: 'connected', label:'{{ _('Connected') }}', type: 'switch',
           mode: ['properties'], 'options': {
-            'onText':   'True',
-            'offText':  'False',
-            'onColor':  'success',
-            'offColor': 'default',
-            'size': 'normal'
+            'onText':   'True', 'offText':  'False', 'onColor':  'success',
+            'offColor': 'danger', 'size': 'small'
           }
         },{
           id: 'version', label:'{{ _('Version') }}', type: 'text', group: null,
           mode: ['properties'], show: 'isConnected'
         },{
           id: 'comment', label:'{{ _('Comments') }}', type: 'multiline', group: null,
-          mode: ['properties', 'edit', 'create'], disabled: 'notEditMode'
+          mode: ['properties', 'edit', 'create']
         },{
           id: 'host', label:'{{ _('Host Name/Address') }}', type: 'text', group: "Connection",
           mode: ['properties', 'edit', 'create'], disabled: 'isConnected'
@@ -215,7 +211,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
           this.errorModel.set(err);
 
           if (_.size(err)) {
-            return err;
+            return errmsg;
           }
 
           return null;