diff --git a/web/pgadmin/preferences/templates/preferences/preferences.js b/web/pgadmin/preferences/templates/preferences/preferences.js
index 87609d1ad..38a26ef2d 100644
--- a/web/pgadmin/preferences/templates/preferences/preferences.js
+++ b/web/pgadmin/preferences/templates/preferences/preferences.js
@@ -353,11 +353,11 @@ define(
               return {
                 buttons:[
                   {
-                    text: "{{ _(' <span class=button-label> OK </span>') }}", key: 13, className: "btn btn-primary fa fa-lg fa-save"
-                	  
+                    text: "{{ _('OK') }}", key: 13, className: "btn btn-primary fa fa-lg fa-save pg-alertify-button"
+
                   },
                   {
-                    text: "{{ _(' <span class=button-label> Cancel </span>') }}", className: "btn btn-danger fa fa-lg fa-close"
+                    text: "{{ _('Cancel') }}", className: "btn btn-danger fa fa-lg fa-times pg-alertify-button"
                   }
                 ],
                 focus: { element: 0 },
diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css
index 662805d7b..83dc0039b 100755
--- a/web/pgadmin/static/css/overrides.css
+++ b/web/pgadmin/static/css/overrides.css
@@ -351,21 +351,16 @@ iframe {
     border-left-style: solid
 }
 
-.pg-prop-btn-group-below .pg-prop-btn-group button {
-  margin: 2px 5px;
+.pg-prop-btn-group button {
+  margin: 2px 3px 2px 0px;
 }
 
-.pg-prop-btn-group button:not(:first-child):not(:last-child) {
-    margin-left: 0px;
+.pg-prop-btn-group button:first-child {
+    margin-left: 3px;
 }
 
-.pg-prop-btn-group-below button:not(:first-child):not(:last-child) {
-    margin-left: 2px;
-    margin-right: 5px;
-}
-
-.btn-primary{
-  margin: 2px 13px !important;
+.pg-prop-btn-group button:last-child {
+    margin-right: 3px;
 }
 
 .pg-prop-content {
@@ -1013,13 +1008,13 @@ ul.nav.nav-tabs {
 .alertify .ajs-footer .ajs-buttons.ajs-auxiliary .ajs-button, .alertify .ajs-footer .ajs-buttons.ajs-primary .ajs-button {
   margin-left: 2px;
   margin-right: 2px;
-  margin-top:0px;
+  margin-top:2px;
   margin-bottom:0px;
 }
 
 .alertify .ajs-footer .ajs-buttons .ajs-button {
-  min-width: 55px;
-  min-height: 33px;
+  min-width: 80px;
+  min-height: 30px;
 }
 
 .alertify .ajs-commands {
@@ -1087,9 +1082,14 @@ ul.nav.nav-tabs {
   background-image:none;
 }
 span.button-label {
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-    font-size: initial;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: initial;
+}
+button.pg-alertify-button {
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: initial;
+}
+.fa.pg-alertify-button:before {
+  font: normal normal normal 18px/1 FontAwesome;
+  margin-right: 5px;
 }
-button.ajs-button.btn.btn-primary {
-    margin: 2px!important;
-}
\ No newline at end of file