diff --git a/Source/Core/Controls/LinedefInfoPanel.cs b/Source/Core/Controls/LinedefInfoPanel.cs
index 6f00cfcd44958247768a717f3fb57bcca02b885d..8ece5fe0e1a9ba112a7bfe08d9f8f260b7430154 100644
--- a/Source/Core/Controls/LinedefInfoPanel.cs
+++ b/Source/Core/Controls/LinedefInfoPanel.cs
@@ -438,6 +438,8 @@ namespace CodeImp.DoomBuilder.Controls
 				// Determine image to show
 				if(required) 
 					General.DisplayZoomedImage(panel, Properties.Resources.MissingTexture);
+				else
+					panel.BackgroundImage = null;
 			}
 			else
 			{
diff --git a/Source/Core/Data/DataManager.cs b/Source/Core/Data/DataManager.cs
index fb44412bc8019218911e41d93bd1fe2a98f3bcfe..9099b9a0e8647d209c2db425e7ee4d473a2f0371 100644
--- a/Source/Core/Data/DataManager.cs
+++ b/Source/Core/Data/DataManager.cs
@@ -78,6 +78,7 @@ namespace CodeImp.DoomBuilder.Data
 		// Special images
 		private ImageData missingtexture3d;
 		private ImageData unknowntexture3d;
+		private UnknownImage unknownImage; //mxd
 		private ImageData hourglass3d;
 		private ImageData crosshair;
 		private ImageData crosshairbusy;
@@ -168,6 +169,7 @@ namespace CodeImp.DoomBuilder.Data
 			whitetexture.UseColorCorrection = false;
 			whitetexture.LoadImage();
 			whitetexture.CreateTexture();
+			unknownImage = new UnknownImage(Properties.Resources.UnknownImage); //mxd. There should be only one!
 		}
 		
 		// Disposer
@@ -190,6 +192,8 @@ namespace CodeImp.DoomBuilder.Data
 				crosshairbusy = null;
 				whitetexture.Dispose();
 				whitetexture = null;
+				unknownImage.Dispose(); //mxd
+				unknownImage = null; //mxd
 				modeldefEntries = null;//mxd
                 mapInfo = null;
 				
@@ -916,7 +920,7 @@ namespace CodeImp.DoomBuilder.Data
 			}
 
 			// Return null image
-			return new UnknownImage(Properties.Resources.UnknownImage);
+			return unknownImage; //mxd
 		}
 		
 		#endregion
@@ -1008,7 +1012,7 @@ namespace CodeImp.DoomBuilder.Data
 			}
 
 			// Return null image
-			return new UnknownImage(Properties.Resources.UnknownImage);
+			return unknownImage; //mxd
 		}
 
 		// This returns an image by long and doesn't check if it exists
@@ -1173,7 +1177,7 @@ namespace CodeImp.DoomBuilder.Data
 				}
 				else
 				{
-					return new UnknownImage(Properties.Resources.UnknownImage);
+					return unknownImage; //mxd
 				}
 			}
 			else
@@ -1214,7 +1218,7 @@ namespace CodeImp.DoomBuilder.Data
 					else
 					{
 						// Return null image
-						return new UnknownImage(Properties.Resources.UnknownImage);
+						return unknownImage; //mxd
 					}
 				}
 			}