diff --git a/src/Gui/Stylesheets/CMakeLists.txt b/src/Gui/Stylesheets/CMakeLists.txt
index 445d22f279..3d78cb7a73 100644
--- a/src/Gui/Stylesheets/CMakeLists.txt
+++ b/src/Gui/Stylesheets/CMakeLists.txt
@@ -10,9 +10,9 @@ SET(Stylesheets_Files
 
 # Find all the image files
 FILE(GLOB Images_Files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/images/*.png")
+    "${CMAKE_CURRENT_SOURCE_DIR}/images_dark-light/*.svg")
 
-SOURCE_GROUP("images" FILES ${Images_Files})
+SOURCE_GROUP("images_dark-light" FILES ${Images_Files})
 
 ADD_CUSTOM_TARGET(Stylesheets_data ALL
     SOURCES ${Stylesheets_Files} ${Images_Files}
@@ -30,5 +30,5 @@ INSTALL(
     FILES
          ${Images_Files}
     DESTINATION
-        ${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets/images
-)
\ No newline at end of file
+        ${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets/images_dark-light
+)
diff --git a/src/Gui/Stylesheets/Dark-blue.qss b/src/Gui/Stylesheets/Dark-blue.qss
index 2350fb8fe9..3ae60f006b 100644
--- a/src/Gui/Stylesheets/Dark-blue.qss
+++ b/src/Gui/Stylesheets/Dark-blue.qss
@@ -1,14 +1,14 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.07
-QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
-It might work with other software that uses QT styling.
+version 2.10
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
+It might work with other software that uses Qt styling.
 
 
 LICENSE
 ============================================================================================================
-Copyright (c) 2017 Pablo Gil Fernández
+Copyright (c) 2018 Pablo Gil Fernández
 
 This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
@@ -21,13 +21,6 @@ INSTALLATION
     WINDOWS = C:/[INSTALLATION_PATH]/FreeCAD/data/Gui/Stylesheets/
     LINUX = /home/[YOUR_USER_NAME]/.FreeCAD/Gui/Stylesheets/
 
-2) In order to display correctly images:
-    2.1) FreeCAD 0.16 (development builds newer than commit 5b3d50a): that's it, you are done!
-
-    2.2) FreeCAD 0.15: Images used in the theme need ABSOLUTE paths to be found by FreeCAD, so you should search the string "qss:images" (without "") and replace with the real path of your computer. It should be done with all the .qss files you want to install-use
-        find = qss:images
-        replace = /Users/myName/Library/Preferences/FreeCAD/Gui/Stylesheets/images
-
 
 CUSTOMIZATION
 ============================================================================================================
@@ -71,7 +64,7 @@ KNOWN BUGS and TO DO
 /*==================================================================================================
 Reset elements
 ==================================================================================================*/
-/* Resetting everything helps to unify styles across different operating systems */
+/* Reseting everything helps to unify styles across different operating systems */
 * {
     padding: 0px;
     margin: 0px;
@@ -99,7 +92,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images/background_freecad.png);
+    background-image: url(qss:images_dark-light/background_freecad.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -132,12 +125,12 @@ QMenu::item:pressed {
 QMenu::right-arrow {
     width: 10px;
     height: 10px;
-    image:url(qss:images/right_arrow_dark.png);
+    image:url(qss:images_dark-light/right_arrow_dark.svg);
     margin-right: 2px;
 }
 
 QMenu::right-arrow:selected {
-    image:url(qss:images/right_arrow_lighter.png);
+    image:url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QMenu::item {
@@ -203,7 +196,7 @@ QToolBar {
 QToolBar::handle:top,
 QToolBar::handle:bottom,
 QToolBar::handle:horizontal {
-    background-image: url(qss:images/Hmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Hmovetoolbar_dark.svg);
     width: 10px;
     margin: 4px 2px;
     background-position: top right;
@@ -213,7 +206,7 @@ QToolBar::handle:horizontal {
 QToolBar::handle:left,
 QToolBar::handle:right,
 QToolBar::handle:vertical {
-    background-image: url(qss:images/Vmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Vmovetoolbar_dark.svg);
     height: 10px;
     margin: 2px 4px;
     background-position: left bottom;
@@ -272,8 +265,8 @@ Dock widget
 ==================================================================================================*/
 QDockWidget {
     color: rgba(0,0,0,120);
-    titlebar-close-icon: url(qss:images/close_dark.png);
-    titlebar-normal-icon: url(qss:images/undock_dark.png);
+    titlebar-close-icon: url(qss:images_dark-light/close_dark.svg);
+    titlebar-normal-icon: url(qss:images_dark-light/undock_dark.svg);
 }
 
 QDockWidget::title {
@@ -296,7 +289,7 @@ QDockWidget::float-button {
 QDockWidget::close-button {
     right: 4px;
 }
-    
+
 QDockWidget::float-button {
     right: 22px;
 }
@@ -374,7 +367,7 @@ QScrollBar::handle:horizontal {
 
 QScrollBar::sub-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/left_arrow_light.png);
+    border-image: url(qss:images_dark-light/left_arrow_light.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: left;
@@ -383,7 +376,7 @@ QScrollBar::sub-line:horizontal {
 
 QScrollBar::add-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/right_arrow_light.png);
+    border-image: url(qss:images_dark-light/right_arrow_light.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: right;
@@ -392,12 +385,12 @@ QScrollBar::add-line:horizontal {
 
 QScrollBar::sub-line:horizontal:hover,
 QScrollBar::sub-line:horizontal:on {
-    border-image: url(qss:images/left_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/left_arrow_lighter.svg);
 }
 
 QScrollBar::add-line:horizontal:hover,
 QScrollBar::add-line:horizontal:on {
-    border-image: url(qss:images/right_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QScrollBar::up-arrow:horizontal,
@@ -424,7 +417,7 @@ QScrollBar::handle:vertical {
 
 QScrollBar::sub-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/up_arrow_light.png);
+    border-image: url(qss:images_dark-light/up_arrow_light.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: top;
@@ -433,7 +426,7 @@ QScrollBar::sub-line:vertical {
 
 QScrollBar::add-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/down_arrow_light.png);
+    border-image: url(qss:images_dark-light/down_arrow_light.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: bottom;
@@ -442,12 +435,12 @@ QScrollBar::add-line:vertical {
 
 QScrollBar::sub-line:vertical:hover,
 QScrollBar::sub-line:vertical:on {
-    border-image: url(qss:images/up_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QScrollBar::add-line:vertical:hover,
 QScrollBar::add-line:vertical:on {
-    border-image: url(qss:images/down_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QScrollBar::up-arrow:vertical,
@@ -504,7 +497,7 @@ QTabBar {
     background-color: transparent;
 }
 
-/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
+/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
 QTabBar {
     border-top: 1px solid #5a5a5a;  /* set color for all QTabBars */
 }
@@ -625,7 +618,7 @@ QTabBar::close-button {
     subcontrol-origin: margin;
     subcontrol-position: center right; /* only works for QT 4.6 and newer */;
     border-radius: 2px;
-    background-image: url(qss:images/close_dark.png);
+    background-image: url(qss:images_dark-light/close_dark.svg);
     background-position: center center;
     background-repeat: none;
 }
@@ -658,55 +651,55 @@ QTabBar QToolButton:hover {
 }
 
 QTabBar QToolButton::right-arrow:enabled {
-     image: url(qss:images/right_arrow_dark.png);
+     image: url(qss:images_dark-light/right_arrow_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:disabled,
 QTabBar QToolButton::right-arrow:off {
-     image: url(qss:images/right_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/right_arrow_disabled_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:hover {
-     image: url(qss:images/right_arrow_darker.png);
+     image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
  QTabBar QToolButton::left-arrow:enabled {
-     image: url(qss:images/left_arrow_dark.png);
+     image: url(qss:images_dark-light/left_arrow_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:disabled,
  QTabBar QToolButton::left-arrow:off {
-     image: url(qss:images/left_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/left_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:hover {
-     image: url(qss:images/left_arrow_darker.png);
+     image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
  QTabBar QToolButton::up-arrow:enabled {
-     image: url(qss:images/up_arrow_dark.png);
+     image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:disabled,
  QTabBar QToolButton::up-arrow:off {
-     image: url(qss:images/up_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:hover {
-     image: url(qss:images/up_arrow_darker.png);
+     image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
  QTabBar QToolButton::down-arrow:enabled {
-     image: url(qss:images/down_arrow_dark.png);
+     image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:disabled,
  QTabBar QToolButton::down-arrow:off {
-     image: url(qss:images/down_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:hover {
-     image: url(qss:images/down_arrow_darker.png);
+     image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QTabBar::tear {
@@ -722,7 +715,7 @@ QListView,
 QTableView {
     background-color: #c8c8c8;
     alternate-background-color: #bebebe; /* related with QListView background  */
-    border: 1px solid #505050; 
+    border: 1px solid #505050;
     selection-color: white;
     selection-background-color: #5e90fa; /* should be similar to QListView::item selected background-color */
     show-decoration-selected: 1; /* make the selection span the entire width of the view */
@@ -907,19 +900,19 @@ QHeaderView::section:last {
 }
 
 QHeaderView::up-arrow {
-    image: url(qss:images/up_arrow_light.png);
+    image: url(qss:images_dark-light/up_arrow_light.svg);
 }
 
 QHeaderView::up-arrow:hover {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QHeaderView::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
 }
 
 QHeaderView::down-arrow:hover {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* Group header inside Property Editor (FreeCAD custom widget) */
@@ -937,34 +930,31 @@ QTreeView::branch  {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-    border-image: url(qss:images/branch_vline.png) 0;
+    border-image: url(qss:images_dark-light/branch_vline_dark.svg) 0;
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_dark.svg) 0;
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_dark.svg) 0;
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-    image: url(qss:images/branch_closed_dark.png);
+    border-image: url(qss:images_dark-light/branch_more_closed_dark.svg) 0;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-    image: url(qss:images/branch_closed_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_closed_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_open_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_open_dark.svg) 0;
 }
 
 
@@ -977,7 +967,7 @@ QSplitter::handle {
 }
 
 QSplitter::handle:horizontal {
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 4px 2px 4px 2px;
@@ -985,7 +975,7 @@ QSplitter::handle:horizontal {
 }
 
 QSplitter::handle:vertical {
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 2px 4px 2px 4px;
@@ -1000,13 +990,13 @@ QMainWindow::separator {
 
 QMainWindow::separator:horizontal {
     height: 2px;
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     margin: 4px 2px 4px 2px;
 }
 
 QMainWindow::separator:vertical {
     width: 2px;
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     margin: 2px 4px 2px 4px;
 }
 
@@ -1075,7 +1065,7 @@ QSint--ActionGroup QToolButton[class="header"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_light.png);
+    background-image: url(qss:images_dark-light/down_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1084,12 +1074,12 @@ QSint--ActionGroup QFrame[class="header"] QLabel {
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_light.png);
+    background-image: url(qss:images_dark-light/up_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1098,7 +1088,7 @@ QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1291,7 +1281,7 @@ QDoubleSpinBox::up-arrow,
 QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
-    image: url(qss:images/up_arrow_light.png);
+    image: url(qss:images_dark-light/up_arrow_light.svg);
     top: 2px; /* fix symmetry between up and down images */
 }
 
@@ -1301,7 +1291,7 @@ QDoubleSpinBox::up-arrow:focus,
 QTimeEdit::up-arrow:focus,
 QDateEdit::up-arrow:focus,
 QDateTimeEdit::up-arrow:focus {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::up-arrow:off,
@@ -1310,7 +1300,7 @@ QDoubleSpinBox::up-arrow:off,
 QTimeEdit::up-arrow:off,
 QDateEdit::up-arrow:off,
 QDateTimeEdit::up-arrow:off {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::up-arrow:disabled,
@@ -1319,7 +1309,7 @@ QDoubleSpinBox::up-arrow:disabled,
 QTimeEdit::up-arrow:disabled,
 QDateEdit::up-arrow:disabled,
 QDateTimeEdit::up-arrow:disabled {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow,
@@ -1328,7 +1318,7 @@ QDoubleSpinBox::down-arrow,
 QTimeEdit::down-arrow,
 QDateEdit::down-arrow,
 QDateTimeEdit::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
     bottom: 0px; /* fix simetry between up and down images */
 }
 
@@ -1338,7 +1328,7 @@ QDoubleSpinBox::down-arrow:focus,
 QTimeEdit::down-arrow:focus,
 QDateEdit::down-arrow:focus,
 QDateTimeEdit::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::down-arrow:off,
@@ -1347,7 +1337,7 @@ QDoubleSpinBox::down-arrow:off,
 QTimeEdit::down-arrow:off,
 QDateEdit::down-arrow:off,
 QDateTimeEdit::down-arrow:off {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow:disabled,
@@ -1356,7 +1346,7 @@ QDoubleSpinBox::down-arrow:disabled,
 QTimeEdit::down-arrow:disabled,
 QDateEdit::down-arrow:disabled,
 QDateTimeEdit::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox */
@@ -1376,17 +1366,17 @@ QComboBox::drop-down:focus {
 }
 
 QComboBox::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
 }
 
 QComboBox::down-arrow:on,
 QComboBox::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QComboBox::down-arrow:off,
 QComboBox::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox menu */
@@ -1579,7 +1569,7 @@ QRadioButton::indicator:unchecked{
 QRadioButton::indicator:checked {
     background-color: #5e90fa; /* QCheckBox has the same color */
     border: 1px solid #3874f2; /* QCheckBox has the same color */
-    image:url(qss:images/radiobutton_light.png);
+    image:url(qss:images_dark-light/radiobutton_light.svg);
 }
 
 QRadioButton,
@@ -1641,7 +1631,7 @@ QCheckBox::indicator:checked:pressed {
 QCheckBox::indicator:checked {
     background-color: #5e90fa; /* QRadioButton has the same color */
     border: 1px solid #3874f2; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QCheckBox:disabled {
@@ -1657,7 +1647,7 @@ QCheckBox::indicator:disabled {
 QCheckBox::indicator:indeterminate {
     background-color: #5e90fa;
     border: 1px solid #3874f2;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 QCheckBox:focus {
@@ -1711,7 +1701,7 @@ QListWidget::indicator:checked,
 QTreeView::indicator:checked {
     background-color: #5e90fa; /* QRadioButton has the same color */
     border: 1px solid #3874f2; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QListWidget::indicator:disabled,
@@ -1724,7 +1714,7 @@ QListWidget::indicator:indeterminate,
 QTreeView::indicator:indeterminate {
     background-color: #5e90fa;
     border: 1px solid #3874f2;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 
@@ -1885,20 +1875,20 @@ QToolBar > QToolButton:pressed {
 }
 
 /* ToolBar menu buttons (buttons with drop-down menu) */
-QToolButton#qt_toolbutton_menubutton {
+QToolBar > QToolButton#qt_toolbutton_menubutton {
     padding-right: 20px; /* Hack to add more width to buttons with menu */
     border: 1px solid transparent;
     border-radius: 3px;
 }
 
-QToolButton#qt_toolbutton_menubutton:hover,
-QToolButton#qt_toolbutton_menubutton:pressed,
-QToolButton#qt_toolbutton_menubutton:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton:open {
     border: 1px solid #7cabf9;
 }
 
 QToolBar QToolButton::menu-button,
-QToolButton#qt_toolbutton_menubutton::menu-button {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button {
     border: none;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
@@ -1907,14 +1897,14 @@ QToolButton#qt_toolbutton_menubutton::menu-button {
     background-color: transparent;
 }
 
-QToolButton#qt_toolbutton_menubutton::menu-button:hover,
-QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
-QToolButton#qt_toolbutton_menubutton::menu-button:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:open {
     background-color: qlineargradient(spread:pad, x1:1, y1:0.8, x2:1, y2:0, stop:0 #5e90fa, stop:1 #7cabf9);
 }
 
 QToolBar > QToolButton::menu-arrow {
-    background-image: url(qss:images/down_arrow_dark.png);
+    background-image: url(qss:images_dark-light/down_arrow_dark.svg);
     background-position: center center;
     background-repeat: none;
     subcontrol-origin: padding;
@@ -1923,11 +1913,11 @@ QToolBar > QToolButton::menu-arrow {
 }
 
 QToolBar > QToolButton::menu-arrow:hover {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QToolBar > QToolButton::menu-arrow:open {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* when QToolButton is checked: */
@@ -1945,20 +1935,20 @@ QToolBar > QToolButton:checked:hover {
 QToolBar QToolButton#qt_toolbar_ext_button {
     margin: 0px;
     padding: 0px;
-    /*background-image: url(qss:images/more_dark.png);*/
+    /*background-image: url(qss:images_dark-light/more_dark.svg);*/
     image: transparent;
     background-repeat: none;
     background-position: center left;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:hover {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #5a5a5a;
     background-color: #5a5a5a;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:on {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #5a5a5a;
     background-color: #5a5a5a;
 }
@@ -2181,3 +2171,8 @@ QPushButton#NavigationIndicator::menu-indicator {
     image: none;
     width: 0px;
 }
+
+QToolBar QToolButton[popupMode="1"] {
+    width: 100px;
+    background: red;
+}
diff --git a/src/Gui/Stylesheets/Dark-green.qss b/src/Gui/Stylesheets/Dark-green.qss
index 24e4fb4d72..b848011ab4 100644
--- a/src/Gui/Stylesheets/Dark-green.qss
+++ b/src/Gui/Stylesheets/Dark-green.qss
@@ -1,14 +1,14 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.07
-QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
-It might work with other software that uses QT styling.
+version 2.10
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
+It might work with other software that uses Qt styling.
 
 
 LICENSE
 ============================================================================================================
-Copyright (c) 2017 Pablo Gil Fernández
+Copyright (c) 2018 Pablo Gil Fernández
 
 This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
@@ -21,13 +21,6 @@ INSTALLATION
     WINDOWS = C:/[INSTALLATION_PATH]/FreeCAD/data/Gui/Stylesheets/
     LINUX = /home/[YOUR_USER_NAME]/.FreeCAD/Gui/Stylesheets/
 
-2) In order to display correctly images:
-    2.1) FreeCAD 0.16 (development builds newer than commit 5b3d50a): that's it, you are done!
-
-    2.2) FreeCAD 0.15: Images used in the theme need ABSOLUTE paths to be found by FreeCAD, so you should search the string "qss:images" (without "") and replace with the real path of your computer. It should be done with all the .qss files you want to install-use
-        find = qss:images
-        replace = /Users/myName/Library/Preferences/FreeCAD/Gui/Stylesheets/images
-
 
 CUSTOMIZATION
 ============================================================================================================
@@ -71,7 +64,7 @@ KNOWN BUGS and TO DO
 /*==================================================================================================
 Reset elements
 ==================================================================================================*/
-/* Resetting everything helps to unify styles across different operating systems */
+/* Reseting everything helps to unify styles across different operating systems */
 * {
     padding: 0px;
     margin: 0px;
@@ -99,7 +92,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images/background_freecad.png);
+    background-image: url(qss:images_dark-light/background_freecad.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -132,12 +125,12 @@ QMenu::item:pressed {
 QMenu::right-arrow {
     width: 10px;
     height: 10px;
-    image:url(qss:images/right_arrow_dark.png);
+    image:url(qss:images_dark-light/right_arrow_dark.svg);
     margin-right: 2px;
 }
 
 QMenu::right-arrow:selected {
-    image:url(qss:images/right_arrow_lighter.png);
+    image:url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QMenu::item {
@@ -203,7 +196,7 @@ QToolBar {
 QToolBar::handle:top,
 QToolBar::handle:bottom,
 QToolBar::handle:horizontal {
-    background-image: url(qss:images/Hmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Hmovetoolbar_dark.svg);
     width: 10px;
     margin: 4px 2px;
     background-position: top right;
@@ -213,7 +206,7 @@ QToolBar::handle:horizontal {
 QToolBar::handle:left,
 QToolBar::handle:right,
 QToolBar::handle:vertical {
-    background-image: url(qss:images/Vmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Vmovetoolbar_dark.svg);
     height: 10px;
     margin: 2px 4px;
     background-position: left bottom;
@@ -272,8 +265,8 @@ Dock widget
 ==================================================================================================*/
 QDockWidget {
     color: rgba(0,0,0,120);
-    titlebar-close-icon: url(qss:images/close_dark.png);
-    titlebar-normal-icon: url(qss:images/undock_dark.png);
+    titlebar-close-icon: url(qss:images_dark-light/close_dark.svg);
+    titlebar-normal-icon: url(qss:images_dark-light/undock_dark.svg);
 }
 
 QDockWidget::title {
@@ -296,7 +289,7 @@ QDockWidget::float-button {
 QDockWidget::close-button {
     right: 4px;
 }
-    
+
 QDockWidget::float-button {
     right: 22px;
 }
@@ -374,7 +367,7 @@ QScrollBar::handle:horizontal {
 
 QScrollBar::sub-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/left_arrow_light.png);
+    border-image: url(qss:images_dark-light/left_arrow_light.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: left;
@@ -383,7 +376,7 @@ QScrollBar::sub-line:horizontal {
 
 QScrollBar::add-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/right_arrow_light.png);
+    border-image: url(qss:images_dark-light/right_arrow_light.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: right;
@@ -392,12 +385,12 @@ QScrollBar::add-line:horizontal {
 
 QScrollBar::sub-line:horizontal:hover,
 QScrollBar::sub-line:horizontal:on {
-    border-image: url(qss:images/left_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/left_arrow_lighter.svg);
 }
 
 QScrollBar::add-line:horizontal:hover,
 QScrollBar::add-line:horizontal:on {
-    border-image: url(qss:images/right_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QScrollBar::up-arrow:horizontal,
@@ -424,7 +417,7 @@ QScrollBar::handle:vertical {
 
 QScrollBar::sub-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/up_arrow_light.png);
+    border-image: url(qss:images_dark-light/up_arrow_light.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: top;
@@ -433,7 +426,7 @@ QScrollBar::sub-line:vertical {
 
 QScrollBar::add-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/down_arrow_light.png);
+    border-image: url(qss:images_dark-light/down_arrow_light.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: bottom;
@@ -442,12 +435,12 @@ QScrollBar::add-line:vertical {
 
 QScrollBar::sub-line:vertical:hover,
 QScrollBar::sub-line:vertical:on {
-    border-image: url(qss:images/up_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QScrollBar::add-line:vertical:hover,
 QScrollBar::add-line:vertical:on {
-    border-image: url(qss:images/down_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QScrollBar::up-arrow:vertical,
@@ -504,7 +497,7 @@ QTabBar {
     background-color: transparent;
 }
 
-/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
+/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
 QTabBar {
     border-top: 1px solid #5a5a5a;  /* set color for all QTabBars */
 }
@@ -625,7 +618,7 @@ QTabBar::close-button {
     subcontrol-origin: margin;
     subcontrol-position: center right; /* only works for QT 4.6 and newer */;
     border-radius: 2px;
-    background-image: url(qss:images/close_dark.png);
+    background-image: url(qss:images_dark-light/close_dark.svg);
     background-position: center center;
     background-repeat: none;
 }
@@ -658,55 +651,55 @@ QTabBar QToolButton:hover {
 }
 
 QTabBar QToolButton::right-arrow:enabled {
-     image: url(qss:images/right_arrow_dark.png);
+     image: url(qss:images_dark-light/right_arrow_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:disabled,
 QTabBar QToolButton::right-arrow:off {
-     image: url(qss:images/right_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/right_arrow_disabled_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:hover {
-     image: url(qss:images/right_arrow_darker.png);
+     image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
  QTabBar QToolButton::left-arrow:enabled {
-     image: url(qss:images/left_arrow_dark.png);
+     image: url(qss:images_dark-light/left_arrow_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:disabled,
  QTabBar QToolButton::left-arrow:off {
-     image: url(qss:images/left_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/left_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:hover {
-     image: url(qss:images/left_arrow_darker.png);
+     image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
  QTabBar QToolButton::up-arrow:enabled {
-     image: url(qss:images/up_arrow_dark.png);
+     image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:disabled,
  QTabBar QToolButton::up-arrow:off {
-     image: url(qss:images/up_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:hover {
-     image: url(qss:images/up_arrow_darker.png);
+     image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
  QTabBar QToolButton::down-arrow:enabled {
-     image: url(qss:images/down_arrow_dark.png);
+     image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:disabled,
  QTabBar QToolButton::down-arrow:off {
-     image: url(qss:images/down_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:hover {
-     image: url(qss:images/down_arrow_darker.png);
+     image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QTabBar::tear {
@@ -722,7 +715,7 @@ QListView,
 QTableView {
     background-color: #c8c8c8;
     alternate-background-color: #bebebe; /* related with QListView background  */
-    border: 1px solid #505050; 
+    border: 1px solid #505050;
     selection-color: white;
     selection-background-color: #94b30f; /* should be similar to QListView::item selected background-color */
     show-decoration-selected: 1; /* make the selection span the entire width of the view */
@@ -907,19 +900,19 @@ QHeaderView::section:last {
 }
 
 QHeaderView::up-arrow {
-    image: url(qss:images/up_arrow_light.png);
+    image: url(qss:images_dark-light/up_arrow_light.svg);
 }
 
 QHeaderView::up-arrow:hover {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QHeaderView::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
 }
 
 QHeaderView::down-arrow:hover {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* Group header inside Property Editor (FreeCAD custom widget) */
@@ -937,34 +930,31 @@ QTreeView::branch  {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-    border-image: url(qss:images/branch_vline.png) 0;
+    border-image: url(qss:images_dark-light/branch_vline_dark.svg) 0;
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_dark.svg) 0;
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_dark.svg) 0;
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-    image: url(qss:images/branch_closed_dark.png);
+    border-image: url(qss:images_dark-light/branch_more_closed_dark.svg) 0;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-    image: url(qss:images/branch_closed_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_closed_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_open_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_open_dark.svg) 0;
 }
 
 
@@ -977,7 +967,7 @@ QSplitter::handle {
 }
 
 QSplitter::handle:horizontal {
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 4px 2px 4px 2px;
@@ -985,7 +975,7 @@ QSplitter::handle:horizontal {
 }
 
 QSplitter::handle:vertical {
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 2px 4px 2px 4px;
@@ -1000,13 +990,13 @@ QMainWindow::separator {
 
 QMainWindow::separator:horizontal {
     height: 2px;
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     margin: 4px 2px 4px 2px;
 }
 
 QMainWindow::separator:vertical {
     width: 2px;
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     margin: 2px 4px 2px 4px;
 }
 
@@ -1075,7 +1065,7 @@ QSint--ActionGroup QToolButton[class="header"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_light.png);
+    background-image: url(qss:images_dark-light/down_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1084,12 +1074,12 @@ QSint--ActionGroup QFrame[class="header"] QLabel {
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_light.png);
+    background-image: url(qss:images_dark-light/up_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1098,7 +1088,7 @@ QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1291,7 +1281,7 @@ QDoubleSpinBox::up-arrow,
 QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
-    image: url(qss:images/up_arrow_light.png);
+    image: url(qss:images_dark-light/up_arrow_light.svg);
     top: 2px; /* fix symmetry between up and down images */
 }
 
@@ -1301,7 +1291,7 @@ QDoubleSpinBox::up-arrow:focus,
 QTimeEdit::up-arrow:focus,
 QDateEdit::up-arrow:focus,
 QDateTimeEdit::up-arrow:focus {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::up-arrow:off,
@@ -1310,7 +1300,7 @@ QDoubleSpinBox::up-arrow:off,
 QTimeEdit::up-arrow:off,
 QDateEdit::up-arrow:off,
 QDateTimeEdit::up-arrow:off {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::up-arrow:disabled,
@@ -1319,7 +1309,7 @@ QDoubleSpinBox::up-arrow:disabled,
 QTimeEdit::up-arrow:disabled,
 QDateEdit::up-arrow:disabled,
 QDateTimeEdit::up-arrow:disabled {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow,
@@ -1328,7 +1318,7 @@ QDoubleSpinBox::down-arrow,
 QTimeEdit::down-arrow,
 QDateEdit::down-arrow,
 QDateTimeEdit::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
     bottom: 0px; /* fix simetry between up and down images */
 }
 
@@ -1338,7 +1328,7 @@ QDoubleSpinBox::down-arrow:focus,
 QTimeEdit::down-arrow:focus,
 QDateEdit::down-arrow:focus,
 QDateTimeEdit::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::down-arrow:off,
@@ -1347,7 +1337,7 @@ QDoubleSpinBox::down-arrow:off,
 QTimeEdit::down-arrow:off,
 QDateEdit::down-arrow:off,
 QDateTimeEdit::down-arrow:off {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow:disabled,
@@ -1356,7 +1346,7 @@ QDoubleSpinBox::down-arrow:disabled,
 QTimeEdit::down-arrow:disabled,
 QDateEdit::down-arrow:disabled,
 QDateTimeEdit::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox */
@@ -1376,17 +1366,17 @@ QComboBox::drop-down:focus {
 }
 
 QComboBox::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
 }
 
 QComboBox::down-arrow:on,
 QComboBox::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QComboBox::down-arrow:off,
 QComboBox::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox menu */
@@ -1579,7 +1569,7 @@ QRadioButton::indicator:unchecked{
 QRadioButton::indicator:checked {
     background-color: #94b30f; /* QCheckBox has the same color */
     border: 1px solid #819c0c; /* QCheckBox has the same color */
-    image:url(qss:images/radiobutton_light.png);
+    image:url(qss:images_dark-light/radiobutton_light.svg);
 }
 
 QRadioButton,
@@ -1641,7 +1631,7 @@ QCheckBox::indicator:checked:pressed {
 QCheckBox::indicator:checked {
     background-color: #94b30f; /* QRadioButton has the same color */
     border: 1px solid #819c0c; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QCheckBox:disabled {
@@ -1657,7 +1647,7 @@ QCheckBox::indicator:disabled {
 QCheckBox::indicator:indeterminate {
     background-color: #94b30f;
     border: 1px solid #819c0c;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 QCheckBox:focus {
@@ -1711,7 +1701,7 @@ QListWidget::indicator:checked,
 QTreeView::indicator:checked {
     background-color: #94b30f; /* QRadioButton has the same color */
     border: 1px solid #819c0c; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QListWidget::indicator:disabled,
@@ -1724,7 +1714,7 @@ QListWidget::indicator:indeterminate,
 QTreeView::indicator:indeterminate {
     background-color: #94b30f;
     border: 1px solid #819c0c;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 
@@ -1885,20 +1875,20 @@ QToolBar > QToolButton:pressed {
 }
 
 /* ToolBar menu buttons (buttons with drop-down menu) */
-QToolButton#qt_toolbutton_menubutton {
+QToolBar > QToolButton#qt_toolbutton_menubutton {
     padding-right: 20px; /* Hack to add more width to buttons with menu */
     border: 1px solid transparent;
     border-radius: 3px;
 }
 
-QToolButton#qt_toolbutton_menubutton:hover,
-QToolButton#qt_toolbutton_menubutton:pressed,
-QToolButton#qt_toolbutton_menubutton:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton:open {
     border: 1px solid #a5c61a;
 }
 
 QToolBar QToolButton::menu-button,
-QToolButton#qt_toolbutton_menubutton::menu-button {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button {
     border: none;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
@@ -1907,14 +1897,14 @@ QToolButton#qt_toolbutton_menubutton::menu-button {
     background-color: transparent;
 }
 
-QToolButton#qt_toolbutton_menubutton::menu-button:hover,
-QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
-QToolButton#qt_toolbutton_menubutton::menu-button:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:open {
     background-color: qlineargradient(spread:pad, x1:1, y1:0.8, x2:1, y2:0, stop:0 #94b30f, stop:1 #a5c61a);
 }
 
 QToolBar > QToolButton::menu-arrow {
-    background-image: url(qss:images/down_arrow_dark.png);
+    background-image: url(qss:images_dark-light/down_arrow_dark.svg);
     background-position: center center;
     background-repeat: none;
     subcontrol-origin: padding;
@@ -1923,11 +1913,11 @@ QToolBar > QToolButton::menu-arrow {
 }
 
 QToolBar > QToolButton::menu-arrow:hover {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QToolBar > QToolButton::menu-arrow:open {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* when QToolButton is checked: */
@@ -1945,20 +1935,20 @@ QToolBar > QToolButton:checked:hover {
 QToolBar QToolButton#qt_toolbar_ext_button {
     margin: 0px;
     padding: 0px;
-    /*background-image: url(qss:images/more_dark.png);*/
+    /*background-image: url(qss:images_dark-light/more_dark.svg);*/
     image: transparent;
     background-repeat: none;
     background-position: center left;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:hover {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #5a5a5a;
     background-color: #5a5a5a;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:on {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #5a5a5a;
     background-color: #5a5a5a;
 }
@@ -2181,3 +2171,8 @@ QPushButton#NavigationIndicator::menu-indicator {
     image: none;
     width: 0px;
 }
+
+QToolBar QToolButton[popupMode="1"] {
+    width: 100px;
+    background: red;
+}
diff --git a/src/Gui/Stylesheets/Dark-orange.qss b/src/Gui/Stylesheets/Dark-orange.qss
index 53db5983f0..f912f93d0a 100644
--- a/src/Gui/Stylesheets/Dark-orange.qss
+++ b/src/Gui/Stylesheets/Dark-orange.qss
@@ -1,14 +1,14 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.07
-QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
-It might work with other software that uses QT styling.
+version 2.10
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
+It might work with other software that uses Qt styling.
 
 
 LICENSE
 ============================================================================================================
-Copyright (c) 2017 Pablo Gil Fernández
+Copyright (c) 2018 Pablo Gil Fernández
 
 This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
@@ -21,13 +21,6 @@ INSTALLATION
     WINDOWS = C:/[INSTALLATION_PATH]/FreeCAD/data/Gui/Stylesheets/
     LINUX = /home/[YOUR_USER_NAME]/.FreeCAD/Gui/Stylesheets/
 
-2) In order to display correctly images:
-    2.1) FreeCAD 0.16 (development builds newer than commit 5b3d50a): that's it, you are done!
-
-    2.2) FreeCAD 0.15: Images used in the theme need ABSOLUTE paths to be found by FreeCAD, so you should search the string "qss:images" (without "") and replace with the real path of your computer. It should be done with all the .qss files you want to install-use
-        find = qss:images
-        replace = /Users/myName/Library/Preferences/FreeCAD/Gui/Stylesheets/images
-
 
 CUSTOMIZATION
 ============================================================================================================
@@ -71,7 +64,7 @@ KNOWN BUGS and TO DO
 /*==================================================================================================
 Reset elements
 ==================================================================================================*/
-/* Resetting everything helps to unify styles across different operating systems */
+/* Reseting everything helps to unify styles across different operating systems */
 * {
     padding: 0px;
     margin: 0px;
@@ -99,7 +92,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images/background_freecad.png);
+    background-image: url(qss:images_dark-light/background_freecad.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -132,12 +125,12 @@ QMenu::item:pressed {
 QMenu::right-arrow {
     width: 10px;
     height: 10px;
-    image:url(qss:images/right_arrow_dark.png);
+    image:url(qss:images_dark-light/right_arrow_dark.svg);
     margin-right: 2px;
 }
 
 QMenu::right-arrow:selected {
-    image:url(qss:images/right_arrow_lighter.png);
+    image:url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QMenu::item {
@@ -203,7 +196,7 @@ QToolBar {
 QToolBar::handle:top,
 QToolBar::handle:bottom,
 QToolBar::handle:horizontal {
-    background-image: url(qss:images/Hmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Hmovetoolbar_dark.svg);
     width: 10px;
     margin: 4px 2px;
     background-position: top right;
@@ -213,7 +206,7 @@ QToolBar::handle:horizontal {
 QToolBar::handle:left,
 QToolBar::handle:right,
 QToolBar::handle:vertical {
-    background-image: url(qss:images/Vmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Vmovetoolbar_dark.svg);
     height: 10px;
     margin: 2px 4px;
     background-position: left bottom;
@@ -272,8 +265,8 @@ Dock widget
 ==================================================================================================*/
 QDockWidget {
     color: rgba(0,0,0,120);
-    titlebar-close-icon: url(qss:images/close_dark.png);
-    titlebar-normal-icon: url(qss:images/undock_dark.png);
+    titlebar-close-icon: url(qss:images_dark-light/close_dark.svg);
+    titlebar-normal-icon: url(qss:images_dark-light/undock_dark.svg);
 }
 
 QDockWidget::title {
@@ -296,7 +289,7 @@ QDockWidget::float-button {
 QDockWidget::close-button {
     right: 4px;
 }
-    
+
 QDockWidget::float-button {
     right: 22px;
 }
@@ -374,7 +367,7 @@ QScrollBar::handle:horizontal {
 
 QScrollBar::sub-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/left_arrow_light.png);
+    border-image: url(qss:images_dark-light/left_arrow_light.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: left;
@@ -383,7 +376,7 @@ QScrollBar::sub-line:horizontal {
 
 QScrollBar::add-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/right_arrow_light.png);
+    border-image: url(qss:images_dark-light/right_arrow_light.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: right;
@@ -392,12 +385,12 @@ QScrollBar::add-line:horizontal {
 
 QScrollBar::sub-line:horizontal:hover,
 QScrollBar::sub-line:horizontal:on {
-    border-image: url(qss:images/left_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/left_arrow_lighter.svg);
 }
 
 QScrollBar::add-line:horizontal:hover,
 QScrollBar::add-line:horizontal:on {
-    border-image: url(qss:images/right_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QScrollBar::up-arrow:horizontal,
@@ -424,7 +417,7 @@ QScrollBar::handle:vertical {
 
 QScrollBar::sub-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/up_arrow_light.png);
+    border-image: url(qss:images_dark-light/up_arrow_light.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: top;
@@ -433,7 +426,7 @@ QScrollBar::sub-line:vertical {
 
 QScrollBar::add-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/down_arrow_light.png);
+    border-image: url(qss:images_dark-light/down_arrow_light.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: bottom;
@@ -442,12 +435,12 @@ QScrollBar::add-line:vertical {
 
 QScrollBar::sub-line:vertical:hover,
 QScrollBar::sub-line:vertical:on {
-    border-image: url(qss:images/up_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QScrollBar::add-line:vertical:hover,
 QScrollBar::add-line:vertical:on {
-    border-image: url(qss:images/down_arrow_lighter.png);
+    border-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QScrollBar::up-arrow:vertical,
@@ -504,7 +497,7 @@ QTabBar {
     background-color: transparent;
 }
 
-/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
+/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
 QTabBar {
     border-top: 1px solid #5a5a5a;  /* set color for all QTabBars */
 }
@@ -625,7 +618,7 @@ QTabBar::close-button {
     subcontrol-origin: margin;
     subcontrol-position: center right; /* only works for QT 4.6 and newer */;
     border-radius: 2px;
-    background-image: url(qss:images/close_dark.png);
+    background-image: url(qss:images_dark-light/close_dark.svg);
     background-position: center center;
     background-repeat: none;
 }
@@ -658,55 +651,55 @@ QTabBar QToolButton:hover {
 }
 
 QTabBar QToolButton::right-arrow:enabled {
-     image: url(qss:images/right_arrow_dark.png);
+     image: url(qss:images_dark-light/right_arrow_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:disabled,
 QTabBar QToolButton::right-arrow:off {
-     image: url(qss:images/right_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/right_arrow_disabled_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:hover {
-     image: url(qss:images/right_arrow_darker.png);
+     image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
  QTabBar QToolButton::left-arrow:enabled {
-     image: url(qss:images/left_arrow_dark.png);
+     image: url(qss:images_dark-light/left_arrow_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:disabled,
  QTabBar QToolButton::left-arrow:off {
-     image: url(qss:images/left_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/left_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:hover {
-     image: url(qss:images/left_arrow_darker.png);
+     image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
  QTabBar QToolButton::up-arrow:enabled {
-     image: url(qss:images/up_arrow_dark.png);
+     image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:disabled,
  QTabBar QToolButton::up-arrow:off {
-     image: url(qss:images/up_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:hover {
-     image: url(qss:images/up_arrow_darker.png);
+     image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
  QTabBar QToolButton::down-arrow:enabled {
-     image: url(qss:images/down_arrow_dark.png);
+     image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:disabled,
  QTabBar QToolButton::down-arrow:off {
-     image: url(qss:images/down_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:hover {
-     image: url(qss:images/down_arrow_darker.png);
+     image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QTabBar::tear {
@@ -722,7 +715,7 @@ QListView,
 QTableView {
     background-color: #c8c8c8;
     alternate-background-color: #bebebe; /* related with QListView background  */
-    border: 1px solid #505050; 
+    border: 1px solid #505050;
     selection-color: white;
     selection-background-color: #daa116; /* should be similar to QListView::item selected background-color */
     show-decoration-selected: 1; /* make the selection span the entire width of the view */
@@ -907,19 +900,19 @@ QHeaderView::section:last {
 }
 
 QHeaderView::up-arrow {
-    image: url(qss:images/up_arrow_light.png);
+    image: url(qss:images_dark-light/up_arrow_light.svg);
 }
 
 QHeaderView::up-arrow:hover {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QHeaderView::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
 }
 
 QHeaderView::down-arrow:hover {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* Group header inside Property Editor (FreeCAD custom widget) */
@@ -937,34 +930,31 @@ QTreeView::branch  {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-    border-image: url(qss:images/branch_vline.png) 0;
+    border-image: url(qss:images_dark-light/branch_vline_dark.svg) 0;
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_dark.svg) 0;
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_dark.svg) 0;
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-    image: url(qss:images/branch_closed_dark.png);
+    border-image: url(qss:images_dark-light/branch_more_closed_dark.svg) 0;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-    image: url(qss:images/branch_closed_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_closed_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_open_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_open_dark.svg) 0;
 }
 
 
@@ -977,7 +967,7 @@ QSplitter::handle {
 }
 
 QSplitter::handle:horizontal {
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 4px 2px 4px 2px;
@@ -985,7 +975,7 @@ QSplitter::handle:horizontal {
 }
 
 QSplitter::handle:vertical {
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 2px 4px 2px 4px;
@@ -1000,13 +990,13 @@ QMainWindow::separator {
 
 QMainWindow::separator:horizontal {
     height: 2px;
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     margin: 4px 2px 4px 2px;
 }
 
 QMainWindow::separator:vertical {
     width: 2px;
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     margin: 2px 4px 2px 4px;
 }
 
@@ -1075,7 +1065,7 @@ QSint--ActionGroup QToolButton[class="header"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_light.png);
+    background-image: url(qss:images_dark-light/down_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1084,12 +1074,12 @@ QSint--ActionGroup QFrame[class="header"] QLabel {
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_light.png);
+    background-image: url(qss:images_dark-light/up_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1098,7 +1088,7 @@ QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1291,7 +1281,7 @@ QDoubleSpinBox::up-arrow,
 QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
-    image: url(qss:images/up_arrow_light.png);
+    image: url(qss:images_dark-light/up_arrow_light.svg);
     top: 2px; /* fix symmetry between up and down images */
 }
 
@@ -1301,7 +1291,7 @@ QDoubleSpinBox::up-arrow:focus,
 QTimeEdit::up-arrow:focus,
 QDateEdit::up-arrow:focus,
 QDateTimeEdit::up-arrow:focus {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::up-arrow:off,
@@ -1310,7 +1300,7 @@ QDoubleSpinBox::up-arrow:off,
 QTimeEdit::up-arrow:off,
 QDateEdit::up-arrow:off,
 QDateTimeEdit::up-arrow:off {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::up-arrow:disabled,
@@ -1319,7 +1309,7 @@ QDoubleSpinBox::up-arrow:disabled,
 QTimeEdit::up-arrow:disabled,
 QDateEdit::up-arrow:disabled,
 QDateTimeEdit::up-arrow:disabled {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow,
@@ -1328,7 +1318,7 @@ QDoubleSpinBox::down-arrow,
 QTimeEdit::down-arrow,
 QDateEdit::down-arrow,
 QDateTimeEdit::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
     bottom: 0px; /* fix simetry between up and down images */
 }
 
@@ -1338,7 +1328,7 @@ QDoubleSpinBox::down-arrow:focus,
 QTimeEdit::down-arrow:focus,
 QDateEdit::down-arrow:focus,
 QDateTimeEdit::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::down-arrow:off,
@@ -1347,7 +1337,7 @@ QDoubleSpinBox::down-arrow:off,
 QTimeEdit::down-arrow:off,
 QDateEdit::down-arrow:off,
 QDateTimeEdit::down-arrow:off {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow:disabled,
@@ -1356,7 +1346,7 @@ QDoubleSpinBox::down-arrow:disabled,
 QTimeEdit::down-arrow:disabled,
 QDateEdit::down-arrow:disabled,
 QDateTimeEdit::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox */
@@ -1376,17 +1366,17 @@ QComboBox::drop-down:focus {
 }
 
 QComboBox::down-arrow {
-    image: url(qss:images/down_arrow_light.png);
+    image: url(qss:images_dark-light/down_arrow_light.svg);
 }
 
 QComboBox::down-arrow:on,
 QComboBox::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QComboBox::down-arrow:off,
 QComboBox::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox menu */
@@ -1579,7 +1569,7 @@ QRadioButton::indicator:unchecked{
 QRadioButton::indicator:checked {
     background-color: #daa116; /* QCheckBox has the same color */
     border: 1px solid #d0970c; /* QCheckBox has the same color */
-    image:url(qss:images/radiobutton_light.png);
+    image:url(qss:images_dark-light/radiobutton_light.svg);
 }
 
 QRadioButton,
@@ -1641,7 +1631,7 @@ QCheckBox::indicator:checked:pressed {
 QCheckBox::indicator:checked {
     background-color: #daa116; /* QRadioButton has the same color */
     border: 1px solid #d0970c; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QCheckBox:disabled {
@@ -1657,7 +1647,7 @@ QCheckBox::indicator:disabled {
 QCheckBox::indicator:indeterminate {
     background-color: #daa116;
     border: 1px solid #d0970c;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 QCheckBox:focus {
@@ -1711,7 +1701,7 @@ QListWidget::indicator:checked,
 QTreeView::indicator:checked {
     background-color: #daa116; /* QRadioButton has the same color */
     border: 1px solid #d0970c; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QListWidget::indicator:disabled,
@@ -1724,7 +1714,7 @@ QListWidget::indicator:indeterminate,
 QTreeView::indicator:indeterminate {
     background-color: #daa116;
     border: 1px solid #d0970c;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 
@@ -1885,20 +1875,20 @@ QToolBar > QToolButton:pressed {
 }
 
 /* ToolBar menu buttons (buttons with drop-down menu) */
-QToolButton#qt_toolbutton_menubutton {
+QToolBar > QToolButton#qt_toolbutton_menubutton {
     padding-right: 20px; /* Hack to add more width to buttons with menu */
     border: 1px solid transparent;
     border-radius: 3px;
 }
 
-QToolButton#qt_toolbutton_menubutton:hover,
-QToolButton#qt_toolbutton_menubutton:pressed,
-QToolButton#qt_toolbutton_menubutton:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton:open {
     border: 1px solid #e3b64d;
 }
 
 QToolBar QToolButton::menu-button,
-QToolButton#qt_toolbutton_menubutton::menu-button {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button {
     border: none;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
@@ -1907,14 +1897,14 @@ QToolButton#qt_toolbutton_menubutton::menu-button {
     background-color: transparent;
 }
 
-QToolButton#qt_toolbutton_menubutton::menu-button:hover,
-QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
-QToolButton#qt_toolbutton_menubutton::menu-button:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:open {
     background-color: qlineargradient(spread:pad, x1:1, y1:0.8, x2:1, y2:0, stop:0 #daa116, stop:1 #e3b64d);
 }
 
 QToolBar > QToolButton::menu-arrow {
-    background-image: url(qss:images/down_arrow_dark.png);
+    background-image: url(qss:images_dark-light/down_arrow_dark.svg);
     background-position: center center;
     background-repeat: none;
     subcontrol-origin: padding;
@@ -1923,11 +1913,11 @@ QToolBar > QToolButton::menu-arrow {
 }
 
 QToolBar > QToolButton::menu-arrow:hover {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QToolBar > QToolButton::menu-arrow:open {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* when QToolButton is checked: */
@@ -1945,20 +1935,20 @@ QToolBar > QToolButton:checked:hover {
 QToolBar QToolButton#qt_toolbar_ext_button {
     margin: 0px;
     padding: 0px;
-    /*background-image: url(qss:images/more_dark.png);*/
+    /*background-image: url(qss:images_dark-light/more_dark.svg);*/
     image: transparent;
     background-repeat: none;
     background-position: center left;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:hover {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #5a5a5a;
     background-color: #5a5a5a;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:on {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #5a5a5a;
     background-color: #5a5a5a;
 }
@@ -2181,3 +2171,8 @@ QPushButton#NavigationIndicator::menu-indicator {
     image: none;
     width: 0px;
 }
+
+QToolBar QToolButton[popupMode="1"] {
+    width: 100px;
+    background: red;
+}
diff --git a/src/Gui/Stylesheets/Light-blue.qss b/src/Gui/Stylesheets/Light-blue.qss
index 2015617607..8c0cdd1555 100644
--- a/src/Gui/Stylesheets/Light-blue.qss
+++ b/src/Gui/Stylesheets/Light-blue.qss
@@ -1,14 +1,14 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.07
-QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
-It might work with other software that uses QT styling.
+version 2.09
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
+It might work with other software that uses Qt styling.
 
 
 LICENSE
 ============================================================================================================
-Copyright (c) 2017 Pablo Gil Fernández
+Copyright (c) 2018 Pablo Gil Fernández
 
 This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
@@ -21,13 +21,6 @@ INSTALLATION
     WINDOWS = C:/[INSTALLATION_PATH]/FreeCAD/data/Gui/Stylesheets/
     LINUX = /home/[YOUR_USER_NAME]/.FreeCAD/Gui/Stylesheets/
 
-2) In order to display correctly images:
-    2.1) FreeCAD 0.16 (development builds newer than commit 5b3d50a): that's it, you are done!
-
-    2.2) FreeCAD 0.15: Images used in the theme need ABSOLUTE paths to be found by FreeCAD, so you should search the string "qss:images" (without "") and replace with the real path of your computer. It should be done with all the .qss files you want to install-use
-        find = qss:images
-        replace = /Users/myName/Library/Preferences/FreeCAD/Gui/Stylesheets/images
-
 
 CUSTOMIZATION
 ============================================================================================================
@@ -71,7 +64,7 @@ KNOWN BUGS and TO DO
 /*==================================================================================================
 Reset elements
 ==================================================================================================*/
-/* Resetting everything helps to unify styles across different operating systems */
+/* Reseting everything helps to unify styles across different operating systems */
 * {
     padding: 0px;
     margin: 0px;
@@ -99,7 +92,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images/background_freecad.png);
+        background-image: url(qss:images_dark-light/background_freecad.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -132,12 +125,12 @@ QMenu::item:pressed {
 QMenu::right-arrow {
     width: 10px;
     height: 10px;
-    image:url(qss:images/right_arrow_dark.png);
+    image:url(qss:images_dark-light/right_arrow_dark.svg);
     margin-right: 2px;
 }
 
 QMenu::right-arrow:selected {
-    image:url(qss:images/right_arrow_lighter.png);
+    image:url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QMenu::item {
@@ -203,7 +196,7 @@ QToolBar {
 QToolBar::handle:top,
 QToolBar::handle:bottom,
 QToolBar::handle:horizontal {
-    background-image: url(qss:images/Hmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Hmovetoolbar_dark.svg);
     width: 10px;
     margin: 4px 2px;
     background-position: top right;
@@ -213,7 +206,7 @@ QToolBar::handle:horizontal {
 QToolBar::handle:left,
 QToolBar::handle:right,
 QToolBar::handle:vertical {
-    background-image: url(qss:images/Vmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Vmovetoolbar_dark.svg);
     height: 10px;
     margin: 2px 4px;
     background-position: left bottom;
@@ -272,8 +265,8 @@ Dock widget
 ==================================================================================================*/
 QDockWidget {
     color: rgba(0,0,0,120);
-    titlebar-close-icon: url(qss:images/close_dark.png);
-    titlebar-normal-icon: url(qss:images/undock_dark.png);
+    titlebar-close-icon: url(qss:images_dark-light/close_dark.svg);
+    titlebar-normal-icon: url(qss:images_dark-light/undock_dark.svg);
 }
 
 QDockWidget::title {
@@ -296,7 +289,7 @@ QDockWidget::float-button {
 QDockWidget::close-button {
     right: 4px;
 }
-    
+
 QDockWidget::float-button {
     right: 22px;
 }
@@ -374,7 +367,7 @@ QScrollBar::handle:horizontal {
 
 QScrollBar::sub-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/left_arrow_dark.png);
+    border-image: url(qss:images_dark-light/left_arrow_dark.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: left;
@@ -383,7 +376,7 @@ QScrollBar::sub-line:horizontal {
 
 QScrollBar::add-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/right_arrow_dark.png);
+    border-image: url(qss:images_dark-light/right_arrow_dark.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: right;
@@ -392,12 +385,12 @@ QScrollBar::add-line:horizontal {
 
 QScrollBar::sub-line:horizontal:hover,
 QScrollBar::sub-line:horizontal:on {
-    border-image: url(qss:images/left_arrow_darker.png);
+    border-image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
 QScrollBar::add-line:horizontal:hover,
 QScrollBar::add-line:horizontal:on {
-    border-image: url(qss:images/right_arrow_darker.png);
+    border-image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
 QScrollBar::up-arrow:horizontal,
@@ -424,7 +417,7 @@ QScrollBar::handle:vertical {
 
 QScrollBar::sub-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/up_arrow_dark.png);
+    border-image: url(qss:images_dark-light/up_arrow_dark.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: top;
@@ -433,7 +426,7 @@ QScrollBar::sub-line:vertical {
 
 QScrollBar::add-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/down_arrow_dark.png);
+    border-image: url(qss:images_dark-light/down_arrow_dark.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: bottom;
@@ -442,12 +435,12 @@ QScrollBar::add-line:vertical {
 
 QScrollBar::sub-line:vertical:hover,
 QScrollBar::sub-line:vertical:on {
-    border-image: url(qss:images/up_arrow_darker.png);
+    border-image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
 QScrollBar::add-line:vertical:hover,
 QScrollBar::add-line:vertical:on {
-    border-image: url(qss:images/down_arrow_darker.png);
+    border-image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QScrollBar::up-arrow:vertical,
@@ -504,7 +497,7 @@ QTabBar {
     background-color: transparent;
 }
 
-/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
+/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
 QTabBar {
     border-top: 1px solid #d2d2d2;  /* set color for all QTabBars */
 }
@@ -624,7 +617,7 @@ QTabBar::close-button {
     subcontrol-origin: margin;
     subcontrol-position: center right; /* only works for QT 4.6 and newer */;
     border-radius: 2px;
-    background-image: url(qss:images/close_dark.png);
+    background-image: url(qss:images_dark-light/close_dark.svg);
     background-position: center center;
     background-repeat: none;
 }
@@ -657,55 +650,55 @@ QTabBar QToolButton:hover {
 }
 
 QTabBar QToolButton::right-arrow:enabled {
-     image: url(qss:images/right_arrow_dark.png);
+     image: url(qss:images_dark-light/right_arrow_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:disabled,
 QTabBar QToolButton::right-arrow:off {
-     image: url(qss:images/right_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/right_arrow_disabled_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:hover {
-     image: url(qss:images/right_arrow_darker.png);
+     image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
  QTabBar QToolButton::left-arrow:enabled {
-     image: url(qss:images/left_arrow_dark.png);
+     image: url(qss:images_dark-light/left_arrow_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:disabled,
  QTabBar QToolButton::left-arrow:off {
-     image: url(qss:images/left_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/left_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:hover {
-     image: url(qss:images/left_arrow_darker.png);
+     image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
  QTabBar QToolButton::up-arrow:enabled {
-     image: url(qss:images/up_arrow_dark.png);
+     image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:disabled,
  QTabBar QToolButton::up-arrow:off {
-     image: url(qss:images/up_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:hover {
-     image: url(qss:images/up_arrow_darker.png);
+     image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
  QTabBar QToolButton::down-arrow:enabled {
-     image: url(qss:images/down_arrow_dark.png);
+     image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:disabled,
  QTabBar QToolButton::down-arrow:off {
-     image: url(qss:images/down_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:hover {
-     image: url(qss:images/down_arrow_darker.png);
+     image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QTabBar::tear {
@@ -721,7 +714,7 @@ QListView,
 QTableView {
     background-color: #f0f0f0;
     alternate-background-color: #e6e6e6; /* related with QListView background  */
-    border: 1px solid #c3c3c3; 
+    border: 1px solid #c3c3c3;
     selection-color: white;
     selection-background-color: #5e90fa; /* should be similar to QListView::item selected background-color */
     show-decoration-selected: 1; /* make the selection span the entire width of the view */
@@ -905,19 +898,19 @@ QHeaderView::section:last {
 }
 
 QHeaderView::up-arrow {
-    image: url(qss:images/up_arrow_dark.png);
+    image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
 QHeaderView::up-arrow:hover {
-    image: url(qss:images/up_arrow_darker.png);
+    image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
 QHeaderView::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
 QHeaderView::down-arrow:hover {
-    image: url(qss:images/down_arrow_darker.png);
+    image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 /* Group header inside Property Editor (FreeCAD custom widget) */
@@ -935,34 +928,31 @@ QTreeView::branch  {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-    border-image: url(qss:images/branch_vline.png) 0;
+    border-image: url(qss:images_dark-light/branch_vline_dark.svg) 0;
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_dark.svg) 0;
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_dark.svg) 0;
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-    image: url(qss:images/branch_closed_dark.png);
+    border-image: url(qss:images_dark-light/branch_more_closed_dark.svg) 0;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-    image: url(qss:images/branch_closed_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_closed_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_open_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_open_dark.svg) 0;
 }
 
 
@@ -975,7 +965,7 @@ QSplitter::handle {
 }
 
 QSplitter::handle:horizontal {
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 4px 2px 4px 2px;
@@ -983,7 +973,7 @@ QSplitter::handle:horizontal {
 }
 
 QSplitter::handle:vertical {
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 2px 4px 2px 4px;
@@ -998,13 +988,13 @@ QMainWindow::separator {
 
 QMainWindow::separator:horizontal {
     height: 2px;
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     margin: 4px 2px 4px 2px;
 }
 
 QMainWindow::separator:vertical {
     width: 2px;
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     margin: 2px 4px 2px 4px;
 }
 
@@ -1073,7 +1063,7 @@ QSint--ActionGroup QToolButton[class="header"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_light.png);
+    background-image: url(qss:images_dark-light/down_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1082,12 +1072,12 @@ QSint--ActionGroup QFrame[class="header"] QLabel {
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_light.png);
+    background-image: url(qss:images_dark-light/up_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1096,7 +1086,7 @@ QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1289,7 +1279,7 @@ QDoubleSpinBox::up-arrow,
 QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
-    image: url(qss:images/up_arrow_dark.png);
+    image: url(qss:images_dark-light/up_arrow_dark.svg);
     top: 2px; /* fix symmetry between up and down images */
 }
 
@@ -1299,7 +1289,7 @@ QDoubleSpinBox::up-arrow:focus,
 QTimeEdit::up-arrow:focus,
 QDateEdit::up-arrow:focus,
 QDateTimeEdit::up-arrow:focus {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::up-arrow:off,
@@ -1308,7 +1298,7 @@ QDoubleSpinBox::up-arrow:off,
 QTimeEdit::up-arrow:off,
 QDateEdit::up-arrow:off,
 QDateTimeEdit::up-arrow:off {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::up-arrow:disabled,
@@ -1317,7 +1307,7 @@ QDoubleSpinBox::up-arrow:disabled,
 QTimeEdit::up-arrow:disabled,
 QDateEdit::up-arrow:disabled,
 QDateTimeEdit::up-arrow:disabled {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow,
@@ -1326,7 +1316,7 @@ QDoubleSpinBox::down-arrow,
 QTimeEdit::down-arrow,
 QDateEdit::down-arrow,
 QDateTimeEdit::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
     bottom: 0px; /* fix simetry between up and down images */
 }
 
@@ -1336,7 +1326,7 @@ QDoubleSpinBox::down-arrow:focus,
 QTimeEdit::down-arrow:focus,
 QDateEdit::down-arrow:focus,
 QDateTimeEdit::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::down-arrow:off,
@@ -1345,7 +1335,7 @@ QDoubleSpinBox::down-arrow:off,
 QTimeEdit::down-arrow:off,
 QDateEdit::down-arrow:off,
 QDateTimeEdit::down-arrow:off {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow:disabled,
@@ -1354,7 +1344,7 @@ QDoubleSpinBox::down-arrow:disabled,
 QTimeEdit::down-arrow:disabled,
 QDateEdit::down-arrow:disabled,
 QDateTimeEdit::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox */
@@ -1373,17 +1363,17 @@ QComboBox::drop-down:focus {
 }
 
 QComboBox::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
 QComboBox::down-arrow:on,
 QComboBox::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QComboBox::down-arrow:off,
 QComboBox::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox menu */
@@ -1576,7 +1566,7 @@ QRadioButton::indicator:unchecked{
 QRadioButton::indicator:checked {
     background-color: #5e90fa; /* QCheckBox has the same color */
     border: 1px solid #3874f2; /* QCheckBox has the same color */
-    image:url(qss:images/radiobutton_light.png);
+    image:url(qss:images_dark-light/radiobutton_light.svg);
 }
 
 QRadioButton,
@@ -1638,7 +1628,7 @@ QCheckBox::indicator:checked:pressed {
 QCheckBox::indicator:checked {
     background-color: #5e90fa; /* QRadioButton has the same color */
     border: 1px solid #3874f2; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QCheckBox:disabled {
@@ -1654,7 +1644,7 @@ QCheckBox::indicator:disabled {
 QCheckBox::indicator:indeterminate {
     background-color: #5e90fa;
     border: 1px solid #3874f2;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 QCheckBox:focus {
@@ -1708,7 +1698,7 @@ QListWidget::indicator:checked,
 QTreeView::indicator:checked {
     background-color: #5e90fa; /* QRadioButton has the same color */
     border: 1px solid #3874f2; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QListWidget::indicator:disabled,
@@ -1721,7 +1711,7 @@ QListWidget::indicator:indeterminate,
 QTreeView::indicator:indeterminate {
     background-color: #5e90fa;
     border: 1px solid #3874f2;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 
@@ -1882,20 +1872,20 @@ QToolBar > QToolButton:pressed {
 }
 
 /* ToolBar menu buttons (buttons with drop-down menu) */
-QToolButton#qt_toolbutton_menubutton {
+QToolBar > QToolButton#qt_toolbutton_menubutton {
     padding-right: 20px; /* Hack to add more width to buttons with menu */
     border: 1px solid transparent;
     border-radius: 3px;
 }
 
-QToolButton#qt_toolbutton_menubutton:hover,
-QToolButton#qt_toolbutton_menubutton:pressed,
-QToolButton#qt_toolbutton_menubutton:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton:open {
     border: 1px solid #7cabf9;
 }
 
 QToolBar QToolButton::menu-button,
-QToolButton#qt_toolbutton_menubutton::menu-button {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button {
     border: none;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
@@ -1904,14 +1894,14 @@ QToolButton#qt_toolbutton_menubutton::menu-button {
     background-color: transparent;
 }
 
-QToolButton#qt_toolbutton_menubutton::menu-button:hover,
-QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
-QToolButton#qt_toolbutton_menubutton::menu-button:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:open {
     background-color: qlineargradient(spread:pad, x1:1, y1:0.8, x2:1, y2:0, stop:0 #5e90fa, stop:1 #7cabf9);
 }
 
 QToolBar > QToolButton::menu-arrow {
-    background-image: url(qss:images/down_arrow_dark.png);
+    background-image: url(qss:images_dark-light/down_arrow_dark.svg);
     background-position: center center;
     background-repeat: none;
     subcontrol-origin: padding;
@@ -1920,11 +1910,11 @@ QToolBar > QToolButton::menu-arrow {
 }
 
 QToolBar > QToolButton::menu-arrow:hover {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QToolBar > QToolButton::menu-arrow:open {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* when QToolButton is checked: */
@@ -1942,20 +1932,20 @@ QToolButton:checked:hover {
 QToolBar QToolButton#qt_toolbar_ext_button {
     margin: 0px;
     padding: 0px;
-    /*background-image: url(qss:images/more_dark.png);*/
+    /*background-image: url(qss:images_dark-light/more_dark.svg);*/
     image: transparent;
     background-repeat: none;
     background-position: center left;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:hover {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #e0e0e0;
     background-color: #e0e0e0;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:on {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #e0e0e0;
     background-color: #e0e0e0;
 }
diff --git a/src/Gui/Stylesheets/Light-green.qss b/src/Gui/Stylesheets/Light-green.qss
index 71250c86b3..f3205ac848 100644
--- a/src/Gui/Stylesheets/Light-green.qss
+++ b/src/Gui/Stylesheets/Light-green.qss
@@ -1,14 +1,14 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.07
-QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
-It might work with other software that uses QT styling.
+version 2.09
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
+It might work with other software that uses Qt styling.
 
 
 LICENSE
 ============================================================================================================
-Copyright (c) 2017 Pablo Gil Fernández
+Copyright (c) 2018 Pablo Gil Fernández
 
 This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
@@ -21,13 +21,6 @@ INSTALLATION
     WINDOWS = C:/[INSTALLATION_PATH]/FreeCAD/data/Gui/Stylesheets/
     LINUX = /home/[YOUR_USER_NAME]/.FreeCAD/Gui/Stylesheets/
 
-2) In order to display correctly images:
-    2.1) FreeCAD 0.16 (development builds newer than commit 5b3d50a): that's it, you are done!
-
-    2.2) FreeCAD 0.15: Images used in the theme need ABSOLUTE paths to be found by FreeCAD, so you should search the string "qss:images" (without "") and replace with the real path of your computer. It should be done with all the .qss files you want to install-use
-        find = qss:images
-        replace = /Users/myName/Library/Preferences/FreeCAD/Gui/Stylesheets/images
-
 
 CUSTOMIZATION
 ============================================================================================================
@@ -71,7 +64,7 @@ KNOWN BUGS and TO DO
 /*==================================================================================================
 Reset elements
 ==================================================================================================*/
-/* Resetting everything helps to unify styles across different operating systems */
+/* Reseting everything helps to unify styles across different operating systems */
 * {
     padding: 0px;
     margin: 0px;
@@ -99,7 +92,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images/background_freecad.png);
+        background-image: url(qss:images_dark-light/background_freecad.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -132,12 +125,12 @@ QMenu::item:pressed {
 QMenu::right-arrow {
     width: 10px;
     height: 10px;
-    image:url(qss:images/right_arrow_dark.png);
+    image:url(qss:images_dark-light/right_arrow_dark.svg);
     margin-right: 2px;
 }
 
 QMenu::right-arrow:selected {
-    image:url(qss:images/right_arrow_lighter.png);
+    image:url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QMenu::item {
@@ -203,7 +196,7 @@ QToolBar {
 QToolBar::handle:top,
 QToolBar::handle:bottom,
 QToolBar::handle:horizontal {
-    background-image: url(qss:images/Hmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Hmovetoolbar_dark.svg);
     width: 10px;
     margin: 4px 2px;
     background-position: top right;
@@ -213,7 +206,7 @@ QToolBar::handle:horizontal {
 QToolBar::handle:left,
 QToolBar::handle:right,
 QToolBar::handle:vertical {
-    background-image: url(qss:images/Vmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Vmovetoolbar_dark.svg);
     height: 10px;
     margin: 2px 4px;
     background-position: left bottom;
@@ -272,8 +265,8 @@ Dock widget
 ==================================================================================================*/
 QDockWidget {
     color: rgba(0,0,0,120);
-    titlebar-close-icon: url(qss:images/close_dark.png);
-    titlebar-normal-icon: url(qss:images/undock_dark.png);
+    titlebar-close-icon: url(qss:images_dark-light/close_dark.svg);
+    titlebar-normal-icon: url(qss:images_dark-light/undock_dark.svg);
 }
 
 QDockWidget::title {
@@ -296,7 +289,7 @@ QDockWidget::float-button {
 QDockWidget::close-button {
     right: 4px;
 }
-    
+
 QDockWidget::float-button {
     right: 22px;
 }
@@ -374,7 +367,7 @@ QScrollBar::handle:horizontal {
 
 QScrollBar::sub-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/left_arrow_dark.png);
+    border-image: url(qss:images_dark-light/left_arrow_dark.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: left;
@@ -383,7 +376,7 @@ QScrollBar::sub-line:horizontal {
 
 QScrollBar::add-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/right_arrow_dark.png);
+    border-image: url(qss:images_dark-light/right_arrow_dark.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: right;
@@ -392,12 +385,12 @@ QScrollBar::add-line:horizontal {
 
 QScrollBar::sub-line:horizontal:hover,
 QScrollBar::sub-line:horizontal:on {
-    border-image: url(qss:images/left_arrow_darker.png);
+    border-image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
 QScrollBar::add-line:horizontal:hover,
 QScrollBar::add-line:horizontal:on {
-    border-image: url(qss:images/right_arrow_darker.png);
+    border-image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
 QScrollBar::up-arrow:horizontal,
@@ -424,7 +417,7 @@ QScrollBar::handle:vertical {
 
 QScrollBar::sub-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/up_arrow_dark.png);
+    border-image: url(qss:images_dark-light/up_arrow_dark.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: top;
@@ -433,7 +426,7 @@ QScrollBar::sub-line:vertical {
 
 QScrollBar::add-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/down_arrow_dark.png);
+    border-image: url(qss:images_dark-light/down_arrow_dark.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: bottom;
@@ -442,12 +435,12 @@ QScrollBar::add-line:vertical {
 
 QScrollBar::sub-line:vertical:hover,
 QScrollBar::sub-line:vertical:on {
-    border-image: url(qss:images/up_arrow_darker.png);
+    border-image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
 QScrollBar::add-line:vertical:hover,
 QScrollBar::add-line:vertical:on {
-    border-image: url(qss:images/down_arrow_darker.png);
+    border-image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QScrollBar::up-arrow:vertical,
@@ -504,7 +497,7 @@ QTabBar {
     background-color: transparent;
 }
 
-/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
+/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
 QTabBar {
     border-top: 1px solid #d2d2d2;  /* set color for all QTabBars */
 }
@@ -624,7 +617,7 @@ QTabBar::close-button {
     subcontrol-origin: margin;
     subcontrol-position: center right; /* only works for QT 4.6 and newer */;
     border-radius: 2px;
-    background-image: url(qss:images/close_dark.png);
+    background-image: url(qss:images_dark-light/close_dark.svg);
     background-position: center center;
     background-repeat: none;
 }
@@ -657,55 +650,55 @@ QTabBar QToolButton:hover {
 }
 
 QTabBar QToolButton::right-arrow:enabled {
-     image: url(qss:images/right_arrow_dark.png);
+     image: url(qss:images_dark-light/right_arrow_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:disabled,
 QTabBar QToolButton::right-arrow:off {
-     image: url(qss:images/right_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/right_arrow_disabled_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:hover {
-     image: url(qss:images/right_arrow_darker.png);
+     image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
  QTabBar QToolButton::left-arrow:enabled {
-     image: url(qss:images/left_arrow_dark.png);
+     image: url(qss:images_dark-light/left_arrow_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:disabled,
  QTabBar QToolButton::left-arrow:off {
-     image: url(qss:images/left_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/left_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:hover {
-     image: url(qss:images/left_arrow_darker.png);
+     image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
  QTabBar QToolButton::up-arrow:enabled {
-     image: url(qss:images/up_arrow_dark.png);
+     image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:disabled,
  QTabBar QToolButton::up-arrow:off {
-     image: url(qss:images/up_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:hover {
-     image: url(qss:images/up_arrow_darker.png);
+     image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
  QTabBar QToolButton::down-arrow:enabled {
-     image: url(qss:images/down_arrow_dark.png);
+     image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:disabled,
  QTabBar QToolButton::down-arrow:off {
-     image: url(qss:images/down_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:hover {
-     image: url(qss:images/down_arrow_darker.png);
+     image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QTabBar::tear {
@@ -721,7 +714,7 @@ QListView,
 QTableView {
     background-color: #f0f0f0;
     alternate-background-color: #e6e6e6; /* related with QListView background  */
-    border: 1px solid #c3c3c3; 
+    border: 1px solid #c3c3c3;
     selection-color: white;
     selection-background-color: #94b30f; /* should be similar to QListView::item selected background-color */
     show-decoration-selected: 1; /* make the selection span the entire width of the view */
@@ -905,19 +898,19 @@ QHeaderView::section:last {
 }
 
 QHeaderView::up-arrow {
-    image: url(qss:images/up_arrow_dark.png);
+    image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
 QHeaderView::up-arrow:hover {
-    image: url(qss:images/up_arrow_darker.png);
+    image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
 QHeaderView::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
 QHeaderView::down-arrow:hover {
-    image: url(qss:images/down_arrow_darker.png);
+    image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 /* Group header inside Property Editor (FreeCAD custom widget) */
@@ -935,34 +928,31 @@ QTreeView::branch  {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-    border-image: url(qss:images/branch_vline.png) 0;
+    border-image: url(qss:images_dark-light/branch_vline_dark.svg) 0;
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_dark.svg) 0;
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_dark.svg) 0;
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-    image: url(qss:images/branch_closed_dark.png);
+    border-image: url(qss:images_dark-light/branch_more_closed_dark.svg) 0;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-    image: url(qss:images/branch_closed_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_closed_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_open_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_open_dark.svg) 0;
 }
 
 
@@ -975,7 +965,7 @@ QSplitter::handle {
 }
 
 QSplitter::handle:horizontal {
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 4px 2px 4px 2px;
@@ -983,7 +973,7 @@ QSplitter::handle:horizontal {
 }
 
 QSplitter::handle:vertical {
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 2px 4px 2px 4px;
@@ -998,13 +988,13 @@ QMainWindow::separator {
 
 QMainWindow::separator:horizontal {
     height: 2px;
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     margin: 4px 2px 4px 2px;
 }
 
 QMainWindow::separator:vertical {
     width: 2px;
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     margin: 2px 4px 2px 4px;
 }
 
@@ -1073,7 +1063,7 @@ QSint--ActionGroup QToolButton[class="header"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_light.png);
+    background-image: url(qss:images_dark-light/down_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1082,12 +1072,12 @@ QSint--ActionGroup QFrame[class="header"] QLabel {
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_light.png);
+    background-image: url(qss:images_dark-light/up_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1096,7 +1086,7 @@ QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1289,7 +1279,7 @@ QDoubleSpinBox::up-arrow,
 QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
-    image: url(qss:images/up_arrow_dark.png);
+    image: url(qss:images_dark-light/up_arrow_dark.svg);
     top: 2px; /* fix symmetry between up and down images */
 }
 
@@ -1299,7 +1289,7 @@ QDoubleSpinBox::up-arrow:focus,
 QTimeEdit::up-arrow:focus,
 QDateEdit::up-arrow:focus,
 QDateTimeEdit::up-arrow:focus {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::up-arrow:off,
@@ -1308,7 +1298,7 @@ QDoubleSpinBox::up-arrow:off,
 QTimeEdit::up-arrow:off,
 QDateEdit::up-arrow:off,
 QDateTimeEdit::up-arrow:off {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::up-arrow:disabled,
@@ -1317,7 +1307,7 @@ QDoubleSpinBox::up-arrow:disabled,
 QTimeEdit::up-arrow:disabled,
 QDateEdit::up-arrow:disabled,
 QDateTimeEdit::up-arrow:disabled {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow,
@@ -1326,7 +1316,7 @@ QDoubleSpinBox::down-arrow,
 QTimeEdit::down-arrow,
 QDateEdit::down-arrow,
 QDateTimeEdit::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
     bottom: 0px; /* fix simetry between up and down images */
 }
 
@@ -1336,7 +1326,7 @@ QDoubleSpinBox::down-arrow:focus,
 QTimeEdit::down-arrow:focus,
 QDateEdit::down-arrow:focus,
 QDateTimeEdit::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::down-arrow:off,
@@ -1345,7 +1335,7 @@ QDoubleSpinBox::down-arrow:off,
 QTimeEdit::down-arrow:off,
 QDateEdit::down-arrow:off,
 QDateTimeEdit::down-arrow:off {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow:disabled,
@@ -1354,7 +1344,7 @@ QDoubleSpinBox::down-arrow:disabled,
 QTimeEdit::down-arrow:disabled,
 QDateEdit::down-arrow:disabled,
 QDateTimeEdit::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox */
@@ -1373,17 +1363,17 @@ QComboBox::drop-down:focus {
 }
 
 QComboBox::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
 QComboBox::down-arrow:on,
 QComboBox::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QComboBox::down-arrow:off,
 QComboBox::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox menu */
@@ -1576,7 +1566,7 @@ QRadioButton::indicator:unchecked{
 QRadioButton::indicator:checked {
     background-color: #94b30f; /* QCheckBox has the same color */
     border: 1px solid #819c0c; /* QCheckBox has the same color */
-    image:url(qss:images/radiobutton_light.png);
+    image:url(qss:images_dark-light/radiobutton_light.svg);
 }
 
 QRadioButton,
@@ -1638,7 +1628,7 @@ QCheckBox::indicator:checked:pressed {
 QCheckBox::indicator:checked {
     background-color: #94b30f; /* QRadioButton has the same color */
     border: 1px solid #819c0c; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QCheckBox:disabled {
@@ -1654,7 +1644,7 @@ QCheckBox::indicator:disabled {
 QCheckBox::indicator:indeterminate {
     background-color: #94b30f;
     border: 1px solid #819c0c;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 QCheckBox:focus {
@@ -1708,7 +1698,7 @@ QListWidget::indicator:checked,
 QTreeView::indicator:checked {
     background-color: #94b30f; /* QRadioButton has the same color */
     border: 1px solid #819c0c; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QListWidget::indicator:disabled,
@@ -1721,7 +1711,7 @@ QListWidget::indicator:indeterminate,
 QTreeView::indicator:indeterminate {
     background-color: #94b30f;
     border: 1px solid #819c0c;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 
@@ -1882,20 +1872,20 @@ QToolBar > QToolButton:pressed {
 }
 
 /* ToolBar menu buttons (buttons with drop-down menu) */
-QToolButton#qt_toolbutton_menubutton {
+QToolBar > QToolButton#qt_toolbutton_menubutton {
     padding-right: 20px; /* Hack to add more width to buttons with menu */
     border: 1px solid transparent;
     border-radius: 3px;
 }
 
-QToolButton#qt_toolbutton_menubutton:hover,
-QToolButton#qt_toolbutton_menubutton:pressed,
-QToolButton#qt_toolbutton_menubutton:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton:open {
     border: 1px solid #a5c61a;
 }
 
 QToolBar QToolButton::menu-button,
-QToolButton#qt_toolbutton_menubutton::menu-button {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button {
     border: none;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
@@ -1904,14 +1894,14 @@ QToolButton#qt_toolbutton_menubutton::menu-button {
     background-color: transparent;
 }
 
-QToolButton#qt_toolbutton_menubutton::menu-button:hover,
-QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
-QToolButton#qt_toolbutton_menubutton::menu-button:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:open {
     background-color: qlineargradient(spread:pad, x1:1, y1:0.8, x2:1, y2:0, stop:0 #94b30f, stop:1 #a5c61a);
 }
 
 QToolBar > QToolButton::menu-arrow {
-    background-image: url(qss:images/down_arrow_dark.png);
+    background-image: url(qss:images_dark-light/down_arrow_dark.svg);
     background-position: center center;
     background-repeat: none;
     subcontrol-origin: padding;
@@ -1920,11 +1910,11 @@ QToolBar > QToolButton::menu-arrow {
 }
 
 QToolBar > QToolButton::menu-arrow:hover {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QToolBar > QToolButton::menu-arrow:open {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* when QToolButton is checked: */
@@ -1942,20 +1932,20 @@ QToolButton:checked:hover {
 QToolBar QToolButton#qt_toolbar_ext_button {
     margin: 0px;
     padding: 0px;
-    /*background-image: url(qss:images/more_dark.png);*/
+    /*background-image: url(qss:images_dark-light/more_dark.svg);*/
     image: transparent;
     background-repeat: none;
     background-position: center left;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:hover {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #e0e0e0;
     background-color: #e0e0e0;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:on {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #e0e0e0;
     background-color: #e0e0e0;
 }
diff --git a/src/Gui/Stylesheets/Light-orange.qss b/src/Gui/Stylesheets/Light-orange.qss
index 0aaa78ffce..d31304859b 100644
--- a/src/Gui/Stylesheets/Light-orange.qss
+++ b/src/Gui/Stylesheets/Light-orange.qss
@@ -1,14 +1,14 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.07
-QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
-It might work with other software that uses QT styling.
+version 2.09
+Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
+It might work with other software that uses Qt styling.
 
 
 LICENSE
 ============================================================================================================
-Copyright (c) 2017 Pablo Gil Fernández
+Copyright (c) 2018 Pablo Gil Fernández
 
 This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
@@ -21,13 +21,6 @@ INSTALLATION
     WINDOWS = C:/[INSTALLATION_PATH]/FreeCAD/data/Gui/Stylesheets/
     LINUX = /home/[YOUR_USER_NAME]/.FreeCAD/Gui/Stylesheets/
 
-2) In order to display correctly images:
-    2.1) FreeCAD 0.16 (development builds newer than commit 5b3d50a): that's it, you are done!
-
-    2.2) FreeCAD 0.15: Images used in the theme need ABSOLUTE paths to be found by FreeCAD, so you should search the string "qss:images" (without "") and replace with the real path of your computer. It should be done with all the .qss files you want to install-use
-        find = qss:images
-        replace = /Users/myName/Library/Preferences/FreeCAD/Gui/Stylesheets/images
-
 
 CUSTOMIZATION
 ============================================================================================================
@@ -71,7 +64,7 @@ KNOWN BUGS and TO DO
 /*==================================================================================================
 Reset elements
 ==================================================================================================*/
-/* Resetting everything helps to unify styles across different operating systems */
+/* Reseting everything helps to unify styles across different operating systems */
 * {
     padding: 0px;
     margin: 0px;
@@ -99,7 +92,7 @@ QToolBar  {
 }
 
 QMdiArea {
-    background-image: url(qss:images/background_freecad.png);
+        background-image: url(qss:images_dark-light/background_freecad.svg);
     background-position: center center;
     background-repeat: no-repeat;
 }
@@ -132,12 +125,12 @@ QMenu::item:pressed {
 QMenu::right-arrow {
     width: 10px;
     height: 10px;
-    image:url(qss:images/right_arrow_dark.png);
+    image:url(qss:images_dark-light/right_arrow_dark.svg);
     margin-right: 2px;
 }
 
 QMenu::right-arrow:selected {
-    image:url(qss:images/right_arrow_lighter.png);
+    image:url(qss:images_dark-light/right_arrow_lighter.svg);
 }
 
 QMenu::item {
@@ -203,7 +196,7 @@ QToolBar {
 QToolBar::handle:top,
 QToolBar::handle:bottom,
 QToolBar::handle:horizontal {
-    background-image: url(qss:images/Hmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Hmovetoolbar_dark.svg);
     width: 10px;
     margin: 4px 2px;
     background-position: top right;
@@ -213,7 +206,7 @@ QToolBar::handle:horizontal {
 QToolBar::handle:left,
 QToolBar::handle:right,
 QToolBar::handle:vertical {
-    background-image: url(qss:images/Vmovetoolbar_dark.png);
+    background-image: url(qss:images_dark-light/Vmovetoolbar_dark.svg);
     height: 10px;
     margin: 2px 4px;
     background-position: left bottom;
@@ -272,8 +265,8 @@ Dock widget
 ==================================================================================================*/
 QDockWidget {
     color: rgba(0,0,0,120);
-    titlebar-close-icon: url(qss:images/close_dark.png);
-    titlebar-normal-icon: url(qss:images/undock_dark.png);
+    titlebar-close-icon: url(qss:images_dark-light/close_dark.svg);
+    titlebar-normal-icon: url(qss:images_dark-light/undock_dark.svg);
 }
 
 QDockWidget::title {
@@ -296,7 +289,7 @@ QDockWidget::float-button {
 QDockWidget::close-button {
     right: 4px;
 }
-    
+
 QDockWidget::float-button {
     right: 22px;
 }
@@ -374,7 +367,7 @@ QScrollBar::handle:horizontal {
 
 QScrollBar::sub-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/left_arrow_dark.png);
+    border-image: url(qss:images_dark-light/left_arrow_dark.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: left;
@@ -383,7 +376,7 @@ QScrollBar::sub-line:horizontal {
 
 QScrollBar::add-line:horizontal {
     margin: 1px 3px 0px 3px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/right_arrow_dark.png);
+    border-image: url(qss:images_dark-light/right_arrow_dark.svg);
     width: 6px;
     height: 10px;
     subcontrol-position: right;
@@ -392,12 +385,12 @@ QScrollBar::add-line:horizontal {
 
 QScrollBar::sub-line:horizontal:hover,
 QScrollBar::sub-line:horizontal:on {
-    border-image: url(qss:images/left_arrow_darker.png);
+    border-image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
 QScrollBar::add-line:horizontal:hover,
 QScrollBar::add-line:horizontal:on {
-    border-image: url(qss:images/right_arrow_darker.png);
+    border-image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
 QScrollBar::up-arrow:horizontal,
@@ -424,7 +417,7 @@ QScrollBar::handle:vertical {
 
 QScrollBar::sub-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/up_arrow_dark.png);
+    border-image: url(qss:images_dark-light/up_arrow_dark.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: top;
@@ -433,7 +426,7 @@ QScrollBar::sub-line:vertical {
 
 QScrollBar::add-line:vertical {
     margin: 3px 0px 3px 1px; /* 1px to correctly fit the 10px width image */
-    border-image: url(qss:images/down_arrow_dark.png);
+    border-image: url(qss:images_dark-light/down_arrow_dark.svg);
     height: 6px;
     width: 10px;
     subcontrol-position: bottom;
@@ -442,12 +435,12 @@ QScrollBar::add-line:vertical {
 
 QScrollBar::sub-line:vertical:hover,
 QScrollBar::sub-line:vertical:on {
-    border-image: url(qss:images/up_arrow_darker.png);
+    border-image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
 QScrollBar::add-line:vertical:hover,
 QScrollBar::add-line:vertical:on {
-    border-image: url(qss:images/down_arrow_darker.png);
+    border-image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QScrollBar::up-arrow:vertical,
@@ -504,7 +497,7 @@ QTabBar {
     background-color: transparent;
 }
 
-/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
+/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
 QTabBar {
     border-top: 1px solid #d2d2d2;  /* set color for all QTabBars */
 }
@@ -624,7 +617,7 @@ QTabBar::close-button {
     subcontrol-origin: margin;
     subcontrol-position: center right; /* only works for QT 4.6 and newer */;
     border-radius: 2px;
-    background-image: url(qss:images/close_dark.png);
+    background-image: url(qss:images_dark-light/close_dark.svg);
     background-position: center center;
     background-repeat: none;
 }
@@ -657,55 +650,55 @@ QTabBar QToolButton:hover {
 }
 
 QTabBar QToolButton::right-arrow:enabled {
-     image: url(qss:images/right_arrow_dark.png);
+     image: url(qss:images_dark-light/right_arrow_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:disabled,
 QTabBar QToolButton::right-arrow:off {
-     image: url(qss:images/right_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/right_arrow_disabled_dark.svg);
 }
 
 QTabBar QToolButton::right-arrow:hover {
-     image: url(qss:images/right_arrow_darker.png);
+     image: url(qss:images_dark-light/right_arrow_darker.svg);
 }
 
  QTabBar QToolButton::left-arrow:enabled {
-     image: url(qss:images/left_arrow_dark.png);
+     image: url(qss:images_dark-light/left_arrow_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:disabled,
  QTabBar QToolButton::left-arrow:off {
-     image: url(qss:images/left_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/left_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::left-arrow:hover {
-     image: url(qss:images/left_arrow_darker.png);
+     image: url(qss:images_dark-light/left_arrow_darker.svg);
 }
 
  QTabBar QToolButton::up-arrow:enabled {
-     image: url(qss:images/up_arrow_dark.png);
+     image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:disabled,
  QTabBar QToolButton::up-arrow:off {
-     image: url(qss:images/up_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::up-arrow:hover {
-     image: url(qss:images/up_arrow_darker.png);
+     image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
  QTabBar QToolButton::down-arrow:enabled {
-     image: url(qss:images/down_arrow_dark.png);
+     image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:disabled,
  QTabBar QToolButton::down-arrow:off {
-     image: url(qss:images/down_arrow_disabled_dark.png);
+     image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
  QTabBar QToolButton::down-arrow:hover {
-     image: url(qss:images/down_arrow_darker.png);
+     image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 QTabBar::tear {
@@ -721,7 +714,7 @@ QListView,
 QTableView {
     background-color: #f0f0f0;
     alternate-background-color: #e6e6e6; /* related with QListView background  */
-    border: 1px solid #c3c3c3; 
+    border: 1px solid #c3c3c3;
     selection-color: white;
     selection-background-color: #daa116; /* should be similar to QListView::item selected background-color */
     show-decoration-selected: 1; /* make the selection span the entire width of the view */
@@ -905,19 +898,19 @@ QHeaderView::section:last {
 }
 
 QHeaderView::up-arrow {
-    image: url(qss:images/up_arrow_dark.png);
+    image: url(qss:images_dark-light/up_arrow_dark.svg);
 }
 
 QHeaderView::up-arrow:hover {
-    image: url(qss:images/up_arrow_darker.png);
+    image: url(qss:images_dark-light/up_arrow_darker.svg);
 }
 
 QHeaderView::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
 QHeaderView::down-arrow:hover {
-    image: url(qss:images/down_arrow_darker.png);
+    image: url(qss:images_dark-light/down_arrow_darker.svg);
 }
 
 /* Group header inside Property Editor (FreeCAD custom widget) */
@@ -935,34 +928,31 @@ QTreeView::branch  {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-    border-image: url(qss:images/branch_vline.png) 0;
+    border-image: url(qss:images_dark-light/branch_vline_dark.svg) 0;
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_dark.svg) 0;
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_dark.svg) 0;
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-    image: url(qss:images/branch_closed_dark.png);
+    border-image: url(qss:images_dark-light/branch_more_closed_dark.svg) 0;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-    image: url(qss:images/branch_closed_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_closed_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_more.png) 0;
+    border-image: url(qss:images_dark-light/branch_more_open_dark.svg) 0;
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
-    image: url(qss:images/branch_open_dark.png);
-    border-image: url(qss:images/branch_end.png) 0;
+    border-image: url(qss:images_dark-light/branch_end_open_dark.svg) 0;
 }
 
 
@@ -975,7 +965,7 @@ QSplitter::handle {
 }
 
 QSplitter::handle:horizontal {
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 4px 2px 4px 2px;
@@ -983,7 +973,7 @@ QSplitter::handle:horizontal {
 }
 
 QSplitter::handle:vertical {
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     background-position: center center;
     background-repeat: none;
     margin: 2px 4px 2px 4px;
@@ -998,13 +988,13 @@ QMainWindow::separator {
 
 QMainWindow::separator:horizontal {
     height: 2px;
-    background-image: url(qss:images/splitter_horizontal_dark.png);
+    background-image: url(qss:images_dark-light/splitter_horizontal_dark.svg);
     margin: 4px 2px 4px 2px;
 }
 
 QMainWindow::separator:vertical {
     width: 2px;
-    background-image: url(qss:images/splitter_vertical_dark.png);
+    background-image: url(qss:images_dark-light/splitter_vertical_dark.svg);
     margin: 2px 4px 2px 4px;
 }
 
@@ -1073,7 +1063,7 @@ QSint--ActionGroup QToolButton[class="header"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_light.png);
+    background-image: url(qss:images_dark-light/down_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1082,12 +1072,12 @@ QSint--ActionGroup QFrame[class="header"] QLabel {
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover {
     background-color: transparent;
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_light.png);
+    background-image: url(qss:images_dark-light/up_arrow_light.svg);
     background-repeat: none;
     background-position: center center;
     padding: 0px;
@@ -1096,7 +1086,7 @@ QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
     background-color: transparent;
-    background-image: url(qss:images/up_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1289,7 +1279,7 @@ QDoubleSpinBox::up-arrow,
 QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
-    image: url(qss:images/up_arrow_dark.png);
+    image: url(qss:images_dark-light/up_arrow_dark.svg);
     top: 2px; /* fix symmetry between up and down images */
 }
 
@@ -1299,7 +1289,7 @@ QDoubleSpinBox::up-arrow:focus,
 QTimeEdit::up-arrow:focus,
 QDateEdit::up-arrow:focus,
 QDateTimeEdit::up-arrow:focus {
-    image: url(qss:images/up_arrow_lighter.png);
+    image: url(qss:images_dark-light/up_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::up-arrow:off,
@@ -1308,7 +1298,7 @@ QDoubleSpinBox::up-arrow:off,
 QTimeEdit::up-arrow:off,
 QDateEdit::up-arrow:off,
 QDateTimeEdit::up-arrow:off {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::up-arrow:disabled,
@@ -1317,7 +1307,7 @@ QDoubleSpinBox::up-arrow:disabled,
 QTimeEdit::up-arrow:disabled,
 QDateEdit::up-arrow:disabled,
 QDateTimeEdit::up-arrow:disabled {
-    image: url(qss:images/up_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/up_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow,
@@ -1326,7 +1316,7 @@ QDoubleSpinBox::down-arrow,
 QTimeEdit::down-arrow,
 QDateEdit::down-arrow,
 QDateTimeEdit::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
     bottom: 0px; /* fix simetry between up and down images */
 }
 
@@ -1336,7 +1326,7 @@ QDoubleSpinBox::down-arrow:focus,
 QTimeEdit::down-arrow:focus,
 QDateEdit::down-arrow:focus,
 QDateTimeEdit::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QAbstractSpinBox::down-arrow:off,
@@ -1345,7 +1335,7 @@ QDoubleSpinBox::down-arrow:off,
 QTimeEdit::down-arrow:off,
 QDateEdit::down-arrow:off,
 QDateTimeEdit::down-arrow:off {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 QAbstractSpinBox::down-arrow:disabled,
@@ -1354,7 +1344,7 @@ QDoubleSpinBox::down-arrow:disabled,
 QTimeEdit::down-arrow:disabled,
 QDateEdit::down-arrow:disabled,
 QDateTimeEdit::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox */
@@ -1373,17 +1363,17 @@ QComboBox::drop-down:focus {
 }
 
 QComboBox::down-arrow {
-    image: url(qss:images/down_arrow_dark.png);
+    image: url(qss:images_dark-light/down_arrow_dark.svg);
 }
 
 QComboBox::down-arrow:on,
 QComboBox::down-arrow:focus {
-    image: url(qss:images/down_arrow_lighter.png);
+    image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QComboBox::down-arrow:off,
 QComboBox::down-arrow:disabled {
-    image: url(qss:images/down_arrow_disabled_dark.png);
+    image: url(qss:images_dark-light/down_arrow_disabled_dark.svg);
 }
 
 /* ComboBox menu */
@@ -1576,7 +1566,7 @@ QRadioButton::indicator:unchecked{
 QRadioButton::indicator:checked {
     background-color: #daa116; /* QCheckBox has the same color */
     border: 1px solid #d0970c; /* QCheckBox has the same color */
-    image:url(qss:images/radiobutton_light.png);
+    image:url(qss:images_dark-light/radiobutton_light.svg);
 }
 
 QRadioButton,
@@ -1638,7 +1628,7 @@ QCheckBox::indicator:checked:pressed {
 QCheckBox::indicator:checked {
     background-color: #daa116; /* QRadioButton has the same color */
     border: 1px solid #d0970c; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QCheckBox:disabled {
@@ -1654,7 +1644,7 @@ QCheckBox::indicator:disabled {
 QCheckBox::indicator:indeterminate {
     background-color: #daa116;
     border: 1px solid #d0970c;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 QCheckBox:focus {
@@ -1708,7 +1698,7 @@ QListWidget::indicator:checked,
 QTreeView::indicator:checked {
     background-color: #daa116; /* QRadioButton has the same color */
     border: 1px solid #d0970c; /* QRadioButton has the same color */
-    image:url(qss:images/checkbox_light.png);
+    image:url(qss:images_dark-light/checkbox_light.svg);
 }
 
 QListWidget::indicator:disabled,
@@ -1721,7 +1711,7 @@ QListWidget::indicator:indeterminate,
 QTreeView::indicator:indeterminate {
     background-color: #daa116;
     border: 1px solid #d0970c;
-    image: url(qss:images/checkbox_indeterminate_light.png);
+    image: url(qss:images_dark-light/checkbox_indeterminate_light.svg);
 }
 
 
@@ -1882,20 +1872,20 @@ QToolBar > QToolButton:pressed {
 }
 
 /* ToolBar menu buttons (buttons with drop-down menu) */
-QToolButton#qt_toolbutton_menubutton {
+QToolBar > QToolButton#qt_toolbutton_menubutton {
     padding-right: 20px; /* Hack to add more width to buttons with menu */
     border: 1px solid transparent;
     border-radius: 3px;
 }
 
-QToolButton#qt_toolbutton_menubutton:hover,
-QToolButton#qt_toolbutton_menubutton:pressed,
-QToolButton#qt_toolbutton_menubutton:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton:open {
     border: 1px solid #e3b64d;
 }
 
 QToolBar QToolButton::menu-button,
-QToolButton#qt_toolbutton_menubutton::menu-button {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button {
     border: none;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
@@ -1904,14 +1894,14 @@ QToolButton#qt_toolbutton_menubutton::menu-button {
     background-color: transparent;
 }
 
-QToolButton#qt_toolbutton_menubutton::menu-button:hover,
-QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
-QToolButton#qt_toolbutton_menubutton::menu-button:open {
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:hover,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:pressed,
+QToolBar > QToolButton#qt_toolbutton_menubutton::menu-button:open {
     background-color: qlineargradient(spread:pad, x1:1, y1:0.8, x2:1, y2:0, stop:0 #daa116, stop:1 #e3b64d);
 }
 
 QToolBar > QToolButton::menu-arrow {
-    background-image: url(qss:images/down_arrow_dark.png);
+    background-image: url(qss:images_dark-light/down_arrow_dark.svg);
     background-position: center center;
     background-repeat: none;
     subcontrol-origin: padding;
@@ -1920,11 +1910,11 @@ QToolBar > QToolButton::menu-arrow {
 }
 
 QToolBar > QToolButton::menu-arrow:hover {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 QToolBar > QToolButton::menu-arrow:open {
-    background-image: url(qss:images/down_arrow_lighter.png);
+    background-image: url(qss:images_dark-light/down_arrow_lighter.svg);
 }
 
 /* when QToolButton is checked: */
@@ -1942,20 +1932,20 @@ QToolButton:checked:hover {
 QToolBar QToolButton#qt_toolbar_ext_button {
     margin: 0px;
     padding: 0px;
-    /*background-image: url(qss:images/more_dark.png);*/
+    /*background-image: url(qss:images_dark-light/more_dark.svg);*/
     image: transparent;
     background-repeat: none;
     background-position: center left;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:hover {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #e0e0e0;
     background-color: #e0e0e0;
 }
 
 QToolBar QToolButton#qt_toolbar_ext_button:on {
-    /*background-image: url(qss:images/more_light.png);*/
+    /*background-image: url(qss:images_dark-light/more_light.svg);*/
     border-color: #e0e0e0;
     background-color: #e0e0e0;
 }
diff --git a/src/Gui/Stylesheets/images/Hmovetoolbar_dark.png b/src/Gui/Stylesheets/images/Hmovetoolbar_dark.png
deleted file mode 100644
index a408e856fb..0000000000
Binary files a/src/Gui/Stylesheets/images/Hmovetoolbar_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/Hmovetoolbar_light.png b/src/Gui/Stylesheets/images/Hmovetoolbar_light.png
deleted file mode 100644
index 663b643a73..0000000000
Binary files a/src/Gui/Stylesheets/images/Hmovetoolbar_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/Hsepartoolbar_dark.png b/src/Gui/Stylesheets/images/Hsepartoolbar_dark.png
deleted file mode 100644
index 002fad040e..0000000000
Binary files a/src/Gui/Stylesheets/images/Hsepartoolbar_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/Hsepartoolbar_light.png b/src/Gui/Stylesheets/images/Hsepartoolbar_light.png
deleted file mode 100644
index 841f467841..0000000000
Binary files a/src/Gui/Stylesheets/images/Hsepartoolbar_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/Vmovetoolbar_dark.png b/src/Gui/Stylesheets/images/Vmovetoolbar_dark.png
deleted file mode 100644
index a73ced8bfe..0000000000
Binary files a/src/Gui/Stylesheets/images/Vmovetoolbar_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/Vmovetoolbar_light.png b/src/Gui/Stylesheets/images/Vmovetoolbar_light.png
deleted file mode 100644
index 7b5130ab53..0000000000
Binary files a/src/Gui/Stylesheets/images/Vmovetoolbar_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/Vsepartoolbar_dark.png b/src/Gui/Stylesheets/images/Vsepartoolbar_dark.png
deleted file mode 100644
index 18806c5bae..0000000000
Binary files a/src/Gui/Stylesheets/images/Vsepartoolbar_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/Vsepartoolbar_light.png b/src/Gui/Stylesheets/images/Vsepartoolbar_light.png
deleted file mode 100644
index 4b62f795be..0000000000
Binary files a/src/Gui/Stylesheets/images/Vsepartoolbar_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/background_freecad.png b/src/Gui/Stylesheets/images/background_freecad.png
deleted file mode 100644
index ee72af5764..0000000000
Binary files a/src/Gui/Stylesheets/images/background_freecad.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/branch_closed_dark.png b/src/Gui/Stylesheets/images/branch_closed_dark.png
deleted file mode 100644
index c39992345c..0000000000
Binary files a/src/Gui/Stylesheets/images/branch_closed_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/branch_closed_darker.png b/src/Gui/Stylesheets/images/branch_closed_darker.png
deleted file mode 100644
index ff8af8bad1..0000000000
Binary files a/src/Gui/Stylesheets/images/branch_closed_darker.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/branch_end.png b/src/Gui/Stylesheets/images/branch_end.png
deleted file mode 100644
index 963a7cb31b..0000000000
Binary files a/src/Gui/Stylesheets/images/branch_end.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/branch_more.png b/src/Gui/Stylesheets/images/branch_more.png
deleted file mode 100644
index 7c534f17bf..0000000000
Binary files a/src/Gui/Stylesheets/images/branch_more.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/branch_open_dark.png b/src/Gui/Stylesheets/images/branch_open_dark.png
deleted file mode 100644
index 4d04a22389..0000000000
Binary files a/src/Gui/Stylesheets/images/branch_open_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/branch_open_darker.png b/src/Gui/Stylesheets/images/branch_open_darker.png
deleted file mode 100644
index cdbc89e6c5..0000000000
Binary files a/src/Gui/Stylesheets/images/branch_open_darker.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/branch_vline.png b/src/Gui/Stylesheets/images/branch_vline.png
deleted file mode 100644
index b4c98266a0..0000000000
Binary files a/src/Gui/Stylesheets/images/branch_vline.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/checkbox_indeterminate_light.png b/src/Gui/Stylesheets/images/checkbox_indeterminate_light.png
deleted file mode 100644
index 9d79911314..0000000000
Binary files a/src/Gui/Stylesheets/images/checkbox_indeterminate_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/checkbox_light.png b/src/Gui/Stylesheets/images/checkbox_light.png
deleted file mode 100644
index 0e8882c703..0000000000
Binary files a/src/Gui/Stylesheets/images/checkbox_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/close_dark.png b/src/Gui/Stylesheets/images/close_dark.png
deleted file mode 100644
index 8771a0bd18..0000000000
Binary files a/src/Gui/Stylesheets/images/close_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/close_light.png b/src/Gui/Stylesheets/images/close_light.png
deleted file mode 100644
index 3e6b9d8377..0000000000
Binary files a/src/Gui/Stylesheets/images/close_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/down_arrow_dark.png b/src/Gui/Stylesheets/images/down_arrow_dark.png
deleted file mode 100644
index 296a86fe07..0000000000
Binary files a/src/Gui/Stylesheets/images/down_arrow_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/down_arrow_darker.png b/src/Gui/Stylesheets/images/down_arrow_darker.png
deleted file mode 100644
index 5ac0b88829..0000000000
Binary files a/src/Gui/Stylesheets/images/down_arrow_darker.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/down_arrow_disabled_dark.png b/src/Gui/Stylesheets/images/down_arrow_disabled_dark.png
deleted file mode 100644
index 9be5446a96..0000000000
Binary files a/src/Gui/Stylesheets/images/down_arrow_disabled_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/down_arrow_disabled_light.png b/src/Gui/Stylesheets/images/down_arrow_disabled_light.png
deleted file mode 100644
index b5e881a15e..0000000000
Binary files a/src/Gui/Stylesheets/images/down_arrow_disabled_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/down_arrow_light.png b/src/Gui/Stylesheets/images/down_arrow_light.png
deleted file mode 100644
index 29c473dea1..0000000000
Binary files a/src/Gui/Stylesheets/images/down_arrow_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/down_arrow_lighter.png b/src/Gui/Stylesheets/images/down_arrow_lighter.png
deleted file mode 100644
index 73ee03ebda..0000000000
Binary files a/src/Gui/Stylesheets/images/down_arrow_lighter.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/left_arrow_dark.png b/src/Gui/Stylesheets/images/left_arrow_dark.png
deleted file mode 100644
index 0084e1fe4b..0000000000
Binary files a/src/Gui/Stylesheets/images/left_arrow_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/left_arrow_darker.png b/src/Gui/Stylesheets/images/left_arrow_darker.png
deleted file mode 100644
index 18ecee7a49..0000000000
Binary files a/src/Gui/Stylesheets/images/left_arrow_darker.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/left_arrow_disabled_dark.png b/src/Gui/Stylesheets/images/left_arrow_disabled_dark.png
deleted file mode 100644
index db9da5d596..0000000000
Binary files a/src/Gui/Stylesheets/images/left_arrow_disabled_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/left_arrow_disabled_light.png b/src/Gui/Stylesheets/images/left_arrow_disabled_light.png
deleted file mode 100644
index a1b787f72b..0000000000
Binary files a/src/Gui/Stylesheets/images/left_arrow_disabled_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/left_arrow_light.png b/src/Gui/Stylesheets/images/left_arrow_light.png
deleted file mode 100644
index 3bcdd8125c..0000000000
Binary files a/src/Gui/Stylesheets/images/left_arrow_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/left_arrow_lighter.png b/src/Gui/Stylesheets/images/left_arrow_lighter.png
deleted file mode 100644
index 01fbda8a09..0000000000
Binary files a/src/Gui/Stylesheets/images/left_arrow_lighter.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/more_dark.png b/src/Gui/Stylesheets/images/more_dark.png
deleted file mode 100644
index 9bc9002344..0000000000
Binary files a/src/Gui/Stylesheets/images/more_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/more_light.png b/src/Gui/Stylesheets/images/more_light.png
deleted file mode 100644
index 6a958cb93f..0000000000
Binary files a/src/Gui/Stylesheets/images/more_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/radiobutton_light.png b/src/Gui/Stylesheets/images/radiobutton_light.png
deleted file mode 100644
index e9a7e24308..0000000000
Binary files a/src/Gui/Stylesheets/images/radiobutton_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/right_arrow_dark.png b/src/Gui/Stylesheets/images/right_arrow_dark.png
deleted file mode 100644
index 89cf86589f..0000000000
Binary files a/src/Gui/Stylesheets/images/right_arrow_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/right_arrow_darker.png b/src/Gui/Stylesheets/images/right_arrow_darker.png
deleted file mode 100644
index 884627afe2..0000000000
Binary files a/src/Gui/Stylesheets/images/right_arrow_darker.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/right_arrow_disabled_dark.png b/src/Gui/Stylesheets/images/right_arrow_disabled_dark.png
deleted file mode 100644
index 8972887eec..0000000000
Binary files a/src/Gui/Stylesheets/images/right_arrow_disabled_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/right_arrow_disabled_light.png b/src/Gui/Stylesheets/images/right_arrow_disabled_light.png
deleted file mode 100644
index 711cf0fc26..0000000000
Binary files a/src/Gui/Stylesheets/images/right_arrow_disabled_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/right_arrow_light.png b/src/Gui/Stylesheets/images/right_arrow_light.png
deleted file mode 100644
index ac25f58d29..0000000000
Binary files a/src/Gui/Stylesheets/images/right_arrow_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/right_arrow_lighter.png b/src/Gui/Stylesheets/images/right_arrow_lighter.png
deleted file mode 100644
index 0e56941684..0000000000
Binary files a/src/Gui/Stylesheets/images/right_arrow_lighter.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/sizegrip_dark.png b/src/Gui/Stylesheets/images/sizegrip_dark.png
deleted file mode 100644
index 0c3de41211..0000000000
Binary files a/src/Gui/Stylesheets/images/sizegrip_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/sizegrip_light.png b/src/Gui/Stylesheets/images/sizegrip_light.png
deleted file mode 100644
index 14fd8136f0..0000000000
Binary files a/src/Gui/Stylesheets/images/sizegrip_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/splitter_horizontal_dark.png b/src/Gui/Stylesheets/images/splitter_horizontal_dark.png
deleted file mode 100644
index 9d8e67396d..0000000000
Binary files a/src/Gui/Stylesheets/images/splitter_horizontal_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/splitter_horizontal_light.png b/src/Gui/Stylesheets/images/splitter_horizontal_light.png
deleted file mode 100644
index 217271b94f..0000000000
Binary files a/src/Gui/Stylesheets/images/splitter_horizontal_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/splitter_vertical_dark.png b/src/Gui/Stylesheets/images/splitter_vertical_dark.png
deleted file mode 100644
index b4c30d6386..0000000000
Binary files a/src/Gui/Stylesheets/images/splitter_vertical_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/splitter_vertical_light.png b/src/Gui/Stylesheets/images/splitter_vertical_light.png
deleted file mode 100644
index 1473e2b32c..0000000000
Binary files a/src/Gui/Stylesheets/images/splitter_vertical_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/transparent.png b/src/Gui/Stylesheets/images/transparent.png
deleted file mode 100644
index 483df25137..0000000000
Binary files a/src/Gui/Stylesheets/images/transparent.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/undock_dark.png b/src/Gui/Stylesheets/images/undock_dark.png
deleted file mode 100644
index 01b678559e..0000000000
Binary files a/src/Gui/Stylesheets/images/undock_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/undock_light.png b/src/Gui/Stylesheets/images/undock_light.png
deleted file mode 100644
index 36881f6425..0000000000
Binary files a/src/Gui/Stylesheets/images/undock_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up-down_arrow_dark.png b/src/Gui/Stylesheets/images/up-down_arrow_dark.png
deleted file mode 100644
index 2941cd4548..0000000000
Binary files a/src/Gui/Stylesheets/images/up-down_arrow_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up-down_arrow_darker.png b/src/Gui/Stylesheets/images/up-down_arrow_darker.png
deleted file mode 100644
index 8dc85d4a62..0000000000
Binary files a/src/Gui/Stylesheets/images/up-down_arrow_darker.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up-down_arrow_disabled_dark.png b/src/Gui/Stylesheets/images/up-down_arrow_disabled_dark.png
deleted file mode 100644
index ba48476e71..0000000000
Binary files a/src/Gui/Stylesheets/images/up-down_arrow_disabled_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up-down_arrow_disabled_light.png b/src/Gui/Stylesheets/images/up-down_arrow_disabled_light.png
deleted file mode 100644
index d3e2a30128..0000000000
Binary files a/src/Gui/Stylesheets/images/up-down_arrow_disabled_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up-down_arrow_light.png b/src/Gui/Stylesheets/images/up-down_arrow_light.png
deleted file mode 100644
index 425744971b..0000000000
Binary files a/src/Gui/Stylesheets/images/up-down_arrow_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up-down_arrow_lighter.png b/src/Gui/Stylesheets/images/up-down_arrow_lighter.png
deleted file mode 100644
index 4db20d77d2..0000000000
Binary files a/src/Gui/Stylesheets/images/up-down_arrow_lighter.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up_arrow_dark.png b/src/Gui/Stylesheets/images/up_arrow_dark.png
deleted file mode 100644
index bb65cebebf..0000000000
Binary files a/src/Gui/Stylesheets/images/up_arrow_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up_arrow_darker.png b/src/Gui/Stylesheets/images/up_arrow_darker.png
deleted file mode 100644
index da2b6a28d5..0000000000
Binary files a/src/Gui/Stylesheets/images/up_arrow_darker.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up_arrow_disabled_dark.png b/src/Gui/Stylesheets/images/up_arrow_disabled_dark.png
deleted file mode 100644
index d21f24c5a6..0000000000
Binary files a/src/Gui/Stylesheets/images/up_arrow_disabled_dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up_arrow_disabled_light.png b/src/Gui/Stylesheets/images/up_arrow_disabled_light.png
deleted file mode 100644
index 6a56e89ba8..0000000000
Binary files a/src/Gui/Stylesheets/images/up_arrow_disabled_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up_arrow_light.png b/src/Gui/Stylesheets/images/up_arrow_light.png
deleted file mode 100644
index 675aa98fda..0000000000
Binary files a/src/Gui/Stylesheets/images/up_arrow_light.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images/up_arrow_lighter.png b/src/Gui/Stylesheets/images/up_arrow_lighter.png
deleted file mode 100644
index cfe3fd389a..0000000000
Binary files a/src/Gui/Stylesheets/images/up_arrow_lighter.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_dark-light/Hmovetoolbar_dark.svg b/src/Gui/Stylesheets/images_dark-light/Hmovetoolbar_dark.svg
new file mode 100644
index 0000000000..2331d4b961
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/Hmovetoolbar_dark.svg
@@ -0,0 +1,108 @@
+<?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="6"
+   height="4"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Hmovetoolbar_dark.svg"
+   viewBox="0 0 6 4">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.419567"
+     inkscape:cx="4.8611848"
+     inkscape:cy="1.2762259"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-352.59799)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.23529412;fill-rule:evenodd;stroke:none;stroke-width:3.77952766;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect969"
+       width="2"
+       height="2"
+       x="1074.0664"
+       y="352.59799" />
+    <rect
+       y="352.59799"
+       x="1078.0664"
+       height="2"
+       width="2"
+       id="rect971"
+       style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.23529412;fill-rule:evenodd;stroke:none;stroke-width:3.77952766;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/Hmovetoolbar_light.svg b/src/Gui/Stylesheets/images_dark-light/Hmovetoolbar_light.svg
new file mode 100644
index 0000000000..494a7ea532
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/Hmovetoolbar_light.svg
@@ -0,0 +1,108 @@
+<?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="6"
+   height="4"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Hmovetoolbar_light.svg"
+   viewBox="0 0 6 4">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.419567"
+     inkscape:cx="4.8611848"
+     inkscape:cy="1.2762259"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-352.59799)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.23529412;fill-rule:evenodd;stroke:none;stroke-width:3.77952766;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect969"
+       width="2"
+       height="2"
+       x="1074.0664"
+       y="352.59799" />
+    <rect
+       y="352.59799"
+       x="1078.0664"
+       height="2"
+       width="2"
+       id="rect971"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.23529412;fill-rule:evenodd;stroke:none;stroke-width:3.77952766;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/Hsepartoolbar_dark.svg b/src/Gui/Stylesheets/images_dark-light/Hsepartoolbar_dark.svg
new file mode 100644
index 0000000000..ed555b1719
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/Hsepartoolbar_dark.svg
@@ -0,0 +1,99 @@
+<?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="7"
+   height="63"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Hsepartoolbar_dark.svg"
+   viewBox="0 0 7 63">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.6819036"
+     inkscape:cx="7.5833169"
+     inkscape:cy="28.832854"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="0"
+       originy="0"
+       enabled="true"
+       spacingx="0.5"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1070.0664,-293.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.39215686"
+       d="m 1073.5664,306.59799 v 37"
+       id="path1145"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/Hsepartoolbar_light.svg b/src/Gui/Stylesheets/images_dark-light/Hsepartoolbar_light.svg
new file mode 100644
index 0000000000..99fe70f5ae
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/Hsepartoolbar_light.svg
@@ -0,0 +1,99 @@
+<?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="7"
+   height="63"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Hsepartoolbar_light.svg"
+   viewBox="0 0 7 63">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.6819036"
+     inkscape:cx="7.5833169"
+     inkscape:cy="28.832854"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="0"
+       originy="0"
+       enabled="true"
+       spacingx="0.5"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1070.0664,-293.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.39215687"
+       d="m 1073.5664,306.59799 v 37"
+       id="path1145"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/Vmovetoolbar_light.svg b/src/Gui/Stylesheets/images_dark-light/Vmovetoolbar_light.svg
new file mode 100644
index 0000000000..129238055f
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/Vmovetoolbar_light.svg
@@ -0,0 +1,108 @@
+<?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="4"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Vmovetoolbar_light.svg"
+   viewBox="0 0 4 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9441002"
+     inkscape:cy="6.1813361"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-4.9218749e-05"
+       originy="1.0296328e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.50980395;fill-rule:evenodd;stroke:none;stroke-width:3.77952766;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1513"
+       width="2"
+       height="2"
+       x="1074.0664"
+       y="350.59799" />
+    <rect
+       y="354.59799"
+       x="1074.0664"
+       height="2"
+       width="2"
+       id="rect1515"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.50980395;fill-rule:evenodd;stroke:none;stroke-width:3.77952766;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/Vsepartoolbar_dark.svg b/src/Gui/Stylesheets/images_dark-light/Vsepartoolbar_dark.svg
new file mode 100644
index 0000000000..d3a09cce6b
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/Vsepartoolbar_dark.svg
@@ -0,0 +1,99 @@
+<?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="63"
+   height="7"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Vsepartoolbar_dark.svg"
+   viewBox="0 0 63 7">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.871661"
+     inkscape:cx="26.215694"
+     inkscape:cy="2.5788752"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.5468749e-05"
+       originy="1.2239687e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-349.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.35294119"
+       d="m 1097.5664,353.09799 h 16"
+       id="path2004"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/Vsepartoolbar_light.svg b/src/Gui/Stylesheets/images_dark-light/Vsepartoolbar_light.svg
new file mode 100644
index 0000000000..425360b657
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/Vsepartoolbar_light.svg
@@ -0,0 +1,99 @@
+<?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="63"
+   height="7"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Vsepartoolbar_light.svg"
+   viewBox="0 0 63 7">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.871661"
+     inkscape:cx="26.215694"
+     inkscape:cy="2.5788752"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.5468749e-05"
+       originy="1.2239687e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-349.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412"
+       d="m 1097.5664,353.09799 h 16"
+       id="path2004"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/background_freecad.svg b/src/Gui/Stylesheets/images_dark-light/background_freecad.svg
new file mode 100644
index 0000000000..71cbb0b7b6
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/background_freecad.svg
@@ -0,0 +1,221 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="200"
+   height="187"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="background_freecad.svg"
+   viewBox="0 0 200 187">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3864">
+      <stop
+         style="stop-color:#71b2f8;stop-opacity:1;"
+         offset="0"
+         id="stop3866" />
+      <stop
+         style="stop-color:#002795;stop-opacity:1;"
+         offset="1"
+         id="stop3868" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3682">
+      <stop
+         id="stop3684"
+         offset="0"
+         style="stop-color:#ff6d0f;stop-opacity:1;" />
+      <stop
+         id="stop3686"
+         offset="1"
+         style="stop-color:#ff1000;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3148"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3864-9">
+      <stop
+         id="stop3866-1"
+         offset="0"
+         style="stop-color:#204a87;stop-opacity:1" />
+      <stop
+         id="stop3868-1"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3682-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3684-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3686-0" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3148-5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3682-0-6"
+       id="radialGradient3817-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2361257,0.30001695,-0.83232803,3.3883821,-499.9452,-167.33108)"
+       cx="270.58316"
+       cy="33.899986"
+       fx="270.58316"
+       fy="33.899986"
+       r="19.571428" />
+    <linearGradient
+       id="linearGradient3682-0-6">
+      <stop
+         style="stop-color:#ff390f;stop-opacity:1"
+         offset="0"
+         id="stop3684-0-7" />
+      <stop
+         style="stop-color:#ff1000;stop-opacity:1;"
+         offset="1"
+         id="stop3686-0-5" />
+    </linearGradient>
+    <radialGradient
+       r="19.571428"
+       fy="29.149046"
+       fx="282.64584"
+       cy="29.149046"
+       cx="282.64584"
+       gradientTransform="matrix(5.7288511,8.9513089,-9.5679943,6.1235071,58.310989,-2259.7896)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3661"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="33.899986"
+       fx="270.58316"
+       cy="33.899986"
+       cx="270.58316"
+       gradientTransform="matrix(10.324266,2.5208852,-6.9517116,28.470721,-1273.3834,-1264.2181)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3817"
+       xlink:href="#linearGradient3682"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3148-4"
+       inkscape:persp3d-origin="32.000001 : 21.333333 : 1"
+       inkscape:vp_z="64.000003 : 31.999999 : 1"
+       inkscape:vp_y="0 : 999.99999 : 0"
+       inkscape:vp_x="0 : 31.999999 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.9839572"
+     inkscape:cx="100"
+     inkscape:cy="93.5"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-6.1718749e-05"
+       originy="1.4183046e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-169.59799)">
+    <g
+       id="g2894"
+       transform="matrix(0.33206214,0,0,0.33206214,712.95729,111.07002)"
+       style="opacity:0.2">
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         id="rect3663"
+         d="m 1087.4726,176.65061 v 513.93534 h 114.5937 V 489.46824 h 81.0258 v -79.28958 h -81.0258 V 324.59797 H 1401.669 V 176.93999 Z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3817);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:17.6867981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3659"
+         d="m 1597.5716,329.82 -66.6566,38.24317 -29.435,-10.21474 -28.0834,-71.77244 -44.1768,2.3215 -20.1502,74.2172 -28.2013,13.50502 -70.3389,-30.76959 -29.7092,33.01397 38.2432,66.65655 -10.4507,29.34873 -71.7725,28.08347 2.5574,44.26291 74.2173,20.15017 13.505,28.20126 -31.0055,70.25278 33.0139,29.70922 66.6565,-38.24319 29.5848,10.53691 27.8475,71.68628 44.4989,-2.47136 19.9142,-74.30332 28.2013,-13.50504 70.4886,31.09176 29.7093,-33.01397 -38.2432,-66.65654 10.3008,-29.67091 71.6863,-27.84751 -2.2352,-44.41269 -74.3034,-19.91417 -13.5051,-28.20126 30.8558,-70.57495 z m -99.8313,109.30858 13.6832,7.9392 11.855,10.74852 9.491,12.8273 6.8274,14.26172 4.0141,15.374 0.6649,15.75571 -2.2756,15.75162 -5.1935,14.95348 -8.2614,13.83305 -10.4263,11.7051 -12.8273,9.49098 -14.2618,6.82739 -15.3739,4.01409 -15.8419,0.9011 -15.7517,-2.27551 -14.9534,-5.19354 -13.833,-8.26139 -11.6191,-10.66236 -9.577,-12.59128 -6.8275,-14.26171 -3.9279,-15.61 -0.901,-15.84188 2.2755,-15.75166 5.1936,-14.95344 8.1752,-13.59707 10.5126,-11.94108 12.8273,-9.49099 14.2616,-6.82741 15.61,-3.92789 15.7557,-0.66506 15.7517,2.27549 14.9534,5.19356 z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3661);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:17.6867981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_end_closed_dark.svg b/src/Gui/Stylesheets/images_dark-light/branch_end_closed_dark.svg
new file mode 100644
index 0000000000..c44a33a1e4
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_end_closed_dark.svg
@@ -0,0 +1,111 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_end_closed.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.861905"
+     inkscape:cx="11.795005"
+     inkscape:cy="9.9557736"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706"
+       d="m 1083.5663,336.59799 v 8 c 0,1.5 1,2.5 2.5,2.5 h 8"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <g
+       transform="translate(7.0000156,-5.4999999)"
+       id="layer1-4"
+       inkscape:label="Capa 1">
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path2474"
+         d="m 1075.0663,348.59798 3,3.50001 -3,3.49999"
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.34901961" />
+    </g>
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_end_closed_light.svg b/src/Gui/Stylesheets/images_dark-light/branch_end_closed_light.svg
new file mode 100644
index 0000000000..157066aa27
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_end_closed_light.svg
@@ -0,0 +1,106 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_end_closed_light.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.861905"
+     inkscape:cx="2.9338207"
+     inkscape:cy="9.5529925"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412"
+       d="m 1083.5663,336.59799 v 8 c 0,1.5 1,2.5 2.5,2.5 h 8"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1082.0663,343.09798 3,3.50001 -3,3.49999"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_end_dark.svg b/src/Gui/Stylesheets/images_dark-light/branch_end_dark.svg
new file mode 100644
index 0000000000..ff6154085a
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_end_dark.svg
@@ -0,0 +1,100 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_end.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.149996"
+     inkscape:cx="10.026919"
+     inkscape:cy="10.000001"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706"
+       d="m 1083.5663,336.59799 v 8 c 0,1.5 1,2.5 2.5,2.5 h 8"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_end_light.svg b/src/Gui/Stylesheets/images_dark-light/branch_end_light.svg
new file mode 100644
index 0000000000..2c589e7423
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_end_light.svg
@@ -0,0 +1,100 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_end_light.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.861905"
+     inkscape:cx="2.9338207"
+     inkscape:cy="9.5529925"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412"
+       d="m 1083.5663,336.59799 v 8 c 0,1.5 1,2.5 2.5,2.5 h 8"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_end_open_dark.svg b/src/Gui/Stylesheets/images_dark-light/branch_end_open_dark.svg
new file mode 100644
index 0000000000..ffcf76a567
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_end_open_dark.svg
@@ -0,0 +1,111 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_end_open.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.046714"
+     inkscape:cx="11.269764"
+     inkscape:cy="9.7225656"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706"
+       d="m 1083.5663,336.59799 v 8 c 0,1.5 1,2.5 2.5,2.5 h 8"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <g
+       transform="rotate(90,1082.5663,353.098)"
+       id="layer1-4"
+       inkscape:label="Capa 1">
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path2474"
+         d="m 1075.0663,348.59798 3,3.50001 -3,3.49999"
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.34901961" />
+    </g>
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_end_open_light.svg b/src/Gui/Stylesheets/images_dark-light/branch_end_open_light.svg
new file mode 100644
index 0000000000..e384d064a1
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_end_open_light.svg
@@ -0,0 +1,106 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_end_open_light.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.861905"
+     inkscape:cx="2.9338207"
+     inkscape:cy="9.5529925"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412"
+       d="m 1083.5663,336.59799 v 8 c 0,1.5 1,2.5 2.5,2.5 h 8"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1087.0663,345.59799 -3.5,3 -3.5,-3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_more_closed_dark.svg b/src/Gui/Stylesheets/images_dark-light/branch_more_closed_dark.svg
new file mode 100644
index 0000000000..a1eeefc0b9
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_more_closed_dark.svg
@@ -0,0 +1,110 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_more_closed.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.046714"
+     inkscape:cx="11.269764"
+     inkscape:cy="9.7225656"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="363"
+     inkscape:window-y="56"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706"
+       d="m 1094.0663,347.09799 h -10"
+       id="path1730"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706"
+       d="m 1083.5663,336.59799 v 20"
+       id="path1728"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:1.99999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.34901961"
+       d="m 1082.0663,343.09798 3,3.50001 -3,3.49999"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_more_closed_light.svg b/src/Gui/Stylesheets/images_dark-light/branch_more_closed_light.svg
new file mode 100644
index 0000000000..01a6e6d71c
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_more_closed_light.svg
@@ -0,0 +1,112 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_more_closed_light.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.861905"
+     inkscape:cx="2.9338207"
+     inkscape:cy="9.5529925"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412"
+       d="m 1083.5663,336.59799 0,20"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1082.0663,343.59799 3,3.5 -3,3.5"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path2301"
+       d="m 1084.0663,347.09799 h 10"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_more_dark.svg b/src/Gui/Stylesheets/images_dark-light/branch_more_dark.svg
new file mode 100644
index 0000000000..0a5dc08e1d
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_more_dark.svg
@@ -0,0 +1,104 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_more.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.468465"
+     inkscape:cx="10.075775"
+     inkscape:cy="9.755721"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706"
+       d="m 1094.0663,347.09799 h -10"
+       id="path1730"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:0.99999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706"
+       d="m 1083.5663,336.59799 v 20"
+       id="path1728"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_more_light.svg b/src/Gui/Stylesheets/images_dark-light/branch_more_light.svg
new file mode 100644
index 0000000000..2e843763e0
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_more_light.svg
@@ -0,0 +1,106 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_more_light.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.861905"
+     inkscape:cx="11.795005"
+     inkscape:cy="9.9557736"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412"
+       d="m 1083.5663,336.59799 0,20"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path2301"
+       d="m 1084.0663,347.09799 h 10"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_more_open_dark.svg b/src/Gui/Stylesheets/images_dark-light/branch_more_open_dark.svg
new file mode 100644
index 0000000000..265aaefb34
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_more_open_dark.svg
@@ -0,0 +1,120 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_more_open.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.046714"
+     inkscape:cx="11.269764"
+     inkscape:cy="9.7225656"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <g
+       transform="rotate(90,1082.5663,353.098)"
+       id="layer1-4"
+       inkscape:label="Capa 1">
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path2474"
+         d="m 1075.0663,348.59798 3,3.50001 -3,3.49999"
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.34901961" />
+    </g>
+    <g
+       transform="translate(1.5420313e-5)"
+       id="layer1-6"
+       inkscape:label="Capa 1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1730"
+         d="m 1094.0663,347.09799 h -10"
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1728"
+         d="m 1083.5663,336.59799 v 20"
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706" />
+    </g>
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_more_open_light.svg b/src/Gui/Stylesheets/images_dark-light/branch_more_open_light.svg
new file mode 100644
index 0000000000..689f1c044f
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_more_open_light.svg
@@ -0,0 +1,112 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_more_open_light.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.861905"
+     inkscape:cx="2.9338207"
+     inkscape:cy="9.5529925"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412"
+       d="m 1083.5663,336.59799 0,20"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1087.0663,345.59799 -3.5,3 -3.5,-3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path2301"
+       d="m 1084.0663,347.09799 h 10"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_vline_dark.svg b/src/Gui/Stylesheets/images_dark-light/branch_vline_dark.svg
new file mode 100644
index 0000000000..9865088d90
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_vline_dark.svg
@@ -0,0 +1,99 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_vline.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.468465"
+     inkscape:cx="4.8170934"
+     inkscape:cy="9.51669"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:0.99999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706"
+       d="m 1083.5663,336.59799 v 20"
+       id="path1728"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/branch_vline_light.svg b/src/Gui/Stylesheets/images_dark-light/branch_vline_light.svg
new file mode 100644
index 0000000000..c9118b390d
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/branch_vline_light.svg
@@ -0,0 +1,100 @@
+<?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="20.000002"
+   height="20.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="branch_vline_light.svg"
+   viewBox="0 0 20.000002 20.000001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.861905"
+     inkscape:cx="2.9338207"
+     inkscape:cy="9.5529925"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="1.5820313e-05"
+       originy="1.5795308e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-336.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23529412"
+       d="m 1083.5663,336.59799 0,20"
+       id="path1536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/checkbox_indeterminate_light.svg b/src/Gui/Stylesheets/images_dark-light/checkbox_indeterminate_light.svg
new file mode 100644
index 0000000000..4e168c64fe
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/checkbox_indeterminate_light.svg
@@ -0,0 +1,104 @@
+<?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="30"
+   height="30"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="background_freecad.svg"
+   viewBox="0 0 30 29.999999">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.046715"
+     inkscape:cx="7.3268577"
+     inkscape:cy="11.793002"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="3.1640626e-05"
+       originy="2.0228902e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-326.59799)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path7901"
+       d="m 1082.0663,343.59799 h 14"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:5.9999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 1082.0663,341.59799 h 14"
+       id="path7899"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/checkbox_light.svg b/src/Gui/Stylesheets/images_dark-light/checkbox_light.svg
new file mode 100644
index 0000000000..86dd9da58f
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/checkbox_light.svg
@@ -0,0 +1,106 @@
+<?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="30"
+   height="30"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="checkbox_light.svg"
+   viewBox="0 0 30 29.999999">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="30.515009"
+     inkscape:cx="10.041114"
+     inkscape:cy="17.952873"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="3.1640626e-05"
+       originy="2.0228902e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-326.59799)">
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path8685"
+       d="m 1081.0663,345.09799 3.9999,4 12.0001,-12"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#1b0909;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.11764706" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 1081.0663,342.59799 3.9999,4 12.0001,-12"
+       id="path7899"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/close_dark.svg b/src/Gui/Stylesheets/images_dark-light/close_dark.svg
new file mode 100644
index 0000000000..8407efa264
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/close_dark.svg
@@ -0,0 +1,99 @@
+<?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="14"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="close_dark.svg"
+   viewBox="0 0 14 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="9.6253537"
+     inkscape:cy="6.3941102"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="4.7460939e-05"
+       originy="4.4662497e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-342.59799)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.35294119;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 2.9902344 1.9902344 A 1.0001 1.0001 0 0 0 2.2929688 3.7070312 L 5.5859375 7 L 2.2929688 10.292969 A 1.0001 1.0001 0 1 0 3.7070312 11.707031 L 7 8.4140625 L 10.292969 11.707031 A 1.0001 1.0001 0 1 0 11.707031 10.292969 L 8.4140625 7 L 11.707031 3.7070312 A 1.0001 1.0001 0 0 0 10.980469 1.9902344 A 1.0001 1.0001 0 0 0 10.292969 2.2929688 L 7 5.5859375 L 3.7070312 2.2929688 A 1.0001 1.0001 0 0 0 2.9902344 1.9902344 z "
+       transform="translate(1074.0663,342.59799)"
+       id="path8784" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/close_light.svg b/src/Gui/Stylesheets/images_dark-light/close_light.svg
new file mode 100644
index 0000000000..557e5a4c6d
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/close_light.svg
@@ -0,0 +1,99 @@
+<?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="14"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="close_light.svg"
+   viewBox="0 0 14 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="9.6253537"
+     inkscape:cy="6.3941102"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="4.7460939e-05"
+       originy="4.4662497e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-342.59799)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.35294119;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 2.9902344 1.9902344 A 1.0001 1.0001 0 0 0 2.2929688 3.7070312 L 5.5859375 7 L 2.2929688 10.292969 A 1.0001 1.0001 0 1 0 3.7070312 11.707031 L 7 8.4140625 L 10.292969 11.707031 A 1.0001 1.0001 0 1 0 11.707031 10.292969 L 8.4140625 7 L 11.707031 3.7070312 A 1.0001 1.0001 0 0 0 10.980469 1.9902344 A 1.0001 1.0001 0 0 0 10.292969 2.2929688 L 7 5.5859375 L 3.7070312 2.2929688 A 1.0001 1.0001 0 0 0 2.9902344 1.9902344 z "
+       transform="translate(1074.0663,342.59799)"
+       id="path8784" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/down_arrow_dark.svg b/src/Gui/Stylesheets/images_dark-light/down_arrow_dark.svg
new file mode 100644
index 0000000000..43d6660c3b
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/down_arrow_dark.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="down_arrow_dark.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="9.6252474"
+     inkscape:cy="6.3941121"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980392"
+       d="m 1082.0663,351.59798 -3.5,3 -3.5,-3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/down_arrow_darker.svg b/src/Gui/Stylesheets/images_dark-light/down_arrow_darker.svg
new file mode 100644
index 0000000000..a92186ce6e
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/down_arrow_darker.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="down_arrow_darker.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="9.6252474"
+     inkscape:cy="6.3941121"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1082.0663,351.59798 -3.5,3 -3.5,-3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/down_arrow_disabled_dark.svg b/src/Gui/Stylesheets/images_dark-light/down_arrow_disabled_dark.svg
new file mode 100644
index 0000000000..c090512064
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/down_arrow_disabled_dark.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="down_arrow_disabled_dark.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="9.6252474"
+     inkscape:cy="6.3941121"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980395"
+       d="m 1082.5663,351.09798 -4,4 -4,-4"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/down_arrow_disabled_light.svg b/src/Gui/Stylesheets/images_dark-light/down_arrow_disabled_light.svg
new file mode 100644
index 0000000000..bc87d61232
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/down_arrow_disabled_light.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="down_arrow_disabled_light.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="9.6252474"
+     inkscape:cy="6.3941121"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1082.5663,351.09798 -4,4 -4,-4"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/down_arrow_light.svg b/src/Gui/Stylesheets/images_dark-light/down_arrow_light.svg
new file mode 100644
index 0000000000..b2deeec40a
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/down_arrow_light.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="down_arrow_light.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="9.6252474"
+     inkscape:cy="6.3941121"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1082.0663,351.59798 -3.5,3 -3.5,-3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/down_arrow_lighter.svg b/src/Gui/Stylesheets/images_dark-light/down_arrow_lighter.svg
new file mode 100644
index 0000000000..d94725e333
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/down_arrow_lighter.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="down_arrow_lighter.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="9.6252474"
+     inkscape:cy="6.3941121"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.90196079"
+       d="m 1082.0663,351.59798 -3.5,3 -3.5,-3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/left_arrow_dark.svg b/src/Gui/Stylesheets/images_dark-light/left_arrow_dark.svg
new file mode 100644
index 0000000000..4523bc444d
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/left_arrow_dark.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="left_arrow_dark.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.697811"
+     inkscape:cx="-6.5450998"
+     inkscape:cy="14.258502"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-6.2500001e-06"
+       originy="1.9433594e-06"
+       enabled="true"
+       spacingx="0.5"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1070.0664,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980395"
+       d="m 1075.0664,354.59804 -3,-3.5 3,-3.5"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/left_arrow_darker.svg b/src/Gui/Stylesheets/images_dark-light/left_arrow_darker.svg
new file mode 100644
index 0000000000..d7cf7b303d
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/left_arrow_darker.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="left_arrow_darker.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.697811"
+     inkscape:cx="5.4294725"
+     inkscape:cy="14.802801"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-6.2500001e-06"
+       originy="1.9433594e-06"
+       enabled="true"
+       spacingx="0.5"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1070.0664,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1075.0664,354.59804 -3,-3.5 3,-3.5"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/left_arrow_disabled_dark.svg b/src/Gui/Stylesheets/images_dark-light/left_arrow_disabled_dark.svg
new file mode 100644
index 0000000000..63275ce90e
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/left_arrow_disabled_dark.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="left_arrow_disabled_dark.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="2.8574619"
+     inkscape:cy="4.483588"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
+       d="m 1079.5664,355.09798 -4,-4 4,-4"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/left_arrow_disabled_light.svg b/src/Gui/Stylesheets/images_dark-light/left_arrow_disabled_light.svg
new file mode 100644
index 0000000000..656cf2d84d
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/left_arrow_disabled_light.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="left_arrow_disabled_light.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="2.8574619"
+     inkscape:cy="4.483588"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980383"
+       d="m 1079.5664,355.09798 -4,-4 4,-4"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/left_arrow_light.svg b/src/Gui/Stylesheets/images_dark-light/left_arrow_light.svg
new file mode 100644
index 0000000000..1f5fdc6d0b
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/left_arrow_light.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="left_arrow_light.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.766667"
+     inkscape:cx="5.3649271"
+     inkscape:cy="7.2936248"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-6.2500001e-06"
+       originy="1.9433594e-06"
+       enabled="true"
+       spacingx="0.5"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1070.0664,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1075.0664,354.59804 -3,-3.5 3,-3.5"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/left_arrow_lighter.svg b/src/Gui/Stylesheets/images_dark-light/left_arrow_lighter.svg
new file mode 100644
index 0000000000..2381880382
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/left_arrow_lighter.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="left_arrow_lighter.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="30.51501"
+     inkscape:cx="5.4420186"
+     inkscape:cy="7.3696368"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-6.2500001e-06"
+       originy="1.9433594e-06"
+       enabled="true"
+       spacingx="0.5"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1070.0664,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.86274511"
+       d="m 1075.0664,354.59804 -3,-3.5 3,-3.5"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/more_dark.svg b/src/Gui/Stylesheets/images_dark-light/more_dark.svg
new file mode 100644
index 0000000000..69ea662c7e
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/more_dark.svg
@@ -0,0 +1,99 @@
+<?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="11"
+   height="11"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="more_dark2.svg"
+   viewBox="0 0 11 11">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="7.6278703"
+     inkscape:cy="6.7258085"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-1.25e-05"
+       originy="3.8867188e-06"
+       enabled="true"
+       spacingx="0.5"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1070.0664,-345.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:#050505;fill-opacity:0.35294119;fill-rule:evenodd;stroke:none;stroke-width:3.77952766;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2 0 C 0.8920031 0 0 0.8920031 0 2 L 0 9 C 0 10.107997 0.8920031 11 2 11 L 9 11 C 10.107997 11 11 10.107997 11 9 L 11 2 C 11 0.8920031 10.107997 0 9 0 L 2 0 z M 5.4921875 1.9941406 A 0.50005 0.50005 0 0 1 6 2.5 L 6 5 L 8.5 5 A 0.50005 0.50005 0 1 1 8.5 6 L 6 6 L 6 8.5 A 0.50005 0.50005 0 1 1 5 8.5 L 5 6 L 2.5 6 A 0.50005 0.50005 0 1 1 2.5 5 L 5 5 L 5 2.5 A 0.50005 0.50005 0 0 1 5.4921875 1.9941406 z "
+       transform="translate(1070.0664,345.59799)"
+       id="rect6655" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/more_light.svg b/src/Gui/Stylesheets/images_dark-light/more_light.svg
new file mode 100644
index 0000000000..fb0f9277a8
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/more_light.svg
@@ -0,0 +1,99 @@
+<?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="11"
+   height="11"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="more_dark.svg"
+   viewBox="0 0 11 11">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="7.6278703"
+     inkscape:cy="6.7258085"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-1.25e-05"
+       originy="3.8867188e-06"
+       enabled="true"
+       spacingx="0.5"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1070.0664,-345.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.35294119;fill-rule:evenodd;stroke:none;stroke-width:3.77952766;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2 0 C 0.8920031 0 0 0.8920031 0 2 L 0 9 C 0 10.107997 0.8920031 11 2 11 L 9 11 C 10.107997 11 11 10.107997 11 9 L 11 2 C 11 0.8920031 10.107997 0 9 0 L 2 0 z M 5.4921875 1.9941406 A 0.50005 0.50005 0 0 1 6 2.5 L 6 5 L 8.5 5 A 0.50005 0.50005 0 1 1 8.5 6 L 6 6 L 6 8.5 A 0.50005 0.50005 0 1 1 5 8.5 L 5 6 L 2.5 6 A 0.50005 0.50005 0 1 1 2.5 5 L 5 5 L 5 2.5 A 0.50005 0.50005 0 0 1 5.4921875 1.9941406 z "
+       transform="translate(1070.0664,345.59799)"
+       id="rect6655" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/radiobutton_light.svg b/src/Gui/Stylesheets/images_dark-light/radiobutton_light.svg
new file mode 100644
index 0000000000..08993896a8
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/radiobutton_light.svg
@@ -0,0 +1,110 @@
+<?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="30"
+   height="30"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="radiobutton_light.svg"
+   viewBox="0 0 30 29.999999">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.697811"
+     inkscape:cx="7.1479536"
+     inkscape:cy="12.99474"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="3.1640626e-05"
+       originy="2.0228902e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-326.59799)">
+    <ellipse
+       ry="5.999999"
+       rx="6.0000114"
+       cy="343.59799"
+       cx="1089.0663"
+       id="ellipse7528"
+       style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.11764706;fill-rule:evenodd;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <ellipse
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path7524"
+       cx="1089.0663"
+       cy="341.59799"
+       rx="6.0000114"
+       ry="5.999999" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/right_arrow_dark.svg b/src/Gui/Stylesheets/images_dark-light/right_arrow_dark.svg
new file mode 100644
index 0000000000..a55a508d0b
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/right_arrow_dark.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="right_arrow_dark.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="2.8574619"
+     inkscape:cy="4.483588"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
+       d="m 1075.0664,354.59798 3,-3.5 -3,-3.5"
+       id="path2474-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/right_arrow_darker.svg b/src/Gui/Stylesheets/images_dark-light/right_arrow_darker.svg
new file mode 100644
index 0000000000..c216e2277e
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/right_arrow_darker.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="right_arrow_darker.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="2.8574619"
+     inkscape:cy="4.483588"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1075.0664,354.59798 3,-3.5 -3,-3.5"
+       id="path2474-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/right_arrow_disabled_dark.svg b/src/Gui/Stylesheets/images_dark-light/right_arrow_disabled_dark.svg
new file mode 100644
index 0000000000..6f03b71fd8
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/right_arrow_disabled_dark.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="right_arrow_disabled_dark.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="2.8574619"
+     inkscape:cy="4.483588"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980383"
+       d="m 1074.5664,355.09798 4,-4 -4,-4"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/right_arrow_disabled_light.svg b/src/Gui/Stylesheets/images_dark-light/right_arrow_disabled_light.svg
new file mode 100644
index 0000000000..09f16134e2
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/right_arrow_disabled_light.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="right_arrow_disabled_light.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="2.8574619"
+     inkscape:cy="4.483588"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
+       d="m 1074.5664,355.09798 4,-4 -4,-4"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/right_arrow_light.svg b/src/Gui/Stylesheets/images_dark-light/right_arrow_light.svg
new file mode 100644
index 0000000000..86bfe96be7
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/right_arrow_light.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="right_arrow_light.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="2.8574619"
+     inkscape:cy="4.483588"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1075.0664,354.59798 3,-3.5 -3,-3.5"
+       id="path2474-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/right_arrow_lighter.svg b/src/Gui/Stylesheets/images_dark-light/right_arrow_lighter.svg
new file mode 100644
index 0000000000..a45a0eb771
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/right_arrow_lighter.svg
@@ -0,0 +1,100 @@
+<?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="6"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="right_arrow_lighter.svg"
+   viewBox="0 0 6 10">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="2.8574619"
+     inkscape:cy="4.483588"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-346.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.86274511"
+       d="m 1075.0664,354.59798 3,-3.5 -3,-3.5"
+       id="path2474-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/sizegrip_dark.svg b/src/Gui/Stylesheets/images_dark-light/sizegrip_dark.svg
new file mode 100644
index 0000000000..ae72b18e35
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/sizegrip_dark.svg
@@ -0,0 +1,114 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="sizegrip_dark.svg"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="30.51501"
+     inkscape:cx="0.59381228"
+     inkscape:cy="6.1721819"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-4.9218749e-05"
+       originy="1.0296328e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-340.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.35294119"
+       d="m 1075.0664,355.59798 13.9999,-14"
+       id="path955"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.35294119"
+       d="m 1089.0663,345.59798 -9.9999,10"
+       id="path957"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.35294119"
+       d="m 1083.0664,355.59798 5.9999,-6"
+       id="path959"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.35294119"
+       d="m 1089.0663,353.59798 -1.9999,2"
+       id="path961"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/sizegrip_light.svg b/src/Gui/Stylesheets/images_dark-light/sizegrip_light.svg
new file mode 100644
index 0000000000..819274fc74
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/sizegrip_light.svg
@@ -0,0 +1,114 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="sizegrip_light.svg"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="30.51501"
+     inkscape:cx="0.59381228"
+     inkscape:cy="6.1721819"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-4.9218749e-05"
+       originy="1.0296328e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-340.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1075.0664,355.59798 13.9999,-14"
+       id="path955"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1089.0663,345.59798 -9.9999,10"
+       id="path957"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1083.0664,355.59798 5.9999,-6"
+       id="path959"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1089.0663,353.59798 -1.9999,2"
+       id="path961"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/splitter_horizontal_dark.svg b/src/Gui/Stylesheets/images_dark-light/splitter_horizontal_dark.svg
new file mode 100644
index 0000000000..b154bfdc40
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/splitter_horizontal_dark.svg
@@ -0,0 +1,124 @@
+<?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="38"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="splitter_horizontal_dark.svg"
+   viewBox="0 0 38 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="25.331163"
+     inkscape:cx="18.87964"
+     inkscape:cy="1.7558777"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.5468749e-05"
+       originy="1.2239687e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824"
+       d="m 1075.0663,353.59798 h 4"
+       id="path955"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path1079"
+       d="m 1083.0663,353.59798 h 4"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824"
+       d="m 1091.0663,353.59798 h 4"
+       id="path1081"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path1083"
+       d="m 1099.0663,353.59798 h 4"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824"
+       d="m 1107.0663,353.59798 h 4"
+       id="path1087"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/splitter_horizontal_light.svg b/src/Gui/Stylesheets/images_dark-light/splitter_horizontal_light.svg
new file mode 100644
index 0000000000..1a855fd412
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/splitter_horizontal_light.svg
@@ -0,0 +1,124 @@
+<?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="38"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="splitter_horizontal_light.svg"
+   viewBox="0 0 38 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="25.331163"
+     inkscape:cx="18.87964"
+     inkscape:cy="1.7558777"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.5468749e-05"
+       originy="1.2239687e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1075.0663,353.59798 h 4"
+       id="path955"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path1079"
+       d="m 1083.0663,353.59798 h 4"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1091.0663,353.59798 h 4"
+       id="path1081"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path1083"
+       d="m 1099.0663,353.59798 h 4"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1107.0663,353.59798 h 4"
+       id="path1087"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/splitter_vertical_dark.svg b/src/Gui/Stylesheets/images_dark-light/splitter_vertical_dark.svg
new file mode 100644
index 0000000000..c14f2a156e
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/splitter_vertical_dark.svg
@@ -0,0 +1,124 @@
+<?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="6"
+   height="38"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="splitter_vertical_dark.svg"
+   viewBox="0 0 6 38">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.605263"
+     inkscape:cx="3"
+     inkscape:cy="19"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="6.0351563e-05"
+       originy="1.4183046e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-318.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824"
+       d="m 1077.0663,355.59795 v -4"
+       id="path955"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path1079"
+       d="m 1077.0663,347.59795 v -4"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824"
+       d="m 1077.0663,339.59795 v -4"
+       id="path1081"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path1083"
+       d="m 1077.0663,331.59795 v -4"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47058824"
+       d="m 1077.0663,323.59795 v -4"
+       id="path1087"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/splitter_vertical_light.svg b/src/Gui/Stylesheets/images_dark-light/splitter_vertical_light.svg
new file mode 100644
index 0000000000..3788db742c
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/splitter_vertical_light.svg
@@ -0,0 +1,124 @@
+<?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="6"
+   height="38"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="splitter_vertical_light.svg"
+   viewBox="0 0 6 38">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.605263"
+     inkscape:cx="3"
+     inkscape:cy="19"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="6.0351563e-05"
+       originy="1.4183046e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-318.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1077.0663,355.59795 v -4"
+       id="path955"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path1079"
+       d="m 1077.0663,347.59795 v -4"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1077.0663,339.59795 v -4"
+       id="path1081"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path1083"
+       d="m 1077.0663,331.59795 v -4"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373" />
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.60093898;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1077.0663,323.59795 v -4"
+       id="path1087"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/transparent.svg b/src/Gui/Stylesheets/images_dark-light/transparent.svg
new file mode 100644
index 0000000000..aeb0d74de9
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/transparent.svg
@@ -0,0 +1,93 @@
+<?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="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="transparent.svg"
+   viewBox="0 0 64 64">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.4430399"
+     inkscape:cx="-14.235596"
+     inkscape:cy="23.852357"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="7.6171875e-05"
+       originy="1.6126405e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-292.59799)" />
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/undock_dark.svg b/src/Gui/Stylesheets/images_dark-light/undock_dark.svg
new file mode 100644
index 0000000000..16f856c004
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/undock_dark.svg
@@ -0,0 +1,114 @@
+<?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="14"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="undock_dark.svg"
+   viewBox="0 0 14 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="38.909827"
+     inkscape:cx="6.8915405"
+     inkscape:cy="6.2573646"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-3.0078125e-05"
+       originy="-1.2447814e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-342.59796)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.35294118;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 2.4941406 1.9960938 A 0.50005 0.50005 0 0 0 2 2.5625 L 2 6 L 3 6 L 3 3.7070312 L 5.1464844 5.8535156 A 0.50005 0.50005 0 1 0 5.8535156 5.1464844 L 3.7070312 3 L 6 3 L 6 2 L 2.5566406 2 A 0.50005 0.50005 0 0 0 2.4941406 1.9960938 z "
+       transform="translate(1074.0664,342.59796)"
+       id="path1952" />
+    <path
+       id="path1965"
+       d="m 1086.0703,345.09211 a 0.50005,0.50005 0 0 0 -0.5664,-0.49414 h -3.4375 v 1 h 2.2929 l -2.1464,2.14648 a 0.50005,0.50005 0 1 0 0.707,0.70703 l 2.1465,-2.14648 v 2.29297 h 1 v -3.44336 a 0.50005,0.50005 0 0 0 0,-0.0625 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.35294118;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path1967"
+       d="m 1076.5605,354.60189 a 0.50005,0.50005 0 0 1 -0.4941,-0.56641 v -3.4375 h 1 v 2.29297 l 2.1465,-2.14648 a 0.50005,0.50005 0 1 1 0.707,0.70703 l -2.1465,2.14648 h 2.293 v 1 h -3.4434 a 0.50005,0.50005 0 0 1 -0.062,0.004 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.35294118;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.35294118;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 1086.0703,354.10383 a 0.50005,0.50005 0 0 1 -0.5664,0.49414 h -3.4375 v -1 h 2.2929 l -2.1464,-2.14648 a 0.50005,0.50005 0 1 1 0.707,-0.70703 l 2.1465,2.14648 v -2.29297 h 1 v 3.44336 a 0.50005,0.50005 0 0 1 0,0.0625 z"
+       id="path1969" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/undock_light.svg b/src/Gui/Stylesheets/images_dark-light/undock_light.svg
new file mode 100644
index 0000000000..51c67e307a
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/undock_light.svg
@@ -0,0 +1,114 @@
+<?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="14"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="undock_light.svg"
+   viewBox="0 0 14 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="38.909827"
+     inkscape:cx="6.8915405"
+     inkscape:cy="6.2573646"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-3.0078125e-05"
+       originy="-1.2447814e-05"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-342.59796)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.35294119;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 2.4941406 1.9960938 A 0.50005 0.50005 0 0 0 2 2.5625 L 2 6 L 3 6 L 3 3.7070312 L 5.1464844 5.8535156 A 0.50005 0.50005 0 1 0 5.8535156 5.1464844 L 3.7070312 3 L 6 3 L 6 2 L 2.5566406 2 A 0.50005 0.50005 0 0 0 2.4941406 1.9960938 z "
+       transform="translate(1074.0664,342.59796)"
+       id="path1952" />
+    <path
+       id="path1965"
+       d="m 1086.0703,345.09211 a 0.50005,0.50005 0 0 0 -0.5664,-0.49414 h -3.4375 v 1 h 2.2929 l -2.1464,2.14648 a 0.50005,0.50005 0 1 0 0.707,0.70703 l 2.1465,-2.14648 v 2.29297 h 1 v -3.44336 a 0.50005,0.50005 0 0 0 0,-0.0625 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.35294119;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path1967"
+       d="m 1076.5605,354.60189 a 0.50005,0.50005 0 0 1 -0.4941,-0.56641 v -3.4375 h 1 v 2.29297 l 2.1465,-2.14648 a 0.50005,0.50005 0 1 1 0.707,0.70703 l -2.1465,2.14648 h 2.293 v 1 h -3.4434 a 0.50005,0.50005 0 0 1 -0.062,0.004 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.35294119;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.35294119;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 1086.0703,354.10383 a 0.50005,0.50005 0 0 1 -0.5664,0.49414 h -3.4375 v -1 h 2.2929 l -2.1464,-2.14648 a 0.50005,0.50005 0 1 1 0.707,-0.70703 l 2.1465,2.14648 v -2.29297 h 1 v 3.44336 a 0.50005,0.50005 0 0 1 0,0.0625 z"
+       id="path1969" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up-down_arrow_dark.svg b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_dark.svg
new file mode 100644
index 0000000000..80c0618146
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_dark.svg
@@ -0,0 +1,106 @@
+<?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="10"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up-down_arrow_dark.svg"
+   viewBox="0 0 10 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9442064"
+     inkscape:cy="6.1813341"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-342.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038"
+       d="m 1082.0664,346.59798 -3.5,-3 -3.5,3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path881"
+       d="m 1082.0664,351.59798 -3.5,3 -3.5,-3"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5098038" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up-down_arrow_darker.svg b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_darker.svg
new file mode 100644
index 0000000000..707bd33f13
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_darker.svg
@@ -0,0 +1,106 @@
+<?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="10"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up-down_arrow_darker.svg"
+   viewBox="0 0 10 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9442064"
+     inkscape:cy="6.1813341"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-342.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1082.0664,346.59798 -3.5,-3 -3.5,3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path881"
+       d="m 1082.0664,351.59798 -3.5,3 -3.5,-3"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up-down_arrow_disabled_dark.svg b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_disabled_dark.svg
new file mode 100644
index 0000000000..8e2746a204
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_disabled_dark.svg
@@ -0,0 +1,106 @@
+<?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="10"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up-down_arrow_disabled_dark.svg"
+   viewBox="0 0 10 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9442064"
+     inkscape:cy="6.1813341"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-342.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980395"
+       d="m 1082.0664,346.59798 -3.5,-3 -3.5,3"
+       id="path2474-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path1407"
+       d="m 1082.0664,351.59798 -3.5,3 -3.5,-3"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980395" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up-down_arrow_disabled_light.svg b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_disabled_light.svg
new file mode 100644
index 0000000000..ad68041132
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_disabled_light.svg
@@ -0,0 +1,116 @@
+<?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="10"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up-down_arrow_disabled_light.svg"
+   viewBox="0 0 10 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9442064"
+     inkscape:cy="6.1813341"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-342.59799)">
+    <g
+       transform="translate(5.6941251e-5,-7.4949281)"
+       id="layer1-5"
+       inkscape:label="Capa 1">
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path2474-6"
+         d="m 1082.0663,354.09291 -3.5,-3 -3.5,3"
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373" />
+    </g>
+    <g
+       inkscape:label="Capa 1"
+       id="g1409"
+       transform="matrix(1,0,0,-1,5.6941251e-5,705.69089)">
+      <path
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+         d="m 1082.0663,354.09291 -3.5,-3 -3.5,3"
+         id="path1407"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+    </g>
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up-down_arrow_light.svg b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_light.svg
new file mode 100644
index 0000000000..f3feaa06c0
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_light.svg
@@ -0,0 +1,106 @@
+<?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="10"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up-down_arrow_light.svg"
+   viewBox="0 0 10 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9442064"
+     inkscape:cy="6.1813341"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-342.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374"
+       d="m 1082.0664,346.59798 -3.5,-3 -3.5,3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path881"
+       d="m 1082.0664,351.59798 -3.5,3 -3.5,-3"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431374" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up-down_arrow_lighter.svg b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_lighter.svg
new file mode 100644
index 0000000000..04f1a07007
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up-down_arrow_lighter.svg
@@ -0,0 +1,106 @@
+<?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="10"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up-down_arrow_lighter.svg"
+   viewBox="0 0 10 14">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9442064"
+     inkscape:cy="6.1813341"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="5.7031251e-05"
+       originy="8.3529685e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0663,-342.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.90196079"
+       d="m 1082.0664,346.59798 -3.5,-3 -3.5,3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path881"
+       d="m 1082.0664,351.59798 -3.5,3 -3.5,-3"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.90196079" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up_arrow_dark.svg b/src/Gui/Stylesheets/images_dark-light/up_arrow_dark.svg
new file mode 100644
index 0000000000..3dc97f2b07
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up_arrow_dark.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up_arrow_dark.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9440906"
+     inkscape:cy="6.1813322"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980386"
+       d="m 1082.0663,354.58864 -3.5,-3 -3.5,3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up_arrow_darker.svg b/src/Gui/Stylesheets/images_dark-light/up_arrow_darker.svg
new file mode 100644
index 0000000000..82e8f1e680
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up_arrow_darker.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up_arrow_darker.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9440906"
+     inkscape:cy="6.1813322"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1082.0663,354.58864 -3.5,-3 -3.5,3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up_arrow_disabled_dark.svg b/src/Gui/Stylesheets/images_dark-light/up_arrow_disabled_dark.svg
new file mode 100644
index 0000000000..97542d382e
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up_arrow_disabled_dark.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up_arrow_disabled_dark.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9440906"
+     inkscape:cy="6.1813322"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50980392"
+       d="m 1082.5663,355.09291 -4,-4 -4,4"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up_arrow_disabled_light.svg b/src/Gui/Stylesheets/images_dark-light/up_arrow_disabled_light.svg
new file mode 100644
index 0000000000..7968a09e7d
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up_arrow_disabled_light.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up_arrow_disabled_light.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9440906"
+     inkscape:cy="6.1813322"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1082.5663,355.09291 -4,-4 -4,4"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up_arrow_light.svg b/src/Gui/Stylesheets/images_dark-light/up_arrow_light.svg
new file mode 100644
index 0000000000..476b60c534
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up_arrow_light.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up_arrow_light.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9440906"
+     inkscape:cy="6.1813322"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.78431373"
+       d="m 1082.0663,354.58864 -3.5,-3 -3.5,3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/images_dark-light/up_arrow_lighter.svg b/src/Gui/Stylesheets/images_dark-light/up_arrow_lighter.svg
new file mode 100644
index 0000000000..b2e085e416
--- /dev/null
+++ b/src/Gui/Stylesheets/images_dark-light/up_arrow_lighter.svg
@@ -0,0 +1,100 @@
+<?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="10"
+   height="6"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="up_arrow_lighter.svg"
+   viewBox="0 0 10 6">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#c0c0c0"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.597544"
+     inkscape:cx="4.9440906"
+     inkscape:cy="6.1813322"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     guidecolor="#0092ff"
+     guideopacity="0.49803922"
+     guidehicolor="#ff5200"
+     guidehiopacity="0.49803922"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="939"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2242"
+       originx="-5.8789061e-05"
+       originy="6.4096091e-06"
+       enabled="true"
+       spacingx="0.49999999"
+       spacingy="0.49999999"
+       empspacing="2"
+       color="#c63fff"
+       opacity="0.0627451" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1074.0664,-350.59799)">
+    <path
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:0.34901961;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.90196078"
+       d="m 1082.0663,354.58864 -3.5,-3 -3.5,3"
+       id="path2474"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>