diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
index 8e37ee9e7ed..e917f7434f1 100644
--- a/src/app/qgsoptions.cpp
+++ b/src/app/qgsoptions.cpp
@@ -16,6 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgsapplication.h"
+#include "qgsdistancearea.h"
 #include "qgsoptions.h"
 #include "qgis.h"
 #include "qgisapp.h"
@@ -77,6 +78,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
 
   connect( spinFontSize, SIGNAL( valueChanged( const QString& ) ), this, SLOT( fontSizeChanged( const QString& ) ) );
 
+  connect( cmbEllipsoid, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateEllipsoidUI( int ) ) );
+
 #ifdef Q_WS_X11
   connect( chkEnableBackbuffer, SIGNAL( stateChanged( int ) ), this, SLOT( toggleEnableBackbuffer( int ) ) );
 #endif
@@ -279,24 +282,34 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   leProjectGlobalCrs->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
 
   // populate combo box with ellipsoids
+
   QgsDebugMsg( "Setting upp ellipsoid" );
 
-  getEllipsoidList();
-  // Pre-select current ellipsoid
-  QString myEllipsoidId = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
-  cmbEllipsoid->setCurrentIndex( cmbEllipsoid->findText( getEllipsoidName( myEllipsoidId ), Qt::MatchExactly ) );
-  // Check if CRS transformation is on, or else turn combobox off
-  if ( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() )
+  mEllipsoidIndex = 0;
+  populateEllipsoidList();
+
+  // Reading ellipsoid from setttings
+  QStringList mySplitEllipsoid = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString().split( ':' );
+
+  int myIndex = 0;
+  int i;
+  for ( i = 0; i < mEllipsoidList.length(); i++ )
   {
-    cmbEllipsoid->setEnabled( true );
-    cmbEllipsoid->setToolTip( "" );
+    if ( mEllipsoidList[ i ].acronym.startsWith( mySplitEllipsoid[ 0 ] ) )
+    {
+      myIndex = i;
+      break;
+    }
   }
-  else
+  // Update paramaters if present.
+  if ( mySplitEllipsoid.length() >= 3 )
   {
-    cmbEllipsoid->setEnabled( false );
-    cmbEllipsoid->setToolTip( "Can only use ellipsoidal calculations when CRS transformation is enabled" );
+    mEllipsoidList[ myIndex ].semiMajor =  mySplitEllipsoid[ 1 ].toDouble();
+    mEllipsoidList[ myIndex ].semiMinor =  mySplitEllipsoid[ 2 ].toDouble();
   }
 
+  updateEllipsoidUI( myIndex );
+
   // Set the units for measuring
   QGis::UnitType myDisplayUnits = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
   if ( myDisplayUnits == QGis::Feet )
@@ -940,7 +953,25 @@ void QgsOptions::saveOptions()
   settings.setValue( "/Projections/otfTransformEnabled", chkOtfTransform->isChecked() );
   settings.setValue( "/Projections/projectDefaultCrs", mDefaultCrs.authid() );
 
