diff --git a/data/gui/macros/_initial.cfg b/data/gui/macros/_initial.cfg
index cbdcc9c4179b..b6a308f12307 100644
--- a/data/gui/macros/_initial.cfg
+++ b/data/gui/macros/_initial.cfg
@@ -238,6 +238,11 @@
 	y = "(screen_height / 2 - window_height / 2)"
 #enddef
 
+#define GUI_CENTERED_IMAGE
+	x = "(width / 2 - image_width / 2)"
+	y = "(height / 2 - image_height / 2)"
+#enddef
+
 #define GUI_HORIZONTAL_SPACER_LINE
 	[row]
 		grow_factor = 0
diff --git a/data/gui/widget/addon_list.cfg b/data/gui/widget/addon_list.cfg
index a120e5849f04..259bd861da85 100644
--- a/data/gui/widget/addon_list.cfg
+++ b/data/gui/widget/addon_list.cfg
@@ -170,6 +170,8 @@
 															name = "(text)"
 															w = "(min(image_original_width, 72))"
 															h = "(min(image_original_height, 72))"
+
+															{GUI_CENTERED_IMAGE}
 														[/image]
 
 													[/draw]
diff --git a/data/gui/widget/image_default.cfg b/data/gui/widget/image_default.cfg
index 7987348e1fbb..afe83da7838c 100644
--- a/data/gui/widget/image_default.cfg
+++ b/data/gui/widget/image_default.cfg
@@ -55,8 +55,7 @@
 
 				[image]
 					name = "(text)"
-					x = "(width / 2 - image_width / 2)"
-					y = "(height / 2 - image_height / 2)"
+					{GUI_CENTERED_IMAGE}
 				[/image]
 
 			[/draw]
diff --git a/data/gui/window/addon_manager.cfg b/data/gui/window/addon_manager.cfg
index 9bef2aaee17d..71b4a9f3f7f8 100644
--- a/data/gui/window/addon_manager.cfg
+++ b/data/gui/window/addon_manager.cfg
@@ -13,7 +13,7 @@
 				grow_factor = 0
 				border = "all"
 				border_size = 5
-				vertical_grow = "true"
+				vertical_alignment = "top"
 				horizontal_alignment = "left"
 
 				[drawing]
@@ -28,6 +28,8 @@
 							name = "(text)"
 							w = "(min(image_original_width, 72))"
 							h = "(min(image_original_height, 72))"
+
+							{GUI_CENTERED_IMAGE}
 						[/image]
 					[/draw]