diff --git a/src/Mod/PartDesign/SprocketFeature.py b/src/Mod/PartDesign/SprocketFeature.py
index 6d0656edb6..c1c9223cbf 100644
--- a/src/Mod/PartDesign/SprocketFeature.py
+++ b/src/Mod/PartDesign/SprocketFeature.py
@@ -209,13 +209,6 @@ class SprocketTaskPanel:
                            "ANSI 180":[2.250, 1.460, 1.301],
                            "ANSI 200":[2.500, 1.562, 1.389],
                            "ANSI 240":[3.000, 1.875, 1.738],
-                           "Motorcycle 420":[0.500, 0.3125, 0.227],
-                           "Motorcycle 425":[0.500, 0.3125, 0.284],
-                           "Motorcycle 428":[0.500, 0.335, 0.284],
-                           "Motorcycle 520":[0.625, 0.400, 0.227],
-                           "Motorcycle 525":[0.625, 0.400, 0.284],
-                           "Motorcycle 530":[0.625, 0.400, 0.343],
-                           "Motorcycle 630":[0.75, 0.400, 0.343],
                            "Bicycle with Derailleur":[0.500, 0.3125, 0.11],
                            "Bicycle without Derailleur":[0.500, 0.3125, 0.084],
                            "ISO 606 06B":[0.375, 5.72/25.4, 5.2/25.4],
@@ -224,11 +217,18 @@ class SprocketTaskPanel:
                            "ISO 606 12B":[0.750, 11.68/25.4, 11.1/25.4],
                            "ISO 606 16B":[1.000, 17.02/25.4, 16.2/25.4],
                            "ISO 606 20B":[1.250, 19.56/25.4, 18.5/25.4],
-                           "ISO 606 24B":[1.5, 25.4/25.4, 24.1/25.4]}
+                           "ISO 606 24B":[1.500, 25.4/25.4, 24.1/25.4],
+                           "Motorcycle 420":[0.500, 0.3125, 0.227],
+                           "Motorcycle 425":[0.500, 0.3125, 0.284],
+                           "Motorcycle 428":[0.500, 0.335, 0.284],
+                           "Motorcycle 520":[0.625, 0.400, 0.227],
+                           "Motorcycle 525":[0.625, 0.400, 0.284],
+                           "Motorcycle 530":[0.625, 0.400, 0.343],
+                           "Motorcycle 630":[0.750, 0.400, 0.343],}
 
-        self.obj.Pitch           = str(SprocketReferenceRollerTable[size][0]) + " in"
-        self.obj.RollerDiameter  = str(SprocketReferenceRollerTable[size][1]) + " in"
-        self.obj.Thickness       = str(SprocketReferenceRollerTable[size][2]) + " in"
+        self.obj.Pitch          = str(SprocketReferenceRollerTable[size][0]) + " in"
+        self.obj.RollerDiameter = str(SprocketReferenceRollerTable[size][1]) + " in"
+        self.obj.Thickness      = str(SprocketReferenceRollerTable[size][2]) + " in"
         self.form.Quantity_Pitch.setText(self.obj.Pitch.UserString)
         self.form.Quantity_RollerDiameter.setText(self.obj.RollerDiameter.UserString)
         self.form.Quantity_Thickness.setText(self.obj.Thickness.UserString)
@@ -270,6 +270,5 @@ class SprocketTaskPanel:
         FreeCAD.ActiveDocument.abortTransaction()
 
 
-
 if FreeCAD.GuiUp:
     FreeCADGui.addCommand('PartDesign_Sprocket', CommandSprocket())
diff --git a/src/Mod/PartDesign/SprocketFeature.ui b/src/Mod/PartDesign/SprocketFeature.ui
index 28176e021a..d45ca8c48f 100644
--- a/src/Mod/PartDesign/SprocketFeature.ui
+++ b/src/Mod/PartDesign/SprocketFeature.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>195</width>
+    <width>264</width>
     <height>142</height>
    </rect>
   </property>
@@ -14,7 +14,6 @@
    <string>Sprocket parameter</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
-
    <item row="0" column="0">
     <widget class="QLabel" name="label_9">
      <property name="text">
@@ -35,7 +34,6 @@
      </property>
     </widget>
    </item>
-
    <item row="1" column="0">
     <widget class="QLabel" name="label_10">
      <property name="text">
