diff --git a/data/gui/default/window/wml_message.cfg b/data/gui/default/window/wml_message.cfg
index 407966cfd1b..36222ec0aa6 100644
--- a/data/gui/default/window/wml_message.cfg
+++ b/data/gui/default/window/wml_message.cfg
@@ -114,9 +114,11 @@
 )#enddef
 
 # The X location of the image to display, only tested on the left side.
-#define __GUI_IMAGE_DISPLAYED_X
+#define __GUI_IMAGE_DISPLAYED_X X
 (
-	({__GUI_IMAGE_WIDTH} - image_width) / 2
+	if(image_original_width > 100,
+		{X},
+		({__GUI_IMAGE_WIDTH} - image_width) / 2)
 
 )#enddef
 
@@ -129,9 +131,9 @@
 #
 #define __GUI_IMAGE_DISPLAYED_Y
 (
-	if(image_original_height < 250,
-		(height - image_height - 10),
-		(height - image_height))
+	if(image_original_height > 0,
+		(height - image_height),
+		height - (({__GUI_IMAGE_WIDTH} - image_height) / 2))
 
 )#enddef
 
@@ -154,7 +156,7 @@
 			[draw]
 
 				[image]
-					x = "{__GUI_IMAGE_DISPLAYED_X}"
+					x = "{__GUI_IMAGE_DISPLAYED_X X}"
 					y = "{__GUI_IMAGE_DISPLAYED_Y}"
 					w = "{__GUI_IMAGE_DISPLAYED_WIDTH}"
 					h = "{__GUI_IMAGE_DISPLAYED_HEIGHT}"
@@ -189,7 +191,7 @@
 			[draw]
 
 				[image]
-					x = "(({__GUI_IMAGE_WIDTH} - image_width) / 2) + {MAX_TEXT_WIDTH}"
+					x = "(width - {__GUI_IMAGE_DISPLAYED_WIDTH})"
 					y = "(height - image_height)"
 					w = "{__GUI_IMAGE_DISPLAYED_WIDTH}"
 					h = "{__GUI_IMAGE_DISPLAYED_HEIGHT}"