-  settings.setValue( "/qgis/measure/ellipsoid", getEllipsoidAcronym( cmbEllipsoid->currentText() ) );
+  if ( mEllipsoidList[ mEllipsoidIndex ].acronym.startsWith( "PARAMETER" ) )
+  {
+    double major = mEllipsoidList[ mEllipsoidIndex ].semiMajor;
+    double minor = mEllipsoidList[ mEllipsoidIndex ].semiMinor;
+    // If the user fields have changed, use them instead.
+    if ( leSemiMajor->isModified() || leSemiMinor->isModified() )
+    {
+      QgsDebugMsg( "Using paramteric major/minor" );
+      major = QLocale::system().toDouble( leSemiMajor->text() );
+      minor = QLocale::system().toDouble( leSemiMinor->text() );
+    }
+    settings.setValue( "/qgis/measure/ellipsoid", QString( "PARAMETER:%1:%2" )
+                       .arg( major, 0, 'g', 17 )
+                       .arg( minor, 0, 'g', 17 ) );
+  }
+  else
+  {
+    settings.setValue( "/qgis/measure/ellipsoid", mEllipsoidList[ mEllipsoidIndex ].acronym );
+  }
 
   if ( radFeet->isChecked() )
   {
@@ -1163,21 +1194,29 @@ bool QgsOptions::newVisible()
 {
   return chkAddedVisibility->isChecked();
 }
-
-void QgsOptions::getEllipsoidList()
+void QgsOptions::populateEllipsoidList()
 {
-  // (copied from qgscustomprojectiondialog.cpp)
-
   //
-  // Populate the ellipsoid combo
+  // Populate the ellipsoid list
   //
   sqlite3      *myDatabase;
   const char   *myTail;
   sqlite3_stmt *myPreparedStatement;
   int           myResult;
+  EllipsoidDefs myItem, i;
 
+  myItem.acronym = GEO_NONE;
+  myItem.description =  tr( GEO_NONE_DESC );
+  myItem.semiMajor = 0.0;
+  myItem.semiMinor = 0.0;
+  mEllipsoidList.append( myItem );
+
+  myItem.acronym = QString( "PARAMETER:6370997:6370997" );
+  myItem.description = tr( "Parameters :" );
+  myItem.semiMajor = 6370997.0;
+  myItem.semiMinor = 6370997.0;
+  mEllipsoidList.append( myItem );
 
-  cmbEllipsoid->addItem( tr( GEO_NONE_DESC ) );
   //check the db is available
   myResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().data(), &myDatabase, SQLITE_OPEN_READONLY, NULL );
   if ( myResult )
@@ -1189,86 +1228,53 @@ void QgsOptions::getEllipsoidList()
   }
 
   // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
-  QString mySql = "select * from tbl_ellipsoid order by name";
+  QString mySql = "select acronym, name, radius, parameter2 from tbl_ellipsoid order by name";
   myResult = sqlite3_prepare( myDatabase, mySql.toUtf8(), mySql.toUtf8().length(), &myPreparedStatement, &myTail );
   // XXX Need to free memory from the error msg if one is set
   if ( myResult == SQLITE_OK )
   {
     while ( sqlite3_step( myPreparedStatement ) == SQLITE_ROW )
     {
-      cmbEllipsoid->addItem(( const char * )sqlite3_column_text( myPreparedStatement, 1 ) );
+      QString para1, para2;
+      myItem.acronym = ( const char * )sqlite3_column_text( myPreparedStatement, 0 );
+      myItem.description = ( const char * )sqlite3_column_text( myPreparedStatement, 1 );
+
+      // Copied from QgsDistanecArea. Should perhaps be moved there somehow?
+      // No error checking, this values are for show only, never used in calculations.
+
+      // Fall-back values
+      myItem.semiMajor = 0.0;
+      myItem.semiMinor = 0.0;
+      // Crash if no column?
+      para1 = ( const char * )sqlite3_column_text( myPreparedStatement, 2 );
+      para2 = ( const char * )sqlite3_column_text( myPreparedStatement, 3 );
+      myItem.semiMajor = para1.mid( 2 ).toDouble();
+      if ( para2.left( 2 ) == "b=" )
+      {
+        myItem.semiMinor = para2.mid( 2 ).toDouble();
+      }
+      else if ( para2.left( 3 ) == "rf=" )
+      {
+        double invFlattening = para2.mid( 3 ).toDouble();
+        if ( invFlattening != 0.0 )
+        {
+          myItem.semiMinor = myItem.semiMajor - ( myItem.semiMajor / invFlattening );
+        }
+      }
+      mEllipsoidList.append( myItem );
     }
   }
+
   // close the sqlite3 statement
   sqlite3_finalize( myPreparedStatement );
   sqlite3_close( myDatabase );
-}
 
