diff --git a/common/dialogs/dialog_locked_items_query_base.cpp b/common/dialogs/dialog_locked_items_query_base.cpp
index c846cde7d2..985d5e1532 100644
--- a/common/dialogs/dialog_locked_items_query_base.cpp
+++ b/common/dialogs/dialog_locked_items_query_base.cpp
@@ -53,11 +53,11 @@ DIALOG_LOCKED_ITEMS_QUERY_BASE::DIALOG_LOCKED_ITEMS_QUERY_BASE( wxWindow* parent
 	bButtonSizer = new wxBoxSizer( wxHORIZONTAL );
 
 	m_overrideBtn = new wxButton( this, wxID_ANY, _("Override Locks"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_overrideBtn->SetToolTip( _("Override locks and apply the operation on the locked items.\nThe locked items will remain locked after the operation is complete.") );
+	m_overrideBtn->SetToolTip( _("Override locks and apply the operation on all the items selected.\nAny locked items will remain locked after the operation is complete.") );
 
 	bButtonSizer->Add( m_overrideBtn, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-	m_removeBtn = new wxButton( this, wxID_ANY, _("Remove Locked Items"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_removeBtn = new wxButton( this, wxID_ANY, _("Skip Locked Items"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_removeBtn->SetToolTip( _("Remove locked items from the selection and only apply the operation to the unlocked items (if any).") );
 
 	bButtonSizer->Add( m_removeBtn, 0, wxALL, 5 );
diff --git a/common/dialogs/dialog_locked_items_query_base.fbp b/common/dialogs/dialog_locked_items_query_base.fbp
index a58ef2415b..8c1766a156 100644
--- a/common/dialogs/dialog_locked_items_query_base.fbp
+++ b/common/dialogs/dialog_locked_items_query_base.fbp
@@ -461,7 +461,7 @@
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label">Remove Locked Items</property>
+                                <property name="label">Skip Locked Items</property>
                                 <property name="margins"></property>
                                 <property name="markup">0</property>
                                 <property name="max_size"></property>
diff --git a/pcbnew/dialogs/panel_edit_options_base.cpp b/pcbnew/dialogs/panel_edit_options_base.cpp
index 152de00bee..69854b5014 100644
--- a/pcbnew/dialogs/panel_edit_options_base.cpp
+++ b/pcbnew/dialogs/panel_edit_options_base.cpp
@@ -367,7 +367,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
 	sbSizer4->Add( m_Auto_Refill_Zones, 0, wxALL, 5 );
 
 	m_Allow_Free_Pads = new wxCheckBox( sbSizer4->GetStaticBox(), wxID_ANY, _("Allow free pads"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_Allow_Free_Pads->SetToolTip( _("If unchecked (default), any attempt to move unlocked pads will instead move the footprint as a whole.\nIf checked, unlocked pads can be moved freely with respect to the rest of the footprint. \nNote: Locked pads cannot be moved with respect to the parent footprint regardless of this setting.") );
+	m_Allow_Free_Pads->SetToolTip( _("If checked, pads can be moved with respect to the rest of the footprint.") );
 
 	sbSizer4->Add( m_Allow_Free_Pads, 0, wxALL, 5 );
 
diff --git a/pcbnew/dialogs/panel_edit_options_base.fbp b/pcbnew/dialogs/panel_edit_options_base.fbp
index 2e8ba9daed..7e30b7773f 100644
--- a/pcbnew/dialogs/panel_edit_options_base.fbp
+++ b/pcbnew/dialogs/panel_edit_options_base.fbp
@@ -3477,7 +3477,7 @@
                                                             <property name="style"></property>
                                                             <property name="subclass"></property>
                                                             <property name="toolbar_pane">0</property>
-                                                            <property name="tooltip">If unchecked (default), any attempt to move unlocked pads will instead move the footprint as a whole.&#x0A;If checked, unlocked pads can be moved freely with respect to the rest of the footprint. &#x0A;Note: Locked pads cannot be moved with respect to the parent footprint regardless of this setting.</property>
+                                                            <property name="tooltip">If checked, pads can be moved with respect to the rest of the footprint.</property>
                                                             <property name="validator_data_type"></property>
                                                             <property name="validator_style">wxFILTER_NONE</property>
                                                             <property name="validator_type">wxDefaultValidator</property>