diff --git a/Base/res/icons/themes/Redmond/16x16/window-close.png b/Base/res/icons/themes/Redmond/16x16/window-close.png
new file mode 100644
index 00000000000..7eaaf706770
Binary files /dev/null and b/Base/res/icons/themes/Redmond/16x16/window-close.png differ
diff --git a/Base/res/icons/themes/Redmond/16x16/window-maximize.png b/Base/res/icons/themes/Redmond/16x16/window-maximize.png
new file mode 100644
index 00000000000..76ef018d3b7
Binary files /dev/null and b/Base/res/icons/themes/Redmond/16x16/window-maximize.png differ
diff --git a/Base/res/icons/themes/Redmond/16x16/window-minimize.png b/Base/res/icons/themes/Redmond/16x16/window-minimize.png
new file mode 100644
index 00000000000..4f0fa672de9
Binary files /dev/null and b/Base/res/icons/themes/Redmond/16x16/window-minimize.png differ
diff --git a/Base/res/icons/themes/Redmond/16x16/window-restore.png b/Base/res/icons/themes/Redmond/16x16/window-restore.png
new file mode 100644
index 00000000000..a435469b951
Binary files /dev/null and b/Base/res/icons/themes/Redmond/16x16/window-restore.png differ
diff --git a/Base/res/themes/Redmond 2000.ini b/Base/res/themes/Redmond 2000.ini
index 3026172a95f..3ff0cf9cf5f 100644
--- a/Base/res/themes/Redmond 2000.ini	
+++ b/Base/res/themes/Redmond 2000.ini	
@@ -53,3 +53,10 @@ SyntaxControlKeyword=black
 SyntaxIdentifier=#092e64
 SyntaxPreprocessorStatement=#008080
 SyntaxPreprocessorValue=#800000
+
+[Metrics]
+TitleButtonWidth=17
+TitleButtonHeight=15
+
+[Paths]
+TitleButtonIcons=/res/icons/themes/Redmond/16x16/
diff --git a/Base/res/themes/Redmond.ini b/Base/res/themes/Redmond.ini
index 04a4d7ded9a..8fcf6afd9bf 100644
--- a/Base/res/themes/Redmond.ini
+++ b/Base/res/themes/Redmond.ini
@@ -1,5 +1,5 @@
 [Colors]
-DesktopBackground=#00787f
+DesktopBackground=#008080
 ActiveWindowBorder1=#00007f
 ActiveWindowBorder2=#00007f
 ActiveWindowTitle=white
@@ -53,3 +53,10 @@ SyntaxControlKeyword=black
 SyntaxIdentifier=#092e64
 SyntaxPreprocessorStatement=#008080
 SyntaxPreprocessorValue=#800000
+
+[Metrics]
+TitleButtonWidth=17
+TitleButtonHeight=15
+
+[Paths]
+TitleButtonIcons=/res/icons/themes/Redmond/16x16/