diff --git a/ui/accounts_editor_add_pane.ui b/ui/accounts_editor_add_pane.ui
index 336b73ea..5ca519fb 100644
--- a/ui/accounts_editor_add_pane.ui
+++ b/ui/accounts_editor_add_pane.ui
@@ -95,51 +95,14 @@
False
none
-
diff --git a/ui/accounts_editor_edit_pane.ui b/ui/accounts_editor_edit_pane.ui
index 3516e5aa..33b4a9e8 100644
--- a/ui/accounts_editor_edit_pane.ui
+++ b/ui/accounts_editor_edit_pane.ui
@@ -88,203 +88,211 @@
True
False
-
+
True
False
+ 24
-
+
True
False
- True
- 0
- in
-
+
True
False
- none
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- True
- False
- start
- Email addresses
-
-
-
- 0
- 1
-
-
-
-
- True
- False
- True
- 0
- in
-
-
- True
- False
- none
-
-
-
-
-
-
-
-
-
- 0
- 2
-
-
-
-
- True
- False
- start
- Signature
-
-
-
- 0
- 3
-
-
-
-
- True
- False
- 0
- in
-
-
-
-
-
-
-
-
-
- 0
- 4
-
-
-
-
- True
- False
- start
- Settings
-
-
-
- 0
- 5
-
-
-
-
- True
- False
- True
- 0
- in
-
-
- True
- False
- none
-
-
-
-
-
-
-
-
-
- 0
- 6
-
-
-
-
- True
- False
- end
-
-
- Server Settings
- True
- True
- False
-
+ True
+ 0
+ in
+
+
+ True
+ False
+ none
+
+
+
+
+
+
+
- True
- True
- end
- 0
+ 0
+ 0
-
- Remove Account
+
True
- True
- False
- Remove this account from Geary
-
+ False
+ start
+ Email addresses
- True
- True
- end
- 1
- True
+ 0
+ 1
+
+
+
+
+ True
+ False
+ True
+ 0
+ in
+
+
+ True
+ False
+ none
+
+
+
+
+
+
+
+
+
+ 0
+ 2
+
+
+
+
+ True
+ False
+ start
+ Signature
+
+
+
+ 0
+ 3
+
+
+
+
+ True
+ False
+ 0
+ in
+
+
+
+
+
+
+
+
+
+ 0
+ 4
+
+
+
+
+ True
+ False
+ start
+ Settings
+
+
+
+ 0
+ 5
+
+
+
+
+ True
+ False
+ True
+ 0
+ in
+
+
+ True
+ False
+ none
+
+
+
+
+
+
+
+
+
+ 0
+ 6
+
+
+
+
+ True
+ False
+ end
+
+
+ Server Settings
+ True
+ True
+ False
+
+
+
+ True
+ True
+ end
+ 0
+
+
+
+
+ Remove Account
+ True
+ True
+ False
+ Remove this account from Geary
+
+
+
+
+ True
+ True
+ end
+ 1
+ True
+
+
+
+
+
+ 0
+ 7
-
- 0
- 7
-
+
-
diff --git a/ui/accounts_editor_list_pane.ui b/ui/accounts_editor_list_pane.ui
index b3946196..53cc716f 100644
--- a/ui/accounts_editor_list_pane.ui
+++ b/ui/accounts_editor_list_pane.ui
@@ -31,148 +31,154 @@
True
False
-
+
True
False
+ 24
-
+
True
False
- center
- 12
-
+
True
False
- 64
- True
+ center
+ 12
+
+
+ True
+ False
+ 64
+ True
+
+
+ 0
+ 0
+ 2
+
+
+
+
+ True
+ False
+ start
+ start
+ True
+ To get started, select an email provider below.
+ 0
+ True
+
+
+ 1
+ 1
+
+
+
+
+ True
+ False
+ start
+ end
+ Welcome to Geary
+ 0
+ True
+
+
+
+
+
+ 1
+ 0
+
+
+
0
0
- 2
-
+
True
False
- start
start
- True
- To get started, select an email provider below.
- 0
- True
+ True
+ True
+ 0
+ in
+
+
+ True
+ False
+ none
+
+
+
+
+
+
- 1
+ 0
1
-
+
True
False
start
- end
- Welcome to Geary
- 0
- True
+ Add an account
+
- 1
- 0
+ 0
+ 2
-
-
-
- 0
- 0
-
-
-
-
- True
- False
- start
- True
- True
- 0
- in
-
- True
- False
- none
-
-
-
-
-
-
-
-
-
- 0
- 1
-
-
-
-
- True
- False
- start
- Add an account
-
-
-
-
-
-
- 0
- 2
-
-
-
-
- True
- False
- start
- True
- True
- 0
- in
-
-
- 0
+
True
False
start
- none
-
-
+ True
+ True
+ 0
+ in
+
+
+ 0
+ True
+ False
+ start
+ none
+
+
+
+
+
+
+
+ 0
+ 3
+
-
-
-
+
+
-
- 0
- 3
-
-
diff --git a/ui/accounts_editor_remove_pane.ui b/ui/accounts_editor_remove_pane.ui
index 22798248..7edf4c13 100644
--- a/ui/accounts_editor_remove_pane.ui
+++ b/ui/accounts_editor_remove_pane.ui
@@ -7,105 +7,112 @@
False
center
-
+
True
False
- start
- True
- 32
-
-
- True
- False
- end
-
-
- Remove Account
- True
- True
- True
- Remove this account from Geary
-
-
-
-
- True
- True
- 1
-
-
-
-
-
- 0
- 1
-
-
+ 24
True
False
- 6
- 18
+ start
+ True
+ 32
-
+
True
False
- dialog-warning-symbolic
- 6
+ end
+
+
+ Remove Account
+ True
+ True
+ True
+ Remove this account from Geary
+
+
+
+
+ True
+ True
+ 1
+
+
+
+
+
+ 0
+ 1
+
+
+
+
+ True
+ False
+ 6
+ 18
+
+
+ True
+ False
+ dialog-warning-symbolic
+ 6
+
+
+ 0
+ 0
+ 2
+
+
+
+
+ True
+ False
+ start
+ True
+ Confirm removing: %s
+
+
+
+
+
+
+ 1
+ 0
+
+
+
+
+ True
+ False
+ start
+ Removing an account will remove it from Geary and delete locally cached email data from your computer, but not from your service provider.
+ True
+ 0
+
+
+ 1
+ 1
+
+
0
0
- 2
-
-
-
-
- True
- False
- start
- True
- Confirm removing: %s
-
-
-
-
-
-
- 1
- 0
-
-
-
-
- True
- False
- start
- Removing an account will remove it from Geary and delete locally cached email data from your computer, but not from your service provider.
- True
- 0
-
-
- 1
- 1
+
-
- 0
- 0
-
-
0
diff --git a/ui/accounts_editor_servers_pane.ui b/ui/accounts_editor_servers_pane.ui
index 1a1234a3..a01eba5b 100644
--- a/ui/accounts_editor_servers_pane.ui
+++ b/ui/accounts_editor_servers_pane.ui
@@ -89,117 +89,121 @@
True
False
-
+
True
False
+ 24
-
+
True
False
- True
- 0
- in
-
+
True
False
- none
-
-
+ True
+ 0
+ in
+
+
+ True
+ False
+ none
+
+
+
+
+
+
+
+ 0
+ 2
+
-
-
+
+
+ True
+ False
+ start
+ Receiving
+
+
+
+ 0
+ 1
+
+
+
+
+ True
+ False
+ True
+ 0
+ in
+
+
+ True
+ False
+ none
+
+
+
+
+
+
+
+
+ 0
+ 4
+
+
+
+
+ True
+ False
+ start
+ Sending
+
+
+
+ 0
+ 3
+
+
+
+
+ True
+ False
+ True
+ 0
+ in
+
+
+ True
+ False
+ none
+
+
+
+
+
+
+
+
+ 0
+ 0
+
-
-
- 0
- 2
-
-
-
-
- True
- False
- start
- Receiving
-
- 0
- 1
-
-
-
- True
- False
- True
- 0
- in
-
-
- True
- False
- none
-
-
-
-
-
-
-
-
-
- 0
- 4
-
-
-
-
- True
- False
- start
- Sending
-
-
-
- 0
- 3
-
-
-
-
- True
- False
- True
- 0
- in
-
-
- True
- False
- none
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
diff --git a/ui/geary.css b/ui/geary.css
index 2d1d48c3..ca3cf640 100644
--- a/ui/geary.css
+++ b/ui/geary.css
@@ -270,10 +270,6 @@ row.geary-labelled-row > grid > switch {
/* Accounts.Editor */
-grid.geary-accounts-editor-pane-content {
- padding: 32px 128px;
-}
-
grid.geary-account-view image:dir(ltr) {
margin-right: 6px;
}