dialog fixes

7 files changed, 233 insertions, 174 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 227d09c..9c8b242 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -1044,6 +1044,10 @@ headerbar {
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: rgba(38, 42, 51, 0.97); }
 
+headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+  margin-top: 6px;
+  margin-bottom: 6px; }
+
 .primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
@@ -1053,10 +1057,6 @@ headerbar {
   .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop {
     opacity: 0.6; }
 
-.primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar button, headerbar button, .primary-toolbar separator, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
-  margin-top: 6px;
-  margin-bottom: 6px; }
-
 .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton {
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(21, 23, 28, 0.37);
@@ -2397,28 +2397,38 @@ calendar {
   calendar.highlight {
     color: #D3DAE3; }
 
-messagedialog {
-  -GtkDialog-button-spacing: 0; }
-  messagedialog .titlebar {
-    background-color: rgba(47, 52, 63, 0.97);
-    border-bottom: 1px solid rgba(32, 35, 43, 0.97); }
-  messagedialog .dialog-action-area button {
-    padding: 2px; }
-  messagedialog.csd.background {
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-    border: none; }
-  messagedialog.csd .dialog-action-area button {
-    padding: 2px;
-    border-radius: 0; }
-  messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled {
-    border-right-style: none;
-    border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 3px; }
-  messagedialog.csd .dialog-action-area button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 3px; }
+messagedialog .titlebar {
+  background-color: rgba(47, 52, 63, 0.97);
+  border-bottom: 1px solid rgba(32, 35, 43, 0.97); }
+
+messagedialog .dialog-action-area button {
+  padding: 8px;
+  min-height: 0; }
+
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-bottom-style: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-radius: 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:last-child {
+  border-radius: 0 0 3px 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:first-child {
+  border-radius: 0 0 0 3px;
+  border-left-style: none; }
+
+messagedialog.csd .dialog-action-area button:only-child {
+  border-radius: 0 0 3px 3px;
+  border-left-style: none;
+  border-right-style: none; }
 
 .sidebar, .sidebar .view {
   border: none;
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 169786a..4cfa54c 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -1043,6 +1043,10 @@ headerbar {
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: rgba(38, 42, 51, 0.97); }
 
+headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+  margin-top: 6px;
+  margin-bottom: 6px; }
+
 .primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
@@ -1052,10 +1056,6 @@ headerbar {
   .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop {
     opacity: 0.6; }
 
-.primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar button, headerbar button, .primary-toolbar separator, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
-  margin-top: 6px;
-  margin-bottom: 6px; }
-
 .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton {
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(21, 23, 28, 0.37);
@@ -2396,28 +2396,38 @@ calendar {
   calendar.highlight {
     color: #5c616c; }
 
-messagedialog {
-  -GtkDialog-button-spacing: 0; }
-  messagedialog .titlebar {
-    background-color: rgba(47, 52, 63, 0.97);
-    border-bottom: 1px solid rgba(32, 35, 43, 0.97); }
-  messagedialog .dialog-action-area button {
-    padding: 2px; }
-  messagedialog.csd.background {
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-    border: none; }
-  messagedialog.csd .dialog-action-area button {
-    padding: 2px;
-    border-radius: 0; }
-  messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled {
-    border-right-style: none;
-    border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 3px; }
-  messagedialog.csd .dialog-action-area button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 3px; }
+messagedialog .titlebar {
+  background-color: rgba(47, 52, 63, 0.97);
+  border-bottom: 1px solid rgba(32, 35, 43, 0.97); }
+
+messagedialog .dialog-action-area button {
+  padding: 8px;
+  min-height: 0; }
+
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-bottom-style: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-radius: 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:last-child {
+  border-radius: 0 0 3px 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:first-child {
+  border-radius: 0 0 0 3px;
+  border-left-style: none; }
+
+messagedialog.csd .dialog-action-area button:only-child {
+  border-radius: 0 0 3px 3px;
+  border-left-style: none;
+  border-right-style: none; }
 
 .sidebar, .sidebar .view {
   border: none;
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index cd6b323..54cc685 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -1044,6 +1044,10 @@ headerbar {
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: #262a33; }
 
+headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+  margin-top: 6px;
+  margin-bottom: 6px; }
+
 .primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
@@ -1053,10 +1057,6 @@ headerbar {
   .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop {
     opacity: 0.6; }
 
-.primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar button, headerbar button, .primary-toolbar separator, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
-  margin-top: 6px;
-  margin-bottom: 6px; }
-
 .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton {
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(21, 23, 28, 0.4);
@@ -2397,28 +2397,38 @@ calendar {
   calendar.highlight {
     color: #D3DAE3; }
 
-messagedialog {
-  -GtkDialog-button-spacing: 0; }
-  messagedialog .titlebar {
-    background-color: #2f343f;
-    border-bottom: 1px solid #20232b; }
-  messagedialog .dialog-action-area button {
-    padding: 2px; }
-  messagedialog.csd.background {
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-    border: none; }
-  messagedialog.csd .dialog-action-area button {
-    padding: 2px;
-    border-radius: 0; }
-  messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled {
-    border-right-style: none;
-    border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 3px; }
-  messagedialog.csd .dialog-action-area button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 3px; }
+messagedialog .titlebar {
+  background-color: #2f343f;
+  border-bottom: 1px solid #20232b; }
+
+messagedialog .dialog-action-area button {
+  padding: 8px;
+  min-height: 0; }
+
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-bottom-style: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-radius: 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:last-child {
+  border-radius: 0 0 3px 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:first-child {
+  border-radius: 0 0 0 3px;
+  border-left-style: none; }
+
+messagedialog.csd .dialog-action-area button:only-child {
+  border-radius: 0 0 3px 3px;
+  border-left-style: none;
+  border-right-style: none; }
 
 .sidebar, .sidebar .view {
   border: none;
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 97e9fa8..3c651ec 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -1043,6 +1043,10 @@ headerbar {
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: #262a33; }
 
+headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+  margin-top: 6px;
+  margin-bottom: 6px; }
+
 .primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
@@ -1052,10 +1056,6 @@ headerbar {
   .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop {
     opacity: 0.6; }
 
-.primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar button, headerbar button, .primary-toolbar separator, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
-  margin-top: 6px;
-  margin-bottom: 6px; }
-
 .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton {
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(21, 23, 28, 0.4);
@@ -2396,28 +2396,38 @@ calendar {
   calendar.highlight {
     color: #5c616c; }
 
-messagedialog {
-  -GtkDialog-button-spacing: 0; }
-  messagedialog .titlebar {
-    background-color: #2f343f;
-    border-bottom: 1px solid #20232b; }
-  messagedialog .dialog-action-area button {
-    padding: 2px; }
-  messagedialog.csd.background {
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-    border: none; }
-  messagedialog.csd .dialog-action-area button {
-    padding: 2px;
-    border-radius: 0; }
-  messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled {
-    border-right-style: none;
-    border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 3px; }
-  messagedialog.csd .dialog-action-area button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 3px; }
+messagedialog .titlebar {
+  background-color: #2f343f;
+  border-bottom: 1px solid #20232b; }
+
+messagedialog .dialog-action-area button {
+  padding: 8px;
+  min-height: 0; }
+
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-bottom-style: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-radius: 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:last-child {
+  border-radius: 0 0 3px 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:first-child {
+  border-radius: 0 0 0 3px;
+  border-left-style: none; }
+
+messagedialog.csd .dialog-action-area button:only-child {
+  border-radius: 0 0 3px 3px;
+  border-left-style: none;
+  border-right-style: none; }
 
 .sidebar, .sidebar .view {
   border: none;
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index cee70f8..73e573b 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -1043,6 +1043,10 @@ headerbar {
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: #d4d5db; }
 
+headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+  margin-top: 6px;
+  margin-bottom: 6px; }
+
 .primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
@@ -1052,10 +1056,6 @@ headerbar {
   .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop {
     opacity: 0.6; }
 
-.primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar button, headerbar button, .primary-toolbar separator, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
-  margin-top: 6px;
-  margin-bottom: 6px; }
-
 .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton {
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
@@ -2400,28 +2400,38 @@ calendar {
   calendar.highlight {
     color: #5c616c; }
 
-messagedialog {
-  -GtkDialog-button-spacing: 0; }
-  messagedialog .titlebar {
-    background-color: #e7e8eb;
-    border-bottom: 1px solid #d4d5db; }
-  messagedialog .dialog-action-area button {
-    padding: 2px; }
-  messagedialog.csd.background {
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-    border: none; }
-  messagedialog.csd .dialog-action-area button {
-    padding: 2px;
-    border-radius: 0; }
-  messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled {
-    border-right-style: none;
-    border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 3px; }
-  messagedialog.csd .dialog-action-area button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 3px; }
+messagedialog .titlebar {
+  background-color: #e7e8eb;
+  border-bottom: 1px solid #d4d5db; }
+
+messagedialog .dialog-action-area button {
+  padding: 8px;
+  min-height: 0; }
+
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-bottom-style: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-radius: 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:last-child {
+  border-radius: 0 0 3px 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:first-child {
+  border-radius: 0 0 0 3px;
+  border-left-style: none; }
+
+messagedialog.csd .dialog-action-area button:only-child {
+  border-radius: 0 0 3px 3px;
+  border-left-style: none;
+  border-right-style: none; }
 
 .sidebar, .sidebar .view {
   border: none;
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 494579e..553befd 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -1043,6 +1043,10 @@ headerbar {
   .titlebar separator, .titlebar .sidebar .view separator, .sidebar .view .titlebar separator {
     background-color: rgba(212, 213, 219, 0.95); }
 
+headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
+  margin-top: 6px;
+  margin-bottom: 6px; }
+
 .primary-toolbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar separator.titlebutton, headerbar .sidebar .view separator.titlebutton, .sidebar .view headerbar separator.titlebutton {
   min-width: 1px;
   min-height: 1px;
@@ -1052,10 +1056,6 @@ headerbar {
   .primary-toolbar separator:backdrop, headerbar separator.titlebutton:backdrop {
     opacity: 0.6; }
 
-.primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar button, headerbar button, .primary-toolbar separator, headerbar separator, headerbar .sidebar separator, .sidebar headerbar separator, .primary-toolbar .sidebar .view separator, .sidebar .view .primary-toolbar separator, headerbar .sidebar .view separator, .sidebar .view headerbar separator {
-  margin-top: 6px;
-  margin-bottom: 6px; }
-
 .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton {
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
@@ -2400,28 +2400,38 @@ calendar {
   calendar.highlight {
     color: #5c616c; }
 
-messagedialog {
-  -GtkDialog-button-spacing: 0; }
-  messagedialog .titlebar {
-    background-color: rgba(231, 232, 235, 0.95);
-    border-bottom: 1px solid rgba(212, 213, 219, 0.95); }
-  messagedialog .dialog-action-area button {
-    padding: 2px; }
-  messagedialog.csd.background {
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-    border: none; }
-  messagedialog.csd .dialog-action-area button {
-    padding: 2px;
-    border-radius: 0; }
-  messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled {
-    border-right-style: none;
-    border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 3px; }
-  messagedialog.csd .dialog-action-area button:first-child {
-    border-left-style: none;
-    border-bottom-left-radius: 3px; }
+messagedialog .titlebar {
+  background-color: rgba(231, 232, 235, 0.95);
+  border-bottom: 1px solid rgba(212, 213, 219, 0.95); }
+
+messagedialog .dialog-action-area button {
+  padding: 8px;
+  min-height: 0; }
+
+messagedialog.csd.background {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-bottom-style: none; }
+
+messagedialog.csd .dialog-action-area button {
+  border-radius: 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:last-child {
+  border-radius: 0 0 3px 0;
+  border-right-style: none; }
+
+messagedialog.csd .dialog-action-area button:first-child {
+  border-radius: 0 0 0 3px;
+  border-left-style: none; }
+
+messagedialog.csd .dialog-action-area button:only-child {
+  border-radius: 0 0 3px 3px;
+  border-left-style: none;
+  border-right-style: none; }
 
 .sidebar, .sidebar .view {
   border: none;
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 9d422f0..c339b5b 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1138,7 +1138,6 @@ headerbar {
   }
   // Separator in Gnome Tweak Tool
   separator { background-color: $header_border; }
-
 }
 
 // Only extending headerbar avoids some problems (Gnome Documents searchbar)
@@ -1146,6 +1145,11 @@ headerbar {
   separator.titlebutton { @extend %header_separator; }
 
   @extend %header_widgets;
+
+  entry, button, separator {
+    margin-top: 6px;
+    margin-bottom: 6px;
+  }
 }
 
 %header_separator {
@@ -1164,11 +1168,6 @@ headerbar {
 
 %header_widgets {
 
-  entry, button, separator {
-    margin-top: 6px;
-    margin-bottom: 6px;
-  }
-
   // Headerbar Entries
   entry, spinbutton {
     @include entry(header-normal);
@@ -2508,11 +2507,10 @@ calendar {
 // Dialogs
 //
 messagedialog { // Message Dialog styling
-  -GtkDialog-button-spacing: 0;
 
   .titlebar { background-color: $header_bg; border-bottom: 1px solid darken($header_bg, 7%) }
 
-  .dialog-action-area button { padding: 2px; }
+  .dialog-action-area button { padding: 8px; min-height: 0; }
 
   &.csd { // rounded bottom border styling for csd version
     &.background {
@@ -2521,28 +2519,29 @@ messagedialog { // Message Dialog styling
       border: none;
     }
     .dialog-action-area button {
-      padding: 2px;
-      border-radius: 0;
+      border-bottom-style: none;
 
       @extend %middle_button;
-
-      &:hover, &:active, &:disabled {
-        @extend %middle_button;
-      }
-
       &:first-child{ @extend %first_button; }
       &:last-child { @extend %last_button; }
+      &:only-child { @extend %single_button; }
     }
     %middle_button {
+      border-radius: 0;
       border-right-style: none;
-      border-bottom-style: none;
     }
     %last_button {
-      border-bottom-right-radius: 3px;
+      border-radius: 0 0 3px 0;
+      border-right-style: none;
     }
     %first_button {
+      border-radius: 0 0 0 3px;
       border-left-style: none;
-      border-bottom-left-radius: 3px;
+    }
+    %single_button {
+      border-radius: 0 0 3px 3px;
+      border-left-style: none;
+      border-right-style: none;
     }
   }
 }