diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
index cc9d92d426dd..d0f9624f9161 100644
--- a/src/gui/qgscolorbutton.cpp
+++ b/src/gui/qgscolorbutton.cpp
@@ -66,3 +66,33 @@ void QgsColorButton::setColor( const QColor &color )
   mColor = color;
   update();
 }
+
+
+//////////////////
+
+QgsColorButtonV2::QgsColorButtonV2( QWidget* parent )
+ : QPushButton(parent)
+{
+}
+
+void QgsColorButtonV2::setColor( const QColor &color )
+{
+  mColor = color;
+
+  QPixmap pixmap(iconSize());
+  pixmap.fill(QColor(0,0,0,0));
+
+  QRect rect(1,1, iconSize().width() - 2, iconSize().height() - 2);
+
+  // draw a slightly rounded rectangle
+  QPainter p;
+  p.begin(&pixmap);
+  p.setPen(Qt::NoPen);
+  p.setRenderHint(QPainter::Antialiasing);
+  p.setBrush(color);
+  p.drawRoundedRect(rect, 4, 4);
+  p.end();
+
+  // set this pixmap as icon
+  setIcon(QIcon(pixmap));
+}
diff --git a/src/gui/qgscolorbutton.h b/src/gui/qgscolorbutton.h
index ade8d9a0898a..62d708ba5b1f 100644
--- a/src/gui/qgscolorbutton.h
+++ b/src/gui/qgscolorbutton.h
@@ -17,6 +17,7 @@
 #define QGSCOLORBUTTON_H
 
 #include <QToolButton>