@@ -44,21 +42,20 @@
     </widget>
    </item>
    <item row="1" column="1">
-     <widget class="QComboBox" name="comboBox_SprocketReference">
-
+    <widget class="QComboBox" name="comboBox_SprocketReference">
      <item>
       <property name="text">
-        <string>ANSI 25</string>
+       <string>ANSI 25</string>
       </property>
      </item>
      <item>
       <property name="text">
-        <string>ANSI 35</string>
+       <string>ANSI 35</string>
       </property>
      </item>
      <item>
       <property name="text">
-        <string>ANSI 41</string>
+       <string>ANSI 41</string>
       </property>
      </item>
      <item>
@@ -116,41 +113,6 @@
        <string>ANSI 240</string>
       </property>
      </item>
-     <item>
-      <property name="text">
-       <string>Motorcycle 420</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Motorcycle 425</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Motorcycle 428</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Motorcycle 520</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Motorcycle 525</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Motorcycle 530</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Motorcycle 630</string>
-      </property>
-     </item>
      <item>
       <property name="text">
        <string>Bicycle with Derailleur</string>
@@ -196,20 +158,51 @@
        <string>ISO 606 24B</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Motorcycle 420</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Motorcycle 425</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Motorcycle 428</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Motorcycle 520</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Motorcycle 525</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Motorcycle 530</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Motorcycle 630</string>
+      </property>
+     </item>
     </widget>
    </item>
-
    <item row="2" column="0">
-
     <widget class="QLabel" name="label_8">
      <property name="text">
       <string>Chain Pitch:</string>
      </property>
     </widget>
    </item>
-
    <item row="2" column="1">
-
     <widget class="Gui::InputField" name="Quantity_Pitch">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -224,35 +217,32 @@
       </size>
      </property>
      <property name="text">
-      <string/>
+      <string>0 in</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
+     <property name="singleStep">
+      <double>0.001000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>2000.000000000000000</double>
+     </property>
+     <property name="minimum">
+      <double>0.010000000000000</double>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">in</string>
      </property>
      <property name="decimals" stdset="0">
       <number>3</number>
      </property>
-     <property name="maximum" stdset="0">
-      <double>2000.000000000000000</double>
-     </property>
-     <property name="minimum" stdset="0">
-      <double>0.01</double>
-     </property>
-
-     <property name="singleStep" stdset="0">
-      <double>0.001</double>
-     </property>
      <property name="value" stdset="0">
-      <double>0.375</double>
+      <double>0.375000000000000</double>
      </property>
     </widget>
    </item>
-
    <item row="3" column="0">
-
     <widget class="QLabel" name="label_6">
      <property name="text">
       <string>Roller Diameter:</string>
@@ -276,30 +266,27 @@
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
+     <property name="singleStep">
+      <double>0.010000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>50.000000000000000</double>
+     </property>
+     <property name="minimum">
+      <double>0.010000000000000</double>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">in</string>
      </property>
      <property name="decimals" stdset="0">
       <number>3</number>
      </property>
-     <property name="maximum" stdset="0">
-      <double>50.000000000000000</double>
-     </property>
-     <property name="minimum" stdset="0">
-      <double>0.01</double>
-     </property>
-
-     <property name="singleStep" stdset="0">
-      <double>0.01</double>
-     </property>
      <property name="value" stdset="0">
-      <double>0.20</double>
+      <double>0.200000000000000</double>
      </property>
     </widget>
    </item>
-
    <item row="4" column="0">
-
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>Thickness:</string>
@@ -323,28 +310,26 @@
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
+     <property name="singleStep">
+      <double>0.010000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>50.000000000000000</double>
+     </property>
+     <property name="minimum">
+      <double>0.010000000000000</double>
+     </property>
      <property name="unit" stdset="0">
       <string notr="true">in</string>
      </property>
      <property name="decimals" stdset="0">
       <number>3</number>
      </property>
-     <property name="maximum" stdset="0">
-      <double>50.000000000000000</double>
-     </property>
-     <property name="minimum" stdset="0">
-      <double>0.01</double>
-     </property>
-
-     <property name="singleStep" stdset="0">
-      <double>0.01</double>
-     </property>
      <property name="value" stdset="0">
-      <double>0.20</double>
+      <double>0.200000000000000</double>
      </property>
     </widget>
    </item>
-
   </layout>
  </widget>
  <customwidgets>