diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp
index c1244dedfd9b..c2300e3f7b82 100644
--- a/src/app/composer/qgscomposeritemwidget.cpp
+++ b/src/app/composer/qgscomposeritemwidget.cpp
@@ -108,7 +108,13 @@ QgsVectorLayer* QgsComposerItemBaseWidget::atlasCoverageLayer() const
 
 //QgsComposerItemWidget
 
-QgsComposerItemWidget::QgsComposerItemWidget( QWidget* parent, QgsComposerItem* item ): QgsComposerItemBaseWidget( parent, item ), mItem( item )
+QgsComposerItemWidget::QgsComposerItemWidget( QWidget* parent, QgsComposerItem* item )
+    : QgsComposerItemBaseWidget( parent, item )
+    , mItem( item )
+    , mFreezeXPosSpin( false )
+    , mFreezeYPosSpin( false )
+    , mFreezeWidthSpin( false )
+    , mFreezeHeightSpin( false )
 {
 
   setupUi( this );
@@ -376,68 +382,88 @@ void QgsComposerItemWidget::setValuesForGuiPositionElements()
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::UpperLeft )
   {
     mUpperLeftCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() );
-    mYPosSpin->setValue( pos.y() );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() );
   }
 
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::UpperMiddle )
   {
     mUpperMiddleCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() + mItem->rect().width() / 2.0 );
-    mYPosSpin->setValue( pos.y() );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() + mItem->rect().width() / 2.0 );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() );
   }
 
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::UpperRight )
   {
     mUpperRightCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() + mItem->rect().width() );
-    mYPosSpin->setValue( pos.y() );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() + mItem->rect().width() );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() );
   }
 
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::MiddleLeft )
   {
     mMiddleLeftCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() );
-    mYPosSpin->setValue( pos.y() + mItem->rect().height() / 2.0 );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() + mItem->rect().height() / 2.0 );
   }
 
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::Middle )
   {
     mMiddleCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() + mItem->rect().width() / 2.0 );
-    mYPosSpin->setValue( pos.y() + mItem->rect().height() / 2.0 );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() + mItem->rect().width() / 2.0 );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() + mItem->rect().height() / 2.0 );
   }
 
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::MiddleRight )
   {
     mMiddleRightCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() + mItem->rect().width() );
-    mYPosSpin->setValue( pos.y() + mItem->rect().height() / 2.0 );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() + mItem->rect().width() );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() + mItem->rect().height() / 2.0 );
   }
 
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::LowerLeft )
   {
     mLowerLeftCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() );
-    mYPosSpin->setValue( pos.y() + mItem->rect().height() );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() + mItem->rect().height() );
   }
 
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::LowerMiddle )
   {
     mLowerMiddleCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() + mItem->rect().width() / 2.0 );
-    mYPosSpin->setValue( pos.y() + mItem->rect().height() );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() + mItem->rect().width() / 2.0 );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() + mItem->rect().height() );
   }
 
   if ( mItem->lastUsedPositionMode() == QgsComposerItem::LowerRight )
   {
     mLowerRightCheckBox->setChecked( true );
-    mXPosSpin->setValue( pos.x() + mItem->rect().width() );
-    mYPosSpin->setValue( pos.y() + mItem->rect().height() );
+    if ( !mFreezeXPosSpin )
+      mXPosSpin->setValue( pos.x() + mItem->rect().width() );
+    if ( !mFreezeYPosSpin )
+      mYPosSpin->setValue( pos.y() + mItem->rect().height() );
   }
 
-  mWidthSpin->setValue( mItem->rect().width() );
-  mHeightSpin->setValue( mItem->rect().height() );
+  if ( !mFreezeWidthSpin )
+    mWidthSpin->setValue( mItem->rect().width() );
+  if ( !mFreezeHeightSpin )
+    mHeightSpin->setValue( mItem->rect().height() );
   mPageSpinBox->setValue( mItem->page() );
 
   mXPosSpin->blockSignals( false );
@@ -635,6 +661,34 @@ void QgsComposerItemWidget::on_mItemIdLineEdit_editingFinished()
   }
 }
 