-QString QgsOptions::getEllipsoidAcronym( QString theEllipsoidName )
-{
-  sqlite3      *myDatabase;
-  const char   *myTail;
-  sqlite3_stmt *myPreparedStatement;
-  int           myResult;
-  QString       myName = GEO_NONE;
+  // Add all items to selector
 
-  //check the db is available
-  myResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().data(), &myDatabase, SQLITE_OPEN_READONLY, NULL );
-  if ( myResult )
+  foreach ( i, mEllipsoidList )
   {
-    QgsDebugMsg( QString( "Can't open database: %1" ).arg( sqlite3_errmsg( myDatabase ) ) );
-    // XXX This will likely never happen since on open, sqlite creates the
-    //     database if it does not exist.
-    Q_ASSERT( myResult == 0 );
+    cmbEllipsoid->addItem( i.description );
   }
-  // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
-  QString mySql = "select acronym from tbl_ellipsoid where name='" + theEllipsoidName + "'";
-  myResult = sqlite3_prepare( myDatabase, mySql.toUtf8(), mySql.toUtf8().length(), &myPreparedStatement, &myTail );
-  // XXX Need to free memory from the error msg if one is set
-  if ( myResult == SQLITE_OK )
-  {
-    if ( sqlite3_step( myPreparedStatement ) == SQLITE_ROW )
-      myName = QString(( const char * )sqlite3_column_text( myPreparedStatement, 0 ) );
-  }
-  // close the sqlite3 statement
-  sqlite3_finalize( myPreparedStatement );
-  sqlite3_close( myDatabase );
-  return myName;
-
-}
-
-QString QgsOptions::getEllipsoidName( QString theEllipsoidAcronym )
-{
-  sqlite3      *myDatabase;
-  const char   *myTail;
-  sqlite3_stmt *myPreparedStatement;
-  int           myResult;
-  QString       myName;
-
-  myName = tr( GEO_NONE_DESC );
-  //check the db is available
-  myResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().data(), &myDatabase, SQLITE_OPEN_READONLY, NULL );
-  if ( myResult )
-  {
-    QgsDebugMsg( QString( "Can't open database: %1" ).arg( sqlite3_errmsg( myDatabase ) ) );
-    // XXX This will likely never happen since on open, sqlite creates the
-    //     database if it does not exist.
-    Q_ASSERT( myResult == 0 );
-  }
-  // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
-  QString mySql = "select name from tbl_ellipsoid where acronym='" + theEllipsoidAcronym + "'";
-  myResult = sqlite3_prepare( myDatabase, mySql.toUtf8(), mySql.toUtf8().length(), &myPreparedStatement, &myTail );
-  // XXX Need to free memory from the error msg if one is set
-  if ( myResult == SQLITE_OK )
-  {
-    if ( sqlite3_step( myPreparedStatement ) == SQLITE_ROW )
-      myName = QString(( const char * )sqlite3_column_text( myPreparedStatement, 0 ) );
-  }
-  // close the sqlite3 statement
-  sqlite3_finalize( myPreparedStatement );
-  sqlite3_close( myDatabase );
-  return myName;
-
 }
 
 QStringList QgsOptions::i18nList()
@@ -1678,3 +1684,54 @@ void QgsOptions::saveContrastEnhancement( QComboBox *cbox, QString name )
   QString value = cbox->itemData( cbox->currentIndex() ).toString();
   settings.setValue( "/Raster/defaultContrastEnhancementAlgorithm/" + name, value );
 }
