diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..e1fae6cc5699c1165e6db287c4b10cf358f4dc40
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,28 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[meson.build]
+indent_size = 2
+tab_size = 2
+indent_style = space
+
+[*.{c,h,h.in}]
+indent_size = 2
+tab_size = 2
+indent_style = space
+max_line_length = 80
+
+[*.css]
+indent_size = 2
+tab_size = 2
+indent_style = space
+
+[*.xml]
+indent_size = 2
+tab_size = 2
+indent_style = space
+
diff --git a/src/polkit-auth-prompt.c b/src/polkit-auth-prompt.c
index 201a32b92ed9b0448732aa7c6d9be46ae367e762..df87ac742d555691916a4b270544ef0afa67a8e5 100644
--- a/src/polkit-auth-prompt.c
+++ b/src/polkit-auth-prompt.c
@@ -439,6 +439,7 @@ phosh_polkit_auth_prompt_constructed (GObject *object)
   gtk_entry_set_buffer (GTK_ENTRY (self->entry_password),
                         GTK_ENTRY_BUFFER (self->password_buffer));
 
+  gtk_widget_set_app_paintable(GTK_WIDGET (self), TRUE);
   g_signal_connect (G_OBJECT(self),
                     "draw",
                     G_CALLBACK(draw_cb),
diff --git a/src/style.css b/src/style.css
index 81a6a9144685783447604a29e0510a635bc91232..25249e05cb0d8045f38ec450bded835948f106d8 100644
--- a/src/style.css
+++ b/src/style.css
@@ -112,18 +112,8 @@ phosh-home, .phosh-panel {
     100% {-gtk-icon-transform: translateY(0); opacity: 0.7}
 }
 
-/* polkit auth agent */
-.phosh-polkit-auth-agent {
-    background-color: black;
-    border: solid 20px;
-    border-color: black;
-}
-
-.phosh-system-prompt {
-    background-color: black;
-}
-
-.phosh-system-dialog {
+/* system modal dialogs (polkit, gcr) */
+.phosh-system-modal-dialog {
     background-color: black;
     border: solid 2px;
     border-color: white;
diff --git a/src/ui/polkit-auth-prompt.ui b/src/ui/polkit-auth-prompt.ui
index 6951d0f9fe80b71031acf41a98f4a533303a7d2b..29968eda703d4aa4e0af11641722c0432e756901 100644
--- a/src/ui/polkit-auth-prompt.ui
+++ b/src/ui/polkit-auth-prompt.ui
@@ -131,17 +131,15 @@
             <property name="can_focus">False</property>
             <property name="margin_top">12</property>
             <child>
-              <object class="GtkButton" id="btn_authenticate">
+              <object class="GtkButton" id="btn_cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
-                <style>
-                  <class name="suggested-action"/>
-                </style>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -150,15 +148,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="btn_cancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="btn_authenticate">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="receives_default">False</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
-                <property name="use_stock">True</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -174,9 +174,9 @@
             <property name="width">2</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
+        <style>
+          <class name="phosh-system-modal-dialog"/>
+        </style>
         <style>
           <class name="phosh-polkit-auth-agent"/>
         </style>
diff --git a/src/ui/system-prompt.ui b/src/ui/system-prompt.ui
index b91b4062a9579dbd1c8d60f605560542319dc522..2d8a297235bac7f6de61c7535da6090102daf40f 100644
--- a/src/ui/system-prompt.ui
+++ b/src/ui/system-prompt.ui
@@ -133,15 +133,19 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="btn_cancel">
+          <object class="GtkButton" id="btn_continue">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="can_default">True</property>
-            <property name="receives_default">False</property>
+            <property name="has_default">True</property>
+            <property name="receives_default">True</property>
             <property name="halign">end</property>
             <property name="valign">center</property>
             <property name="margin_top">12</property>
             <property name="use_stock">True</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -180,19 +184,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="btn_continue">
+          <object class="GtkButton" id="btn_cancel">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="can_default">True</property>
-            <property name="has_default">True</property>
-            <property name="receives_default">True</property>
+            <property name="receives_default">False</property>
             <property name="halign">start</property>
             <property name="valign">center</property>
             <property name="margin_top">12</property>
             <property name="use_stock">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -206,7 +206,7 @@
           <placeholder/>
         </child>
         <style>
-          <class name="phosh-system-dialog"/>
+	  <class name="phosh-system-modal-dialog"/>
         </style>
       </object>
     </child>