+void QgsComposerItemWidget::on_mXPosSpin_valueChanged( double )
+{
+  mFreezeXPosSpin = true;
+  changeItemPosition();
+  mFreezeXPosSpin = false;
+}
+
+void QgsComposerItemWidget::on_mYPosSpin_valueChanged( double )
+{
+  mFreezeYPosSpin = true;
+  changeItemPosition();
+  mFreezeYPosSpin = false;
+}
+
+void QgsComposerItemWidget::on_mWidthSpin_valueChanged( double )
+{
+  mFreezeWidthSpin = true;
+  changeItemPosition();
+  mFreezeWidthSpin = false;
+}
+
+void QgsComposerItemWidget::on_mHeightSpin_valueChanged( double )
+{
+  mFreezeHeightSpin = true;
+  changeItemPosition();
+  mFreezeHeightSpin = false;
+}
+
 void QgsComposerItemWidget::on_mUpperLeftCheckBox_stateChanged( int state )
 {
   if ( state != Qt::Checked )
diff --git a/src/app/composer/qgscomposeritemwidget.h b/src/app/composer/qgscomposeritemwidget.h
index fa699a0f215f..4fc10801f0e6 100644
--- a/src/app/composer/qgscomposeritemwidget.h
+++ b/src/app/composer/qgscomposeritemwidget.h
@@ -91,10 +91,10 @@ class QgsComposerItemWidget: public QgsComposerItemBaseWidget, private Ui::QgsCo
 
     //adjust coordinates in line edits
     void on_mPageSpinBox_valueChanged( int ) { changeItemPosition(); }
-    void on_mXPosSpin_valueChanged( double ) { changeItemPosition(); }
-    void on_mYPosSpin_valueChanged( double ) { changeItemPosition(); }
-    void on_mWidthSpin_valueChanged( double ) { changeItemPosition(); }
-    void on_mHeightSpin_valueChanged( double ) { changeItemPosition(); }
+    void on_mXPosSpin_valueChanged( double );
+    void on_mYPosSpin_valueChanged( double );
+    void on_mWidthSpin_valueChanged( double );
+    void on_mHeightSpin_valueChanged( double );
 
     void on_mUpperLeftCheckBox_stateChanged( int state );
     void on_mUpperMiddleCheckBox_stateChanged( int state );
@@ -130,6 +130,11 @@ class QgsComposerItemWidget: public QgsComposerItemBaseWidget, private Ui::QgsCo
 
     QgsComposerItem* mItem;
 
+    bool mFreezeXPosSpin;
+    bool mFreezeYPosSpin;
+    bool mFreezeWidthSpin;
+    bool mFreezeHeightSpin;
+
 //    void changeItemTransparency( int value );
     void changeItemPosition();
 
diff --git a/src/app/composer/qgscomposerlabelwidget.cpp b/src/app/composer/qgscomposerlabelwidget.cpp
index 1161da03c3f0..b3bd70e7af55 100644
--- a/src/app/composer/qgscomposerlabelwidget.cpp
+++ b/src/app/composer/qgscomposerlabelwidget.cpp
@@ -36,6 +36,9 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel* label ): QgsCo
   mFontColorButton->setColorDialogTitle( tr( "Select font color" ) );
   mFontColorButton->setContext( "composer" );
 