+
+void QgsOptions::updateEllipsoidUI( int newIndex )
+{
+  // Called whenever settings change, adjusts the UI accordingly
+  // Pre-select current ellipsoid
+
+  // Check if CRS transformation is on, or else turn everything off
+  double myMajor =  mEllipsoidList[ newIndex ].semiMajor;
+  double myMinor =  mEllipsoidList[ newIndex ].semiMinor;
+
+  // If user has modified the radii (only possible if parametric!), before
+  // changing ellipsoid, save the modified coordinates
+  if ( leSemiMajor->isModified() || leSemiMinor->isModified() )
+  {
+    QgsDebugMsg( "Saving major/minor" );
+    mEllipsoidList[ mEllipsoidIndex ].semiMajor = QLocale::system().toDouble( leSemiMajor->text() );
+    mEllipsoidList[ mEllipsoidIndex ].semiMinor = QLocale::system().toDouble( leSemiMinor->text() );
+  }
+
+  mEllipsoidIndex = newIndex;
+  leSemiMajor->setEnabled( false );
+  leSemiMinor->setEnabled( false );
+  leSemiMajor->setText( "" );
+  leSemiMinor->setText( "" );
+  if ( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() )
+  {
+    cmbEllipsoid->setEnabled( true );
+    cmbEllipsoid->setToolTip( "" );
+    if ( mEllipsoidList[ mEllipsoidIndex ].acronym.startsWith( "PARAMETER:" ) )
+    {
+      leSemiMajor->setEnabled( true );
+      leSemiMinor->setEnabled( true );
+    }
+    else
+    {
+      leSemiMajor->setToolTip( QString( "Select %1 from pull-down menu to adjust radii" ).arg( tr( "Parameters:" ) ) );
+      leSemiMinor->setToolTip( QString( "Select %1 from pull-down menu to adjust radii" ).arg( tr( "Parameters:" ) ) );
+    }
+    cmbEllipsoid->setCurrentIndex( mEllipsoidIndex ); // Not always necessary
+    if ( mEllipsoidList[ mEllipsoidIndex ].acronym != GEO_NONE )
+    {
+      leSemiMajor->setText( QLocale::system().toString( myMajor, 'f', 3 ) );
+      leSemiMinor->setText( QLocale::system().toString( myMinor, 'f', 3 ) );
+    }
+  }
+  else
+  {
+    cmbEllipsoid->setEnabled( false );
+    cmbEllipsoid->setToolTip( tr( "Can only use ellipsoidal calculations when CRS transformation is enabled" ) );
+  }
+}
diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h
index 9a1efb62df6..346c690265b 100644
--- a/src/app/qgsoptions.h
+++ b/src/app/qgsoptions.h
@@ -25,6 +25,7 @@
 
 #include <qgscoordinatereferencesystem.h>
 
+#include <QList>
 
 /**
  * \class QgsOptions
@@ -180,12 +181,11 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
      */
     void saveGdalDriverList();
 
-  protected:
-    //! Populates combo box with ellipsoids
-    void getEllipsoidList();
-
-    QString getEllipsoidAcronym( QString theEllipsoidName );
-    QString getEllipsoidName( QString theEllipsoidAcronym );
+    /* Update ComboBox accorindg to the selected new index
+     * Also sets the new selected Ellipsoid.
+     * @note added in 2.0
+     */
+    void updateEllipsoidUI( int newIndex );
 
   private:
     QStringList i18nList();
@@ -195,6 +195,20 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
     QgsCoordinateReferenceSystem mLayerDefaultCrs;
     bool mLoadedGdalDriverList;
 
+    // List for all ellispods, also None and Custom
+    struct EllipsoidDefs
+    {
+      QString acronym;
+      QString description;
+      double semiMajor;
+      double semiMinor;
+    };
+    QList<EllipsoidDefs> mEllipsoidList;
+    int mEllipsoidIndex;
+
+    //! Populates list with ellipsoids from Sqlite3 db
+    void populateEllipsoidList();
+
     static const char * GEO_NONE_DESC;
 };
 
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
index 6773b462699..4c2ee92301f 100644
--- a/src/core/qgsdistancearea.cpp
+++ b/src/core/qgsdistancearea.cpp
@@ -130,6 +130,28 @@ bool QgsDistanceArea::setEllipsoid( const QString& ellipsoid )
     return true;
   }
 
