diff --git a/icons/title_button_close.png b/icons/title_button_close.png
index 22cfe52..d2f10db 100644
Binary files a/icons/title_button_close.png and b/icons/title_button_close.png differ
diff --git a/icons/title_button_close@2x.png b/icons/title_button_close@2x.png
index b281004..89bfa1b 100644
Binary files a/icons/title_button_close@2x.png and b/icons/title_button_close@2x.png differ
diff --git a/icons/title_button_close@3x.png b/icons/title_button_close@3x.png
index c4bf819..9db41de 100644
Binary files a/icons/title_button_close@3x.png and b/icons/title_button_close@3x.png differ
diff --git a/icons/title_button_maximize.png b/icons/title_button_maximize.png
index 2759b3f..5d2b886 100644
Binary files a/icons/title_button_maximize.png and b/icons/title_button_maximize.png differ
diff --git a/icons/title_button_maximize@2x.png b/icons/title_button_maximize@2x.png
index 00daaae..708654f 100644
Binary files a/icons/title_button_maximize@2x.png and b/icons/title_button_maximize@2x.png differ
diff --git a/icons/title_button_maximize@3x.png b/icons/title_button_maximize@3x.png
index 4d8073f..6ee5b8e 100644
Binary files a/icons/title_button_maximize@3x.png and b/icons/title_button_maximize@3x.png differ
diff --git a/icons/title_button_minimize.png b/icons/title_button_minimize.png
index 85934dd..93c120e 100644
Binary files a/icons/title_button_minimize.png and b/icons/title_button_minimize.png differ
diff --git a/icons/title_button_minimize@2x.png b/icons/title_button_minimize@2x.png
index d70a497..dd49d09 100644
Binary files a/icons/title_button_minimize@2x.png and b/icons/title_button_minimize@2x.png differ
diff --git a/icons/title_button_minimize@3x.png b/icons/title_button_minimize@3x.png
index 93e36c2..64d3d5a 100644
Binary files a/icons/title_button_minimize@3x.png and b/icons/title_button_minimize@3x.png differ
diff --git a/icons/title_button_restore.png b/icons/title_button_restore.png
index c9f276b..12fa624 100644
Binary files a/icons/title_button_restore.png and b/icons/title_button_restore.png differ
diff --git a/icons/title_button_restore@2x.png b/icons/title_button_restore@2x.png
index 63c3e1b..132199a 100644
Binary files a/icons/title_button_restore@2x.png and b/icons/title_button_restore@2x.png differ
diff --git a/icons/title_button_restore@3x.png b/icons/title_button_restore@3x.png
index 44b9323..98a55e6 100644
Binary files a/icons/title_button_restore@3x.png and b/icons/title_button_restore@3x.png differ
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 785c41c..0a85f1f 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1433,90 +1433,93 @@ shakeShift: 4px;
 
 // Windows specific title
 
+windowTitleButtonWidth: 28px;
+windowTitleHeight: 24px;
 windowTitleButton: IconButton {
-	width: 24px;
-	height: 21px;
+	width: windowTitleButtonWidth;
+	height: windowTitleHeight;
 	iconPosition: point(0px, 0px);
 }
 windowTitleButtonClose: IconButton(windowTitleButton) {
-	width: 25px;
+	width: windowTitleButtonWidth;
 }
 
