diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index dab689da88..a9031909b5 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -816,7 +816,7 @@ static constexpr NWidgetPart _nested_timetable_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
 		NWidget(WWT_CAPTION, COLOUR_GREY, WID_VT_CAPTION), SetStringTip(STR_TIMETABLE_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VT_ORDER_VIEW), SetMinimalSize(61, 14), SetDataTip( STR_TIMETABLE_ORDER_VIEW, STR_TIMETABLE_ORDER_VIEW_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VT_ORDER_VIEW), SetMinimalSize(61, 14), SetStringTip(STR_TIMETABLE_ORDER_VIEW, STR_TIMETABLE_ORDER_VIEW_TOOLTIP),
 		NWidget(WWT_SHADEBOX, COLOUR_GREY),
 		NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 0e5499eb02..40244892e2 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -2906,8 +2906,8 @@ static constexpr NWidgetPart _nested_vehicle_view_widgets[] = {
 		EndContainer(),
 		NWidget(NWID_VERTICAL),
 			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_VV_SELECT_DEPOT_CLONE),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_GOTO_DEPOT), SetMinimalSize(18, 18), SetDataTip(0x0 /* filled later */, STR_NULL /* filled later */),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_CLONE), SetMinimalSize(18, 18), SetDataTip(0x0 /* filled later */, STR_NULL /* filled later */),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_GOTO_DEPOT), SetMinimalSize(18, 18), SetSpriteTip(SPR_EMPTY /* filled later */, STR_NULL /* filled later */),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_CLONE), SetMinimalSize(18, 18), SetSpriteTip(SPR_EMPTY /* filled later */, STR_NULL /* filled later */),
 			EndContainer(),
 			/* For trains only, 'ignore signal' button. */
 			NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_FORCE_PROCEED), SetMinimalSize(18, 18),
diff --git a/src/widget_type.h b/src/widget_type.h
index e6ed7d8a61..a4325df4f4 100644
--- a/src/widget_type.h
+++ b/src/widget_type.h
@@ -1196,17 +1196,6 @@ constexpr NWidgetPart EndContainer()
 	return NWidgetPart{WPT_ENDCONTAINER};
 }
 
-/**
- * Widget part function for setting the data and tooltip.
- * @param data Data of the widget.
- * @param tip  Tooltip of the widget.
- * @ingroup NestedWidgetParts
- */
-constexpr NWidgetPart SetDataTip(uint32_t data, StringID tip)
-{
-	return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{data, tip}};
-}
-
 /**
  * Widget part function for setting the string and tooltip.
  * @param string String of the widget.