diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
index 8d95a1ee1b0..59504b8b9c5 100644
--- a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
+++ b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -2255,6 +2255,7 @@ QgsLinePatternFillSymbolLayerWidget::QgsLinePatternFillSymbolLayerWidget( const
   setupUi( this );
   mDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
   mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
+  mOffsetSpinBox->setClearValue( 0 );
 }
 
 void QgsLinePatternFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )
diff --git a/src/ui/qgscomposeritemwidgetbase.ui b/src/ui/qgscomposeritemwidgetbase.ui
index 3ebe9b2d847..bcc6c014400 100755
--- a/src/ui/qgscomposeritemwidgetbase.ui
+++ b/src/ui/qgscomposeritemwidgetbase.ui
@@ -14,7 +14,16 @@
    <string>Global Options</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -102,7 +111,7 @@
           <property name="minimum">
            <number>1</number>
           </property>
-          <property name="showClearButton">
+          <property name="showClearButton" stdset="0">
            <bool>false</bool>
           </property>
          </widget>
@@ -118,7 +127,7 @@
           <property name="maximum">
            <double>9999999.000000000000000</double>
           </property>
-          <property name="showClearButton">
+          <property name="showClearButton" stdset="0">
            <bool>false</bool>
           </property>
          </widget>
@@ -134,7 +143,7 @@
           <property name="maximum">
            <double>9999999.000000000000000</double>
           </property>
-          <property name="showClearButton">
+          <property name="showClearButton" stdset="0">
            <bool>false</bool>
           </property>
          </widget>
@@ -153,7 +162,7 @@
           <property name="maximum">
            <double>9999999.000000000000000</double>
           </property>
-          <property name="showClearButton">
+          <property name="showClearButton" stdset="0">
            <bool>false</bool>
           </property>
          </widget>
@@ -172,7 +181,7 @@
           <property name="maximum">
            <double>9999999.000000000000000</double>
           </property>
-          <property name="showClearButton">
+          <property name="showClearButton" stdset="0">
            <bool>false</bool>
           </property>
          </widget>
@@ -470,7 +479,10 @@
         <property name="suffix">
          <string> mm</string>
         </property>
-        <property name="showClearButton">
+        <property name="singleStep">
+         <double>0.100000000000000</double>
+        </property>
+        <property name="showClearButton" stdset="0">
          <bool>false</bool>
         </property>
        </widget>
diff --git a/src/ui/symbollayer/widget_linepatternfill.ui b/src/ui/symbollayer/widget_linepatternfill.ui
index ac20c53b257..fdb98edb4f2 100644
--- a/src/ui/symbollayer/widget_linepatternfill.ui
+++ b/src/ui/symbollayer/widget_linepatternfill.ui
@@ -56,7 +56,7 @@
         <double>0.500000000000000</double>
        </property>
        <property name="showClearButton" stdset="0">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -149,7 +149,7 @@
         <double>0.200000000000000</double>
        </property>
        <property name="showClearButton" stdset="0">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -161,6 +161,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QgsDataDefinedButton</class>
+   <extends>QToolButton</extends>
+   <header>qgsdatadefinedbutton.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsDoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
@@ -172,11 +177,6 @@
    <header>qgsunitselectionwidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QgsDataDefinedButton</class>
-   <extends>QToolButton</extends>
-   <header>qgsdatadefinedbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/ui/symbollayer/widget_pointpatternfill.ui b/src/ui/symbollayer/widget_pointpatternfill.ui
index 47651c4f8ab..94964f5fc74 100644
--- a/src/ui/symbollayer/widget_pointpatternfill.ui
+++ b/src/ui/symbollayer/widget_pointpatternfill.ui
@@ -155,7 +155,7 @@
         <double>0.200000000000000</double>
        </property>
        <property name="showClearButton" stdset="0">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -205,7 +205,7 @@
         <double>0.200000000000000</double>
        </property>
        <property name="showClearButton" stdset="0">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -231,6 +231,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QgsDataDefinedButton</class>
+   <extends>QToolButton</extends>
+   <header>qgsdatadefinedbutton.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsDoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
@@ -242,11 +247,6 @@
    <header>qgsunitselectionwidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QgsDataDefinedButton</class>
-   <extends>QToolButton</extends>
-   <header>qgsdatadefinedbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>