+  mMarginXDoubleSpinBox->setClearValue( 0.0 );
+  mMarginYDoubleSpinBox->setClearValue( 0.0 );
+
   if ( mComposerLabel )
   {
     setGuiElementValues();
diff --git a/src/ui/qgscomposerarrowwidgetbase.ui b/src/ui/qgscomposerarrowwidgetbase.ui
index 911f8d2d3633..606596d72d65 100755
--- a/src/ui/qgscomposerarrowwidgetbase.ui
+++ b/src/ui/qgscomposerarrowwidgetbase.ui
@@ -188,13 +188,16 @@
            </widget>
           </item>
           <item row="3" column="1">
-           <widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mOutlineWidthSpinBox">
             <property name="prefix">
              <string/>
             </property>
             <property name="suffix">
              <string> mm</string>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="4" column="0">
@@ -205,13 +208,16 @@
            </widget>
           </item>
           <item row="4" column="1">
-           <widget class="QDoubleSpinBox" name="mArrowHeadWidthSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mArrowHeadWidthSpinBox">
             <property name="prefix">
              <string/>
             </property>
             <property name="suffix">
              <string> mm</string>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="5" column="0">
@@ -266,18 +272,23 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QgsCollapsibleGroupBoxBasic</class>
-   <extends>QGroupBox</extends>
-   <header location="global">qgscollapsiblegroupbox.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsColorButtonV2</class>
    <extends>QToolButton</extends>
    <header>qgscolorbuttonv2.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsCollapsibleGroupBoxBasic</class>
+   <extends>QGroupBox</extends>
+   <header location="global">qgscollapsiblegroupbox.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
diff --git a/src/ui/qgscomposerattributetablewidgetbase.ui b/src/ui/qgscomposerattributetablewidgetbase.ui
index c7765dda4d2a..f13208e314c4 100755
--- a/src/ui/qgscomposerattributetablewidgetbase.ui
+++ b/src/ui/qgscomposerattributetablewidgetbase.ui
@@ -45,9 +45,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-400</y>
+        <y>0</y>
         <width>392</width>
-        <height>1192</height>
+        <height>1204</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="mainLayout">
@@ -260,10 +260,13 @@
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QDoubleSpinBox" name="mMarginSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mMarginSpinBox">
             <property name="suffix">
              <string> mm</string>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="3" column="0">
@@ -397,10 +400,13 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="mGridStrokeWidthSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mGridStrokeWidthSpinBox">
             <property name="suffix">
              <string> mm</string>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -705,22 +711,27 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QgsCollapsibleGroupBoxBasic</class>
-   <extends>QGroupBox</extends>
-   <header location="global">qgscollapsiblegroupbox.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsColorButtonV2</class>
    <extends>QToolButton</extends>
    <header>qgscolorbuttonv2.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsMapLayerComboBox</class>
    <extends>QComboBox</extends>
-   <header location="global">qgsmaplayercombobox.h</header>
+   <header>qgsmaplayercombobox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsCollapsibleGroupBoxBasic</class>
+   <extends>QGroupBox</extends>
+   <header location="global">qgscollapsiblegroupbox.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/ui/qgscomposerhtmlwidgetbase.ui b/src/ui/qgscomposerhtmlwidgetbase.ui
index 5a352c33f4eb..3c1e3096d764 100755
--- a/src/ui/qgscomposerhtmlwidgetbase.ui
+++ b/src/ui/qgscomposerhtmlwidgetbase.ui
@@ -45,9 +45,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-157</y>
+        <y>-155</y>
         <width>391</width>
-        <height>517</height>
+        <height>515</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="mainLayout">
@@ -222,7 +222,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="mMaxDistanceSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mMaxDistanceSpinBox">
             <property name="suffix">
              <string> mm</string>
             </property>
@@ -235,6 +235,9 @@
             <property name="singleStep">
              <double>1.000000000000000</double>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -278,17 +281,22 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QgsDataDefinedButton</class>
+   <extends>QToolButton</extends>
+   <header>qgsdatadefinedbutton.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsCollapsibleGroupBoxBasic</class>
    <extends>QGroupBox</extends>
    <header location="global">qgscollapsiblegroupbox.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QgsDataDefinedButton</class>
-   <extends>QToolButton</extends>
-   <header>qgsdatadefinedbutton.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
diff --git a/src/ui/qgscomposeritemwidgetbase.ui b/src/ui/qgscomposeritemwidgetbase.ui
index e4fad38e9cb7..99493055a875 100755
--- a/src/ui/qgscomposeritemwidgetbase.ui
+++ b/src/ui/qgscomposeritemwidgetbase.ui
@@ -105,7 +105,7 @@
          </widget>
         </item>
         <item row="3" column="1" colspan="2">
-         <widget class="QDoubleSpinBox" name="mWidthSpin">
+         <widget class="QgsDoubleSpinBox" name="mWidthSpin">
           <property name="suffix">
            <string> mm</string>
           </property>
@@ -115,10 +115,13 @@
           <property name="maximum">
            <double>9999999.000000000000000</double>
           </property>
+          <property name="showClearButton">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
         <item row="4" column="1" colspan="2">
-         <widget class="QDoubleSpinBox" name="mHeightSpin">
+         <widget class="QgsDoubleSpinBox" name="mHeightSpin">
           <property name="suffix">
            <string> mm</string>
           </property>
@@ -128,10 +131,13 @@
           <property name="maximum">
            <double>9999999.000000000000000</double>
           </property>
+          <property name="showClearButton">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
         <item row="2" column="1" colspan="2">
-         <widget class="QDoubleSpinBox" name="mYPosSpin">
+         <widget class="QgsDoubleSpinBox" name="mYPosSpin">
           <property name="suffix">
            <string> mm</string>
           </property>
@@ -144,10 +150,13 @@
           <property name="maximum">
            <double>9999999.000000000000000</double>
           </property>
+          <property name="showClearButton">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
         <item row="1" column="1" colspan="2">
-         <widget class="QDoubleSpinBox" name="mXPosSpin">
+         <widget class="QgsDoubleSpinBox" name="mXPosSpin">
           <property name="suffix">
            <string> mm</string>
           </property>
@@ -160,6 +169,9 @@
           <property name="maximum">
            <double>9999999.000000000000000</double>
           </property>
+          <property name="showClearButton">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -340,7 +352,7 @@
       <item row="0" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
-         <widget class="QDoubleSpinBox" name="mItemRotationSpinBox">
+         <widget class="QgsDoubleSpinBox" name="mItemRotationSpinBox">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -445,7 +457,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
+       <widget class="QgsDoubleSpinBox" name="mOutlineWidthSpinBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -455,6 +467,9 @@
         <property name="suffix">
          <string> mm</string>
         </property>
+        <property name="showClearButton">
+         <bool>false</bool>
+        </property>
        </widget>
       </item>
       <item row="2" column="0">
@@ -687,9 +702,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QgsCollapsibleGroupBoxBasic</class>
-   <extends>QGroupBox</extends>
-   <header location="global">qgscollapsiblegroupbox.h</header>
+   <class>QgsColorButtonV2</class>
+   <extends>QToolButton</extends>
+   <header>qgscolorbuttonv2.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -698,16 +713,21 @@
    <header>qgsdatadefinedbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>QgsColorButtonV2</class>
-   <extends>QToolButton</extends>
-   <header>qgscolorbuttonv2.h</header>
-   <container>1</container>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
   </customwidget>
   <customwidget>
    <class>QgsPenJoinStyleComboBox</class>
    <extends>QComboBox</extends>
    <header>qgspenstylecombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>QgsCollapsibleGroupBoxBasic</class>
+   <extends>QGroupBox</extends>
+   <header location="global">qgscollapsiblegroupbox.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>QgsBlendModeComboBox</class>
    <extends>QComboBox</extends>
diff --git a/src/ui/qgscomposerlabelwidgetbase.ui b/src/ui/qgscomposerlabelwidgetbase.ui
index 7f9fcbb28e55..3f30cda3a6b5 100755
--- a/src/ui/qgscomposerlabelwidgetbase.ui
+++ b/src/ui/qgscomposerlabelwidgetbase.ui
@@ -172,7 +172,7 @@
            </layout>
           </item>
           <item row="2" column="1">
-           <widget class="QDoubleSpinBox" name="mMarginXDoubleSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mMarginXDoubleSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -302,7 +302,7 @@
            </layout>
           </item>
           <item row="3" column="1">
-           <widget class="QDoubleSpinBox" name="mMarginYDoubleSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mMarginYDoubleSpinBox">
             <property name="suffix">
              <string> mm</string>
             </property>
@@ -341,6 +341,11 @@
    <header>qgscolorbuttonv2.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
diff --git a/src/ui/qgscomposerlegendwidgetbase.ui b/src/ui/qgscomposerlegendwidgetbase.ui
index 29050cbb7934..af0dd8e18521 100644
--- a/src/ui/qgscomposerlegendwidgetbase.ui
+++ b/src/ui/qgscomposerlegendwidgetbase.ui
@@ -54,9 +54,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-319</y>
+        <y>0</y>
         <width>375</width>
-        <height>1291</height>
+        <height>1273</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="mainLayout">
@@ -586,13 +586,16 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="mSymbolWidthSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mSymbolWidthSpinBox">
             <property name="prefix">
              <string/>
             </property>
             <property name="suffix">
              <string> mm</string>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -606,13 +609,16 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="mSymbolHeightSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mSymbolHeightSpinBox">
             <property name="prefix">
              <string/>
             </property>
             <property name="suffix">
              <string> mm</string>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -650,7 +656,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="mWmsLegendWidthSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mWmsLegendWidthSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -660,6 +666,9 @@
             <property name="maximum">
              <double>9999.000000000000000</double>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -673,7 +682,7 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="mWmsLegendHeightSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mWmsLegendHeightSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -683,6 +692,9 @@
             <property name="maximum">
              <double>9999.000000000000000</double>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -723,7 +735,7 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="mGroupSpaceSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mGroupSpaceSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -746,7 +758,7 @@
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QDoubleSpinBox" name="mLayerSpaceSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mLayerSpaceSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -769,7 +781,7 @@
            </widget>
           </item>
           <item row="3" column="1">
-           <widget class="QDoubleSpinBox" name="mSymbolSpaceSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mSymbolSpaceSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -792,7 +804,7 @@
            </widget>
           </item>
           <item row="4" column="1">
-           <widget class="QDoubleSpinBox" name="mIconLabelSpaceSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mIconLabelSpaceSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -812,7 +824,7 @@
            </widget>
           </item>
           <item row="5" column="1">
-           <widget class="QDoubleSpinBox" name="mBoxSpaceSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mBoxSpaceSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -829,7 +841,7 @@
            </widget>
           </item>
           <item row="6" column="1">
-           <widget class="QDoubleSpinBox" name="mColumnSpaceSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mColumnSpaceSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -849,7 +861,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="mTitleSpaceBottomSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mTitleSpaceBottomSpinBox">
             <property name="toolTip">
              <string>Space below title.</string>
             </property>
@@ -869,18 +881,23 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
-  <customwidget>
-   <class>QgsCollapsibleGroupBoxBasic</class>
-   <extends>QGroupBox</extends>
-   <header location="global">qgscollapsiblegroupbox.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsColorButtonV2</class>
    <extends>QToolButton</extends>
    <header>qgscolorbuttonv2.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsCollapsibleGroupBoxBasic</class>
+   <extends>QGroupBox</extends>
+   <header location="global">qgscollapsiblegroupbox.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>QgsLayerTreeView</class>
    <extends>QTreeView</extends>
diff --git a/src/ui/qgscomposermapwidgetbase.ui b/src/ui/qgscomposermapwidgetbase.ui
index 7ed5ed76f0c7..1323845f939a 100755
--- a/src/ui/qgscomposermapwidgetbase.ui
+++ b/src/ui/qgscomposermapwidgetbase.ui
@@ -56,7 +56,7 @@
         <x>0</x>
         <y>0</y>
         <width>484</width>
-        <height>2469</height>
+        <height>2454</height>
        </rect>
       </property>
       <property name="sizePolicy">
@@ -140,7 +140,7 @@
           <item row="2" column="1">
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
-             <widget class="QDoubleSpinBox" name="mMapRotationSpinBox">
+             <widget class="QgsDoubleSpinBox" name="mMapRotationSpinBox">
               <property name="suffix">
                <string> °</string>
               </property>
@@ -613,7 +613,7 @@
              <item row="3" column="1">
               <layout class="QVBoxLayout" name="verticalLayout_9">
                <item>
-                <widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
+                <widget class="QgsDoubleSpinBox" name="mIntervalXSpinBox">
                  <property name="prefix">
                   <string>X </string>
                  </property>
@@ -626,7 +626,7 @@
                 </widget>
                </item>
                <item>
-                <widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
+                <widget class="QgsDoubleSpinBox" name="mIntervalYSpinBox">
                  <property name="prefix">
                   <string>Y </string>
                  </property>
@@ -653,7 +653,7 @@
              <item row="4" column="1">
               <layout class="QVBoxLayout" name="verticalLayout_10">
                <item>
-                <widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
+                <widget class="QgsDoubleSpinBox" name="mOffsetXSpinBox">
                  <property name="prefix">
                   <string>X </string>
                  </property>
@@ -666,7 +666,7 @@
                 </widget>
                </item>
                <item>
-                <widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
+                <widget class="QgsDoubleSpinBox" name="mOffsetYSpinBox">
                  <property name="prefix">
                   <string>Y </string>
                  </property>
@@ -691,13 +691,16 @@
               </widget>
              </item>
              <item row="5" column="1">
-              <widget class="QDoubleSpinBox" name="mCrossWidthSpinBox">
+              <widget class="QgsDoubleSpinBox" name="mCrossWidthSpinBox">
                <property name="suffix">
                 <string> mm</string>
                </property>
                <property name="decimals">
                 <number>2</number>
                </property>
+               <property name="showClearButton">
+                <bool>false</bool>
+               </property>
               </widget>
              </item>
              <item row="6" column="0">
@@ -784,10 +787,13 @@
                  </widget>
                 </item>
                 <item row="2" column="1">
-                 <widget class="QDoubleSpinBox" name="mGridFramePenSizeSpinBox">
+                 <widget class="QgsDoubleSpinBox" name="mGridFramePenSizeSpinBox">
                   <property name="suffix">
                    <string> mm</string>
                   </property>
+                  <property name="showClearButton">
+                   <bool>false</bool>
+                  </property>
                  </widget>
                 </item>
                 <item row="2" column="2">
@@ -921,10 +927,13 @@
                  </widget>
                 </item>
                 <item row="1" column="1" colspan="2">
-                 <widget class="QDoubleSpinBox" name="mFrameWidthSpinBox">
+                 <widget class="QgsDoubleSpinBox" name="mFrameWidthSpinBox">
                   <property name="suffix">
                    <string> mm</string>
                   </property>
+                  <property name="showClearButton">
+                   <bool>false</bool>
+                  </property>
                  </widget>
                 </item>
                 <item row="5" column="0">
@@ -1114,7 +1123,7 @@
                  </widget>
                 </item>
                 <item row="15" column="1">
-                 <widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox">
+                 <widget class="QgsDoubleSpinBox" name="mDistanceToMapFrameSpinBox">
                   <property name="suffix">
                    <string> mm</string>
                   </property>
@@ -1363,9 +1372,9 @@
    <header>qgsdatadefinedbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>QgsBlendModeComboBox</class>
-   <extends>QComboBox</extends>
-   <header>qgsblendmodecombobox.h</header>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
   </customwidget>
   <customwidget>
    <class>QgsCollapsibleGroupBoxBasic</class>
@@ -1373,6 +1382,11 @@
    <header location="global">qgscollapsiblegroupbox.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsBlendModeComboBox</class>
+   <extends>QComboBox</extends>
+   <header>qgsblendmodecombobox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
diff --git a/src/ui/qgscomposerpicturewidgetbase.ui b/src/ui/qgscomposerpicturewidgetbase.ui
index 68854384fc44..271bc6b09397 100755
--- a/src/ui/qgscomposerpicturewidgetbase.ui
+++ b/src/ui/qgscomposerpicturewidgetbase.ui
@@ -338,7 +338,7 @@
            <widget class="QComboBox" name="mComposerMapComboBox"/>
           </item>
           <item row="0" column="0" colspan="2">
-           <widget class="QDoubleSpinBox" name="mPictureRotationSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mPictureRotationSpinBox">
             <property name="suffix">
              <string> °</string>
             </property>
@@ -369,6 +369,11 @@
    <extends>QToolButton</extends>
    <header>qgsdatadefinedbutton.h</header>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
diff --git a/src/ui/qgscomposerscalebarwidgetbase.ui b/src/ui/qgscomposerscalebarwidgetbase.ui
index 56643e9e19f0..11e850b9effa 100755
--- a/src/ui/qgscomposerscalebarwidgetbase.ui
+++ b/src/ui/qgscomposerscalebarwidgetbase.ui
@@ -51,9 +51,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-427</y>
-        <width>369</width>
-        <height>817</height>
+        <y>0</y>
+        <width>340</width>
+        <height>823</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="mainLayout">
@@ -165,13 +165,16 @@
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox">
             <property name="decimals">
              <number>6</number>
             </property>
             <property name="maximum">
              <double>9999999999999.000000000000000</double>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="0" column="0" colspan="2">
@@ -240,7 +243,7 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mSegmentSizeSpinBox">
             <property name="suffix">
              <string> units</string>
             </property>
@@ -250,6 +253,9 @@
             <property name="maximum">
              <double>9999999999999.000000000000000</double>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="2" column="0">
@@ -295,7 +301,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="mBoxSizeSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mBoxSizeSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -312,7 +318,7 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mLabelBarSpaceSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -329,7 +335,7 @@
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QDoubleSpinBox" name="mLineWidthSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mLineWidthSpinBox">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -351,6 +357,9 @@
             <property name="value">
              <double>0.200000000000000</double>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="3" column="0">
@@ -597,18 +606,17 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
-  <customwidget>
-   <class>QgsCollapsibleGroupBoxBasic</class>
-   <extends>QGroupBox</extends>
-   <header location="global">qgscollapsiblegroupbox.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsColorButtonV2</class>
    <extends>QToolButton</extends>
    <header>qgscolorbuttonv2.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsPenJoinStyleComboBox</class>
    <extends>QComboBox</extends>
@@ -619,6 +627,12 @@
    <extends>QComboBox</extends>
    <header>qgspenstylecombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>QgsCollapsibleGroupBoxBasic</class>
+   <extends>QGroupBox</extends>
+   <header location="global">qgscollapsiblegroupbox.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
diff --git a/src/ui/qgscomposershapewidgetbase.ui b/src/ui/qgscomposershapewidgetbase.ui
index dd8e76b5bea9..8127914613ff 100755
--- a/src/ui/qgscomposershapewidgetbase.ui
+++ b/src/ui/qgscomposershapewidgetbase.ui
@@ -74,7 +74,7 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="mCornerRadiusSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mCornerRadiusSpinBox">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -128,6 +128,11 @@
    <header location="global">qgscollapsiblegroupbox.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>groupBox</tabstop>
diff --git a/src/ui/qgscompositionwidgetbase.ui b/src/ui/qgscompositionwidgetbase.ui
index 8147e7f3f963..d3bcf24c7629 100755
--- a/src/ui/qgscompositionwidgetbase.ui
+++ b/src/ui/qgscompositionwidgetbase.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>300</width>
+    <width>345</width>
     <height>506</height>
    </rect>
   </property>
@@ -51,8 +51,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>284</width>
-        <height>599</height>
+        <width>327</width>
+        <height>591</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -121,7 +121,7 @@
           <item row="1" column="1">
            <layout class="QHBoxLayout" name="horizontalLayout_2">
             <item>
-             <widget class="QDoubleSpinBox" name="mPaperWidthDoubleSpinBox">
+             <widget class="QgsDoubleSpinBox" name="mPaperWidthDoubleSpinBox">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
                 <horstretch>0</horstretch>
@@ -137,6 +137,9 @@
               <property name="maximum">
                <double>99999.000000000000000</double>
               </property>
+              <property name="showClearButton">
+               <bool>false</bool>
+              </property>
              </widget>
             </item>
             <item>
@@ -161,7 +164,7 @@
           <item row="2" column="1">
            <layout class="QHBoxLayout" name="horizontalLayout_3">
             <item>
-             <widget class="QDoubleSpinBox" name="mPaperHeightDoubleSpinBox">
+             <widget class="QgsDoubleSpinBox" name="mPaperHeightDoubleSpinBox">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
                 <horstretch>0</horstretch>
@@ -177,6 +180,9 @@
               <property name="maximum">
                <double>99999.000000000000000</double>
               </property>
+              <property name="showClearButton">
+               <bool>false</bool>
+              </property>
              </widget>
             </item>
             <item>
@@ -381,7 +387,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="mGridResolutionSpinBox">
+           <widget class="QgsDoubleSpinBox" name="mGridResolutionSpinBox">
             <property name="prefix">
              <string/>
             </property>
@@ -394,6 +400,9 @@
             <property name="maximum">
              <double>9999.000000000000000</double>
             </property>
+            <property name="showClearButton">
+             <bool>false</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -409,7 +418,7 @@
           <item row="1" column="1">
            <layout class="QVBoxLayout" name="verticalLayout_3">
             <item>
-             <widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
+             <widget class="QgsDoubleSpinBox" name="mOffsetXSpinBox">
               <property name="prefix">
                <string>x: </string>
               </property>
@@ -422,13 +431,16 @@
              </widget>
             </item>
             <item>
-             <widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
+             <widget class="QgsDoubleSpinBox" name="mOffsetYSpinBox">
               <property name="prefix">
                <string>y: </string>
               </property>
               <property name="suffix">
                <string> mm</string>
               </property>
+              <property name="maximum">
+               <double>9999.000000000000000</double>
+              </property>
              </widget>
             </item>
            </layout>
@@ -474,17 +486,22 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
+  <customwidget>
+   <class>QgsDataDefinedButton</class>
+   <extends>QToolButton</extends>
+   <header>qgsdatadefinedbutton.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsCollapsibleGroupBoxBasic</class>
    <extends>QGroupBox</extends>
    <header location="global">qgscollapsiblegroupbox.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QgsDataDefinedButton</class>
-   <extends>QToolButton</extends>
-   <header>qgsdatadefinedbutton.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>