diff --git a/Base/res/icons/themes/Sunshine/16x16/window-close.png b/Base/res/icons/themes/Sunshine/16x16/window-close.png
new file mode 100644
index 0000000000..c5b41fe83c
Binary files /dev/null and b/Base/res/icons/themes/Sunshine/16x16/window-close.png differ
diff --git a/Base/res/icons/themes/Sunshine/16x16/window-maximize.png b/Base/res/icons/themes/Sunshine/16x16/window-maximize.png
new file mode 100644
index 0000000000..8e74b3a26e
Binary files /dev/null and b/Base/res/icons/themes/Sunshine/16x16/window-maximize.png differ
diff --git a/Base/res/icons/themes/Sunshine/16x16/window-minimize.png b/Base/res/icons/themes/Sunshine/16x16/window-minimize.png
new file mode 100644
index 0000000000..23f03ba3bd
Binary files /dev/null and b/Base/res/icons/themes/Sunshine/16x16/window-minimize.png differ
diff --git a/Base/res/icons/themes/Sunshine/16x16/window-restore.png b/Base/res/icons/themes/Sunshine/16x16/window-restore.png
new file mode 100644
index 0000000000..703eed5d8b
Binary files /dev/null and b/Base/res/icons/themes/Sunshine/16x16/window-restore.png differ
diff --git a/Base/res/themes/Sunshine.ini b/Base/res/themes/Sunshine.ini
index 60b30a6cdb..48033c79e1 100644
--- a/Base/res/themes/Sunshine.ini
+++ b/Base/res/themes/Sunshine.ini
@@ -3,15 +3,19 @@ DesktopBackground=#574c8f
 ActiveWindowBorder1=#b24d7a
 ActiveWindowBorder2=#b24d7a
 ActiveWindowTitle=white
+ActiveWindowTitleStripes=#00000000
 InactiveWindowBorder1=#aeb2c3
 InactiveWindowBorder2=#aeb2c3
 InactiveWindowTitle=black
+InactiveWindowTitleStripes=#00000000
 MovingWindowBorder1=#b24d7a
 MovingWindowBorder2=#b24d7a
 MovingWindowTitle=white
+MovingWindowTitleStripes=#00000000
 HighlightWindowBorder1=#b24d7a
 HighlightWindowBorder2=#b24d7a
 HighlightWindowTitle=white
+HighlightWindowTitleStripes=#00000000
 HighlightSearching=#ffff00
 HighlightSearchingText=black
 MenuBase=#aeb2c3
@@ -58,3 +62,6 @@ SyntaxPreprocessorStatement=#008080
 SyntaxPreprocessorValue=#800000
 Tooltip=#ffffe1
 TooltipText=black
+
+[Paths]
+TitleButtonIcons=/res/icons/themes/Sunshine/16x16/