diff --git a/Base/res/icons/themes/Light/16x16/window-close-modified.png b/Base/res/icons/themes/Light/16x16/window-close-modified.png
new file mode 100644
index 0000000000..6b1a713a56
Binary files /dev/null and b/Base/res/icons/themes/Light/16x16/window-close-modified.png differ
diff --git a/Base/res/icons/themes/Light/16x16/window-close.png b/Base/res/icons/themes/Light/16x16/window-close.png
new file mode 100644
index 0000000000..5bca3842ce
Binary files /dev/null and b/Base/res/icons/themes/Light/16x16/window-close.png differ
diff --git a/Base/res/icons/themes/Light/16x16/window-maximize.png b/Base/res/icons/themes/Light/16x16/window-maximize.png
new file mode 100644
index 0000000000..ed23618da4
Binary files /dev/null and b/Base/res/icons/themes/Light/16x16/window-maximize.png differ
diff --git a/Base/res/icons/themes/Light/16x16/window-minimize.png b/Base/res/icons/themes/Light/16x16/window-minimize.png
new file mode 100644
index 0000000000..9544544032
Binary files /dev/null and b/Base/res/icons/themes/Light/16x16/window-minimize.png differ
diff --git a/Base/res/icons/themes/Light/16x16/window-restore.png b/Base/res/icons/themes/Light/16x16/window-restore.png
new file mode 100644
index 0000000000..375b04f297
Binary files /dev/null and b/Base/res/icons/themes/Light/16x16/window-restore.png differ
diff --git a/Base/res/themes/Light.ini b/Base/res/themes/Light.ini
index e2e39d4bd8..f6082ef3f9 100644
--- a/Base/res/themes/Light.ini
+++ b/Base/res/themes/Light.ini
@@ -79,7 +79,11 @@ TitleAlignment=Left
 
 [Flags]
 IsDark=false
+TitleButtonsIconOnly=true
 
 [Paths]
+ActiveWindowShadow=/res/icons/themes/Default/frame-shadow-dark.png
+InactiveWindowShadow=/res/icons/themes/Default/frame-shadow-light.png
+TitleButtonIcons=/res/icons/themes/Light/16x16/
 MenuShadow=/res/icons/themes/Redmond/menu-shadow.png
 TooltipShadow=/res/icons/themes/Redmond/menu-shadow.png