+  // Check if we have a custom projection, and set from text string.
+  // Format is "PARAMETER:<semi-major axis>:<semi minor axis>
+  // Numbers must be with (optional) decimal point and no other separators (C locale)
+  // Distances in meters.  Flattening is calculated.
+  if ( ellipsoid.startsWith( "PARAMETER" ) )
+  {
+    QStringList paramList = ellipsoid.split( ":" );
+    bool semiMajorOk, semiMinorOk;
+    double semiMajor = paramList[1].toDouble( & semiMajorOk );
+    double semiMinor = paramList[2].toDouble( & semiMinorOk );
+    if ( semiMajorOk && semiMinorOk )
+    {
+      return setEllipsoid( semiMajor, semiMinor );
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  // Continue with PROJ.4 list of ellipsoids.
+
   //check the db is available
   myResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().data(), &myDatabase, SQLITE_OPEN_READONLY, NULL );
   if ( myResult )
@@ -213,7 +235,7 @@ bool QgsDistanceArea::setEllipsoid( const QString& ellipsoid )
 // Also, b = a-(a/invf)
 bool  QgsDistanceArea::setEllipsoid( double semiMajor, double semiMinor )
 {
-  mEllipsoid = "PARAMETER";
+  mEllipsoid = QString( "PARAMETER:%1:%2" ).arg( semiMajor ).arg( semiMinor );
   mSemiMajor = semiMajor;
   mSemiMinor = semiMinor;
   mInvFlattening = mSemiMajor / ( mSemiMajor - mSemiMinor );
diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
index 0631ee45229..496fca89da3 100644
--- a/src/ui/qgsoptionsbase.ui
+++ b/src/ui/qgsoptionsbase.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>810</width>
+    <width>808</width>
     <height>674</height>
    </rect>
   </property>
@@ -33,7 +33,7 @@
    <item row="2" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>4</number>
      </property>
      <property name="iconSize">
       <size>
@@ -66,7 +66,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>772</width>
+            <width>770</width>
             <height>1062</height>
            </rect>
           </property>
@@ -1003,7 +1003,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>1012</width>
+            <width>1010</width>
             <height>815</height>
            </rect>
           </property>
@@ -1518,8 +1518,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>772</width>
-            <height>724</height>
+            <width>770</width>
+            <height>757</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -1585,131 +1585,6 @@
              </layout>
             </widget>
            </item>
-           <item row="1" column="0">
-            <widget class="QGroupBox" name="groupBox_6">
-             <property name="title">
-              <string>Measure tool</string>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_21">
-              <item row="1" column="0">
-               <widget class="QLabel" name="textLabel1_8">
-                <property name="text">
-                 <string>Ellipsoid for distance calculations</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QComboBox" name="cmbEllipsoid"/>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="textLabel1_10">
-                <property name="text">
-                 <string>Rubberband color</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QgsColorButton" name="pbnMeasureColor">
-                <property name="minimumSize">
-                 <size>
-                  <width>100</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="2" colspan="2">
-               <spacer>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>191</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item row="5" column="0">
-               <widget class="QLabel" name="textLabel1_11">
-                <property name="text">
-                 <string>Preferred measurements units</string>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="1">
-               <widget class="QRadioButton" name="radMeters">
-                <property name="text">
-                 <string>Meters</string>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="2">
-               <widget class="QRadioButton" name="radFeet">
-                <property name="text">
-                 <string>Feet</string>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="0">
-               <widget class="QLabel" name="mAngleUnitsLabel">
-                <property name="text">
-                 <string>Preferred angle units</string>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="1">
-               <widget class="QRadioButton" name="mDegreesRadioButton">
-                <property name="text">
-                 <string>Degrees</string>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="2">
-               <widget class="QRadioButton" name="mRadiansRadioButton">
-                <property name="text">
-                 <string>Radians</string>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="3">
-               <widget class="QRadioButton" name="mGonRadioButton">
-                <property name="text">
-                 <string>Gon</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QLabel" name="label_12">
-                <property name="text">
-                 <string>Decimal places</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QSpinBox" name="mDecimalPlacesSpinBox"/>
-              </item>
-              <item row="4" column="0">
-               <widget class="QLabel" name="label_13">
-                <property name="text">
-                 <string>Keep base unit</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="1">
-               <widget class="QCheckBox" name="mKeepBaseUnitCheckBox">
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
            <item row="2" column="0">
             <widget class="QGroupBox" name="groupBox_10">
              <property name="title">
@@ -1719,30 +1594,6 @@
               <property name="margin">
                <number>11</number>
               </property>
-              <item row="0" column="1">
-               <widget class="QComboBox" name="cmbWheelAction">
-                <item>
-                 <property name="text">
-                  <string>Zoom</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Zoom and recenter</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Zoom to mouse cursor</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Nothing</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
               <item row="1" column="0">
                <widget class="QLabel" name="label_3">
                 <property name="text">
@@ -1770,6 +1621,30 @@
                 </property>
                </widget>
               </item>
+              <item row="0" column="1">
+               <widget class="QComboBox" name="cmbWheelAction">
+                <item>
+                 <property name="text">
+                  <string>Zoom</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Zoom and recenter</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Zoom to mouse cursor</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Nothing</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>
@@ -1857,6 +1732,151 @@
              </layout>
             </widget>
            </item>
+           <item row="1" column="0">
+            <widget class="QGroupBox" name="groupBox_6">
+             <property name="title">
+              <string>Measure tool</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_21">
+              <item row="2" column="3">
+               <widget class="QLabel" name="label_42">
+                <property name="text">
+                 <string>Semi-minor</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="textLabel1_10">
+                <property name="text">
+                 <string>Rubberband color</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1">
+               <widget class="QgsColorButton" name="pbnMeasureColor">
+                <property name="minimumSize">
+                 <size>
+                  <width>100</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="0">
+               <widget class="QLabel" name="textLabel1_11">
+                <property name="text">
+                 <string>Preferred measurements units</string>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="1">
+               <widget class="QRadioButton" name="radMeters">
+                <property name="text">
+                 <string>Meters</string>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="2">
+               <widget class="QRadioButton" name="radFeet">
+                <property name="text">
+                 <string>Feet</string>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="0">
+               <widget class="QLabel" name="mAngleUnitsLabel">
+                <property name="text">
+                 <string>Preferred angle units</string>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="1">
+               <widget class="QRadioButton" name="mDegreesRadioButton">
+                <property name="text">
+                 <string>Degrees</string>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="2">
+               <widget class="QRadioButton" name="mRadiansRadioButton">
+                <property name="text">
+                 <string>Radians</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="label_12">
+                <property name="text">
+                 <string>Decimal places</string>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="1">
+               <widget class="QSpinBox" name="mDecimalPlacesSpinBox"/>
+              </item>
+              <item row="6" column="0">
+               <widget class="QLabel" name="label_13">
+                <property name="text">
+                 <string>Keep base unit</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="1">
+               <widget class="QCheckBox" name="mKeepBaseUnitCheckBox">
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="2">
+               <widget class="QLineEdit" name="leSemiMajor"/>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLabel" name="label_41">
+                <property name="text">
+                 <string>Semi-major</string>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="3">
+               <widget class="QRadioButton" name="mGonRadioButton">
+                <property name="text">
+                 <string>Gon</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="4">
+               <widget class="QLineEdit" name="leSemiMinor"/>
+              </item>
+              <item row="1" column="1" colspan="4">
+               <widget class="QComboBox" name="cmbEllipsoid"/>
+              </item>
+              <item row="1" column="0" rowspan="2">
+               <widget class="QLabel" name="textLabel1_8">
+                <property name="text">
+                 <string>Ellipsoid for distance calculations</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="2" colspan="3">
+               <spacer>
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>191</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>
@@ -1888,7 +1908,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>788</width>
+            <width>786</width>
             <height>585</height>
            </rect>
           </property>
@@ -1969,7 +1989,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>772</width>
+            <width>770</width>
             <height>606</height>
            </rect>
           </property>
@@ -2345,7 +2365,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>788</width>
+            <width>786</width>
             <height>585</height>
            </rect>
           </property>
@@ -2532,7 +2552,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>788</width>
+            <width>786</width>
             <height>585</height>
            </rect>
           </property>
@@ -2629,7 +2649,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>788</width>
+            <width>786</width>
             <height>585</height>
            </rect>
           </property>
@@ -2920,9 +2940,6 @@
   <tabstop>radFeet</tabstop>
   <tabstop>mDegreesRadioButton</tabstop>
   <tabstop>mRadiansRadioButton</tabstop>
-  <tabstop>mGonRadioButton</tabstop>
-  <tabstop>cmbWheelAction</tabstop>
-  <tabstop>spinZoomFactor</tabstop>
   <tabstop>scrollArea_4</tabstop>
   <tabstop>mOverlayAlgorithmComboBox</tabstop>
   <tabstop>scrollArea_5</tabstop>