diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 1816e28f3f..95d20e7515 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -57,15 +57,13 @@ static const NWidgetPart _nested_build_vehicle_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY),
-		NWidget(NWID_HORIZONTAL),
-			NWidget(NWID_VERTICAL),
+		NWidget(NWID_VERTICAL),
+			NWidget(NWID_HORIZONTAL),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BV_SORT_ASSENDING_DESCENDING), SetSizingType(NWST_STEP), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER), SetFill(1, 0),
-				NWidget(NWID_SPACER), SetFill(1, 1),
-			EndContainer(),
-			NWidget(NWID_VERTICAL),
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_BV_SORT_DROPDOWN), SetSizingType(NWST_STEP), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_SORT_CRITERIA),
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_BV_CARGO_FILTER_DROPDOWN), SetSizingType(NWST_STEP), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_FILTER_CRITERIA),
 			EndContainer(),
+			NWidget(NWID_SPACER), SetFill(1, 1),
 		EndContainer(),
 	EndContainer(),
 	/* Vehicle list. */
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 6889d6eb16..551697d601 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -342,7 +342,7 @@ public:
 				resize->height = this->tiny_step_height;
 
 				/* Minimum height is the height of the list widget minus all and default vehicles... */
-				size->height =  4 * GetVehicleListHeight(this->vli.vtype, this->tiny_step_height) - 2 * this->tiny_step_height;
+				size->height = (this->vli.vtype >= VEH_SHIP ? 3 : 6) * GetVehicleListHeight(this->vli.vtype, this->tiny_step_height) - 2 * this->tiny_step_height;
 
 				/* Get a multiple of tiny_step_height of that amount */
 				size->height = Ceil(size->height, tiny_step_height);
@@ -366,7 +366,7 @@ public:
 			case WID_GL_LIST_VEHICLE:
 				this->ComputeGroupInfoSize();
 				resize->height = GetVehicleListHeight(this->vli.vtype, this->tiny_step_height);
-				size->height = 4 * resize->height;
+				size->height = (this->vli.vtype >= VEH_SHIP ? 3 : 6) * resize->height;
 				break;
 
 			case WID_GL_MANAGE_VEHICLES_DROPDOWN: {
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index 26910e952b..cf48cf2193 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -374,7 +374,7 @@ struct MusicTrackSelectionWindow : public Window {
 				}
 				resize->height = GetMinSizing(NWST_STEP, d.height);
 				d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
-				d.height = 10 * resize->height + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
+				d.height = 7 * resize->height + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
 				*size = maxdim(*size, d);
 				break;
 			}
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 537c0a3e7f..0fdc623301 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -649,7 +649,7 @@ struct RefitWindow : public Window {
 		switch (widget) {
 			case WID_VR_MATRIX:
 				resize->height = GetMinSizing(NWST_STEP, WD_MATRIX_TOP + FONT_HEIGHT_NORMAL + WD_MATRIX_BOTTOM);
-				size->height = resize->height * 8;
+				size->height = resize->height * 6;
 				break;
 
 			case WID_VR_VEHICLE_PANEL_DISPLAY:
@@ -1474,7 +1474,7 @@ public:
 				switch (this->vli.vtype) {
 					case VEH_TRAIN:
 					case VEH_ROAD:
-						size->height = 7 * resize->height;
+						size->height = 6 * resize->height;
 						break;
 					case VEH_SHIP:
 					case VEH_AIRCRAFT:
diff --git a/todo.txt b/todo.txt
index 2b4e64e5d0..36c93f49af 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,5 +1 @@
-- Resize Aircraft window
-- Resize Ship window
-- Resize Music Program Selection window
-- Resize all buttons and fonts when screen resolution changes
 - Add Load button to Play Heightmap dialog