diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index a6817ee09..b9ff787cd 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -469,10 +469,6 @@ var bottomHeight = 71;
         panelSize.height = minimumSize.height;
 
     buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
-
-    if ([_window styleMask] & _CPModalWindowMask)
-        buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height / 2 + buttonOffset;
-
     offsetX = panelSize.width - inset.right;
 
     switch ([_window styleMask])
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 5840eee1a..c3c63d853 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -1877,7 +1877,6 @@ var themedButtonValues = nil,
 {
     var alert = [CPAlert new],
         buttonOffset = 10.0,
-        buttonMarginY = 10.0,
         defaultElementsMargin = 3.0,
         errorIcon = PatternImage("alert-error.png", 53.0, 46.0),
         helpIcon = PatternImage("alert-help.png", 24.0, 24.0),
@@ -1896,7 +1895,6 @@ var themedButtonValues = nil,
 
     themedAlertValues =
     [
-        [@"modal-window-button-margin-y",       buttonMarginY],
         [@"button-offset",                      buttonOffset],
         [@"content-inset",                      inset],
         [@"default-elements-margin",            defaultElementsMargin],
@@ -1912,6 +1910,8 @@ var themedButtonValues = nil,
         [@"message-text-alignment",             CPJustifiedTextAlignment],
         [@"message-text-color",                 [CPColor blackColor]],
         [@"message-text-font",                  messageFont],
+        [@"modal-window-button-margin-x",       -1.0],
+        [@"modal-window-button-margin-y",       23.0],
         [@"suppression-button-text-color",      [CPColor blackColor]],
         [@"suppression-button-text-font",       suppressionButtonFont],
         [@"size",                               size],
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 21c126e16..71234cc63 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -1376,7 +1376,8 @@ var themedButtonValues = nil,
         [@"message-text-alignment",             CPJustifiedTextAlignment],
         [@"message-text-color",                 [CPColor blackColor]],
         [@"message-text-font",                  messageFont],
-        [@"modal-window-button-margin-x",       -15],
+        [@"modal-window-button-margin-x",       -18.0],
+        [@"modal-window-button-margin-y",       15.0],
         [@"suppression-button-text-color",      [CPColor blackColor]],
         [@"suppression-button-text-font",       suppressionButtonFont],
         [@"size",                               size],