diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index a968a44823..fae125aa9b 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -402,7 +402,7 @@ static const NWidgetPart _nested_build_docks_scen_toolbar_widgets[] = {
 
 /** Window definition for the build docks in scenario editor window. */
 static WindowDesc _build_docks_scen_toolbar_desc(
-	WDP_AUTO, "toolbar_water_scen", 0, 0,
+	WDP_ALIGN_TOOLBAR, "toolbar_water_scen", 0, 0,
 	WC_SCEN_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
 	_nested_build_docks_scen_toolbar_widgets, lengthof(_nested_build_docks_scen_toolbar_widgets)
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 2a0ff6cd30..f919da1ebe 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -189,7 +189,7 @@ static const NWidgetPart _nested_build_industry_widgets[] = {
 
 /** Window definition of the dynamic place industries gui */
 static WindowDesc _build_industry_desc(
-	WDP_AUTO, "build_industry", 170, 212,
+	WDP_ALIGN_TOOLBAR, "build_industry", 170, 212,
 	WC_BUILD_INDUSTRY, WC_NONE,
 	WDF_CONSTRUCTION,
 	_nested_build_industry_widgets, lengthof(_nested_build_industry_widgets)
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 7526216f4b..5d08eede13 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -833,7 +833,7 @@ static const NWidgetPart _nested_build_road_scen_widgets[] = {
 };
 
 static WindowDesc _build_road_scen_desc(
-	WDP_AUTO, "toolbar_road_scen", 0, 0,
+	WDP_ALIGN_TOOLBAR, "toolbar_road_scen", 0, 0,
 	WC_SCEN_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
 	_nested_build_road_scen_widgets, lengthof(_nested_build_road_scen_widgets),
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 4efce0b131..9f77cc6dcb 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -748,7 +748,7 @@ static Hotkey terraform_editor_hotkeys[] = {
 HotkeyList ScenarioEditorLandscapeGenerationWindow::hotkeys("terraform_editor", terraform_editor_hotkeys, TerraformToolbarEditorGlobalHotkeys);
 
 static WindowDesc _scen_edit_land_gen_desc(
-	WDP_AUTO, "toolbar_landscape_scen", 0, 0,
+	WDP_ALIGN_TOOLBAR, "toolbar_landscape_scen", 0, 0,
 	WC_SCEN_LAND_GEN, WC_NONE,
 	WDF_CONSTRUCTION,
 	_nested_scen_edit_land_gen_widgets, lengthof(_nested_scen_edit_land_gen_widgets),
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 8d6c081af6..93300f15b4 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -1201,7 +1201,7 @@ public:
 };
 
 static WindowDesc _found_town_desc(
-	WDP_AUTO, "build_town", 160, 162,
+	WDP_ALIGN_TOOLBAR, "build_town", 160, 162,
 	WC_FOUND_TOWN, WC_NONE,
 	WDF_CONSTRUCTION,
 	_nested_found_town_widgets, lengthof(_nested_found_town_widgets)