diff --git a/src/ui/settings-window/SettingsWindow.swift b/src/ui/settings-window/SettingsWindow.swift
index cd511695..2a228527 100644
--- a/src/ui/settings-window/SettingsWindow.swift
+++ b/src/ui/settings-window/SettingsWindow.swift
@@ -657,20 +657,23 @@ class SettingsWindow: NSWindow {
         ])
     }
 
+    @objc private func resetPreferences() {
+        GeneralTab.resetPreferences()
+    }
+
     private func setupSupportButton(_ parent: NSView) {
+        supportButton.toolTip = supportButton.title
         supportButton.translatesAutoresizingMaskIntoConstraints = false
         parent.addSubview(supportButton)
         NSLayoutConstraint.activate([
             supportButton.centerXAnchor.constraint(equalTo: parent.centerXAnchor),
             supportButton.bottomAnchor.constraint(equalTo: resetButton.topAnchor, constant: -20),
+            supportButton.widthAnchor.constraint(lessThanOrEqualTo: parent.widthAnchor, constant: -Self.sidebarHorizontalPadding * 2),
         ])
     }
 
-    @objc private func resetPreferences() {
-        GeneralTab.resetPreferences()
-    }
-
     private func setupResetButton(_ parent: NSView) {
+        resetButton.toolTip = resetButton.title
         resetButton.bezelStyle = .rounded
         if #available(macOS 11.0, *) { resetButton.hasDestructiveAction = true }
         resetButton.target = self
@@ -680,18 +683,19 @@ class SettingsWindow: NSWindow {
         NSLayoutConstraint.activate([
             resetButton.centerXAnchor.constraint(equalTo: parent.centerXAnchor),
             resetButton.bottomAnchor.constraint(equalTo: quitButton.topAnchor, constant: -20),
-            resetButton.heightAnchor.constraint(equalToConstant: Self.sidebarActionButtonHeight),
+            resetButton.widthAnchor.constraint(lessThanOrEqualTo: parent.widthAnchor, constant: -Self.sidebarHorizontalPadding * 2),
         ])
     }
 
     private func setupQuitButton(_ parent: NSView) {
+        quitButton.toolTip = quitButton.title
         quitButton.bezelStyle = .rounded
         quitButton.translatesAutoresizingMaskIntoConstraints = false
         parent.addSubview(quitButton)
         NSLayoutConstraint.activate([
             quitButton.centerXAnchor.constraint(equalTo: parent.centerXAnchor),
             quitButton.bottomAnchor.constraint(equalTo: parent.bottomAnchor, constant: -10),
-            quitButton.heightAnchor.constraint(equalToConstant: Self.sidebarActionButtonHeight),
+            quitButton.widthAnchor.constraint(lessThanOrEqualTo: parent.widthAnchor, constant: -Self.sidebarHorizontalPadding * 2),
         ])
     }
 
diff --git a/src/ui/settings-window/tabs/AboutTab.swift b/src/ui/settings-window/tabs/AboutTab.swift
index b48adc6f..d662d3ba 100644
--- a/src/ui/settings-window/tabs/AboutTab.swift
+++ b/src/ui/settings-window/tabs/AboutTab.swift
@@ -47,7 +47,6 @@ class AboutTab {
     private static func styleSupportProjectButton(_ button: NSButton) {
         button.bezelStyle = .rounded
         button.translatesAutoresizingMaskIntoConstraints = false
-        button.heightAnchor.constraint(equalToConstant: SettingsWindow.sidebarActionButtonHeight).isActive = true
     }
 
     private static func makeButtonWithIcon(_ title: String, _ selector: Selector, _ symbolName: String?, _ color: NSColor? = nil, _ target: AnyObject? = nil) -> NSButton {