diff --git a/gnucash/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade
index d21987b20c..d2b600d7d8 100644
--- a/gnucash/gtkbuilder/dialog-account.glade
+++ b/gnucash/gtkbuilder/dialog-account.glade
@@ -782,25 +782,6 @@
0
-
-
-
- False
- False
- 1
-
-
+
+
+
+ False
+ False
+ 1
+
+
1
@@ -912,6 +912,22 @@
True
False
end
+
+
+
+ False
+ False
+ 0
+ True
+
+
@@ -937,21 +953,6 @@
False
True
-
- False
- False
- 1
-
-
-
-
False
False
@@ -1620,9 +1621,9 @@
+ help_button
cancel_button
ok_button
- help_button
diff --git a/gnucash/gtkbuilder/dialog-book-close.glade b/gnucash/gtkbuilder/dialog-book-close.glade
index 6be7d2a85f..20e5f8c635 100644
--- a/gnucash/gtkbuilder/dialog-book-close.glade
+++ b/gnucash/gtkbuilder/dialog-book-close.glade
@@ -33,6 +33,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-commodity.glade b/gnucash/gtkbuilder/dialog-commodity.glade
index 0751299421..80f6d18f19 100644
--- a/gnucash/gtkbuilder/dialog-commodity.glade
+++ b/gnucash/gtkbuilder/dialog-commodity.glade
@@ -52,12 +52,11 @@
False
end
-
-
- _OK
+
+ _Cancel
True
True
True
@@ -84,11 +84,12 @@
-
- _Help
+
+ _OK
True
True
True
+ True
True
True
@@ -702,9 +703,9 @@
+ help_button
cancel_button
ok_button
- help_button
diff --git a/gnucash/gtkbuilder/dialog-custom-report.glade b/gnucash/gtkbuilder/dialog-custom-report.glade
index c731e9f0f4..c61a456368 100644
--- a/gnucash/gtkbuilder/dialog-custom-report.glade
+++ b/gnucash/gtkbuilder/dialog-custom-report.glade
@@ -40,6 +40,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-customer-import-gui.glade b/gnucash/gtkbuilder/dialog-customer-import-gui.glade
index e6e85e3030..0a986bd005 100644
--- a/gnucash/gtkbuilder/dialog-customer-import-gui.glade
+++ b/gnucash/gtkbuilder/dialog-customer-import-gui.glade
@@ -37,6 +37,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-customer.glade b/gnucash/gtkbuilder/dialog-customer.glade
index e856c9887d..f138cf7092 100644
--- a/gnucash/gtkbuilder/dialog-customer.glade
+++ b/gnucash/gtkbuilder/dialog-customer.glade
@@ -59,6 +59,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-employee.glade b/gnucash/gtkbuilder/dialog-employee.glade
index b9cb59c394..03f75b8404 100644
--- a/gnucash/gtkbuilder/dialog-employee.glade
+++ b/gnucash/gtkbuilder/dialog-employee.glade
@@ -35,6 +35,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
index 6423aa4a06..9099cefbb9 100644
--- a/gnucash/gtkbuilder/dialog-import.glade
+++ b/gnucash/gtkbuilder/dialog-import.glade
@@ -1254,6 +1254,23 @@
True
False
end
+
+
+ _Help
+ True
+ True
+ True
+ True
+ True
+
+
+
+ False
+ False
+ 0
+ True
+
+
_Cancel
@@ -1267,7 +1284,7 @@
False
False
- 0
+ 1
@@ -1281,22 +1298,6 @@
True
-
- False
- False
- 1
-
-
-
-
- _Help
- True
- True
- True
- True
- True
-
-
False
False
diff --git a/gnucash/gtkbuilder/dialog-invoice.glade b/gnucash/gtkbuilder/dialog-invoice.glade
index 8ca33e9c7c..4dd330b1f9 100644
--- a/gnucash/gtkbuilder/dialog-invoice.glade
+++ b/gnucash/gtkbuilder/dialog-invoice.glade
@@ -608,6 +608,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-job.glade b/gnucash/gtkbuilder/dialog-job.glade
index b563fba4f5..069b65290e 100644
--- a/gnucash/gtkbuilder/dialog-job.glade
+++ b/gnucash/gtkbuilder/dialog-job.glade
@@ -36,6 +36,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-order.glade b/gnucash/gtkbuilder/dialog-order.glade
index 9ddbd159fd..6a510028bf 100644
--- a/gnucash/gtkbuilder/dialog-order.glade
+++ b/gnucash/gtkbuilder/dialog-order.glade
@@ -37,6 +37,7 @@
False
False
0
+ True
@@ -450,6 +451,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index 906428d2bc..aed187386b 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -131,6 +131,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-print-check.glade b/gnucash/gtkbuilder/dialog-print-check.glade
index 01456cf294..d2ebaf761c 100644
--- a/gnucash/gtkbuilder/dialog-print-check.glade
+++ b/gnucash/gtkbuilder/dialog-print-check.glade
@@ -311,6 +311,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-search.glade b/gnucash/gtkbuilder/dialog-search.glade
index 37631aee4a..81907788cd 100644
--- a/gnucash/gtkbuilder/dialog-search.glade
+++ b/gnucash/gtkbuilder/dialog-search.glade
@@ -32,6 +32,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-sx.glade b/gnucash/gtkbuilder/dialog-sx.glade
index 9fb42d6a50..9a9822ee17 100644
--- a/gnucash/gtkbuilder/dialog-sx.glade
+++ b/gnucash/gtkbuilder/dialog-sx.glade
@@ -786,6 +786,7 @@
False
False
0
+ True
diff --git a/gnucash/gtkbuilder/dialog-vendor.glade b/gnucash/gtkbuilder/dialog-vendor.glade
index 385d5fdbc9..bd7128d9f7 100644
--- a/gnucash/gtkbuilder/dialog-vendor.glade
+++ b/gnucash/gtkbuilder/dialog-vendor.glade
@@ -60,6 +60,7 @@
False
False
0
+ True