diff --git a/changelog b/changelog
index dcbe9e8..cae14f6 100644
--- a/changelog
+++ b/changelog
@@ -1,2 +1,3 @@
-- new wallpaper
-- more icon resolutions
+- new unity controls
+- improved rc files
+- re-merge with ubuntu themes
diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/geary.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/geary.css
index f6d1964..78d5b6b 100644
--- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/geary.css
+++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/geary.css
@@ -1,3 +1,39 @@
+/**************
+ * GNOME Crap *
+ *************/
+
+ApDocView, /* Abiword */
+EogScrollView, /* Eog */
+CheeseThumbView /* Cheese */
+{
+    -EogScrollView-shadow-type: none;
+}
+
+CcNetworkPanel GtkNotebook > .frame {
+    border: none;
+}
+
+
+/********
+* Geary *
+********/
+
+ConversationListView {
+    -GtkWidget-focus-line-width: 1px;
+    -GtkTreeView-grid-line-width: 0;
+}
+ 
+ConversationListView.view.cell {
+    border-style: solid;
+    border-width: 0 0 1px 0;
+    border-color: alpha (#000, 0.2);
+}
+ 
+ConversationListView.view.cell:selected:focus {
+    border-style: solid;
+    border-width: 0 0 1px 0;
+    border-color: shade (@colorAccent, 0.8);
+}
 
 /* for overlay-scrollbars */
 ComposerWidget {
diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css
index 050a438..2d99583 100644
--- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css
+++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css
@@ -20,13 +20,13 @@ UnityDecoration {
 }
 
 UnityDecoration.top {
-    border: 1px solid rgba (72, 72, 72, 0.3568); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 1.06) */
+    border: 1px solid rgba (72, 72, 72, 0.3568); /* shade (@bg_color, 0.8) - shade (#ededed, 1.06) */
     border-bottom-width: 0;
     border-radius: 8px 8px 0 0;
     padding: 1px 8px 0 8px;
 
     box-shadow: inset 0 0 transparent, inset 0 0 transparent,
-                inset 0 1px shade (#edebe6, 1.08), inset 0 0 transparent;
+                inset 0 1px shade (#ededed, 1.08), inset 0 0 transparent;
 
     background-color: transparent;
     background-clip: border-box;
@@ -87,14 +87,14 @@ UnityPanelWidget,
 .unity-panel {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (#e0e0e0, 1.06)),
-                                     to (@dark_bg_color));
-    border-top-color: shade (#edebe6, 1.08);
+                                     to (@bg_color));
+    border-top-color: shade (#ededed, 1.08);
     border-style: solid;
     border-width: 1px 0 0 0;
 
     color: @dark_fg_color;
-    text-shadow: 1px 0 1px shade (@dark_bg_color, 1.06), -1px 0 1px shade (@dark_bg_color, 1.06),
-                 0 1px 1px shade (@dark_bg_color, 1.06), 0 -1px 1px shade (@dark_bg_color, 1.06);
+    text-shadow: 1px 0 1px shade (@bg_color, 1.06), -1px 0 1px shade (@dark_bg_color, 1.06),
+                 0 1px 1px shade (@bg_color, 1.06), 0 -1px 1px shade (@dark_bg_color, 1.06);
 }
 
 .unity-panel.menubar,
diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/progressbar-horizontal-fill-backdrop.png b/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/progressbar-horizontal-fill-backdrop.png
index ef0cf66..97555c0 100644
Binary files a/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/progressbar-horizontal-fill-backdrop.png and b/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/progressbar-horizontal-fill-backdrop.png differ
diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/progressbar-vertical-fill-backdrop.png b/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/progressbar-vertical-fill-backdrop.png
index dd406cd..b59c637 100644
Binary files a/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/progressbar-vertical-fill-backdrop.png and b/src/usr/share/themes/Lubuntu-default/gtk-3.0/assets/progressbar-vertical-fill-backdrop.png differ
diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css
index a54b4c0..020d6db 100644
--- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css
+++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css
@@ -1,3 +1,60 @@
+/*default color scheme */
+@define-color toolbar_base #e0e0e0;
+@define-color toolbar_final #bcbcbc;
+@define-color toolbar_border #ffffff;
+@define-color toolbar_bg_color @toolbar_base;
+@define-color toolbar_fg_color @fg_color;
+@define-color toolbar_textshadow_color @bg_color;
+@define-color toolbar_bg_top_color @toolbar_base;
+@define-color toolbar_bg_bottom_color @toolbar_final;
+@define-color toolbar_border_top_color @toolbar_base;
+@define-color toolbar_border_bottom_color @toolbar_border;
+
+/* misc colors used by gtk+
+ *
+ * Gtk doesn't currently expand color variables for style properties. Thus,
+ * gtk-widgets.css uses literal color names, but includes a comment containing
+ * the name of the variable. Please remember to change values there as well
+ * when changing one of the variables below.
+ */
+@define-color info_fg_color rgb (181, 171, 156);
+@define-color info_bg_color rgb (252, 252, 189);
+@define-color warning_fg_color rgb (173, 120, 41);
+@define-color warning_bg_color rgb (250, 173, 61);
+@define-color question_fg_color rgb (97, 122, 214);
+@define-color question_bg_color rgb (138, 173, 212);
+@define-color error_fg_color rgb (166, 38, 38);
+@define-color error_bg_color rgb (237, 54, 54);
+@define-color link_color #148add;
+@define-color error_color #cc0000;
+@define-color combobox_color #888888;
+@define-color progress_color #5591c3;
+@define-color scroll_color #B3B3B3;
+@define-color sidepane_color #dae0e6;
+
+/* theme common colors */
+@define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
+@define-color notebook_button_bg_color shade (@bg_color, 1.02);
+@define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 0.6);
+@define-color dark_bg_color #e0e0e0;
+@define-color dark_fg_color @fg_color;
+@define-color transparent rgba (0, 0, 0, 0);
+
+@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
+@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
+@define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
+@define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
+@define-color backdrop_selected_fg_color @fg_color;
+
+/* strange colors */
+@define-color scrollslider_gradient_a #bdbdbd;
+@define-color scrollslider_gradient_b #bdbdbd;
+@define-color scrollslider_border #bdbdbd;
+@define-color trough_bg_color_a #efefef;
+@define-color trough_bg_color_b #e0e0e0;
+@define-color colorAccent @selected_bg_color;
+
+
 *:link,
 *:visited {
     color: @link_color;
@@ -263,3 +320,117 @@ NautilusWindow .sidebar,
 NautilusWindow .sidebar .view {
     background-color: @sidepane_color;
 }
+
+/************************************************************
+ *					 GTK3 CSD support 						*
+ ************************************************************/
+
+.titlebar {
+    border-radius: 6px 6px 0 0;
+    background-image: linear-gradient(to bottom,
+                                      shade(@bg_color, 1.07),
+                                      shade(@bg_color, 0.88)
+                                      );
+
+    color: @fg_color;
+}
+
+.tiled .titlebar {
+    border-radius: 0;
+}
+
+.maximized .titlebar {
+    border-radius: 0;
+}
+
+.titlebar.default-decoration {
+    border: none;
+    box-shadow: none;
+}
+
+.titlebar .title {
+    font: bold;
+    color: mix(@fg_color, @bg_color, 0.3);
+    text-shadow: 0 1px shade(@bg_color, 1.1);
+}
+
+.titlebar:backdrop {
+    background-image: linear-gradient(to bottom,
+                                      shade(@bg_color, 1.12),
+                                      shade(@bg_color, 0.98)
+                                      );
+}
+
+.titlebar .title:backdrop {
+    color: mix(@fg_color, @bg_color, 0.6);
+    text-shadow: 0 1px shade(@bg_color, 1.05);
+}
+
+.titlebar .button:backdrop {
+    color: mix(@fg_color, @bg_color, 0.6);
+}
+
+.titlebar .titlebutton {
+    padding: 4px;
+    border-style: none;
+    background: none;
+    color: mix(@fg_color, @bg_color, 0.3);
+    icon-shadow: 0 1px shade(@bg_color, 1.1);
+    box-shadow: none;
+}
+
+.titlebar .titlebutton:hover,
+.titlebar .titlebutton:hover:focus {
+    background: none;
+    color: @fg_color;
+    box-shadow: none;
+}
+
+.titlebar .titlebutton:active,
+.titlebar .titlebutton:checked,
+.titlebar .titlebutton:active:hover,
+.titlebar .titlebutton:checked:hover {
+    background: none;
+    color: @selected_bg_color;
+    box-shadow: none;
+}
+
+.titlebar .titlebutton:backdrop {
+    background-image: none;
+    color: mix(@fg_color, @bg_color, 0.6);
+    icon-shadow: 0 1px shade(@bg_color, 1.05);
+}
+
+.window-frame,
+.window-frame:backdrop {
+    border-style: none;
+    border-radius: 6px 6px 0 0;
+    box-shadow: 0 6px 22px alpha(black, 0.47),
+                0 0 0 1px alpha(black, 0.3);
+
+    /* this is used for the resize cursor area */
+    margin: 10px;
+}
+
+.window-frame.tiled {
+    border-radius: 0;
+}
+
+.window-frame.csd.popup {
+    border-style: none;
+    border-radius: 0;
+    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+}
+
+.window-frame.csd.tooltip {
+    border-radius: 4px;
+    box-shadow: none;
+}
+
+.window-frame.solid-csd {
+    border: solid 1px shade(@bg_color, 0.5);
+    border-radius: 0;
+    margin: 2px;
+    background-color: @bg_color;
+    box-shadow: none;
+}
diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css
index d0fbdf0..6395e24 100644
--- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css
+++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css
@@ -8,7 +8,13 @@
 @define-color tooltip_bg_color #333333;
 @define-color tooltip_fg_color #ffffff;
 
-/* misc colors used by gtk+ */
+/* misc colors used by gtk+
+ *
+ * Gtk doesn't currently expand color variables for style properties. Thus,
+ * gtk-widgets.css uses literal color names, but includes a comment containing
+ * the name of the variable. Please remember to change values there as well
+ * when changing one of the variables below.
+ */
 @define-color info_fg_color rgb (181, 171, 156);
 @define-color info_bg_color rgb (252, 252, 189);
 @define-color warning_fg_color rgb (173, 120, 41);
@@ -28,41 +34,26 @@
 @define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
 @define-color notebook_button_bg_color shade (@bg_color, 1.02);
 @define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 0.6);
-@define-color dark_bg_color #e0e0e0;
+@define-color dark_bg_color #dfd7cf;
 @define-color dark_fg_color @fg_color;
-@define-color transparent rgba (0, 0, 0, 0);
 
 @define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
 @define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
 @define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
 @define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
 @define-color backdrop_selected_fg_color @fg_color;
+@define-color backdrop_filling_bg #b0b0b0;
 
 @define-color focus_color alpha (@selected_bg_color, 0.5);
 @define-color focus_bg_color alpha (@selected_bg_color, 0.1);
+
 @define-color shadow_color alpha(black, 0.5);
+
 @define-color osd_fg_color #eeeeec;
 @define-color osd_bg_color alpha(#202526, 0.7);
 @define-color osd_border_color alpha(black, 0.7);
 
-@define-color scrollslider_gradient_a #bdbdbd;
-@define-color scrollslider_gradient_b #bdbdbd;
-@define-color scrollslider_border #bdbdbd;
-@define-color trough_bg_color_a #efefef;
-@define-color trough_bg_color_b #e0e0e0;
-
-@define-color toolbar_base #e0e0e0;
-@define-color toolbar_final #bcbcbc;
-@define-color toolbar_border #ffffff;
-@define-color toolbar_bg_color @toolbar_base;
-@define-color toolbar_fg_color @fg_color;
-@define-color toolbar_textshadow_color @bg_color;
-@define-color toolbar_bg_top_color @toolbar_base;
-@define-color toolbar_bg_bottom_color @toolbar_final;
-@define-color toolbar_border_top_color @toolbar_base;
-@define-color toolbar_border_bottom_color @toolbar_border;
-
-@define-color colorAccent @selected_bg_color;
+@define-color scrollbar_track_color mix(@base_color, black, 0.1); /* #e6e6e6 */
 
 @import url("gtk-widgets-borders.css");
 @import url("gtk-widgets-borders-radiance.css");
diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css
index ef48d1b..b178dc9 100644
--- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css
+++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css
@@ -180,17 +180,6 @@ GtkSwitch.trough:backdrop,
     border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;
 }
 
-.trough.vertical {
-    border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
-}
-
-.trough row {
-}
-
-.trough.vertical {
-    border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
-}
-
 GtkSwitch.trough {
     border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css
index 1ecf629..f080ef0 100644
--- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css
+++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css
@@ -18,7 +18,7 @@
     -GtkMenuBar-internal-padding: 0;
     -GtkMenuItem-arrow-scaling: 0.6;
     -GtkNotebook-tab-overlap: 1;
-    -GtkPaned-handle-size: 1px;
+    -GtkPaned-handle-size: 6;
     -GtkProgressBar-min-horizontal-bar-height: 14;
     -GtkProgressBar-min-vertical-bar-width: 14;
     -GtkRange-trough-border: 0;
@@ -27,9 +27,6 @@
     -GtkRange-trough-under-steppers: 1;
     -GtkRange-stepper-spacing: 0;
     -GtkScale-trough-border: 0;
-    -GtkScrollbar-activate-slider: 1;
-    -GtkScrollbar-trough-border: 0;
-    -GtkScrollbar-min-slider-length: 31;
     -GtkScrolledWindow-scrollbar-spacing: 0;
     -GtkScrolledWindow-scrollbars-within-bevel: 1;
     -GtkSeparatorMenuItem-horizontal-padding: 0;
@@ -61,27 +58,6 @@
     color: @backdrop_fg_color;
 }
 
-/* LP: #1285783 */
-GtkScrolledWindow {
-    background-color: @bg_color;
-}
-
-GtkPaned {
-    background-color: @bg_color;
-}
-
-/* Background hack to make DejaDup Assistant windows not turn black when
- * overlay scrollbars are enabled.
- */
-Assistant GtkEventBox {
-    background-color: @bg_color;
-}
-
-/* ... and for Evolution's mail preferences window */
-EPreferencesWindow GtkNotebook GtkAlignment GtkVBox {
-    background-color: @bg_color;
-}
-
 /*************
  * assistant *
  *************/
@@ -1030,7 +1006,7 @@ GtkProgressBar {
     border-radius: 8px;
     border-width: 0px;
     background-image: none;
-    background-color: #b0b0b0;
+    background-color: @backdrop_filling_bg;
 }
 
 .scale.highlight.left:insensitive {
@@ -1097,8 +1073,8 @@ GtkLevelBar.vertical {
 .level-bar.fill-block:backdrop,
 .level-bar.fill-block.level-high:backdrop,
 .level-bar.fill-block.level-low:backdrop {
-    background-color: #b0b0b0;
-    border-color: #b0b0b0;
+    background-color: @backdrop_filling_bg;
+    border-color: @backdrop_filling_bg;
     background-image: none;
 }
 
@@ -1181,72 +1157,93 @@ GtkScale.mark {
 /*************
  * scrollbar *
  *************/
-.scrollbar,
-.scrollbar.vertical {
+.scrollbar {
     -GtkScrollbar-has-backward-stepper: 0;
     -GtkScrollbar-has-forward-stepper: 0;
-    -GtkRange-slider-width: 14;
+    -GtkScrollbar-trough-border: 0;
+    -GtkScrollbar-min-slider-length: 31;
+    -GtkRange-slider-width: 10;
 
-    border-radius: 20px;
+    background-image: none;
+    background-size: 0;
+    border: none;
+    border-radius: 0;
+}
 
-    border-image: none;
+.scrollbar:hover,
+.scrollbar.dragging {
+    background-color: @scrollbar_track_color;
 }
 
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-    border-color: shade (@bg_color, 0.8);
+.scrollbar:hover:backdrop,
+.scrollbar.dragging:backdrop {
+    background-color: @backdrop_selected_bg_color;
 }
 
-.scrollbar.slider,
-.scrollbar.slider:hover,
-.scrollbar.button,
-.scrollbar.slider.vertical,
-.scrollbar.slider.vertical:hover,
-.scrollbar.button.vertical {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade (@bg_color, 0.86);
-    background-image: -gtk-gradient (linear, left top, right top,
-                                     from (shade (@button_bg_color, 1.08)),
-                                     color-stop (0.5, @button_bg_color),
-                                     to (shade (@button_bg_color, 0.94)));
-    box-shadow: inset 1px 0 shade (@bg_color, 1.1),
-                inset -1px 0 shade (@bg_color, 1.01),
-                inset 0 1px shade (@bg_color, 1.1),
-                inset 0 -1px shade (@bg_color, 1.1);
+/* Adding margins, so actual visible size is: -GtkRange-slider-width - margin
+ * this allows to keep the slider smaller, but keeping few threshold pixels
+ */
+.scrollbar.vertical:hover:dir(ltr),
+.scrollbar.vertical.dragging:dir(ltr) {
+    margin-left: 2px;
 }
 
-.scrollbar.slider.horizontal,
-.scrollbar.slider.horizontal:hover,
-.scrollbar.button.horizontal {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@button_bg_color, 1.08)),
-                                     color-stop (0.5, @button_bg_color),
-                                     to (shade (@button_bg_color, 0.94)));
-    box-shadow: inset 1px 0 shade (@bg_color, 1.1),
-                inset -1px 0 shade (@bg_color, 1.1),
-                inset 0 1px shade (@bg_color, 1.1),
-                inset 0 -1px shade (@bg_color, 1.01);
+.scrollbar.vertical:hover:dir(rtl),
+.scrollbar.vertical.dragging:dir(rtl) {
+    margin-right: 2px;
 }
 
-/* overlay scrollbar */
-OsThumb {
-    color: shade (@fg_color, 1.6);
+.scrollbar.horizontal:hover,
+.scrollbar.horizontal.dragging,
+.scrollbar.horizontal.slider:hover,
+.scrollbar.horizontal.slider.dragging {
+    margin-top: 2px;
 }
 
-OsThumb:selected,
-GtkScrollbar:selected {
+.scrollbar.slider {
+    background-color: alpha(@selected_bg_color, 0.8);
+    border-radius: 1px;
+}
+
+.scrollbar.slider.hovering,
+.scrollbar.slider.dragging {
+    border-radius: 2px;
+    margin: 0;
+}
+
+/* Adding margins, so actual visible size is: -GtkRange-slider-width - margin
+ * this allows to define some kind of proximity effect also on mouse-enter
+ */
+.scrollbar.slider.vertical:dir(ltr):not(:hover):not(.dragging) {
+    margin-left: 7px;
+}
+
+.scrollbar.slider.vertical:dir(rtl):not(:hover):not(.dragging) {
+    margin-right: 7px;
+}
+
+.scrollbar.slider.horizontal:not(:hover):not(.dragging) {
+    margin-top: 7px;
+}
+
+.scrollbar.slider:hover {
+    background-color: alpha(@selected_bg_color, 0.85);
+}
+
+.scrollbar.slider:active {
     background-color: @selected_bg_color;
 }
 
-OsThumb:active,
-GtkScrollbar:active {
-    background-color: shade (@bg_color, 0.6);
+.scrollbar.slider:backdrop {
+    background-color: alpha(@backdrop_filling_bg, 0.8);
 }
 
-OsThumb:insensitive,
-GtkScrollbar:insensitive {
-    background-color: shade (@bg_color, 0.85);
+.scrollbar.slider:hover:backdrop {
+    background-color: alpha(@backdrop_filling_bg, 0.85);
+}
+
+.scrollbar.slider:active:backdrop {
+    background-color: @backdrop_filling_bg;
 }
 
 /*******************
@@ -1340,12 +1337,31 @@ GtkComboBox .menuitem.separator {
 /***********
  * sidebar *
  ***********/
-.sidebar row:selected {
+GtkPlacesSidebar.sidebar .view {
+    background-color: shade (@bg_color, 0.95);
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);
+}
+
+GtkPlacesSidebar.sidebar:backdrop {
+    color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02);
+}
+
+GtkPlacesSidebar.sidebar row:selected {
+    color: @selected_fg_color;
     text-shadow: 0 1px shade (@selected_bg_color, 0.7);
 }
 
-.sidebar .frame {
-    border-width: 0;
+GtkPlacesSidebar.sidebar row:selected:backdrop {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (shade (@bg_color, 0.95), 0.94)),
+                                     to (shade (shade (@bg_color, 0.95), 0.86)));
+    border-top-color: shade (shade (@bg_color, 0.95), 0.88);
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
 }
 
 /**************
@@ -1599,6 +1615,7 @@ GtkTextView {
     border-style: none;
     padding: 1px;
 
+    background-color: @bg_color;
     color: @fg_color;
     text-shadow: none;
 }
@@ -1652,6 +1669,7 @@ GtkTextView {
     color: @dark_fg_color;
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
     border-image-source: url("assets/radiance-button-toolbar.png");
+    padding: 9px;
 }
 
 .primary-toolbar .button.flat {
@@ -1969,6 +1987,15 @@ GtkViewport.frame {
     background: none;
 }
 
+/* Floating bars */
+.floating-bar {
+    background-color: @info_bg_color;
+    border-radius: 3px 3px 0 0;
+    border-style: solid;
+    border-width: 1px;
+    border-color: darker (@info_bg_color);
+}
+
 
 /* OSD overlays */
 .osd,
@@ -1993,11 +2020,23 @@ GtkViewport.frame {
     transition: all 100ms ease-in-out;
 }
 
+/* buttons that are not part of an osd toolbar need a background */
+.button.osd,
+.button.osd:hover,
+.button.osd:active {
+    background: @osd_bg_color;
+    padding: 12px;
+    box-shadow: none;
+    border-image: none;
+}
+
+.button.osd:hover,
 .osd .button:hover {
     color: lighter(@osd_fg_color);
     icon-shadow: 0 0 3px @osd_fg_color;
 }
 
+.button.osd:active,
 .osd .button:active {
     color: darker(@osd_fg_color);
     icon-shadow: none;
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close.png b/src/usr/share/themes/Lubuntu-default/unity/close.png
deleted file mode 100644
index f0947ae..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/close.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close.svg b/src/usr/share/themes/Lubuntu-default/unity/close.svg
new file mode 100644
index 0000000..ff2979b
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4747"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close.svg">
+  <defs
+     id="defs4749" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.543122"
+     inkscape:cx="11.385108"
+     inkscape:cy="17.304123"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4752">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(295.60105,-849.03082)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect4785"
+       width="19"
+       height="19"
+       x="-295.60104"
+       y="849.03082" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -288.40183,856.52418 -0.70703,0.707 0.35351,0.3535 1.94727,1.9473 -1.94727,1.9453 -0.35351,0.3535 0.70703,0.707 0.35351,-0.3535 1.94727,-1.9472 1.94726,1.9472 0.35352,0.3535 0.70703,-0.707 -0.35351,-0.3535 -1.94727,-1.9453 1.94727,-1.9473 0.35351,-0.3535 -0.70703,-0.707 -0.35352,0.3535 -1.94726,1.9472 -1.94727,-1.9472 -0.35351,-0.3535 z"
+       id="path4646"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#25657f;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -283.80078,855.45312 -0.38867,0.38868 -4.59961,4.59961 -0.39063,0.38867 0.7793,0.7793 0.38867,-0.38868 4.59961,-4.60156 0.38867,-0.38867 -0.77734,-0.77735 z"
+       id="path4535"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#25657f;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -288.40039,855.45312 -0.7793,0.77735 0.39063,0.38867 4.59961,4.60156 0.38867,0.38868 0.77734,-0.7793 -0.38867,-0.38867 -4.59961,-4.59961 -0.38867,-0.38868 z"
+       id="path4537"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_dash.svg b/src/usr/share/themes/Lubuntu-default/unity/close_dash.svg
new file mode 100644
index 0000000..4d49c98
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_dash.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="close_dash.svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="12.421053"
+     inkscape:cx="9.5"
+     inkscape:cy="9.5"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;fill:#ffffff;fill-opacity:1"
+     d="m 7,6.2227 0.38867,0.38867 2.111,2.11 2.111,-2.11 0.389,-0.39 0.777,0.78 -0.388,0.39 -2.112,2.11 2.112,2.11 0.388,0.39 -0.777,0.78 -0.389,-0.39 -2.111,-2.11 -2.111,2.11 -0.389,0.39 -0.777,-0.78 0.388,-0.39 2.112,-2.11 -2.112,-2.11 -0.388,-0.39 0.777,-0.78 z"
+     id="circle4507" />
+  <rect
+     id="rect4539"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="0.040024415"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_dash_disabled.svg b/src/usr/share/themes/Lubuntu-default/unity/close_dash_disabled.svg
new file mode 100644
index 0000000..8c98ccc
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_dash_disabled.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="close_dash_disabled.svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="12.421053"
+     inkscape:cx="9.5"
+     inkscape:cy="9.5"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;fill:#14a2dd;fill-opacity:1"
+     d="m 7,6.2227 0.38867,0.38867 2.111,2.11 2.111,-2.11 0.389,-0.39 0.777,0.78 -0.388,0.39 -2.112,2.11 2.112,2.11 0.388,0.39 -0.777,0.78 -0.389,-0.39 -2.111,-2.11 -2.111,2.11 -0.389,0.39 -0.777,-0.78 0.388,-0.39 2.112,-2.11 -2.112,-2.11 -0.388,-0.39 0.777,-0.78 z"
+     id="path4119" />
+  <rect
+     id="rect4121"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="0.040024415"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_dash_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/close_dash_prelight.svg
new file mode 100644
index 0000000..22aa0e7
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_dash_prelight.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="close_dash_prelight.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="12.421053"
+     inkscape:cx="9.5"
+     inkscape:cy="9.5"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <defs
+     id="defs4488">
+    <filter
+       id="filter4195"
+       style="color-interpolation-filters:sRGB"
+       height="1.24"
+       width="1.24"
+       y="-.12"
+       x="-.12">
+      <feGaussianBlur
+         id="feGaussianBlur4197"
+         stdDeviation="0.75" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;fill:#14a2dd;fill-opacity:1"
+     d="m 7,6.2227 0.38867,0.38867 2.111,2.11 2.111,-2.11 0.389,-0.39 0.777,0.78 -0.388,0.39 -2.112,2.11 2.112,2.11 0.388,0.39 -0.777,0.78 -0.389,-0.39 -2.111,-2.11 -2.111,2.11 -0.389,0.39 -0.777,-0.78 0.388,-0.39 2.112,-2.11 -2.112,-2.11 -0.388,-0.39 0.777,-0.78 z"
+     id="path4133" />
+  <rect
+     id="rect4135"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="0.040024415"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_dash_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/close_dash_pressed.svg
new file mode 100644
index 0000000..999e46f
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_dash_pressed.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="close_dash_pressed.svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="12.421053"
+     inkscape:cx="9.5"
+     inkscape:cy="9.5"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;fill:#14a2dd;fill-opacity:1"
+     d="m 7,6.2227 0.38867,0.38867 2.111,2.11 2.111,-2.11 0.389,-0.39 0.777,0.78 -0.388,0.39 -2.112,2.11 2.112,2.11 0.388,0.39 -0.777,0.78 -0.389,-0.39 -2.111,-2.11 -2.111,2.11 -0.389,0.39 -0.777,-0.78 0.388,-0.39 2.112,-2.11 -2.112,-2.11 -0.388,-0.39 0.777,-0.78 z"
+     id="path4125" />
+  <rect
+     id="rect4127"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="0.040024415"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_focused.svg b/src/usr/share/themes/Lubuntu-default/unity/close_focused.svg
new file mode 100644
index 0000000..b06ec5a
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_focused.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4747"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_focused.svg">
+  <defs
+     id="defs4749" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.981294"
+     inkscape:cx="10.682494"
+     inkscape:cy="11.896997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4752">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(295.60105,-849.03082)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect4785"
+       width="19"
+       height="19"
+       x="-295.60104"
+       y="849.03082" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -288.40183,856.52418 -0.70703,0.707 0.35351,0.3535 1.94727,1.9473 -1.94727,1.9453 -0.35351,0.3535 0.70703,0.707 0.35351,-0.3535 1.94727,-1.9472 1.94726,1.9472 0.35352,0.3535 0.70703,-0.707 -0.35351,-0.3535 -1.94727,-1.9453 1.94727,-1.9473 0.35351,-0.3535 -0.70703,-0.707 -0.35352,0.3535 -1.94726,1.9472 -1.94727,-1.9472 -0.35351,-0.3535 z"
+       id="path4646"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#25657f;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -283.80078,855.45312 -0.38867,0.38868 -4.59961,4.59961 -0.39063,0.38867 0.7793,0.7793 0.38867,-0.38868 4.59961,-4.60156 0.38867,-0.38867 -0.77734,-0.77735 z"
+       id="path4535"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#25657f;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -288.40039,855.45312 -0.7793,0.77735 0.39063,0.38867 4.59961,4.60156 0.38867,0.38868 0.77734,-0.7793 -0.38867,-0.38867 -4.59961,-4.59961 -0.38867,-0.38868 z"
+       id="path4537"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_focused_normal.png b/src/usr/share/themes/Lubuntu-default/unity/close_focused_normal.png
deleted file mode 100644
index bcb7b5f..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/close_focused_normal.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_focused_prelight.png b/src/usr/share/themes/Lubuntu-default/unity/close_focused_prelight.png
deleted file mode 100644
index 8e964e4..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/close_focused_prelight.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_focused_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/close_focused_prelight.svg
new file mode 100644
index 0000000..5453344
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_focused_prelight.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4747"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_focused_prelight.svg">
+  <defs
+     id="defs4749" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="27.07302"
+     inkscape:cy="13.443732"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4752">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(4.7142929,-652.36219)">
+    <rect
+       y="652.36218"
+       x="-4.714293"
+       height="19"
+       width="19"
+       id="rect4875"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4893"
+       d="m 2.4849245,659.85555 -0.70703,0.707 0.35351,0.3535 1.94727,1.9473 -1.94727,1.9453 -0.35351,0.3535 0.70703,0.707 0.35351,-0.3535 1.94727,-1.9472 1.94726,1.9472 0.35352,0.3535 0.70703,-0.707 -0.35351,-0.3535 -1.94727,-1.9453 1.94727,-1.9473 0.35351,-0.3535 -0.70703,-0.707 -0.35352,0.3535 -1.94726,1.9472 -1.94727,-1.9472 -0.35351,-0.3535 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#25657f;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 7.0864845,658.78515 -0.39063,0.3886 -4.5996,4.5996 -0.38868,0.3887 0.77735,0.7774 0.39062,-0.3887 4.59961,-4.5996 0.38867,-0.3887 -0.77734,-0.7773 z"
+       id="path4895"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#25657f;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 2.4849245,658.78515 -0.77735,0.7773 0.38868,0.3887 4.5996,4.5996 0.39063,0.3887 0.77734,-0.7774 -0.38867,-0.3887 -4.59961,-4.5996 -0.39062,-0.3886 z"
+       id="path4897"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_focused_pressed.png b/src/usr/share/themes/Lubuntu-default/unity/close_focused_pressed.png
deleted file mode 100644
index c219ddc..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/close_focused_pressed.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_focused_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/close_focused_pressed.svg
new file mode 100644
index 0000000..8ba4e55
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_focused_pressed.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4747"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_focused_pressed.svg">
+  <defs
+     id="defs4749" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="16.872187"
+     inkscape:cy="12.684108"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4752">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(411.35715,-967.57648)">
+    <rect
+       y="967.57648"
+       x="-411.35715"
+       height="19"
+       width="19"
+       id="rect4550"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#25657f;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -399.55637,973.99943 -0.39063,0.3886 -4.5996,4.5996 -0.38868,0.3887 0.77735,0.7774 0.39062,-0.3887 4.59961,-4.5996 0.38867,-0.3887 -0.77734,-0.7773 z"
+       id="path4989"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#25657f;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -404.15793,973.99943 -0.77735,0.7773 0.38868,0.3887 4.5996,4.5996 0.39063,0.3887 0.77734,-0.7774 -0.38867,-0.3887 -4.59961,-4.5996 -0.39062,-0.3886 z"
+       id="path4991"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused.png b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused.png
deleted file mode 100644
index 4c6600c..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused.svg b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused.svg
new file mode 100644
index 0000000..052b1a1
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4747"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_unfocused.svg">
+  <defs
+     id="defs4749" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="15.202026"
+     inkscape:cy="12.649821"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4752">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(552.28572,-1071.3622)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect4507"
+       width="19"
+       height="19"
+       x="-552.28571"
+       y="1071.3622" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -540.48494,1077.7852 -0.39063,0.3886 -4.5996,4.5996 -0.38868,0.3887 0.77735,0.7774 0.39062,-0.3887 4.59961,-4.5996 0.38867,-0.3887 -0.77734,-0.7773 z"
+       id="path4993"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -545.0865,1077.7852 -0.77735,0.7773 0.38868,0.3887 4.5996,4.5996 0.39063,0.3887 0.77734,-0.7774 -0.38867,-0.3887 -4.59961,-4.5996 -0.39062,-0.3886 z"
+       id="path4995"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_prelight.png b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_prelight.png
deleted file mode 100644
index 072faf9..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_prelight.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_prelight.svg
new file mode 100644
index 0000000..f58f0da
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_prelight.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4747"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_unfocused_prelight.svg">
+  <defs
+     id="defs4749" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="11.826139"
+     inkscape:cy="13.349189"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4752">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-378.21428,-666.57648)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect5149"
+       width="19"
+       height="19"
+       x="378.21429"
+       y="666.57648" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 385.4135,674.0698 -0.70703,0.707 0.35351,0.3535 1.94727,1.9473 -1.94727,1.9453 -0.35351,0.3535 0.70703,0.707 0.35351,-0.3535 1.94727,-1.9472 1.94726,1.9472 0.35352,0.3535 0.70703,-0.707 -0.35351,-0.3535 -1.94727,-1.9453 1.94727,-1.9473 0.35351,-0.3535 -0.70703,-0.707 -0.35352,0.3535 -1.94726,1.9472 -1.94727,-1.9472 -0.35351,-0.3535 z"
+       id="path5157"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 390.01506,672.9994 -0.39063,0.3886 -4.5996,4.5996 -0.38868,0.3887 0.77735,0.7774 0.39062,-0.3887 4.59961,-4.5996 0.38867,-0.3887 -0.77734,-0.7773 z"
+       id="path5159"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 385.4135,672.9994 -0.77735,0.7773 0.38868,0.3887 4.5996,4.5996 0.39063,0.3887 0.77734,-0.7774 -0.38867,-0.3887 -4.59961,-4.5996 -0.39062,-0.3886 z"
+       id="path5161"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_pressed.png b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_pressed.png
deleted file mode 100644
index fd7106a..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_pressed.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_pressed.svg
new file mode 100644
index 0000000..061414b
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/close_unfocused_pressed.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4747"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_unfocused_pressed.svg">
+  <defs
+     id="defs4749" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="23.869436"
+     inkscape:cy="12.391469"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4752">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(151.28572,-984.64791)">
+    <rect
+       y="984.64789"
+       x="-151.28572"
+       height="19"
+       width="19"
+       id="rect5173"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -139.48494,991.07087 -0.39062,0.3886 -4.59961,4.5996 -0.38867,0.3887 0.77734,0.7774 0.39062,-0.3887 4.59961,-4.5996 0.38867,-0.3887 -0.77734,-0.7773 z"
+       id="path5249"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -144.0865,991.07087 -0.77734,0.7773 0.38867,0.3887 4.59961,4.5996 0.39062,0.3887 0.77734,-0.7774 -0.38867,-0.3887 -4.59961,-4.5996 -0.39062,-0.3886 z"
+       id="path5251"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize.png b/src/usr/share/themes/Lubuntu-default/unity/maximize.png
deleted file mode 100644
index 2a7a0b9..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/maximize.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize.svg
new file mode 100644
index 0000000..02b5457
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="17.058291"
+     inkscape:cy="11.303862"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(186.64286,-574.29076)">
+    <rect
+       y="574.29077"
+       x="-186.64287"
+       height="19"
+       width="19"
+       id="rect4803"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -180.64287,581.29182 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       id="rect4828"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -180.64287,580.29182 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       id="rect4811"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_dash.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_dash.svg
new file mode 100644
index 0000000..a9e679b
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_dash.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_dash.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.508845"
+     inkscape:cx="6.9935998"
+     inkscape:cy="12.749818"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <path
+       id="path4209"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;enable-background:accumulate"
+       d="m -283.21429,529.86209 0,5 5,0 0,-5 -5,0 z m -1,-1 7,0 0,7 -7,0 0,-6.5 0,-0.5 z" />
+    <rect
+       y="522.86218"
+       x="-290.21429"
+       height="19"
+       width="19"
+       id="rect4203"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_disabled.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_disabled.svg
new file mode 100644
index 0000000..e9d4902
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_disabled.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_dash_disabled.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.832314"
+     inkscape:cx="13.727312"
+     inkscape:cy="9.916567"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <path
+       id="path4242"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;enable-background:accumulate"
+       d="m -283.21429,529.86209 0,5 5,0 0,-5 -5,0 z m -1,-1 7,0 0,7 -7,0 0,-6.5 0,-0.5 z" />
+    <rect
+       y="522.86218"
+       x="-290.21429"
+       height="19"
+       width="19"
+       id="rect4244"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_prelight.svg
new file mode 100644
index 0000000..581c2c8
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_prelight.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_dash_prelight.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.508845"
+     inkscape:cx="17.994794"
+     inkscape:cy="11.433949"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <path
+       id="path4224"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;enable-background:accumulate"
+       d="m -283.21429,529.86209 0,5 5,0 0,-5 -5,0 z m -1,-1 7,0 0,7 -7,0 0,-6.5 0,-0.5 z" />
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect4226"
+       width="19"
+       height="19"
+       x="-290.21429"
+       y="522.86218" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_pressed.svg
new file mode 100644
index 0000000..ecccbea
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_dash_pressed.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_dash_pressed.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.508845"
+     inkscape:cx="11.76541"
+     inkscape:cy="10.020167"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <path
+       id="path4236"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;enable-background:accumulate"
+       d="m -283.21429,529.86209 0,5 5,0 0,-5 -5,0 z m -1,-1 7,0 0,7 -7,0 0,-6.5 0,-0.5 z" />
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect4238"
+       width="19"
+       height="19"
+       x="-290.21429"
+       y="522.86218" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused.svg
new file mode 100644
index 0000000..0458358
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_focused.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="35.02982"
+     inkscape:cy="11.126885"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(186.64286,-574.29076)">
+    <rect
+       y="574.29077"
+       x="-186.64287"
+       height="19"
+       width="19"
+       id="rect4803"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -180.64287,581.29182 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       id="rect4828"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -180.64287,580.29182 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       id="rect4811"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_normal.png b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_normal.png
deleted file mode 100644
index b7c419a..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_normal.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_prelight.png b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_prelight.png
deleted file mode 100644
index 2c3cfaf..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_prelight.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_prelight.svg
new file mode 100644
index 0000000..45ab18c
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_prelight.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_focused_prelight.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="19.602534"
+     inkscape:cy="12.318774"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(673.28572,-983.79076)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect5007"
+       width="19"
+       height="19"
+       x="-673.28571"
+       y="983.79077" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5061"
+       d="m -667.28572,990.79182 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5063"
+       d="m -667.28572,989.79182 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_pressed.png b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_pressed.png
deleted file mode 100644
index 30b9e69..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_pressed.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_pressed.svg
new file mode 100644
index 0000000..3276651
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_focused_pressed.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_focused_pressed.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="18.019643"
+     inkscape:cy="13.802462"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-191.49999,-81.862193)">
+    <rect
+       y="81.86219"
+       x="191.5"
+       height="19"
+       width="19"
+       id="rect5263"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 197.49999,87.863246 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       id="path5289"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused.png b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused.png
deleted file mode 100644
index 96b3a72..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused.svg
new file mode 100644
index 0000000..bc52ebb
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_unfocused.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="11.244602"
+     inkscape:cy="11.092192"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-408.71427,-87.505113)">
+    <rect
+       y="87.505112"
+       x="408.71426"
+       height="19"
+       width="19"
+       id="rect4935"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 414.71427,93.506146 0,0.5 0,6.500004 7,0 0,-7.000004 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       id="rect4530"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_prelight.png b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_prelight.png
deleted file mode 100644
index b0b905f..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_prelight.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_prelight.svg
new file mode 100644
index 0000000..29ee67c
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_prelight.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_unfocused_prelight.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="15.641757"
+     inkscape:cy="11.721416"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-818.21427,170.56632)">
+    <rect
+       y="-170.56631"
+       x="818.21429"
+       height="19"
+       width="19"
+       id="rect5083"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 824.21427,-163.56532 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       id="path5109"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 824.21427,-164.56532 0,0.5 0,6.5 7,0 0,-7 -7,0 z m 1,1 5,0 0,5 -5,0 0,-5 z"
+       id="path5111"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_pressed.png b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_pressed.png
deleted file mode 100644
index 7f62c4f..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_pressed.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_pressed.svg
new file mode 100644
index 0000000..2fdddd6
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/maximize_unfocused_pressed.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_unfocused_pressed.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="14.919771"
+     inkscape:cy="12.28665"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-887.71427,17.209217)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect5199"
+       width="19"
+       height="19"
+       x="887.71429"
+       y="-17.209217" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5243"
+       d="m 893.71427,-11.208178 0,0.5 0,6.4999998 7,0 0,-6.9999998 -7,0 z m 1,1 5,0 0,4.9999998 -5,0 0,-4.9999998 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/menu.svg b/src/usr/share/themes/Lubuntu-default/unity/menu.svg
new file mode 100644
index 0000000..7c6200c
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/menu.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg8552" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="19" viewBox="0 0 19 19" width="19" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs id="defs8554">
+  <linearGradient id="linearGradient4672" y2="967.36" gradientUnits="userSpaceOnUse" x2="6" gradientTransform="matrix(1.0833 0 0 1.0833 966.86 -1057.5)" y1="967.36" x1="-6">
+   <stop id="stop4668" style="stop-color:#191919;stop-opacity:.4" offset="0"/>
+   <stop id="stop4700" style="stop-color:#595959;stop-opacity:.10185" offset=".5"/>
+   <stop id="stop4670" style="stop-color:#fff;stop-opacity:.24314" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata id="metadata8557">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(-284.79 -314.29)">
+  <g id="g4722" transform="translate(284.79 -643.07)">
+   <circle id="circle4664" style="color:#000000;fill:url(#linearGradient4672)" d="m 973.36224,-9.5000038 a 6.5,6.5 0 0 1 -6.5,6.5 6.5,6.5 0 0 1 -6.5,-6.5 6.5,6.5 0 0 1 6.5,-6.5000002 6.5,6.5 0 0 1 6.5,6.5000002 z" cx="966.86" transform="rotate(90)" cy="-9.5" r="6.5"/>
+   <circle id="circle5388" style="opacity:.1;color:#000000" d="m 12.999998,967.86218 a 3.4999948,3.4999948 0 0 1 -3.4999951,3.5 3.4999948,3.4999948 0 0 1 -3.4999948,-3.5 3.4999948,3.4999948 0 0 1 3.4999948,-3.49999 3.4999948,3.4999948 0 0 1 3.4999951,3.49999 z" cx="9.5" cy="967.86" r="3.5"/>
+   <circle id="path4662" style="color:#000000;stroke:#d3d0cb;fill:#c6c2bb" d="m 12.500003,966.86218 a 3,3 0 0 1 -3.0000001,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3.0000001,3 z" cy="966.86" cx="9.5" r="3"/>
+   <path id="circle4682" d="m9.5 960.36a6.5 6.5 0 0 0 -6.5 6.5 6.5 6.5 0 0 0 0.023438 0.5293 6.5 6.5 0 0 1 6.4766 -6.0293 6.5 6.5 0 0 1 6.4766 5.9707 6.5 6.5 0 0 0 0.02344 -0.4707 6.5 6.5 0 0 0 -6.5 -6.5z" style="opacity:.1;color:#000000"/>
+   <path id="circle4691" d="m15.977 966.33a6.5 6.5 0 0 1 -6.4766 6.0293 6.5 6.5 0 0 1 -6.4766 -5.9707 6.5 6.5 0 0 0 -0.023438 0.4707 6.5 6.5 0 0 0 6.5 6.5 6.5 6.5 0 0 0 6.5 -6.5 6.5 6.5 0 0 0 -0.02344 -0.5293z" style="opacity:.2;color:#000000;fill:#fff"/>
+   <path id="circle4702" d="m15.99 966.56a6.5 6.5 0 0 1 -6.4902 6.3008 6.5 6.5 0 0 1 -6.4902 -6.1992 6.5 6.5 0 0 0 -0.00977 0.19922 6.5 6.5 0 0 0 6.5 6.5 6.5 6.5 0 0 0 6.5 -6.5 6.5 6.5 0 0 0 -0.0098 -0.30078z" style="opacity:0.07;color:#000000;fill:#fff"/>
+   <path id="circle4711" d="m9.5 960.36a6.5 6.5 0 0 0 -6.5 6.5 6.5 6.5 0 0 0 0.00977 0.30078 6.5 6.5 0 0 1 6.4902 -6.3008 6.5 6.5 0 0 1 6.4902 6.1992 6.5 6.5 0 0 0 0.0098 -0.19922 6.5 6.5 0 0 0 -6.5 -6.5z" style="opacity:.1;color:#000000"/>
+   <rect id="rect4720" style="opacity:.1;color:#000000;fill:none" height="19" width="19" y="957.36" x="-.000002"/>
+  </g>
+ </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/menu_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/menu_prelight.svg
new file mode 100644
index 0000000..d635d08
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/menu_prelight.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg8552" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="19" viewBox="0 0 19 19" width="19" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs id="defs8554">
+  <linearGradient id="linearGradient4747" y2="967.36" gradientUnits="userSpaceOnUse" x2="6" gradientTransform="matrix(1.0833 0 0 1.0833 966.86 -1057.5)" y1="967.36" x1="-6">
+   <stop id="stop4668" style="stop-color:#191919;stop-opacity:.4" offset="0"/>
+   <stop id="stop4700" style="stop-color:#595959;stop-opacity:.10185" offset=".5"/>
+   <stop id="stop4670" style="stop-color:#fff;stop-opacity:.24314" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata id="metadata8557">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(-435.29 -180.93)">
+  <g id="g4731" transform="translate(435.29 -776.43)">
+   <circle id="circle4733" style="color:#000000;fill:url(#linearGradient4747)" d="m 973.36224,-9.5000038 a 6.5,6.5 0 0 1 -6.5,6.5 6.5,6.5 0 0 1 -6.5,-6.5 6.5,6.5 0 0 1 6.5,-6.5000002 6.5,6.5 0 0 1 6.5,6.5000002 z" transform="rotate(90)" cy="-9.5" cx="966.86" r="6.5"/>
+   <circle id="circle5388-4" style="opacity:.1;color:#000000" d="m 12.999998,967.86218 a 3.4999948,3.4999948 0 0 1 -3.4999951,3.5 3.4999948,3.4999948 0 0 1 -3.4999948,-3.5 3.4999948,3.4999948 0 0 1 3.4999948,-3.49999 3.4999948,3.4999948 0 0 1 3.4999951,3.49999 z" cx="9.5" cy="967.86" r="3.5"/>
+   <circle id="circle4735" style="color:#000000;stroke:#6c6967;fill:#555351" d="m 12.500003,966.86218 a 3,3 0 0 1 -3.0000001,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3.0000001,3 z" cx="9.5" cy="966.86" r="3"/>
+   <path id="path4737" style="opacity:.1;color:#000000" d="m9.5 960.36a6.5 6.5 0 0 0 -6.5 6.5 6.5 6.5 0 0 0 0.023438 0.5293 6.5 6.5 0 0 1 6.4766 -6.0293 6.5 6.5 0 0 1 6.4766 5.9707 6.5 6.5 0 0 0 0.02344 -0.4707 6.5 6.5 0 0 0 -6.5 -6.5z"/>
+   <path id="path4739" style="opacity:.2;color:#000000;fill:#fff" d="m15.977 966.33a6.5 6.5 0 0 1 -6.4766 6.0293 6.5 6.5 0 0 1 -6.4766 -5.9707 6.5 6.5 0 0 0 -0.023438 0.4707 6.5 6.5 0 0 0 6.5 6.5 6.5 6.5 0 0 0 6.5 -6.5 6.5 6.5 0 0 0 -0.02344 -0.5293z"/>
+   <path id="path4741" style="opacity:.2;color:#000000;fill:#fff" d="m15.99 966.56a6.5 6.5 0 0 1 -6.4902 6.3008 6.5 6.5 0 0 1 -6.4902 -6.1992 6.5 6.5 0 0 0 -0.00977 0.19922 6.5 6.5 0 0 0 6.5 6.5 6.5 6.5 0 0 0 6.5 -6.5 6.5 6.5 0 0 0 -0.0098 -0.30078z"/>
+   <path id="path4743" style="opacity:.1;color:#000000" d="m9.5 960.36a6.5 6.5 0 0 0 -6.5 6.5 6.5 6.5 0 0 0 0.00977 0.30078 6.5 6.5 0 0 1 6.4902 -6.3008 6.5 6.5 0 0 1 6.4902 6.1992 6.5 6.5 0 0 0 0.0098 -0.19922 6.5 6.5 0 0 0 -6.5 -6.5z"/>
+   <rect id="rect4745" style="opacity:.1;color:#000000;fill:none" height="19" width="19" y="957.36" x="-.000002"/>
+  </g>
+ </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize.png b/src/usr/share/themes/Lubuntu-default/unity/minimize.png
deleted file mode 100644
index 1b4e0ea..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/minimize.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize.svg
new file mode 100644
index 0000000..ad01ac5
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg7526"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize.svg">
+  <defs
+     id="defs7528" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="15.977622"
+     inkscape:cy="10.084362"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7531">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-156.21429,-617.1479)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect4839"
+       width="19"
+       height="19"
+       x="156.21428"
+       y="617.14789" />
+    <rect
+       style="color:#000000;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4834"
+       width="7"
+       height="1"
+       x="162.21428"
+       y="626.14795" />
+    <rect
+       y="627.14795"
+       x="162.21428"
+       height="1"
+       width="7"
+       id="rect4836"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_dash.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_dash.svg
new file mode 100644
index 0000000..27a7fd2
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_dash.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="minimize_dash.svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="24.842105"
+     inkscape:cx="9.1852444"
+     inkscape:cy="8.3848995"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;fill:#ffffff"
+     d="m 6,9 7,0 0,1 -7,0 0,-1 z"
+     id="path4256" />
+  <rect
+     id="rect4250"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="-1.4648437e-05"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_disabled.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_disabled.svg
new file mode 100644
index 0000000..6804db5
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_disabled.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="minimize_dash_disabled.svg">
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="24.842105"
+     inkscape:cx="9.1018751"
+     inkscape:cy="7.7846409"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;fill:#ffffff"
+     d="m 6,9 7,0 0,1 -7,0 0,-1 z"
+     id="path4256" />
+  <rect
+     id="rect4250"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="-1.4648437e-05"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_prelight.svg
new file mode 100644
index 0000000..2561740
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_prelight.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="minimize_dash_prelight.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="24.842105"
+     inkscape:cx="12.670079"
+     inkscape:cy="9.6687861"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <defs
+     id="defs4488">
+    <filter
+       id="filter4411"
+       style="color-interpolation-filters:sRGB"
+       height="1.24"
+       width="1.24"
+       y="-.12"
+       x="-.12">
+      <feGaussianBlur
+         id="feGaussianBlur4413"
+         stdDeviation="0.75" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;fill:#ffffff"
+     d="m 6,9 7,0 0,1 -7,0 0,-1 z"
+     id="path4267" />
+  <rect
+     id="rect4269"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="-1.4648437e-05"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_pressed.svg
new file mode 100644
index 0000000..d9c92cf
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_dash_pressed.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="minimize_dash_pressed.svg">
+  <defs
+     id="defs4250" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview4248"
+     showgrid="false"
+     inkscape:zoom="24.842105"
+     inkscape:cx="8.668355"
+     inkscape:cy="10.869303"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;fill:#ffffff"
+     d="m 6,9 7,0 0,1 -7,0 0,-1 z"
+     id="path4256" />
+  <rect
+     id="rect4250"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="-1.4648437e-05"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused.svg
new file mode 100644
index 0000000..1e820cf
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg7526"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_focused.svg">
+  <defs
+     id="defs7528" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="19.943693"
+     inkscape:cy="12.06079"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7531">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-156.21429,-617.1479)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect4839"
+       width="19"
+       height="19"
+       x="156.21428"
+       y="617.14789" />
+    <rect
+       style="color:#000000;fill:#78858a;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4834"
+       width="7"
+       height="1"
+       x="162.21428"
+       y="626.14795" />
+    <rect
+       y="627.14795"
+       x="162.21428"
+       height="1"
+       width="7"
+       id="rect4836"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_normal.png b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_normal.png
deleted file mode 100644
index ba22c77..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_normal.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_prelight.png b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_prelight.png
deleted file mode 100644
index 753260b..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_prelight.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_prelight.svg
new file mode 100644
index 0000000..1bb49a1
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_prelight.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg7526"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_focused_prelight.svg">
+  <defs
+     id="defs7528" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="21.936972"
+     inkscape:cy="12.357127"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7531">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-6.71429,-89.505043)">
+    <rect
+       y="89.505043"
+       x="6.7142901"
+       height="19"
+       width="19"
+       id="rect5035"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="98.505112"
+       x="12.714292"
+       height="1"
+       width="7"
+       id="rect5065"
+       style="color:#000000;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5067"
+       width="7"
+       height="1"
+       x="12.714292"
+       y="99.505112" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_pressed.png b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_pressed.png
deleted file mode 100644
index cd35c2c..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_pressed.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_pressed.svg
new file mode 100644
index 0000000..452b186
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_focused_pressed.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg7526"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_focused_pressed.svg">
+  <defs
+     id="defs7528" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.439246"
+     inkscape:cx="17.347435"
+     inkscape:cy="3.9901462"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7531">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-302.92857,-256.1479)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect5275"
+       width="19"
+       height="19"
+       x="302.92856"
+       y="256.14789" />
+    <rect
+       style="color:#000000;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5291"
+       width="7"
+       height="1"
+       x="308.92859"
+       y="265.14795" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused.png b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused.png
deleted file mode 100644
index 0184cdc..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused.svg
new file mode 100644
index 0000000..3c13de5
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg7526"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_unfocused.svg">
+  <defs
+     id="defs7528" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.439246"
+     inkscape:cx="16.965832"
+     inkscape:cy="5.8621199"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7531">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-262.75023,-284.66847)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect4953"
+       width="19"
+       height="19"
+       x="262.75024"
+       y="284.66849" />
+    <rect
+       style="color:#000000;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4532"
+       width="7"
+       height="1"
+       x="268.75024"
+       y="293.66855" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_prelight.png b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_prelight.png
deleted file mode 100644
index 0504f81..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_prelight.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_prelight.svg
new file mode 100644
index 0000000..13eb2b2
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_prelight.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg7526"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_unfocused_prelight.svg">
+  <defs
+     id="defs7528" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="21.043702"
+     inkscape:cy="13.824579"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7531">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-6.71429,-89.505043)">
+    <rect
+       y="89.505043"
+       x="6.7142901"
+       height="19"
+       width="19"
+       id="rect5035"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="98.505112"
+       x="12.714292"
+       height="1"
+       width="7"
+       id="rect5065"
+       style="color:#000000;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5067"
+       width="7"
+       height="1"
+       x="12.714292"
+       y="99.505112" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_pressed.png b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_pressed.png
deleted file mode 100644
index 8cbf38c..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_pressed.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_pressed.svg
new file mode 100644
index 0000000..139759a
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/minimize_unfocused_pressed.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg7526"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_unfocused_pressed.svg">
+  <defs
+     id="defs7528" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.038516"
+     inkscape:cx="22.244166"
+     inkscape:cy="10.362873"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7531">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-302.92857,-256.1479)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect5275"
+       width="19"
+       height="19"
+       x="302.92856"
+       y="256.14789" />
+    <rect
+       style="color:#000000;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5291"
+       width="7"
+       height="1"
+       x="308.92859"
+       y="265.14795" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize.png b/src/usr/share/themes/Lubuntu-default/unity/unmaximize.png
deleted file mode 100644
index 2a7a0b9..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/unmaximize.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize.svg
new file mode 100644
index 0000000..450c7ff
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="unmaximize.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="17.832998"
+     inkscape:cy="12.945047"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(269.28569,34.494917)">
+    <rect
+       y="-34.494919"
+       x="-269.28568"
+       height="19"
+       width="19"
+       id="rect4857"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -263.28568,-26.495932 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="rect4840"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -263.28568,-27.495932 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="rect4838"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash.svg
new file mode 100644
index 0000000..6f3408b
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="unmaximize_dash.svg">
+  <defs
+     id="defs4415" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview4413"
+     showgrid="false"
+     inkscape:zoom="24.842105"
+     inkscape:cx="12.036473"
+     inkscape:cy="9.4186783"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path4369"
+     style="color:#000000;fill:#ffffff"
+     d="m 7,8 0,3 5,0 0,-3 -5,0 z M 6,7 13,7 13,12 6,12 6,7.5 6,7 Z" />
+  <rect
+     id="rect4361"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="-1.4648437e-05"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_disabled.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_disabled.svg
new file mode 100644
index 0000000..af5fdaf
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_disabled.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="unmaximize_dash_disabled.svg">
+  <defs
+     id="defs4425" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview4423"
+     showgrid="false"
+     inkscape:zoom="17.566021"
+     inkscape:cx="11.899925"
+     inkscape:cy="9.3747211"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path4369"
+     style="color:#000000;fill:#ffffff"
+     d="m 7,8 c 0,1 0,2 0,3 1.6666667,0 3.333333,0 5,0 0,-1 0,-2 0,-3 C 10.333333,8 8.6666667,8 7,8 Z M 6,7 c 2.3333333,0 4.666667,0 7,0 0,1.6666667 0,3.333333 0,5 -2.333333,0 -4.6666667,0 -7,0 0,-1.666667 0,-3.3333333 0,-5 z" />
+  <rect
+     id="rect4361"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="-1.4648437e-05"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_prelight.svg
new file mode 100644
index 0000000..044c4c4
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_prelight.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="unmaximize_dash_prelight.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview4437"
+     showgrid="false"
+     inkscape:zoom="17.566021"
+     inkscape:cx="20.088624"
+     inkscape:cy="11.89098"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <defs
+     id="defs4488">
+    <filter
+       id="filter4405"
+       style="color-interpolation-filters:sRGB"
+       height="1.24"
+       width="1.24"
+       y="-.12"
+       x="-.12">
+      <feGaussianBlur
+         id="feGaussianBlur4407"
+         stdDeviation="0.75" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path4383"
+     style="color:#000000;fill:#ffffff"
+     d="m 7,8 0,3 5,0 0,-3 -5,0 z M 6,7 13,7 13,12 6,12 6,7.5 6,7 Z" />
+  <rect
+     id="rect4385"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="-1.4648437e-05"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_pressed.svg
new file mode 100644
index 0000000..ec9164d
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_dash_pressed.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4486"
+   height="19"
+   viewBox="0 0 19 19"
+   width="19"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="unmaximize_dash_pressed.svg">
+  <defs
+     id="defs4447" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview4445"
+     showgrid="false"
+     inkscape:zoom="24.842105"
+     inkscape:cx="20.424675"
+     inkscape:cy="11.120596"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4486" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path4369"
+     style="color:#000000;fill:#ffffff"
+     d="m 7,8 0,3 5,0 0,-3 -5,0 z M 6,7 13,7 13,12 6,12 6,7.5 6,7 Z" />
+  <rect
+     id="rect4361"
+     style="color:#000000;fill:none"
+     height="19"
+     width="19"
+     y="-1.4648437e-05"
+     x="0" />
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused.svg
new file mode 100644
index 0000000..2fba22d
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="unmaximize_focused.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="18.789891"
+     inkscape:cy="9.466264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(269.28569,34.494917)">
+    <rect
+       y="-34.494919"
+       x="-269.28568"
+       height="19"
+       width="19"
+       id="rect4857"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -263.28568,-26.495932 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="rect4840"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m -263.28568,-27.495932 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="rect4838"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_normal.png b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_normal.png
deleted file mode 100644
index b7c419a..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_normal.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_prelight.png b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_prelight.png
deleted file mode 100644
index 2c3cfaf..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_prelight.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_prelight.svg
new file mode 100644
index 0000000..c69d0bd
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_prelight.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="unmaximize_focused_prelight.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="17.350247"
+     inkscape:cy="10.705227"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1505.9286,-18.862183)">
+    <rect
+       y="18.862183"
+       x="1505.9286"
+       height="19"
+       width="19"
+       id="rect5107"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 1511.9286,26.86125 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="path5117"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 1511.9286,25.86125 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="path5119"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_pressed.png b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_pressed.png
deleted file mode 100644
index 30b9e69..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_pressed.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_pressed.svg
new file mode 100644
index 0000000..5170244
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_focused_pressed.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="unmaximize_focused_pressed.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="21.304071"
+     inkscape:cy="8.1224239"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-872.57141,233.49492)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect5235"
+       width="19"
+       height="19"
+       x="872.57141"
+       y="-233.49492" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5247"
+       d="m 878.57141,-226.49589 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused.png b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused.png
deleted file mode 100644
index 96b3a72..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused.svg
new file mode 100644
index 0000000..f38cf33
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="unmaximize_unfocused.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="19.560092"
+     inkscape:cy="8.9669612"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-687.7857,142.99492)">
+    <rect
+       y="-142.99492"
+       x="687.78571"
+       height="19"
+       width="19"
+       id="rect4971"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 693.7857,-135.99584 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="rect4534"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_prelight.png b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_prelight.png
deleted file mode 100644
index b0b905f..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_prelight.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_prelight.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_prelight.svg
new file mode 100644
index 0000000..92c91e5
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_prelight.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="unmaximize_unfocused_prelight.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="17.510052"
+     inkscape:cy="10.145118"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1505.9286,-18.862183)">
+    <rect
+       y="18.862183"
+       x="1505.9286"
+       height="19"
+       width="19"
+       id="rect5107"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 1511.9286,26.86125 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="path5117"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 1511.9286,25.86125 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       id="path5119"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_pressed.png b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_pressed.png
deleted file mode 100644
index 7f62c4f..0000000
Binary files a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_pressed.png and /dev/null differ
diff --git a/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_pressed.svg b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_pressed.svg
new file mode 100644
index 0000000..a39254c
--- /dev/null
+++ b/src/usr/share/themes/Lubuntu-default/unity/unmaximize_unfocused_pressed.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg5932"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 19 19"
+   sodipodi:docname="unmaximize_unfocused_pressed.svg">
+  <defs
+     id="defs5934" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="15.092462"
+     inkscape:cy="12.325252"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5937">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-872.57141,233.49492)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect5235"
+       width="19"
+       height="19"
+       x="872.57141"
+       y="-233.49492" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5247"
+       d="m 878.57141,-226.49589 0,0.5 0,4.5 7,0 0,-5 -7,0 z m 1,1 5,0 0,3 -5,0 0,-3 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#79868b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif" />
+  </g>
+</svg>