diff --git a/src/Gui/Stylesheets/Dark - blue.qss b/src/Gui/Stylesheets/Dark - blue.qss
index c57fb0d8c..6889a691a 100644
--- a/src/Gui/Stylesheets/Dark - blue.qss	
+++ b/src/Gui/Stylesheets/Dark - blue.qss	
@@ -1,7 +1,7 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.01
+version 2.02
 QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses QT styling.
 
@@ -97,7 +97,7 @@ QToolBar  {
     background-color: #6e6e6e; /* main background color */
 }
 
-QMdiArea[showImage="true"] {
+QMdiArea {
     background-image: url(qss:images/background_freecad.png);
     background-position: center center;
     background-repeat: no-repeat;
@@ -164,27 +164,29 @@ Tool bar
 ==================================================================================================*/
 QToolBar {
     border: none;
-    min-width: 32px; /* allows a minimum of space between QToolBar colums */
-    min-height: 32px; /* allows a minimum of space between QToolBar rows */
+    padding: 2px;
 }
 
-QToolBar::handle:horizontal {
+QToolBar::handle:top,
+QToolBar::handle:bottom {
     background-image: url(qss:images/Hmovetoolbar_dark.png);
     width: 10px;
-    margin: 6px 2px 6px 2px;
+    margin: 4px 2px;
     background-position: top right;
     background-repeat: repeat-y;
 }
 
-QToolBar::handle:vertical {
+QToolBar::handle:left,
+QToolBar::handle:right {
     background-image: url(qss:images/Vmovetoolbar_dark.png);
     height: 10px;
-    margin: 2px 6px 2px 6px;
+    margin: 2px 4px;
     background-position: left bottom;
     background-repeat: repeat-x;
 }
 
-QToolBar::separator:horizontal {
+QToolBar::separator:top,
+QToolBar::separator:bottom {
     background-image: url(qss:images/separtoolbar_dark.png);
     width: 10px;
     margin: 6px 2px 6px 2px;
@@ -192,7 +194,8 @@ QToolBar::separator:horizontal {
     background-repeat: repeat-y;
 }
 
-QToolBar::separator:vertical {
+QToolBar::separator:left,
+QToolBar::separator:right {
     background-image: url(qss:images/separtoolbar_dark.png);
     height: 10px;
     margin: 2px 6px 2px 6px;
@@ -568,7 +571,7 @@ QDialog#Gui__Dialog__DlgPreferences > QListView {
 
 /* unique styles for sections inside Preferences */
 QDialog#Gui__Dialog__DlgPreferences > QListView::item {
-    border-radius: 6px;
+    border-radius: 4px;
 }
 
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
@@ -578,7 +581,6 @@ QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:selected {
     color: white;
     background-color: #5e90fa;
-    border: 3px solid #3874f2;
 }
 
 
@@ -751,6 +753,20 @@ Gui--PropertyEditor--PropertyEditor QComboBox {
     padding-bottom: 0px;
 }
 
+/* reset min-height to 0px inside list views */
+QTreeView > QWidget > QComboBox,
+QTreeView > QWidget > QAbstractSpinBox,
+QTreeView > QWidget > QSpinBox,
+QTreeView > QWidget > QDoubleSpinBox,
+QTreeView > QWidget > QLineEdit,
+QTreeView > QWidget > QTextEdit,
+QTreeView > QWidget > QTimeEdit,
+QTreeView > QWidget > QDateEdit,
+QTreeView > QWidget > QDateTimeEdit,
+QTreeView > QWidget > Gui--ColorButton {
+    min-height: 0px;
+}
+
 /* set border-radius to 0px inside list views */
 QTreeView > QWidget > QComboBox,
 QTreeView > QWidget > QAbstractSpinBox,
@@ -808,6 +824,7 @@ QTreeView > QWidget > QDateTimeEdit:read-only {
 /* Fix to correctly (not totally) draw QTextEdit on OSX at Page properties: "Page result", "Template" and "Editable Texts" */
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QWidget {
     min-height: 14px;
+    border-radius: 0px; /* reset */
 }
 
 
@@ -912,20 +929,6 @@ QTreeView::branch:open:has-children:!has-siblings  {
 }
 
 
-/*==================================================================================================
-Text/Python editor (macros, etc...)
-==================================================================================================*/
-QPlainTextEdit,
-QPlainTextEdit:focus {
-    background-color: #c8c8c8;
-    selection-color: white;
-    selection-background-color: #3874f2;
-    border: 1px solid #505050;
-    border-radius: 3px;
-    margin: 4px;
-}
-
-
 /*==================================================================================================
 Splitter and windows separator
 ==================================================================================================*/
@@ -969,6 +972,20 @@ QMainWindow::separator:vertical {
 }
 
 
+/*==================================================================================================
+Text/Python editor (macros, etc...)
+==================================================================================================*/
+QPlainTextEdit,
+QPlainTextEdit:focus {
+    background-color: #c8c8c8;
+    selection-color: white;
+    selection-background-color: #3874f2;
+    border: 1px solid #505050;
+    border-radius: 3px;
+    margin: 4px;
+}
+
+
 /*==================================================================================================
 Tasks panel (custom FreeCAD class)
 ==================================================================================================*/
@@ -977,6 +994,17 @@ QFrame[class="panel"] {
     background-color: transparent; /* temporal (transparent background) */
 }
 
+QSint--ActionGroup {
+    padding: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+    margin: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+}
+
+
+QSint--ActionGroup QPushButton {
+    padding: 2px; /* bigger padding crops text and icons... */
+    margin: 0px;
+}
+
 /* Separator line */
 QSint--ActionGroup QFrame[height="1"],
 QSint--ActionGroup QFrame[height="2"],
@@ -1093,6 +1121,7 @@ QDateTimeEdit {
     border: 1px solid #5a5a5a;
     border-radius: 3px;
     min-width: 50px; /* it ensures the default value is correctly displayed */
+    min-height: 20px; /* important to be a pair number in order to up/down buttons to be divisible by two (if not set could create a blank line in Ubuntu. Its downside is that it's needed to reset it (min-width: 0px) on following elements that can't have it such as fields inside QToolBar and inside QTreeView (Property editor) */
     padding: 1px 2px; /* temporal: could don't be compatible with elements inside Tree/List view */
 }
 
@@ -1167,7 +1196,6 @@ QDateEdit:up-button,
 QDateTimeEdit:up-button {
     subcontrol-position: top right;
     border-top-right-radius: 3px;
-    height: 12px; /* fix for Ubuntu that doesn't divide the up/down button into the exact middle */
 }
 
 QAbstractSpinBox:down-button,
@@ -1220,7 +1248,7 @@ QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
     image: url(qss:images/up_arrow_light.png);
-    top: 0px; /* fix simetry between up and down images */
+    top: 2px; /* fix symmetry between up and down images */
 }
 
 QAbstractSpinBox::up-arrow:focus,
@@ -1637,12 +1665,6 @@ QSlider::handle:vertical:disabled {
 /*==================================================================================================
 Toolbar buttons
 ==================================================================================================*/
-QToolBar > QToolButton {
-    margin: 2px;
-    padding: 2px;
-}
-
-QToolBar > QPushButton,
 /*QToolBar > QComboBox,   disabled because creates different margins for body and drop-down button */
 QToolBar > QAbstractSpinBox,
 QToolBar > QSpinBox,
@@ -1652,18 +1674,39 @@ QToolBar > QTextEdit,
 QToolBar > QTimeEdit,
 QToolBar > QDateEdit,
 QToolBar > QDateTimeEdit {
+    margin: 0px 2px;
+    padding: 0px;
+    min-width: 70px; /* necessary to show its content */
+}
+
+QToolBar > QToolButton {
     margin: 2px;
     padding: 2px;
 }
 
+QToolBar > QComboBox,
+QToolBar > QAbstractSpinBox,
+QToolBar > QSpinBox,
+QToolBar > QDoubleSpinBox,
+QToolBar > QLineEdit,
+QToolBar > QTextEdit,
+QToolBar > QTimeEdit,
+QToolBar > QDateEdit,
+QToolBar > QDateTimeEdit {
+    min-height: 0px; /* reset it inside Tool Bar due to the user ability to set the "size of toolbar icons" inside Preferences  */
+}
+
 QToolBar > QPushButton {
+    padding: 0px;
+    margin: 1px; /* doesn't work with :left, :right:, :top or :bottom sub-controls */
+    min-width: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
+    min-height: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
     border-radius: 4px; /* same as regular QPushButton */
-    min-width: 20px; /* reset it due to larger value on regular QPushButton, same or bigger value as regular QPushButton min-height */
 }
 
 QToolBar > QPushButton:checked {
-    border: 1px solid #3874f2;
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #5e90fa, stop:1 #3874f2);
+    border: 1px solid #7cabf9;
+    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #cbd8e6, stop:1 #7cabf9);
 }
 
 QToolBar > QPushButton:!checked {
@@ -1673,7 +1716,7 @@ QToolBar > QPushButton:!checked {
 }
 
 QToolBar > QPushButton:checked:hover {
-    border-color: #2053c0;
+    border-color: #6f9efa;
 }
 
 QToolBar > QPushButton:!checked:hover {
@@ -1682,7 +1725,7 @@ QToolBar > QPushButton:!checked:hover {
 }
 
 QToolBar > QPushButton:checked:pressed {
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #3874f2, stop:1 #5e90fa);
+    background-color: #7cabf9;
 }
 
 QToolBar > QPushButton:!checked:pressed {
@@ -1899,4 +1942,4 @@ QDialog QGroupBox QFrame {
     margin: 2px 0px;
 }
 
-*[mandatoryField="true"] { background-color: cyan }
\ No newline at end of file
+*[mandatoryField="true"] { background-color: cyan }
diff --git a/src/Gui/Stylesheets/Dark - green.qss b/src/Gui/Stylesheets/Dark - green.qss
index dca5b629b..b0a80f61c 100644
--- a/src/Gui/Stylesheets/Dark - green.qss	
+++ b/src/Gui/Stylesheets/Dark - green.qss	
@@ -1,7 +1,7 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.01
+version 2.02
 QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses QT styling.
 
@@ -97,7 +97,7 @@ QToolBar  {
     background-color: #6e6e6e; /* main background color */
 }
 
-QMdiArea[showImage="true"] {
+QMdiArea {
     background-image: url(qss:images/background_freecad.png);
     background-position: center center;
     background-repeat: no-repeat;
@@ -164,27 +164,29 @@ Tool bar
 ==================================================================================================*/
 QToolBar {
     border: none;
-    min-width: 32px; /* allows a minimum of space between QToolBar colums */
-    min-height: 32px; /* allows a minimum of space between QToolBar rows */
+    padding: 2px;
 }
 
-QToolBar::handle:horizontal {
+QToolBar::handle:top,
+QToolBar::handle:bottom {
     background-image: url(qss:images/Hmovetoolbar_dark.png);
     width: 10px;
-    margin: 6px 2px 6px 2px;
+    margin: 4px 2px;
     background-position: top right;
     background-repeat: repeat-y;
 }
 
-QToolBar::handle:vertical {
+QToolBar::handle:left,
+QToolBar::handle:right {
     background-image: url(qss:images/Vmovetoolbar_dark.png);
     height: 10px;
-    margin: 2px 6px 2px 6px;
+    margin: 2px 4px;
     background-position: left bottom;
     background-repeat: repeat-x;
 }
 
-QToolBar::separator:horizontal {
+QToolBar::separator:top,
+QToolBar::separator:bottom {
     background-image: url(qss:images/separtoolbar_dark.png);
     width: 10px;
     margin: 6px 2px 6px 2px;
@@ -192,7 +194,8 @@ QToolBar::separator:horizontal {
     background-repeat: repeat-y;
 }
 
-QToolBar::separator:vertical {
+QToolBar::separator:left,
+QToolBar::separator:right {
     background-image: url(qss:images/separtoolbar_dark.png);
     height: 10px;
     margin: 2px 6px 2px 6px;
@@ -568,7 +571,7 @@ QDialog#Gui__Dialog__DlgPreferences > QListView {
 
 /* unique styles for sections inside Preferences */
 QDialog#Gui__Dialog__DlgPreferences > QListView::item {
-    border-radius: 6px;
+    border-radius: 4px;
 }
 
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
@@ -578,7 +581,6 @@ QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:selected {
     color: white;
     background-color: #94b30f;
-    border: 3px solid #819c0c;
 }
 
 
@@ -751,6 +753,20 @@ Gui--PropertyEditor--PropertyEditor QComboBox {
     padding-bottom: 0px;
 }
 
+/* reset min-height to 0px inside list views */
+QTreeView > QWidget > QComboBox,
+QTreeView > QWidget > QAbstractSpinBox,
+QTreeView > QWidget > QSpinBox,
+QTreeView > QWidget > QDoubleSpinBox,
+QTreeView > QWidget > QLineEdit,
+QTreeView > QWidget > QTextEdit,
+QTreeView > QWidget > QTimeEdit,
+QTreeView > QWidget > QDateEdit,
+QTreeView > QWidget > QDateTimeEdit,
+QTreeView > QWidget > Gui--ColorButton {
+    min-height: 0px;
+}
+
 /* set border-radius to 0px inside list views */
 QTreeView > QWidget > QComboBox,
 QTreeView > QWidget > QAbstractSpinBox,
@@ -808,6 +824,7 @@ QTreeView > QWidget > QDateTimeEdit:read-only {
 /* Fix to correctly (not totally) draw QTextEdit on OSX at Page properties: "Page result", "Template" and "Editable Texts" */
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QWidget {
     min-height: 14px;
+    border-radius: 0px; /* reset */
 }
 
 
@@ -912,20 +929,6 @@ QTreeView::branch:open:has-children:!has-siblings  {
 }
 
 
-/*==================================================================================================
-Text/Python editor (macros, etc...)
-==================================================================================================*/
-QPlainTextEdit,
-QPlainTextEdit:focus {
-    background-color: #c8c8c8;
-    selection-color: white;
-    selection-background-color: #819c0c;
-    border: 1px solid #505050;
-    border-radius: 3px;
-    margin: 4px;
-}
-
-
 /*==================================================================================================
 Splitter and windows separator
 ==================================================================================================*/
@@ -969,6 +972,20 @@ QMainWindow::separator:vertical {
 }
 
 
+/*==================================================================================================
+Text/Python editor (macros, etc...)
+==================================================================================================*/
+QPlainTextEdit,
+QPlainTextEdit:focus {
+    background-color: #c8c8c8;
+    selection-color: white;
+    selection-background-color: #819c0c;
+    border: 1px solid #505050;
+    border-radius: 3px;
+    margin: 4px;
+}
+
+
 /*==================================================================================================
 Tasks panel (custom FreeCAD class)
 ==================================================================================================*/
@@ -977,6 +994,17 @@ QFrame[class="panel"] {
     background-color: transparent; /* temporal (transparent background) */
 }
 
+QSint--ActionGroup {
+    padding: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+    margin: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+}
+
+
+QSint--ActionGroup QPushButton {
+    padding: 2px; /* bigger padding crops text and icons... */
+    margin: 0px;
+}
+
 /* Separator line */
 QSint--ActionGroup QFrame[height="1"],
 QSint--ActionGroup QFrame[height="2"],
@@ -1093,6 +1121,7 @@ QDateTimeEdit {
     border: 1px solid #5a5a5a;
     border-radius: 3px;
     min-width: 50px; /* it ensures the default value is correctly displayed */
+    min-height: 20px; /* important to be a pair number in order to up/down buttons to be divisible by two (if not set could create a blank line in Ubuntu. Its downside is that it's needed to reset it (min-width: 0px) on following elements that can't have it such as fields inside QToolBar and inside QTreeView (Property editor) */
     padding: 1px 2px; /* temporal: could don't be compatible with elements inside Tree/List view */
 }
 
@@ -1167,7 +1196,6 @@ QDateEdit:up-button,
 QDateTimeEdit:up-button {
     subcontrol-position: top right;
     border-top-right-radius: 3px;
-    height: 12px; /* fix for Ubuntu that doesn't divide the up/down button into the exact middle */
 }
 
 QAbstractSpinBox:down-button,
@@ -1220,7 +1248,7 @@ QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
     image: url(qss:images/up_arrow_light.png);
-    top: 0px; /* fix simetry between up and down images */
+    top: 2px; /* fix symmetry between up and down images */
 }
 
 QAbstractSpinBox::up-arrow:focus,
@@ -1637,12 +1665,6 @@ QSlider::handle:vertical:disabled {
 /*==================================================================================================
 Toolbar buttons
 ==================================================================================================*/
-QToolBar > QToolButton {
-    margin: 2px;
-    padding: 2px;
-}
-
-QToolBar > QPushButton,
 /*QToolBar > QComboBox,   disabled because creates different margins for body and drop-down button */
 QToolBar > QAbstractSpinBox,
 QToolBar > QSpinBox,
@@ -1652,18 +1674,39 @@ QToolBar > QTextEdit,
 QToolBar > QTimeEdit,
 QToolBar > QDateEdit,
 QToolBar > QDateTimeEdit {
+    margin: 0px 2px;
+    padding: 0px;
+    min-width: 70px; /* necessary to show its content */
+}
+
+QToolBar > QToolButton {
     margin: 2px;
     padding: 2px;
 }
 
+QToolBar > QComboBox,
+QToolBar > QAbstractSpinBox,
+QToolBar > QSpinBox,
+QToolBar > QDoubleSpinBox,
+QToolBar > QLineEdit,
+QToolBar > QTextEdit,
+QToolBar > QTimeEdit,
+QToolBar > QDateEdit,
+QToolBar > QDateTimeEdit {
+    min-height: 0px; /* reset it inside Tool Bar due to the user ability to set the "size of toolbar icons" inside Preferences  */
+}
+
 QToolBar > QPushButton {
+    padding: 0px;
+    margin: 1px; /* doesn't work with :left, :right:, :top or :bottom sub-controls */
+    min-width: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
+    min-height: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
     border-radius: 4px; /* same as regular QPushButton */
-    min-width: 20px; /* reset it due to larger value on regular QPushButton, same or bigger value as regular QPushButton min-height */
 }
 
 QToolBar > QPushButton:checked {
-    border: 1px solid #819c0c;
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #94b30f, stop:1 #819c0c);
+    border: 1px solid #a5c61a;
+    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #dadfc5, stop:1 #a5c61a);
 }
 
 QToolBar > QPushButton:!checked {
@@ -1673,7 +1716,7 @@ QToolBar > QPushButton:!checked {
 }
 
 QToolBar > QPushButton:checked:hover {
-    border-color: #74831d;
+    border-color: #9bbc12;
 }
 
 QToolBar > QPushButton:!checked:hover {
@@ -1682,7 +1725,7 @@ QToolBar > QPushButton:!checked:hover {
 }
 
 QToolBar > QPushButton:checked:pressed {
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #819c0c, stop:1 #94b30f);
+    background-color: #a5c61a;
 }
 
 QToolBar > QPushButton:!checked:pressed {
@@ -1899,4 +1942,4 @@ QDialog QGroupBox QFrame {
     margin: 2px 0px;
 }
 
-*[mandatoryField="true"] { background-color: cyan }
\ No newline at end of file
+*[mandatoryField="true"] { background-color: cyan }
diff --git a/src/Gui/Stylesheets/Dark - orange.qss b/src/Gui/Stylesheets/Dark - orange.qss
index e0061aa9d..9b86d3134 100644
--- a/src/Gui/Stylesheets/Dark - orange.qss	
+++ b/src/Gui/Stylesheets/Dark - orange.qss	
@@ -1,7 +1,7 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.01
+version 2.02
 QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses QT styling.
 
@@ -97,7 +97,7 @@ QToolBar  {
     background-color: #6e6e6e; /* main background color */
 }
 
-QMdiArea[showImage="true"] {
+QMdiArea {
     background-image: url(qss:images/background_freecad.png);
     background-position: center center;
     background-repeat: no-repeat;
@@ -164,27 +164,29 @@ Tool bar
 ==================================================================================================*/
 QToolBar {
     border: none;
-    min-width: 32px; /* allows a minimum of space between QToolBar colums */
-    min-height: 32px; /* allows a minimum of space between QToolBar rows */
+    padding: 2px;
 }
 
-QToolBar::handle:horizontal {
+QToolBar::handle:top,
+QToolBar::handle:bottom {
     background-image: url(qss:images/Hmovetoolbar_dark.png);
     width: 10px;
-    margin: 6px 2px 6px 2px;
+    margin: 4px 2px;
     background-position: top right;
     background-repeat: repeat-y;
 }
 
-QToolBar::handle:vertical {
+QToolBar::handle:left,
+QToolBar::handle:right {
     background-image: url(qss:images/Vmovetoolbar_dark.png);
     height: 10px;
-    margin: 2px 6px 2px 6px;
+    margin: 2px 4px;
     background-position: left bottom;
     background-repeat: repeat-x;
 }
 
-QToolBar::separator:horizontal {
+QToolBar::separator:top,
+QToolBar::separator:bottom {
     background-image: url(qss:images/separtoolbar_dark.png);
     width: 10px;
     margin: 6px 2px 6px 2px;
@@ -192,7 +194,8 @@ QToolBar::separator:horizontal {
     background-repeat: repeat-y;
 }
 
-QToolBar::separator:vertical {
+QToolBar::separator:left,
+QToolBar::separator:right {
     background-image: url(qss:images/separtoolbar_dark.png);
     height: 10px;
     margin: 2px 6px 2px 6px;
@@ -568,7 +571,7 @@ QDialog#Gui__Dialog__DlgPreferences > QListView {
 
 /* unique styles for sections inside Preferences */
 QDialog#Gui__Dialog__DlgPreferences > QListView::item {
-    border-radius: 6px;
+    border-radius: 4px;
 }
 
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
@@ -578,7 +581,6 @@ QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:selected {
     color: white;
     background-color: #daa116;
-    border: 3px solid #d0970c;
 }
 
 
@@ -751,6 +753,20 @@ Gui--PropertyEditor--PropertyEditor QComboBox {
     padding-bottom: 0px;
 }
 
+/* reset min-height to 0px inside list views */
+QTreeView > QWidget > QComboBox,
+QTreeView > QWidget > QAbstractSpinBox,
+QTreeView > QWidget > QSpinBox,
+QTreeView > QWidget > QDoubleSpinBox,
+QTreeView > QWidget > QLineEdit,
+QTreeView > QWidget > QTextEdit,
+QTreeView > QWidget > QTimeEdit,
+QTreeView > QWidget > QDateEdit,
+QTreeView > QWidget > QDateTimeEdit,
+QTreeView > QWidget > Gui--ColorButton {
+    min-height: 0px;
+}
+
 /* set border-radius to 0px inside list views */
 QTreeView > QWidget > QComboBox,
 QTreeView > QWidget > QAbstractSpinBox,
@@ -808,6 +824,7 @@ QTreeView > QWidget > QDateTimeEdit:read-only {
 /* Fix to correctly (not totally) draw QTextEdit on OSX at Page properties: "Page result", "Template" and "Editable Texts" */
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QWidget {
     min-height: 14px;
+    border-radius: 0px; /* reset */
 }
 
 
@@ -912,20 +929,6 @@ QTreeView::branch:open:has-children:!has-siblings  {
 }
 
 
-/*==================================================================================================
-Text/Python editor (macros, etc...)
-==================================================================================================*/
-QPlainTextEdit,
-QPlainTextEdit:focus {
-    background-color: #c8c8c8;
-    selection-color: white;
-    selection-background-color: #d0970c;
-    border: 1px solid #505050;
-    border-radius: 3px;
-    margin: 4px;
-}
-
-
 /*==================================================================================================
 Splitter and windows separator
 ==================================================================================================*/
@@ -969,6 +972,20 @@ QMainWindow::separator:vertical {
 }
 
 
+/*==================================================================================================
+Text/Python editor (macros, etc...)
+==================================================================================================*/
+QPlainTextEdit,
+QPlainTextEdit:focus {
+    background-color: #c8c8c8;
+    selection-color: white;
+    selection-background-color: #d0970c;
+    border: 1px solid #505050;
+    border-radius: 3px;
+    margin: 4px;
+}
+
+
 /*==================================================================================================
 Tasks panel (custom FreeCAD class)
 ==================================================================================================*/
@@ -977,6 +994,17 @@ QFrame[class="panel"] {
     background-color: transparent; /* temporal (transparent background) */
 }
 
+QSint--ActionGroup {
+    padding: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+    margin: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+}
+
+
+QSint--ActionGroup QPushButton {
+    padding: 2px; /* bigger padding crops text and icons... */
+    margin: 0px;
+}
+
 /* Separator line */
 QSint--ActionGroup QFrame[height="1"],
 QSint--ActionGroup QFrame[height="2"],
@@ -1093,6 +1121,7 @@ QDateTimeEdit {
     border: 1px solid #5a5a5a;
     border-radius: 3px;
     min-width: 50px; /* it ensures the default value is correctly displayed */
+    min-height: 20px; /* important to be a pair number in order to up/down buttons to be divisible by two (if not set could create a blank line in Ubuntu. Its downside is that it's needed to reset it (min-width: 0px) on following elements that can't have it such as fields inside QToolBar and inside QTreeView (Property editor) */
     padding: 1px 2px; /* temporal: could don't be compatible with elements inside Tree/List view */
 }
 
@@ -1167,7 +1196,6 @@ QDateEdit:up-button,
 QDateTimeEdit:up-button {
     subcontrol-position: top right;
     border-top-right-radius: 3px;
-    height: 12px; /* fix for Ubuntu that doesn't divide the up/down button into the exact middle */
 }
 
 QAbstractSpinBox:down-button,
@@ -1220,7 +1248,7 @@ QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
     image: url(qss:images/up_arrow_light.png);
-    top: 0px; /* fix simetry between up and down images */
+    top: 2px; /* fix symmetry between up and down images */
 }
 
 QAbstractSpinBox::up-arrow:focus,
@@ -1637,12 +1665,6 @@ QSlider::handle:vertical:disabled {
 /*==================================================================================================
 Toolbar buttons
 ==================================================================================================*/
-QToolBar > QToolButton {
-    margin: 2px;
-    padding: 2px;
-}
-
-QToolBar > QPushButton,
 /*QToolBar > QComboBox,   disabled because creates different margins for body and drop-down button */
 QToolBar > QAbstractSpinBox,
 QToolBar > QSpinBox,
@@ -1652,18 +1674,39 @@ QToolBar > QTextEdit,
 QToolBar > QTimeEdit,
 QToolBar > QDateEdit,
 QToolBar > QDateTimeEdit {
+    margin: 0px 2px;
+    padding: 0px;
+    min-width: 70px; /* necessary to show its content */
+}
+
+QToolBar > QToolButton {
     margin: 2px;
     padding: 2px;
 }
 
+QToolBar > QComboBox,
+QToolBar > QAbstractSpinBox,
+QToolBar > QSpinBox,
+QToolBar > QDoubleSpinBox,
+QToolBar > QLineEdit,
+QToolBar > QTextEdit,
+QToolBar > QTimeEdit,
+QToolBar > QDateEdit,
+QToolBar > QDateTimeEdit {
+    min-height: 0px; /* reset it inside Tool Bar due to the user ability to set the "size of toolbar icons" inside Preferences  */
+}
+
 QToolBar > QPushButton {
+    padding: 0px;
+    margin: 1px; /* doesn't work with :left, :right:, :top or :bottom sub-controls */
+    min-width: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
+    min-height: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
     border-radius: 4px; /* same as regular QPushButton */
-    min-width: 20px; /* reset it due to larger value on regular QPushButton, same or bigger value as regular QPushButton min-height */
 }
 
 QToolBar > QPushButton:checked {
-    border: 1px solid #d0970c;
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #daa116, stop:1 #d0970c);
+    border: 1px solid #e3b64d;
+    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #e3d8b9, stop:1 #e3b64d);
 }
 
 QToolBar > QPushButton:!checked {
@@ -1673,7 +1716,7 @@ QToolBar > QPushButton:!checked {
 }
 
 QToolBar > QPushButton:checked:hover {
-    border-color: #b28416;
+    border-color: #e2ac2a;
 }
 
 QToolBar > QPushButton:!checked:hover {
@@ -1682,7 +1725,7 @@ QToolBar > QPushButton:!checked:hover {
 }
 
 QToolBar > QPushButton:checked:pressed {
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #d0970c, stop:1 #daa116);
+    background-color: #e3b64d;
 }
 
 QToolBar > QPushButton:!checked:pressed {
@@ -1899,4 +1942,4 @@ QDialog QGroupBox QFrame {
     margin: 2px 0px;
 }
 
-*[mandatoryField="true"] { background-color: cyan }
\ No newline at end of file
+*[mandatoryField="true"] { background-color: cyan }
diff --git a/src/Gui/Stylesheets/Light - blue.qss b/src/Gui/Stylesheets/Light - blue.qss
index e1452835f..b1b706e9d 100644
--- a/src/Gui/Stylesheets/Light - blue.qss	
+++ b/src/Gui/Stylesheets/Light - blue.qss	
@@ -1,7 +1,7 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.01
+version 2.02
 QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses QT styling.
 
@@ -97,7 +97,7 @@ QToolBar  {
     background-color: #f5f5f5; /* main background color */
 }
 
-QMdiArea[showImage="true"] {
+QMdiArea {
     background-image: url(qss:images/background_freecad.png);
     background-position: center center;
     background-repeat: no-repeat;
@@ -164,27 +164,29 @@ Tool bar
 ==================================================================================================*/
 QToolBar {
     border: none;
-    min-width: 32px; /* allows a minimum of space between QToolBar colums */
-    min-height: 32px; /* allows a minimum of space between QToolBar rows */
+    padding: 2px;
 }
 
-QToolBar::handle:horizontal {
+QToolBar::handle:top,
+QToolBar::handle:bottom {
     background-image: url(qss:images/Hmovetoolbar_dark.png);
     width: 10px;
-    margin: 6px 2px 6px 2px;
+    margin: 4px 2px;
     background-position: top right;
     background-repeat: repeat-y;
 }
 
-QToolBar::handle:vertical {
+QToolBar::handle:left,
+QToolBar::handle:right {
     background-image: url(qss:images/Vmovetoolbar_dark.png);
     height: 10px;
-    margin: 2px 6px 2px 6px;
+    margin: 2px 4px;
     background-position: left bottom;
     background-repeat: repeat-x;
 }
 
-QToolBar::separator:horizontal {
+QToolBar::separator:top,
+QToolBar::separator:bottom {
     background-image: url(qss:images/separtoolbar_dark.png);
     width: 10px;
     margin: 6px 2px 6px 2px;
@@ -192,7 +194,8 @@ QToolBar::separator:horizontal {
     background-repeat: repeat-y;
 }
 
-QToolBar::separator:vertical {
+QToolBar::separator:left,
+QToolBar::separator:right {
     background-image: url(qss:images/separtoolbar_dark.png);
     height: 10px;
     margin: 2px 6px 2px 6px;
@@ -575,9 +578,8 @@ QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
 }
 
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:selected {
-    color: #1b3774;
-    background-color: #cbd8e6;
-    border: 3px solid #7cabf9;
+    color: white;
+    background-color: #5e90fa;
 }
 
 
@@ -750,6 +752,20 @@ Gui--PropertyEditor--PropertyEditor QComboBox {
     padding-bottom: 0px;
 }
 
+/* reset min-height to 0px inside list views */
+QTreeView > QWidget > QComboBox,
+QTreeView > QWidget > QAbstractSpinBox,
+QTreeView > QWidget > QSpinBox,
+QTreeView > QWidget > QDoubleSpinBox,
+QTreeView > QWidget > QLineEdit,
+QTreeView > QWidget > QTextEdit,
+QTreeView > QWidget > QTimeEdit,
+QTreeView > QWidget > QDateEdit,
+QTreeView > QWidget > QDateTimeEdit,
+QTreeView > QWidget > Gui--ColorButton {
+    min-height: 0px;
+}
+
 /* set border-radius to 0px inside list views */
 QTreeView > QWidget > QComboBox,
 QTreeView > QWidget > QAbstractSpinBox,
@@ -807,6 +823,7 @@ QTreeView > QWidget > QDateTimeEdit:read-only {
 /* Fix to correctly (not totally) draw QTextEdit on OSX at Page properties: "Page result", "Template" and "Editable Texts" */
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QWidget {
     min-height: 14px;
+    border-radius: 0px; /* reset */
 }
 
 
@@ -958,10 +975,10 @@ Text/Python editor (macros, etc...)
 ==================================================================================================*/
 QPlainTextEdit,
 QPlainTextEdit:focus {
-    background-color: #c8c8c8;
+    background-color: #f0f0f0;
     selection-color: white;
     selection-background-color: #3874f2;
-    border: 1px solid #505050;
+    border: 1px solid #c3c3c3;
     border-radius: 3px;
     margin: 4px;
 }
@@ -975,6 +992,17 @@ QFrame[class="panel"] {
     background-color: transparent; /* temporal (transparent background) */
 }
 
+QSint--ActionGroup {
+    padding: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+    margin: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+}
+
+
+QSint--ActionGroup QPushButton {
+    padding: 2px; /* bigger padding crops text and icons... */
+    margin: 0px;
+}
+
 /* Separator line */
 QSint--ActionGroup QFrame[height="1"],
 QSint--ActionGroup QFrame[height="2"],
@@ -1091,6 +1119,7 @@ QDateTimeEdit {
     border: 1px solid #e0e0e0;
     border-radius: 3px;
     min-width: 50px; /* it ensures the default value is correctly displayed */
+    min-height: 20px; /* important to be a pair number in order to up/down buttons to be divisible by two (if not set could create a blank line in Ubuntu. Its downside is that it's needed to reset it (min-width: 0px) on following elements that can't have it such as fields inside QToolBar and inside QTreeView (Property editor) */
     padding: 1px 2px; /* temporal: could don't be compatible with elements inside Tree/List view */
 }
 
@@ -1165,7 +1194,6 @@ QDateEdit:up-button,
 QDateTimeEdit:up-button {
     subcontrol-position: top right;
     border-top-right-radius: 3px;
-    height: 12px; /* fix for Ubuntu that doesn't divide the up/down button into the exact middle */
 }
 
 QAbstractSpinBox:down-button,
@@ -1218,7 +1246,7 @@ QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
     image: url(qss:images/up_arrow_dark.png);
-    top: 0px; /* fix simetry between up and down images */
+    top: 2px; /* fix symmetry between up and down images */
 }
 
 QAbstractSpinBox::up-arrow:focus,
@@ -1635,12 +1663,6 @@ QSlider::handle:vertical:disabled {
 /*==================================================================================================
 Toolbar buttons
 ==================================================================================================*/
-QToolBar > QToolButton {
-    margin: 2px;
-    padding: 2px;
-}
-
-QToolBar > QPushButton,
 /*QToolBar > QComboBox,   disabled because creates different margins for body and drop-down button */
 QToolBar > QAbstractSpinBox,
 QToolBar > QSpinBox,
@@ -1650,18 +1672,39 @@ QToolBar > QTextEdit,
 QToolBar > QTimeEdit,
 QToolBar > QDateEdit,
 QToolBar > QDateTimeEdit {
+    margin: 0px 2px;
+    padding: 0px;
+    min-width: 70px; /* necessary to show its content */
+}
+
+QToolBar > QToolButton {
     margin: 2px;
     padding: 2px;
 }
 
+QToolBar > QComboBox,
+QToolBar > QAbstractSpinBox,
+QToolBar > QSpinBox,
+QToolBar > QDoubleSpinBox,
+QToolBar > QLineEdit,
+QToolBar > QTextEdit,
+QToolBar > QTimeEdit,
+QToolBar > QDateEdit,
+QToolBar > QDateTimeEdit {
+    min-height: 0px; /* reset it inside Tool Bar due to the user ability to set the "size of toolbar icons" inside Preferences  */
+}
+
 QToolBar > QPushButton {
+    padding: 0px;
+    margin: 1px; /* doesn't work with :left, :right:, :top or :bottom sub-controls */
+    min-width: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
+    min-height: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
     border-radius: 4px; /* same as regular QPushButton */
-    min-width: 20px; /* reset it due to larger value on regular QPushButton, same or bigger value as regular QPushButton min-height */
 }
 
 QToolBar > QPushButton:checked {
-    border: 1px solid #3874f2;
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #5e90fa, stop:1 #3874f2);
+    border: 1px solid #7cabf9;
+    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #cbd8e6, stop:1 #7cabf9);
 }
 
 QToolBar > QPushButton:!checked {
@@ -1671,7 +1714,7 @@ QToolBar > QPushButton:!checked {
 }
 
 QToolBar > QPushButton:checked:hover {
-    border-color: #2053c0;
+    border-color: #6f9efa;
 }
 
 QToolBar > QPushButton:!checked:hover {
@@ -1680,7 +1723,7 @@ QToolBar > QPushButton:!checked:hover {
 }
 
 QToolBar > QPushButton:checked:pressed {
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #3874f2, stop:1 #5e90fa);
+    background-color: #7cabf9;
 }
 
 QToolBar > QPushButton:!checked:pressed {
@@ -1897,4 +1940,4 @@ QDialog QGroupBox QFrame {
     margin: 2px 0px;
 }
 
-*[mandatoryField="true"] { background-color: cyan }
\ No newline at end of file
+*[mandatoryField="true"] { background-color: cyan }
diff --git a/src/Gui/Stylesheets/Light - green.qss b/src/Gui/Stylesheets/Light - green.qss
index 1b14de033..4993cbdcc 100644
--- a/src/Gui/Stylesheets/Light - green.qss	
+++ b/src/Gui/Stylesheets/Light - green.qss	
@@ -1,7 +1,7 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.01
+version 2.02
 QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses QT styling.
 
@@ -97,7 +97,7 @@ QToolBar  {
     background-color: #f5f5f5; /* main background color */
 }
 
-QMdiArea[showImage="true"] {
+QMdiArea {
     background-image: url(qss:images/background_freecad.png);
     background-position: center center;
     background-repeat: no-repeat;
@@ -164,27 +164,29 @@ Tool bar
 ==================================================================================================*/
 QToolBar {
     border: none;
-    min-width: 32px; /* allows a minimum of space between QToolBar colums */
-    min-height: 32px; /* allows a minimum of space between QToolBar rows */
+    padding: 2px;
 }
 
-QToolBar::handle:horizontal {
+QToolBar::handle:top,
+QToolBar::handle:bottom {
     background-image: url(qss:images/Hmovetoolbar_dark.png);
     width: 10px;
-    margin: 6px 2px 6px 2px;
+    margin: 4px 2px;
     background-position: top right;
     background-repeat: repeat-y;
 }
 
-QToolBar::handle:vertical {
+QToolBar::handle:left,
+QToolBar::handle:right {
     background-image: url(qss:images/Vmovetoolbar_dark.png);
     height: 10px;
-    margin: 2px 6px 2px 6px;
+    margin: 2px 4px;
     background-position: left bottom;
     background-repeat: repeat-x;
 }
 
-QToolBar::separator:horizontal {
+QToolBar::separator:top,
+QToolBar::separator:bottom {
     background-image: url(qss:images/separtoolbar_dark.png);
     width: 10px;
     margin: 6px 2px 6px 2px;
@@ -192,7 +194,8 @@ QToolBar::separator:horizontal {
     background-repeat: repeat-y;
 }
 
-QToolBar::separator:vertical {
+QToolBar::separator:left,
+QToolBar::separator:right {
     background-image: url(qss:images/separtoolbar_dark.png);
     height: 10px;
     margin: 2px 6px 2px 6px;
@@ -575,9 +578,8 @@ QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
 }
 
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:selected {
-    color: #566214;
-    background-color: #dadfc5;
-    border: 3px solid #a5c61a;
+    color: white;
+    background-color: #94b30f;
 }
 
 
@@ -750,6 +752,20 @@ Gui--PropertyEditor--PropertyEditor QComboBox {
     padding-bottom: 0px;
 }
 
+/* reset min-height to 0px inside list views */
+QTreeView > QWidget > QComboBox,
+QTreeView > QWidget > QAbstractSpinBox,
+QTreeView > QWidget > QSpinBox,
+QTreeView > QWidget > QDoubleSpinBox,
+QTreeView > QWidget > QLineEdit,
+QTreeView > QWidget > QTextEdit,
+QTreeView > QWidget > QTimeEdit,
+QTreeView > QWidget > QDateEdit,
+QTreeView > QWidget > QDateTimeEdit,
+QTreeView > QWidget > Gui--ColorButton {
+    min-height: 0px;
+}
+
 /* set border-radius to 0px inside list views */
 QTreeView > QWidget > QComboBox,
 QTreeView > QWidget > QAbstractSpinBox,
@@ -807,6 +823,7 @@ QTreeView > QWidget > QDateTimeEdit:read-only {
 /* Fix to correctly (not totally) draw QTextEdit on OSX at Page properties: "Page result", "Template" and "Editable Texts" */
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QWidget {
     min-height: 14px;
+    border-radius: 0px; /* reset */
 }
 
 
@@ -958,10 +975,10 @@ Text/Python editor (macros, etc...)
 ==================================================================================================*/
 QPlainTextEdit,
 QPlainTextEdit:focus {
-    background-color: #c8c8c8;
+    background-color: #f0f0f0;
     selection-color: white;
     selection-background-color: #819c0c;
-    border: 1px solid #505050;
+    border: 1px solid #c3c3c3;
     border-radius: 3px;
     margin: 4px;
 }
@@ -975,6 +992,17 @@ QFrame[class="panel"] {
     background-color: transparent; /* temporal (transparent background) */
 }
 
+QSint--ActionGroup {
+    padding: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+    margin: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+}
+
+
+QSint--ActionGroup QPushButton {
+    padding: 2px; /* bigger padding crops text and icons... */
+    margin: 0px;
+}
+
 /* Separator line */
 QSint--ActionGroup QFrame[height="1"],
 QSint--ActionGroup QFrame[height="2"],
@@ -1091,6 +1119,7 @@ QDateTimeEdit {
     border: 1px solid #e0e0e0;
     border-radius: 3px;
     min-width: 50px; /* it ensures the default value is correctly displayed */
+    min-height: 20px; /* important to be a pair number in order to up/down buttons to be divisible by two (if not set could create a blank line in Ubuntu. Its downside is that it's needed to reset it (min-width: 0px) on following elements that can't have it such as fields inside QToolBar and inside QTreeView (Property editor) */
     padding: 1px 2px; /* temporal: could don't be compatible with elements inside Tree/List view */
 }
 
@@ -1165,7 +1194,6 @@ QDateEdit:up-button,
 QDateTimeEdit:up-button {
     subcontrol-position: top right;
     border-top-right-radius: 3px;
-    height: 12px; /* fix for Ubuntu that doesn't divide the up/down button into the exact middle */
 }
 
 QAbstractSpinBox:down-button,
@@ -1218,7 +1246,7 @@ QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
     image: url(qss:images/up_arrow_dark.png);
-    top: 0px; /* fix simetry between up and down images */
+    top: 2px; /* fix symmetry between up and down images */
 }
 
 QAbstractSpinBox::up-arrow:focus,
@@ -1635,12 +1663,6 @@ QSlider::handle:vertical:disabled {
 /*==================================================================================================
 Toolbar buttons
 ==================================================================================================*/
-QToolBar > QToolButton {
-    margin: 2px;
-    padding: 2px;
-}
-
-QToolBar > QPushButton,
 /*QToolBar > QComboBox,   disabled because creates different margins for body and drop-down button */
 QToolBar > QAbstractSpinBox,
 QToolBar > QSpinBox,
@@ -1650,18 +1672,39 @@ QToolBar > QTextEdit,
 QToolBar > QTimeEdit,
 QToolBar > QDateEdit,
 QToolBar > QDateTimeEdit {
+    margin: 0px 2px;
+    padding: 0px;
+    min-width: 70px; /* necessary to show its content */
+}
+
+QToolBar > QToolButton {
     margin: 2px;
     padding: 2px;
 }
 
+QToolBar > QComboBox,
+QToolBar > QAbstractSpinBox,
+QToolBar > QSpinBox,
+QToolBar > QDoubleSpinBox,
+QToolBar > QLineEdit,
+QToolBar > QTextEdit,
+QToolBar > QTimeEdit,
+QToolBar > QDateEdit,
+QToolBar > QDateTimeEdit {
+    min-height: 0px; /* reset it inside Tool Bar due to the user ability to set the "size of toolbar icons" inside Preferences  */
+}
+
 QToolBar > QPushButton {
+    padding: 0px;
+    margin: 1px; /* doesn't work with :left, :right:, :top or :bottom sub-controls */
+    min-width: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
+    min-height: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
     border-radius: 4px; /* same as regular QPushButton */
-    min-width: 20px; /* reset it due to larger value on regular QPushButton, same or bigger value as regular QPushButton min-height */
 }
 
 QToolBar > QPushButton:checked {
-    border: 1px solid #819c0c;
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #94b30f, stop:1 #819c0c);
+    border: 1px solid #a5c61a;
+    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #dadfc5, stop:1 #a5c61a);
 }
 
 QToolBar > QPushButton:!checked {
@@ -1671,7 +1714,7 @@ QToolBar > QPushButton:!checked {
 }
 
 QToolBar > QPushButton:checked:hover {
-    border-color: #74831d;
+    border-color: #9bbc12;
 }
 
 QToolBar > QPushButton:!checked:hover {
@@ -1680,7 +1723,7 @@ QToolBar > QPushButton:!checked:hover {
 }
 
 QToolBar > QPushButton:checked:pressed {
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #819c0c, stop:1 #94b30f);
+    background-color: #a5c61a;
 }
 
 QToolBar > QPushButton:!checked:pressed {
@@ -1897,4 +1940,4 @@ QDialog QGroupBox QFrame {
     margin: 2px 0px;
 }
 
-*[mandatoryField="true"] { background-color: cyan }
\ No newline at end of file
+*[mandatoryField="true"] { background-color: cyan }
diff --git a/src/Gui/Stylesheets/Light - orange.qss b/src/Gui/Stylesheets/Light - orange.qss
index dca46d920..a735c266b 100644
--- a/src/Gui/Stylesheets/Light - orange.qss	
+++ b/src/Gui/Stylesheets/Light - orange.qss	
@@ -1,7 +1,7 @@
 /*
 ABOUT
 ============================================================================================================
-version 2.01
+version 2.02
 QT theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/).
 It might work with other software that uses QT styling.
 
@@ -97,7 +97,7 @@ QToolBar  {
     background-color: #f5f5f5; /* main background color */
 }
 
-QMdiArea[showImage="true"] {
+QMdiArea {
     background-image: url(qss:images/background_freecad.png);
     background-position: center center;
     background-repeat: no-repeat;
@@ -164,27 +164,29 @@ Tool bar
 ==================================================================================================*/
 QToolBar {
     border: none;
-    min-width: 32px; /* allows a minimum of space between QToolBar colums */
-    min-height: 32px; /* allows a minimum of space between QToolBar rows */
+    padding: 2px;
 }
 
-QToolBar::handle:horizontal {
+QToolBar::handle:top,
+QToolBar::handle:bottom {
     background-image: url(qss:images/Hmovetoolbar_dark.png);
     width: 10px;
-    margin: 6px 2px 6px 2px;
+    margin: 4px 2px;
     background-position: top right;
     background-repeat: repeat-y;
 }
 
-QToolBar::handle:vertical {
+QToolBar::handle:left,
+QToolBar::handle:right {
     background-image: url(qss:images/Vmovetoolbar_dark.png);
     height: 10px;
-    margin: 2px 6px 2px 6px;
+    margin: 2px 4px;
     background-position: left bottom;
     background-repeat: repeat-x;
 }
 
-QToolBar::separator:horizontal {
+QToolBar::separator:top,
+QToolBar::separator:bottom {
     background-image: url(qss:images/separtoolbar_dark.png);
     width: 10px;
     margin: 6px 2px 6px 2px;
@@ -192,7 +194,8 @@ QToolBar::separator:horizontal {
     background-repeat: repeat-y;
 }
 
-QToolBar::separator:vertical {
+QToolBar::separator:left,
+QToolBar::separator:right {
     background-image: url(qss:images/separtoolbar_dark.png);
     height: 10px;
     margin: 2px 6px 2px 6px;
@@ -575,9 +578,8 @@ QDialog#Gui__Dialog__DlgPreferences > QListView::item:hover {
 }
 
 QDialog#Gui__Dialog__DlgPreferences > QListView::item:selected {
-    color: #624b14;
-    background-color: #e3d8b9;
-    border: 3px solid #e3b64d;
+    color: white;
+    background-color: #daa116;
 }
 
 
@@ -750,6 +752,20 @@ Gui--PropertyEditor--PropertyEditor QComboBox {
     padding-bottom: 0px;
 }
 
+/* reset min-height to 0px inside list views */
+QTreeView > QWidget > QComboBox,
+QTreeView > QWidget > QAbstractSpinBox,
+QTreeView > QWidget > QSpinBox,
+QTreeView > QWidget > QDoubleSpinBox,
+QTreeView > QWidget > QLineEdit,
+QTreeView > QWidget > QTextEdit,
+QTreeView > QWidget > QTimeEdit,
+QTreeView > QWidget > QDateEdit,
+QTreeView > QWidget > QDateTimeEdit,
+QTreeView > QWidget > Gui--ColorButton {
+    min-height: 0px;
+}
+
 /* set border-radius to 0px inside list views */
 QTreeView > QWidget > QComboBox,
 QTreeView > QWidget > QAbstractSpinBox,
@@ -807,6 +823,7 @@ QTreeView > QWidget > QDateTimeEdit:read-only {
 /* Fix to correctly (not totally) draw QTextEdit on OSX at Page properties: "Page result", "Template" and "Editable Texts" */
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QWidget {
     min-height: 14px;
+    border-radius: 0px; /* reset */
 }
 
 
@@ -958,10 +975,10 @@ Text/Python editor (macros, etc...)
 ==================================================================================================*/
 QPlainTextEdit,
 QPlainTextEdit:focus {
-    background-color: #c8c8c8;
+    background-color: #f0f0f0;
     selection-color: white;
     selection-background-color: #d0970c;
-    border: 1px solid #505050;
+    border: 1px solid #c3c3c3;
     border-radius: 3px;
     margin: 4px;
 }
@@ -975,6 +992,17 @@ QFrame[class="panel"] {
     background-color: transparent; /* temporal (transparent background) */
 }
 
+QSint--ActionGroup {
+    padding: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+    margin: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
+}
+
+
+QSint--ActionGroup QPushButton {
+    padding: 2px; /* bigger padding crops text and icons... */
+    margin: 0px;
+}
+
 /* Separator line */
 QSint--ActionGroup QFrame[height="1"],
 QSint--ActionGroup QFrame[height="2"],
@@ -1091,6 +1119,7 @@ QDateTimeEdit {
     border: 1px solid #e0e0e0;
     border-radius: 3px;
     min-width: 50px; /* it ensures the default value is correctly displayed */
+    min-height: 20px; /* important to be a pair number in order to up/down buttons to be divisible by two (if not set could create a blank line in Ubuntu. Its downside is that it's needed to reset it (min-width: 0px) on following elements that can't have it such as fields inside QToolBar and inside QTreeView (Property editor) */
     padding: 1px 2px; /* temporal: could don't be compatible with elements inside Tree/List view */
 }
 
@@ -1165,7 +1194,6 @@ QDateEdit:up-button,
 QDateTimeEdit:up-button {
     subcontrol-position: top right;
     border-top-right-radius: 3px;
-    height: 12px; /* fix for Ubuntu that doesn't divide the up/down button into the exact middle */
 }
 
 QAbstractSpinBox:down-button,
@@ -1218,7 +1246,7 @@ QTimeEdit::up-arrow,
 QDateEdit::up-arrow,
 QDateTimeEdit::up-arrow {
     image: url(qss:images/up_arrow_dark.png);
-    top: 0px; /* fix simetry between up and down images */
+    top: 2px; /* fix symmetry between up and down images */
 }
 
 QAbstractSpinBox::up-arrow:focus,
@@ -1635,12 +1663,6 @@ QSlider::handle:vertical:disabled {
 /*==================================================================================================
 Toolbar buttons
 ==================================================================================================*/
-QToolBar > QToolButton {
-    margin: 2px;
-    padding: 2px;
-}
-
-QToolBar > QPushButton,
 /*QToolBar > QComboBox,   disabled because creates different margins for body and drop-down button */
 QToolBar > QAbstractSpinBox,
 QToolBar > QSpinBox,
@@ -1650,18 +1672,39 @@ QToolBar > QTextEdit,
 QToolBar > QTimeEdit,
 QToolBar > QDateEdit,
 QToolBar > QDateTimeEdit {
+    margin: 0px 2px;
+    padding: 0px;
+    min-width: 70px; /* necessary to show its content */
+}
+
+QToolBar > QToolButton {
     margin: 2px;
     padding: 2px;
 }
 
+QToolBar > QComboBox,
+QToolBar > QAbstractSpinBox,
+QToolBar > QSpinBox,
+QToolBar > QDoubleSpinBox,
+QToolBar > QLineEdit,
+QToolBar > QTextEdit,
+QToolBar > QTimeEdit,
+QToolBar > QDateEdit,
+QToolBar > QDateTimeEdit {
+    min-height: 0px; /* reset it inside Tool Bar due to the user ability to set the "size of toolbar icons" inside Preferences  */
+}
+
 QToolBar > QPushButton {
+    padding: 0px;
+    margin: 1px; /* doesn't work with :left, :right:, :top or :bottom sub-controls */
+    min-width: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
+    min-height: 16px; /* could not be larger due to switchable Preferences "Size of toolbar icons" */
     border-radius: 4px; /* same as regular QPushButton */
-    min-width: 20px; /* reset it due to larger value on regular QPushButton, same or bigger value as regular QPushButton min-height */
 }
 
 QToolBar > QPushButton:checked {
-    border: 1px solid #d0970c;
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #daa116, stop:1 #d0970c);
+    border: 1px solid #e3b64d;
+    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #e3d8b9, stop:1 #e3b64d);
 }
 
 QToolBar > QPushButton:!checked {
@@ -1671,7 +1714,7 @@ QToolBar > QPushButton:!checked {
 }
 
 QToolBar > QPushButton:checked:hover {
-    border-color: #b28416;
+    border-color: #e2ac2a;
 }
 
 QToolBar > QPushButton:!checked:hover {
@@ -1680,7 +1723,7 @@ QToolBar > QPushButton:!checked:hover {
 }
 
 QToolBar > QPushButton:checked:pressed {
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #d0970c, stop:1 #daa116);
+    background-color: #e3b64d;
 }
 
 QToolBar > QPushButton:!checked:pressed {
@@ -1897,4 +1940,4 @@ QDialog QGroupBox QFrame {
     margin: 2px 0px;
 }
 
-*[mandatoryField="true"] { background-color: cyan }
\ No newline at end of file
+*[mandatoryField="true"] { background-color: cyan }