+windowTitleButtonSize: size(windowTitleButtonWidth, windowTitleHeight);
 defaultWindowTitle: WindowTitle {
-	height: 21px;
+	height: windowTitleHeight;
 	bg: titleBg;
 	bgActive: titleBgActive;
 	fg: titleFg;
 	fgActive: titleFgActive;
 	minimize: IconButton(windowTitleButton) {
 		icon: icon {
-			{ size(24px, 21px), titleButtonBg },
-			{ "title_button_minimize", titleButtonFg, point(4px, 4px) },
+			{ windowTitleButtonSize, titleButtonBg },
+			{ "title_button_minimize", titleButtonFg },
 		};
 		iconOver: icon {
-			{ size(24px, 21px), titleButtonBgOver },
-			{ "title_button_minimize", titleButtonFgOver, point(4px, 4px) },
+			{ windowTitleButtonSize, titleButtonBgOver },
+			{ "title_button_minimize", titleButtonFgOver },
 		};
 	}
 	minimizeIconActive: icon {
-		{ size(24px, 21px), titleButtonBgActive },
-		{ "title_button_minimize", titleButtonFgActive, point(4px, 4px) },
+		{ windowTitleButtonSize, titleButtonBgActive },
+		{ "title_button_minimize", titleButtonFgActive },
 	};
 	minimizeIconActiveOver: icon {
-		{ size(24px, 21px), titleButtonBgActiveOver },
-		{ "title_button_minimize", titleButtonFgActiveOver, point(4px, 4px) },
+		{ windowTitleButtonSize, titleButtonBgActiveOver },
+		{ "title_button_minimize", titleButtonFgActiveOver },
 	};
 	maximize: IconButton(windowTitleButton) {
 		icon: icon {
-			{ size(24px, 21px), titleButtonBg },
-			{ "title_button_maximize", titleButtonFg, point(4px, 4px) },
+			{ windowTitleButtonSize, titleButtonBg },
+			{ "title_button_maximize", titleButtonFg },
 		};
 		iconOver: icon {
-			{ size(24px, 21px), titleButtonBgOver },
-			{ "title_button_maximize", titleButtonFgOver, point(4px, 4px) },
+			{ windowTitleButtonSize, titleButtonBgOver },
+			{ "title_button_maximize", titleButtonFgOver },
 		};
 	}
 	maximizeIconActive: icon {
-		{ size(24px, 21px), titleButtonBgActive },
-		{ "title_button_maximize", titleButtonFgActive, point(4px, 4px) },
+		{ windowTitleButtonSize, titleButtonBgActive },
+		{ "title_button_maximize", titleButtonFgActive },
 	};
 	maximizeIconActiveOver: icon {
-		{ size(24px, 21px), titleButtonBgActiveOver },
-		{ "title_button_maximize", titleButtonFgActiveOver, point(4px, 4px) },
+		{ windowTitleButtonSize, titleButtonBgActiveOver },
+		{ "title_button_maximize", titleButtonFgActiveOver },
 	};
 	restoreIcon: icon {
-		{ size(24px, 21px), titleButtonBg },
-		{ "title_button_restore", titleButtonFg, point(4px, 4px) },
+		{ windowTitleButtonSize, titleButtonBg },
+		{ "title_button_restore", titleButtonFg },
 	};
 	restoreIconOver: icon {
-		{ size(24px, 21px), titleButtonBgOver },
-		{ "title_button_restore", titleButtonFgOver, point(4px, 4px) },
+		{ windowTitleButtonSize, titleButtonBgOver },
+		{ "title_button_restore", titleButtonFgOver },
 	};
 	restoreIconActive: icon {
-		{ size(24px, 21px), titleButtonBgActive },
-		{ "title_button_restore", titleButtonFgActive, point(4px, 4px) },
+		{ windowTitleButtonSize, titleButtonBgActive },
+		{ "title_button_restore", titleButtonFgActive },
 	};
 	restoreIconActiveOver: icon {
-		{ size(24px, 21px), titleButtonBgActiveOver },
-		{ "title_button_restore", titleButtonFgActiveOver, point(4px, 4px) },
+		{ windowTitleButtonSize, titleButtonBgActiveOver },
+		{ "title_button_restore", titleButtonFgActiveOver },
 	};
 	close: IconButton(windowTitleButtonClose) {
 		icon: icon {
-			{ size(25px, 21px), titleButtonCloseBg },
-			{ "title_button_close", titleButtonCloseFg, point(5px, 4px) },
+			{ windowTitleButtonSize, titleButtonCloseBg },
+			{ "title_button_close", titleButtonCloseFg },
 		};
 		iconOver: icon {
-			{ size(25px, 21px), titleButtonCloseBgOver },
-			{ "title_button_close", titleButtonCloseFgOver, point(5px, 4px) },
+			{ windowTitleButtonSize, titleButtonCloseBgOver },
+			{ "title_button_close", titleButtonCloseFgOver },
 		};
 	}
 	closeIconActive: icon {
-		{ size(25px, 21px), titleButtonCloseBgActive },
-		{ "title_button_close", titleButtonCloseFgActive, point(5px, 4px) },
+		{ windowTitleButtonSize, titleButtonCloseBgActive },
+		{ "title_button_close", titleButtonCloseFgActive },
 	};
 	closeIconActiveOver: icon {
-		{ size(25px, 21px), titleButtonCloseBgActiveOver },
-		{ "title_button_close", titleButtonCloseFgActiveOver, point(5px, 4px) },
+		{ windowTitleButtonSize, titleButtonCloseBgActiveOver },
+		{ "title_button_close", titleButtonCloseFgActiveOver },
 	};
 }