diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index f2c9d5636f..a5bb3fbd12 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -409,7 +409,7 @@ struct BuildRailToolbarWindow : Window {
 		this->last_user_action = WIDGET_LIST_END;
 		this->last_user_action_remove = false;
 
-		if (_settings_client.gui.link_terraform_toolbar || _settings_client.gui.compact_vertical_toolbar) ShowTerraformToolbar(this);
+		if (_settings_client.gui.link_terraform_toolbar || _settings_client.gui.compact_vertical_toolbar) ShowTerraformToolbar(NULL);
 	}
 
 	~BuildRailToolbarWindow()
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 1da4b47f88..4d9f03062e 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -315,7 +315,7 @@ struct BuildRoadToolbarWindow : Window {
 		this->last_started_action_remove = false;
 		this->last_started_action_oneway = false;
 
-		if (_settings_client.gui.link_terraform_toolbar || _settings_client.gui.compact_vertical_toolbar) ShowTerraformToolbar(this);
+		if (_settings_client.gui.link_terraform_toolbar || _settings_client.gui.compact_vertical_toolbar) ShowTerraformToolbar(NULL);
 	}
 
 	~BuildRoadToolbarWindow()
diff --git a/todo.txt b/todo.txt
index a1ac20fdc1..6d53214c0c 100644
--- a/todo.txt
+++ b/todo.txt
@@ -10,5 +10,3 @@
 - Fix text input - it should use SDL_ANDROID_GetScreenKeyboardTextInputAsync(), TODO: it's broken in SDL.
 
 - Draggable combo boxes.
-
-- Rearrange toolbar menus to have less buttons.