diff --git a/Base/res/icons/themes/Coffee/16x16/window-close-modified.png b/Base/res/icons/themes/Coffee/16x16/window-close-modified.png
index aa16575f356..88e59b08b0f 100644
Binary files a/Base/res/icons/themes/Coffee/16x16/window-close-modified.png and b/Base/res/icons/themes/Coffee/16x16/window-close-modified.png differ
diff --git a/Base/res/icons/themes/Coffee/16x16/window-close.png b/Base/res/icons/themes/Coffee/16x16/window-close.png
index aa16575f356..6b0580c3afe 100644
Binary files a/Base/res/icons/themes/Coffee/16x16/window-close.png and b/Base/res/icons/themes/Coffee/16x16/window-close.png differ
diff --git a/Base/res/icons/themes/Coffee/16x16/window-maximize.png b/Base/res/icons/themes/Coffee/16x16/window-maximize.png
index f3f165bad14..01e3205ddda 100644
Binary files a/Base/res/icons/themes/Coffee/16x16/window-maximize.png and b/Base/res/icons/themes/Coffee/16x16/window-maximize.png differ
diff --git a/Base/res/icons/themes/Coffee/16x16/window-minimize.png b/Base/res/icons/themes/Coffee/16x16/window-minimize.png
index f3b41f208c2..59c5099800a 100644
Binary files a/Base/res/icons/themes/Coffee/16x16/window-minimize.png and b/Base/res/icons/themes/Coffee/16x16/window-minimize.png differ
diff --git a/Base/res/icons/themes/Coffee/16x16/window-restore.png b/Base/res/icons/themes/Coffee/16x16/window-restore.png
index acb6e7839c4..26ea7e2bd5a 100644
Binary files a/Base/res/icons/themes/Coffee/16x16/window-restore.png and b/Base/res/icons/themes/Coffee/16x16/window-restore.png differ
diff --git a/Base/res/themes/Coffee.ini b/Base/res/themes/Coffee.ini
index 327ad97564f..8295b81759f 100644
--- a/Base/res/themes/Coffee.ini
+++ b/Base/res/themes/Coffee.ini
@@ -69,7 +69,7 @@ Tray=#9397a5
 TrayText=white
 
 [Metrics]
-TitleButtonWidth=17
+TitleButtonWidth=16
 TitleButtonHeight=16
 
 [Paths]