diff --git a/resources/ui_layout/default/print.ui b/resources/ui_layout/default/print.ui
index 21d38c4b72a..039c1ddf88b 100644
--- a/resources/ui_layout/default/print.ui
+++ b/resources/ui_layout/default/print.ui
@@ -348,13 +348,14 @@ group:label_width$8:sidetext_width$7:Speed for print moves
 		setting:width$4:bridge_speed_internal
 		setting:width$4:overhangs_speed
 	line:Gap fill speed
-		setting:width$4:label$maximum speed:gap_fill_speed
+		setting:width$4:label$Maximum speed:gap_fill_speed
 		setting:width$4:label$Cap with:sidetext$% of perimeter flow:sidetext_width$20:gap_fill_flow_match_perimeter
 	line:Other speed
 		setting:width$4:thin_walls_speed
 		setting:width$4:ironing_speed
-		setting:wipe_tower_speed
-		setting:wipe_tower_wipe_starting_speed
+	line:Wipe tower
+		setting:width$4:label$Main speed:wipe_tower_speed
+		setting:width$4:label$Wipe starting speed:wipe_tower_wipe_starting_speed
 group:Speed for non-print moves
 	line:Travel speed
 		setting:label$xy:travel_speed
diff --git a/src/libslic3r/GCode/WipeTower.cpp b/src/libslic3r/GCode/WipeTower.cpp
index 03876a97ba7..7a8ed99c738 100644
--- a/src/libslic3r/GCode/WipeTower.cpp
+++ b/src/libslic3r/GCode/WipeTower.cpp
@@ -1267,8 +1267,8 @@ void WipeTower::toolchange_Wipe(
     if (this->m_config->filament_max_speed.get_at(this->m_current_tool) > 0) {
         max_speed = float(this->m_config->filament_max_speed.get_at(this->m_current_tool));
     }
-    const float target_speed = std::min(max_speed, (is_first_layer() ? m_first_layer_speed : m_speed) * 60.f);
-    float wipe_speed = std::min(max_speed, std::min(target_speed, float(m_config->wipe_tower_wipe_starting_speed.get_abs_value(target_speed))));
+    const float target_speed = std::min(max_speed, (is_first_layer() ? m_first_layer_speed : m_speed));
+    float wipe_speed = std::min(max_speed, float(m_config->wipe_tower_wipe_starting_speed.get_abs_value(target_speed)));
     if (wipe_speed <= 0) {
         wipe_speed = target_speed;
     }
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index c30aa24a8e5..57d27875af1 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -6251,10 +6251,10 @@ void PrintConfigDef::init_fff_params()
     def->set_default_value(new ConfigOptionFloat(80.));
 
     def = this->add("wipe_tower_wipe_starting_speed", coFloatOrPercent);
-    def->label = L("Wipe tower starting speed");
+    def->label = L("Wipe tower wipe starting speed");
     def->category = OptionCategory::speed;
     def->tooltip = L("Start of the wiping speed ramp up (for wipe tower)."
-        "\nCan be a % of the 'Wipe tower speed'."
+        "\nCan be a % of the 'Wipe tower main speed'."
         "\nSet to 0 to disable.");
     def->sidetext = L("mm/s or %");
     def->mode = comAdvancedE | comSuSi;