diff --git a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
index 6e1c420f2886..c38d760475b2 100644
--- a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
+++ b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
@@ -19,6 +19,9 @@
 QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ): QgsSymbolLayerV2Widget( parent, vl ), mLayer( 0 )
 {
   setupUi( this );
+
+  mDistanceUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
+
   if ( mVectorLayer )
   {
     const QgsFields& fm = mVectorLayer->pendingFields();
@@ -201,13 +204,18 @@ void QgsVectorFieldSymbolLayerWidget::on_mCounterclockwiseFromEastRadioButton_to
   }
 }
 
-void QgsVectorFieldSymbolLayerWidget::on_mDistanceUnitComboBox_currentIndexChanged( int index )
+void QgsVectorFieldSymbolLayerWidget::on_mDistanceUnitWidget_changed()
 {
-  if ( mLayer )
+  if ( !mLayer )
   {
-    mLayer->setDistanceUnit(( QgsSymbolV2::OutputUnit ) index );
-    emit changed();
+    return;
   }
+
+  QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mDistanceUnitWidget->getUnit() );
+  mLayer->setDistanceUnit( unit );
+  mLayer->setDistanceMapUnitScale( mDistanceUnitWidget->getMapUnitScale() );
+  emit changed();
 }
 
 
+
diff --git a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
index 6ecb7ec4eb05..f92c5a2c4a9e 100644
--- a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
+++ b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
@@ -47,7 +47,7 @@ class GUI_EXPORT QgsVectorFieldSymbolLayerWidget: public QgsSymbolLayerV2Widget,
     void on_mRadiansRadioButton_toggled( bool checked );
     void on_mClockwiseFromNorthRadioButton_toggled( bool checked );
     void on_mCounterclockwiseFromEastRadioButton_toggled( bool checked );
-    void on_mDistanceUnitComboBox_currentIndexChanged( int index );
+    void on_mDistanceUnitWidget_changed();
 };
 
 #endif // QGSVECTORFIELDSYMBOLLAYERWIDGET_H
diff --git a/src/ui/symbollayer/widget_vectorfield.ui b/src/ui/symbollayer/widget_vectorfield.ui
index aabec3ff3912..8306b8feaba0 100644
--- a/src/ui/symbollayer/widget_vectorfield.ui
+++ b/src/ui/symbollayer/widget_vectorfield.ui
@@ -14,7 +14,16 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>1</number>
+   </property>
+   <property name="topMargin">
+    <number>1</number>
+   </property>
+   <property name="rightMargin">
+    <number>1</number>
+   </property>
+   <property name="bottomMargin">
     <number>1</number>
    </property>
    <item>
@@ -108,10 +117,19 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="decimals">
+        <number>2</number>
+       </property>
+       <property name="maximum">
+        <double>9999999.000000000000000</double>
+       </property>
        <property name="singleStep">
         <double>0.200000000000000</double>
        </property>
-       <property name="showClearButton">
+       <property name="value">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="showClearButton" stdset="0">
         <bool>false</bool>
        </property>
       </widget>