+#include <QPushButton>
 
 /** \ingroup gui
  * A cross platform button subclass for selecting colors.
@@ -37,4 +38,18 @@ class GUI_EXPORT QgsColorButton: public QToolButton
     QColor mColor;
 };
 
+
+class QgsColorButtonV2 : public QPushButton
+{
+  public:
+    QgsColorButtonV2( QWidget* parent = 0 );
+
+    void setColor( const QColor &color );
+    QColor color() const { return mColor; }
+
+  private:
+    QColor mColor;
+};
+
+
 #endif
diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
index 02849fa2233a..fed9631f211d 100644
--- a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
+++ b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
@@ -27,6 +27,7 @@ QgsRendererV2PropertiesDialog::QgsRendererV2PropertiesDialog(QgsVectorLayer* lay
   if (embedded)
   {
     buttonBox->hide();
+    layout()->setContentsMargins(0,0,0,0);
   }
 
   connect(buttonBox, SIGNAL(accepted()), this, SLOT(onOK()));
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
index 68ff848e22be..d0a4ee1b6fed 100644
--- a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
+++ b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -16,14 +16,7 @@
 #include <QStandardItemModel>
 #include <QSvgRenderer>
 
-static void updateColorButton(QAbstractButton* button, QColor color)
-{
-	QPixmap p(20,20);
-	p.fill(color);
-	button->setIcon(QIcon(p));
-}
 
-//////////
 
 QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget(QWidget* parent)
   : QgsSymbolLayerV2Widget(parent)
@@ -51,7 +44,7 @@ void QgsSimpleLineSymbolLayerV2Widget::setSymbolLayer(QgsSymbolLayerV2* layer)
 
   // set values
   spinWidth->setValue(mLayer->width());
-  updateColorButton(btnChangeColor, mLayer->color());
+  btnChangeColor->setColor(mLayer->color());
   cboPenStyle->setPenStyle(mLayer->penStyle());
   spinOffset->setValue(mLayer->offset());
   cboJoinStyle->setPenJoinStyle(mLayer->penJoinStyle());
@@ -75,7 +68,7 @@ void QgsSimpleLineSymbolLayerV2Widget::colorChanged()
   if (!color.isValid())
     return;
   mLayer->setColor(color);
-  updateColorButton(btnChangeColor, mLayer->color());
+  btnChangeColor->setColor(mLayer->color());
   emit changed();
 }
 
@@ -145,8 +138,8 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer(QgsSymbolLayerV2* layer)
       break;
     }
   }
-  updateColorButton(btnChangeColorBorder, mLayer->borderColor());
-  updateColorButton(btnChangeColorFill, mLayer->color());
+  btnChangeColorBorder->setColor(mLayer->borderColor());
+  btnChangeColorFill->setColor(mLayer->color());
   spinSize->setValue(mLayer->size());
   spinAngle->setValue(mLayer->angle());
 
@@ -176,7 +169,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setColorBorder()
   if (!borderColor.isValid())
     return;
   mLayer->setBorderColor(borderColor);
-  updateColorButton(btnChangeColorBorder, mLayer->borderColor());
+  btnChangeColorBorder->setColor(mLayer->borderColor());
   emit changed();
 }
 
@@ -186,7 +179,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setColorFill()
   if (!color.isValid())
     return;
   mLayer->setColor(color);
-  updateColorButton(btnChangeColorFill, mLayer->color());
+  btnChangeColorFill->setColor(mLayer->color());
   emit changed();
 }
 
@@ -232,8 +225,8 @@ void QgsSimpleFillSymbolLayerV2Widget::setSymbolLayer(QgsSymbolLayerV2* layer)
   mLayer = static_cast<QgsSimpleFillSymbolLayerV2*>(layer);
   
   // set values
-  updateColorButton(btnChangeColor, mLayer->color());
-  updateColorButton(btnChangeBorderColor, mLayer->borderColor());
+  btnChangeColor->setColor(mLayer->color());
+  btnChangeBorderColor->setColor(mLayer->borderColor());
   cboFillStyle->setBrushStyle(mLayer->brushStyle());
 }
 
@@ -248,7 +241,7 @@ void QgsSimpleFillSymbolLayerV2Widget::setColor()
   if (!color.isValid())
     return;
   mLayer->setColor(color);
-  updateColorButton(btnChangeColor, mLayer->color());
+  btnChangeColor->setColor(mLayer->color());
   emit changed();
 }
 
@@ -258,7 +251,7 @@ void QgsSimpleFillSymbolLayerV2Widget::setBorderColor()
   if (!color.isValid())
     return;
   mLayer->setBorderColor(color);
-  updateColorButton(btnChangeBorderColor, mLayer->borderColor());
+  btnChangeBorderColor->setColor(mLayer->borderColor());
   emit changed();
 }
 
@@ -482,7 +475,7 @@ void QgsLineDecorationSymbolLayerV2Widget::setSymbolLayer(QgsSymbolLayerV2* laye
   mLayer = static_cast<QgsLineDecorationSymbolLayerV2*>(layer);
 
   // set values
-  updateColorButton(btnChangeColor, mLayer->color());
+  btnChangeColor->setColor(mLayer->color());
 }
 
 QgsSymbolLayerV2* QgsLineDecorationSymbolLayerV2Widget::symbolLayer()
@@ -496,6 +489,6 @@ void QgsLineDecorationSymbolLayerV2Widget::colorChanged()
   if (!color.isValid())
     return;
   mLayer->setColor(color);
-  updateColorButton(btnChangeColor, mLayer->color());
+  btnChangeColor->setColor(mLayer->color());
   emit changed();
 }
diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
index 8f603055f343..092bf75db848 100644
--- a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
+++ b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
@@ -27,6 +27,7 @@ QgsSymbolV2SelectorDialog::QgsSymbolV2SelectorDialog(QgsSymbolV2* symbol, QgsSty
   if (embedded)
   {
     buttonBox->hide();
+    layout()->setContentsMargins(0,0,0,0);
   }
   
   connect(btnSymbolProperties, SIGNAL(clicked()), this, SLOT(changeSymbolProperties()));
@@ -44,12 +45,15 @@ QgsSymbolV2SelectorDialog::QgsSymbolV2SelectorDialog(QgsSymbolV2* symbol, QgsSty
   // there's a correspondence between symbol type number and page numbering => exploit it!
   stackedWidget->setCurrentIndex(symbol->type());
   
-  connect(btnSetColor, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
+  connect(btnColorMarker, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
+  connect(btnColorLine, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
+  connect(btnColorFill, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
   connect(spinAngle, SIGNAL(valueChanged(double)), this, SLOT(setMarkerAngle(double)));
   connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(setMarkerSize(double)));
   connect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(setLineWidth(double)));
 
   connect(btnAddToStyle, SIGNAL(clicked()), this, SLOT(addSymbolToStyle()));
+  btnSymbolProperties->setIcon( QIcon( QgsApplication::defaultThemePath() + "mActionOptions.png" ) );
   btnAddToStyle->setIcon( QIcon( QgsApplication::defaultThemePath() + "symbologyAdd.png" ) );
 }
 
@@ -114,9 +118,10 @@ void QgsSymbolV2SelectorDialog::updateSymbolPreview()
 
 void QgsSymbolV2SelectorDialog::updateSymbolColor()
 {
-  QPixmap p(20,20);
-  p.fill(mSymbol->color());
-  btnSetColor->setIcon(QIcon(p));
+  QColor c = mSymbol->color();
+  btnColorMarker->setColor(c);
+  btnColorLine->setColor(c);
+  btnColorFill->setColor(c);
 }
 
 void QgsSymbolV2SelectorDialog::updateSymbolInfo()
diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
index 28e9fda640d7..3617ac9e6f5a 100644
--- a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
+++ b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
@@ -5,15 +5,6 @@
 
 #include <QColorDialog>
 
-static void updateColorButton(QAbstractButton* button, QColor color)
-{
-  QPixmap p(20,20);
-  p.fill(color);
-  button->setIcon(QIcon(p));
-}
-
-/////////
-
 
 QgsVectorGradientColorRampV2Dialog::QgsVectorGradientColorRampV2Dialog(QgsVectorGradientColorRampV2* ramp, QWidget* parent)
   : QDialog(parent), mRamp(ramp)
@@ -32,8 +23,8 @@ void QgsVectorGradientColorRampV2Dialog::updatePreview()
   QSize size(300,40);
   lblPreview->setPixmap(QgsSymbolLayerV2Utils::colorRampPreviewPixmap(mRamp, size));
   
-  updateColorButton(btnColor1, mRamp->color1());
-  updateColorButton(btnColor2, mRamp->color2());
+  btnColor1->setColor(mRamp->color1());
+  btnColor2->setColor(mRamp->color2());
 }
 
 void QgsVectorGradientColorRampV2Dialog::setColor1()
diff --git a/src/ui/qgssymbolv2selectordialogbase.ui b/src/ui/qgssymbolv2selectordialogbase.ui
index d13828fa3980..58ce5c970565 100644
--- a/src/ui/qgssymbolv2selectordialogbase.ui
+++ b/src/ui/qgssymbolv2selectordialogbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>452</width>
-    <height>397</height>
+    <height>404</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,15 +15,21 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0" rowspan="3">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
       <widget class="QLabel" name="lblPreview">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>100</height>
+        </size>
+       </property>
        <property name="frameShape">
         <enum>QFrame::Box</enum>
        </property>
@@ -38,36 +44,56 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QPushButton" name="btnSymbolProperties">
-       <property name="text">
-        <string>Properties</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2" rowspan="3">
+     <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="pageMarker">
-        <layout class="QGridLayout">
+        <layout class="QGridLayout" name="gridLayout">
          <item row="0" column="0">
-          <widget class="QLabel" name="label_2">
+          <widget class="QLabel" name="label_5">
            <property name="text">
-            <string>Size:</string>
+            <string>Color</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QgsColorButtonV2" name="btnColorMarker">
+           <property name="text">
+            <string>Change</string>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
-          <widget class="QLabel" name="label_3">
+          <widget class="QLabel" name="label_2">
            <property name="text">
-            <string>Angle:</string>
+            <string>Size</string>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
+          <widget class="QDoubleSpinBox" name="spinSize">
+           <property name="decimals">
+            <number>1</number>
+           </property>
+           <property name="value">
+            <double>1.000000000000000</double>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Rotation</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
           <widget class="QDoubleSpinBox" name="spinAngle">
+           <property name="suffix">
+            <string>°</string>
+           </property>
            <property name="decimals">
             <number>1</number>
            </property>
@@ -79,8 +105,33 @@
            </property>
           </widget>
          </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="pageLine">
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_6">
+           <property name="text">
+            <string>Color</string>
+           </property>
+          </widget>
+         </item>
          <item row="0" column="1">
-          <widget class="QDoubleSpinBox" name="spinSize">
+          <widget class="QgsColorButtonV2" name="btnColorLine">
+           <property name="text">
+            <string>Change</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>Width</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QDoubleSpinBox" name="spinWidth">
            <property name="decimals">
             <number>1</number>
            </property>
@@ -91,51 +142,51 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="pageLine">
-        <layout class="QHBoxLayout">
+       <widget class="QWidget" name="pageFill">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-          <widget class="QLabel" name="label_4">
+          <widget class="QLabel" name="label_7">
            <property name="text">
-            <string>Width:</string>
+            <string>Color</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QDoubleSpinBox" name="spinWidth">
-           <property name="decimals">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <double>1.000000000000000</double>
+          <widget class="QgsColorButtonV2" name="btnColorFill">
+           <property name="text">
+            <string>Change</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="pageFill"/>
       </widget>
      </item>
-     <item row="0" column="3" rowspan="2">
-      <spacer name="verticalSpacer">
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="btnSymbolProperties">
+       <property name="text">
+        <string>Properties</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>20</width>
-         <height>40</height>
+         <width>40</width>
+         <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
-     <item row="1" column="1" rowspan="2">
-      <widget class="QPushButton" name="btnSetColor">
-       <property name="text">
-        <string>Set color</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="3">
+     <item>
       <widget class="QPushButton" name="btnAddToStyle">
        <property name="text">
         <string>Add to style</string>
@@ -153,6 +204,12 @@
    </item>
    <item>
     <widget class="QListView" name="viewSymbols">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>2</verstretch>
+      </sizepolicy>
+     </property>
      <property name="iconSize">
       <size>
        <width>48</width>
@@ -185,6 +242,25 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QgsColorButtonV2</class>
+   <extends>QPushButton</extends>
+   <header>qgscolorbutton.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>btnColorMarker</tabstop>
+  <tabstop>spinSize</tabstop>
+  <tabstop>spinAngle</tabstop>
+  <tabstop>btnColorLine</tabstop>
+  <tabstop>spinWidth</tabstop>
+  <tabstop>btnColorFill</tabstop>
+  <tabstop>btnSymbolProperties</tabstop>
+  <tabstop>btnAddToStyle</tabstop>
+  <tabstop>viewSymbols</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui b/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
index 0f3eca5369f0..72b2eb145d44 100644
--- a/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
+++ b/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QgsVectorGradientColorRampV2DialogBase</class>
- <widget class="QDialog" name="QgsVectorGradientColorRampV2DialogBase" >
-  <property name="geometry" >
+ <widget class="QDialog" name="QgsVectorGradientColorRampV2DialogBase">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,35 +10,35 @@
     <height>300</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Gradient color ramp</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QGridLayout" >
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+    <layout class="QGridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>Color 1:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QPushButton" name="btnColor1" >
-       <property name="text" >
-        <string>change</string>
+     <item row="0" column="1">
+      <widget class="QgsColorButtonV2" name="btnColor1">
+       <property name="text">
+        <string>Change</string>
        </property>
       </widget>
      </item>
-     <item rowspan="2" row="0" column="2" >
+     <item row="0" column="2" rowspan="2">
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Preferred</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>71</height>
@@ -45,17 +46,17 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
         <string>Color 2:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="QPushButton" name="btnColor2" >
-       <property name="text" >
-        <string>change</string>
+     <item row="1" column="1">
+      <widget class="QgsColorButtonV2" name="btnColor2">
+       <property name="text">
+        <string>Change</string>
        </property>
       </widget>
      </item>
@@ -63,13 +64,13 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Preferred</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
@@ -78,20 +79,20 @@
     </spacer>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Preview</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QLabel" name="lblPreview" >
-        <property name="frameShape" >
+       <widget class="QLabel" name="lblPreview">
+        <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
-        <property name="text" >
+        <property name="text">
          <string/>
         </property>
-        <property name="alignment" >
+        <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
@@ -100,17 +101,24 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QgsColorButtonV2</class>
+   <extends>QPushButton</extends>
+   <header>qgscolorbutton.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
@@ -119,11 +127,11 @@
    <receiver>QgsVectorGradientColorRampV2DialogBase</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>258</x>
      <y>281</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>168</x>
      <y>256</y>
     </hint>
@@ -135,11 +143,11 @@
    <receiver>QgsVectorGradientColorRampV2DialogBase</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>363</x>
      <y>273</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>371</x>
      <y>259</y>
     </hint>
diff --git a/src/ui/symbollayer/widget_linedecoration.ui b/src/ui/symbollayer/widget_linedecoration.ui
index 6888e73aa7cb..9b560e0584db 100644
--- a/src/ui/symbollayer/widget_linedecoration.ui
+++ b/src/ui/symbollayer/widget_linedecoration.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>WidgetLineDecoration</class>
- <widget class="QWidget" name="WidgetLineDecoration" >
-  <property name="geometry" >
+ <widget class="QWidget" name="WidgetLineDecoration">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,41 +10,41 @@
     <height>244</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>Color:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="btnChangeColor" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <widget class="QgsColorButtonV2" name="btnChangeColor">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
-        <string>change</string>
+       <property name="text">
+        <string>Change</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Preferred</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>112</width>
          <height>21</height>
@@ -55,10 +56,10 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>350</width>
        <height>81</height>
@@ -68,6 +69,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QgsColorButtonV2</class>
+   <extends>QPushButton</extends>
+   <header>qgscolorbutton.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/symbollayer/widget_markerline.ui b/src/ui/symbollayer/widget_markerline.ui
index b73544e2c4ad..eb8c6b99e99a 100644
--- a/src/ui/symbollayer/widget_markerline.ui
+++ b/src/ui/symbollayer/widget_markerline.ui
@@ -26,7 +26,7 @@
      <item row="0" column="1">
       <widget class="QPushButton" name="btnChangeMarker">
        <property name="text">
-        <string>change</string>
+        <string>Change</string>
        </property>
       </widget>
      </item>
diff --git a/src/ui/symbollayer/widget_simplefill.ui b/src/ui/symbollayer/widget_simplefill.ui
index 0a7605b9a15a..004c8c3eebe3 100644
--- a/src/ui/symbollayer/widget_simplefill.ui
+++ b/src/ui/symbollayer/widget_simplefill.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>WidgetSimpleFill</class>
- <widget class="QWidget" name="WidgetSimpleFill" >
-  <property name="geometry" >
+ <widget class="QWidget" name="WidgetSimpleFill">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,35 +10,35 @@
     <height>154</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QGridLayout" >
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+    <layout class="QGridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>Color:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QPushButton" name="btnChangeColor" >
-       <property name="text" >
-        <string>change</string>
+     <item row="0" column="1">
+      <widget class="QgsColorButtonV2" name="btnChangeColor">
+       <property name="text">
+        <string>Change</string>
        </property>
       </widget>
      </item>
-     <item rowspan="3" row="0" column="2" >
+     <item row="0" column="2" rowspan="3">
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Preferred</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>91</width>
          <height>51</height>
@@ -45,27 +46,27 @@
        </property>
       </spacer>
      </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
         <string>Fill style:</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1" >
-      <widget class="QgsBrushStyleComboBox" name="cboFillStyle" />
+     <item row="2" column="1">
+      <widget class="QgsBrushStyleComboBox" name="cboFillStyle"/>
      </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
         <string>Border color:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="QPushButton" name="btnChangeBorderColor" >
-       <property name="text" >
-        <string>change</string>
+     <item row="1" column="1">
+      <widget class="QgsColorButtonV2" name="btnChangeBorderColor">
+       <property name="text">
+        <string>Change</string>
        </property>
       </widget>
      </item>
@@ -73,10 +74,10 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>244</width>
        <height>21</height>
@@ -92,6 +93,11 @@
    <extends>QComboBox</extends>
    <header>qgsbrushstylecombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>QgsColorButtonV2</class>
+   <extends>QPushButton</extends>
+   <header>qgscolorbutton.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>btnChangeColor</tabstop>
diff --git a/src/ui/symbollayer/widget_simpleline.ui b/src/ui/symbollayer/widget_simpleline.ui
index 25eca1d08f6c..1cf8f7b6ad19 100644
--- a/src/ui/symbollayer/widget_simpleline.ui
+++ b/src/ui/symbollayer/widget_simpleline.ui
@@ -24,7 +24,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QPushButton" name="btnChangeColor">
+      <widget class="QgsColorButtonV2" name="btnChangeColor">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -32,7 +32,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>change</string>
+        <string>Change</string>
        </property>
       </widget>
      </item>
@@ -181,6 +181,11 @@
    <extends>QComboBox</extends>
    <header>qgspenstylecombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>QgsColorButtonV2</class>
+   <extends>QPushButton</extends>
+   <header>qgscolorbutton.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/ui/symbollayer/widget_simplemarker.ui b/src/ui/symbollayer/widget_simplemarker.ui
index 4783ec57b21c..94495cdfbc7d 100644
--- a/src/ui/symbollayer/widget_simplemarker.ui
+++ b/src/ui/symbollayer/widget_simplemarker.ui
@@ -24,9 +24,9 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QPushButton" name="btnChangeColorBorder">
+      <widget class="QgsColorButtonV2" name="btnChangeColorBorder">
        <property name="text">
-        <string>change</string>
+        <string>Change</string>
        </property>
       </widget>
      </item>
@@ -54,9 +54,9 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QPushButton" name="btnChangeColorFill">
+      <widget class="QgsColorButtonV2" name="btnChangeColorFill">
        <property name="text">
-        <string>change</string>
+        <string>Change</string>
        </property>
       </widget>
      </item>
@@ -191,6 +191,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QgsColorButtonV2</class>
+   <extends>QPushButton</extends>
+   <header>qgscolorbutton.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>