diff --git a/protocol-designer/src/components/StepEditForm/fields/TipPosition/index.js b/protocol-designer/src/components/StepEditForm/fields/TipPosition/index.js
index 54ffb3006b8..75a3d6d1aaf 100644
--- a/protocol-designer/src/components/StepEditForm/fields/TipPosition/index.js
+++ b/protocol-designer/src/components/StepEditForm/fields/TipPosition/index.js
@@ -49,7 +49,7 @@ class TipPositionInput extends React.Component<OP & SP, TipPositionInputState> {
     const isTouchTipField = getIsTouchTipField(this.props.fieldName)
 
     const Wrapper = ({children, hoverTooltipHandlers}) => isTouchTipField
-      ? <React.Fragment>{children}</React.Fragment>
+      ? <div {...hoverTooltipHandlers}>{children}</div>
       : <FormGroup
         label={i18n.t('form.step_edit_form.field.tip_position.label')}
         disabled={disabled}
@@ -82,7 +82,7 @@ class TipPositionInput extends React.Component<OP & SP, TipPositionInputState> {
               readOnly
               onClick={this.handleOpen}
               value={String(value)}
-              units="mm" />
+              units={i18n.t('application.units.millimeter')} />
           </Wrapper>
         )}
       </HoverTooltip>
diff --git a/protocol-designer/src/components/StepEditForm/forms/Mix.js b/protocol-designer/src/components/StepEditForm/forms/Mix.js
index c62cf2511e5..ac17db2a6e0 100644
--- a/protocol-designer/src/components/StepEditForm/forms/Mix.js
+++ b/protocol-designer/src/components/StepEditForm/forms/Mix.js
@@ -97,6 +97,7 @@ class MixForm extends React.Component<Props, State> {
               <CheckboxRowField
                 className={styles.small_field}
                 label={i18n.t('form.step_edit_form.field.touchTip.label')}
+                tooltipComponent={i18n.t('tooltip.step_fields.defaults.mix_touchTip_checkbox')}
                 name={'mix_touchTip_checkbox'}
               >
                 <TipPositionField fieldName={'mix_touchTip_mmFromBottom'} />
diff --git a/protocol-designer/src/components/StepEditForm/forms/MoveLiquid/SourceDestFields.js b/protocol-designer/src/components/StepEditForm/forms/MoveLiquid/SourceDestFields.js
index 5fb4d08c557..0a30d83facf 100644
--- a/protocol-designer/src/components/StepEditForm/forms/MoveLiquid/SourceDestFields.js
+++ b/protocol-designer/src/components/StepEditForm/forms/MoveLiquid/SourceDestFields.js
@@ -66,6 +66,7 @@ function SourceDestFields (props: Props) {
         }
         <CheckboxRowField
           name={addFieldNamePrefix('touchTip_checkbox')}
+          tooltipComponent={i18n.t(`tooltip.step_fields.${addFieldNamePrefix('touchTip_checkbox')}`)}
           label={i18n.t('form.step_edit_form.field.touchTip.label')}
           className={styles.small_field}
         >
diff --git a/protocol-designer/src/components/StepEditForm/utils.js b/protocol-designer/src/components/StepEditForm/utils.js
index 301d9964e90..d0ab486d969 100644
--- a/protocol-designer/src/components/StepEditForm/utils.js
+++ b/protocol-designer/src/components/StepEditForm/utils.js
@@ -71,11 +71,9 @@ export function getTooltipForField (stepType: ?string, name: string): ?React.Nod
     : name
 
   // specificity cascade for names.
-  // first level: try getting from step_fields.moveLiquid, fallback to step_fields.default
+  // first level: "disabled" wins out if disabled arg is true
   // second level: prefix. "aspirate_foo" wins over "foo"
   const text: string = i18n.t([
-    `tooltip.step_fields.${stepType}.${name}`,
-    `tooltip.step_fields.${stepType}.${nameWithoutPrefix}`,
     `tooltip.step_fields.defaults.${name}`,
     `tooltip.step_fields.defaults.${nameWithoutPrefix}`,
     '',
diff --git a/protocol-designer/src/localization/en/application.json b/protocol-designer/src/localization/en/application.json
index c3c9950719c..6a52a00f17b 100644
--- a/protocol-designer/src/localization/en/application.json
+++ b/protocol-designer/src/localization/en/application.json
@@ -5,6 +5,7 @@
     "pause": "pause"
   },
   "units": {
+    "millimeter": "mm",
     "microliter": "μL",
     "microliterPerSec": "μL/s",
     "times": "x",
diff --git a/protocol-designer/src/localization/en/form.json b/protocol-designer/src/localization/en/form.json
index a242538141a..097cbc2363e 100644
--- a/protocol-designer/src/localization/en/form.json
+++ b/protocol-designer/src/localization/en/form.json
@@ -61,7 +61,7 @@
       "tip_position": {"label": "tip position"},
       "volume": {"label": "volume"},
       "well_order": {
-        "label": "Well Order",
+        "label": "Well order",
         "option": {
           "l2r": "Left to right",
           "r2l": "Right to left",
diff --git a/protocol-designer/src/localization/en/tooltip.json b/protocol-designer/src/localization/en/tooltip.json
index 63778446170..d19ab290b83 100644
--- a/protocol-designer/src/localization/en/tooltip.json
+++ b/protocol-designer/src/localization/en/tooltip.json
@@ -24,7 +24,10 @@
       "changeTip": "Choose when the robot picks up fresh tips",
       "preWetTip": "Pre-wet pipette tip by aspirating and dispensing 2/3 of the tip's max volume",
       "tipPosition": "Distance from the bottom of the well",
-      "touchTip_checkbox": "Touch tip to 4 sides of the well",
+
+      "aspirate_touchTip_checkbox": "Touch tip to each side of well after aspirating",
+      "dispense_touchTip_checkbox": "Touch tip to each side of well after dispensing",
+      "mix_touchTip_checkbox": "Touch tip to each side of the well after mixing",
 
       "volume": "Volume to dispense in each well"
     }