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 a41546b20b..b2c4d071ef 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 6b0580c3af..8affed278b 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 01e3205ddd..9956963749 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 59c5099800..9709e21c67 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 26ea7e2bd5..950ee5ac66 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 d2025bb47e..b405a4493a 100644
--- a/Base/res/themes/Coffee.ini
+++ b/Base/res/themes/Coffee.ini
@@ -75,6 +75,7 @@ TitleAlignment=Left
 
 [Flags]
 IsDark=false
+TitleButtonsIconOnly=true
 
 [Paths]
 TitleButtonIcons=/res/icons/themes/Coffee/16x16/