diff --git a/src/c4group/C4Components.h b/src/c4group/C4Components.h
index bad245f4b..dc664cced 100644
--- a/src/c4group/C4Components.h
+++ b/src/c4group/C4Components.h
@@ -78,8 +78,7 @@
 #define C4CFN_MatMap          "MatMap.txt"
 #define C4CFN_Title           "Title%s.txt|Title.txt"
 #define C4CFN_WriteTitle      "Title.txt" // file that is generated if a title is set automatically
-#define C4CFN_ScenarioTitle   "Title.bmp"
-#define C4CFN_ScenarioTitlePNG "Title.png"
+#define C4CFN_ScenarioTitle   "Title"
 #define C4CFN_ScenarioIcon    "Icon.bmp"
 #define C4CFN_IconPNG         "Icon.png"
 #define C4CFN_ScenarioObjects "Objects.txt"
@@ -171,14 +170,14 @@
 
 // TODO: proper sorting of scaled def graphics (once we know what order we might load them in...)
 
-#define C4FLS_Scenario  "Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|Fonts.txt|Scenario.txt|Title*.txt|Info.txt|Desc*.rtf|Icon.png|Icon.bmp|Game.txt|StringTbl*.txt|Teams.txt|Parameters.txt|Info.txt|Sect*.ocg|Music.ocg|*.mid|*.wav|Desc*.rtf|Title.bmp|Title.png|*.ocd|Material.ocg|MatMap.txt|Landscape.bmp|Landscape.png|" C4CFN_DiffLandscape "|Sky.bmp|Sky.png|Sky.jpeg|Sky.jpg|PXS.ocb|MassMover.ocb|CtrlRec.ocb|Strings.txt|Objects.txt|RoundResults.txt|Author.txt|Version.txt|Names.txt|*.ocd|Script.c|Script*.c|Map.c|System.ocg"
+#define C4FLS_Scenario  "Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|Fonts.txt|Scenario.txt|Title*.txt|Info.txt|Desc*.rtf|Icon.png|Icon.bmp|Game.txt|StringTbl*.txt|Teams.txt|Parameters.txt|Info.txt|Sect*.ocg|Music.ocg|*.mid|*.wav|Desc*.rtf|Title.png|Title.jpg|*.ocd|Material.ocg|MatMap.txt|Landscape.bmp|Landscape.png|" C4CFN_DiffLandscape "|Sky.bmp|Sky.png|Sky.jpeg|Sky.jpg|PXS.ocb|MassMover.ocb|CtrlRec.ocb|Strings.txt|Objects.txt|RoundResults.txt|Author.txt|Version.txt|Names.txt|*.ocd|Script.c|Script*.c|Map.c|System.ocg"
 #define C4FLS_Section   "Scenario.txt|Game.txt|Landscape.bmp|Landscape.png|Sky.bmp|Sky.png|Sky.jpeg|Sky.jpg|PXS.ocb|MassMover.ocb|CtrlRec.ocb|Strings.txt|Objects.txt"
 #define C4FLS_SectionLandscape "Scenario.txt|Landscape.bmp|Landscape.png|PXS.ocb|MassMover.ocb"
 #define C4FLS_SectionObjects   "Strings.txt|Objects.txt"
-#define C4FLS_Def       "Particle.txt|DefCore.txt|*.material|Graphics.png|Overlay.png|Graphics*.png|Overlay*.png|*.png|*.jpg|Graphics.mesh|*.skeleton|StringTbl*.txt|Script.c|Script*.c|C4Script.c|Names*.txt|Title*.txt|ClonkNames.txt|Rank.txt|Rank*.txt|Rank.png|Desc*.txt|Title.png|Icon.bmp|Author.txt|Version.txt|*.wav|*.ogg|*.ocd"
+#define C4FLS_Def       "Particle.txt|DefCore.txt|*.material|Graphics.png|Overlay.png|Graphics*.png|Overlay*.png|*.png|*.jpg|Graphics.mesh|*.skeleton|StringTbl*.txt|Script.c|Script*.c|C4Script.c|Names*.txt|Title*.txt|ClonkNames.txt|Rank.txt|Rank*.txt|Rank.png|Desc*.txt|Author.txt|Version.txt|*.wav|*.ogg|*.ocd"
 #define C4FLS_Player    "Player.txt|*.oci"
 #define C4FLS_Object    "ObjectInfo.txt"
-#define C4FLS_Folder    "Folder.txt|Title*.txt|Info.txt|Desc*.rtf|Title.png|Title.bmp|Icon.png|Icon.bmp|Author.txt|Version.txt|*.ocs|Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|FolderMap.txt|FolderMap.png"
+#define C4FLS_Folder    "Folder.txt|Title*.txt|Info.txt|Desc*.rtf|Title.png|Title.jpg|Icon.png|Icon.bmp|Author.txt|Version.txt|*.ocs|Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|FolderMap.txt|FolderMap.png"
 #define C4FLS_Material  "TexMap.txt|*.bmp|*.png|*.ocm"
 #define C4FLS_Graphics  "Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|Font*.png"\
             "|Control.png|Fire.png|Background.png|Flag.png|Crew.png|Wealth.png|Player.png|Rank.png|Captain.png|Cursor.png|SelectMark.png|MenuSymbol.png|Menu.png|Logo.png|Construction.png|Energy.png|Options.png|UpperBoard.png|Arrow.png|Exit.png|Hand.png|Gamepad.png|Build.png"\
diff --git a/src/control/C4GameSave.cpp b/src/control/C4GameSave.cpp
index 0990905f5..bae7166d6 100644
--- a/src/control/C4GameSave.cpp
+++ b/src/control/C4GameSave.cpp
@@ -444,7 +444,7 @@ bool C4GameSave::Save(C4Group &hToGroup, bool fKeepGroup)
 	// remove: Title text, image and icon if specified
 	if (!GetKeepTitle())
 	{
-		pSaveGroup->Delete(C4CFN_ScenarioTitle);
+		pSaveGroup->Delete(FormatString("%s.*",C4CFN_ScenarioTitle).getData());
 		pSaveGroup->Delete(C4CFN_ScenarioIcon);
 		pSaveGroup->Delete(FormatString(C4CFN_ScenarioDesc,"*").getData());
 		pSaveGroup->Delete(C4CFN_Titles);
diff --git a/src/game/C4Game.cpp b/src/game/C4Game.cpp
index 0b60b5d2c..f0b79e322 100644
--- a/src/game/C4Game.cpp
+++ b/src/game/C4Game.cpp
@@ -1701,11 +1701,13 @@ bool C4Game::SaveGameTitle(C4Group &hGroup)
 	// Game not running
 	if (!FrameCounter)
 	{
-		char *bpBytes; size_t iSize;
-		if (ScenarioFile.LoadEntry(C4CFN_ScenarioTitle,&bpBytes,&iSize))
-			hGroup.Add(C4CFN_ScenarioTitle,bpBytes,iSize,false,true);
-		if (ScenarioFile.LoadEntry(C4CFN_ScenarioTitlePNG,&bpBytes,&iSize))
-			hGroup.Add(C4CFN_ScenarioTitlePNG,bpBytes,iSize,false,true);
+		char* bpBytes;
+		size_t iSize;
+		StdStrBuf realFilename;
+
+		if(ScenarioFile.FindEntry(FormatString("%s.*",C4CFN_ScenarioTitle).getData(),&realFilename,&iSize))
+			if (ScenarioFile.LoadEntry(realFilename.getData(),&bpBytes,&iSize))
+				hGroup.Add(realFilename.getData(),bpBytes,iSize,false,true);
 	}
 
 	// Fullscreen screenshot
@@ -1720,11 +1722,10 @@ bool C4Game::SaveGameTitle(C4Group &hGroup)
 		                        sfcPic,0,0,iSfcWdt,iSfcHgt);
 
 		bool fOkay=true;
-		const char *szDestFn;
 		fOkay = sfcPic->SavePNG(Config.AtTempPath(C4CFN_TempTitle), false, true, false);
-		szDestFn = C4CFN_ScenarioTitlePNG;
+		StdStrBuf destFilename = FormatString("%s.png",C4CFN_ScenarioTitle);
 		delete sfcPic; if (!fOkay) return false;
-		if (!hGroup.Move(Config.AtTempPath(C4CFN_TempTitle),szDestFn)) return false;
+		if (!hGroup.Move(Config.AtTempPath(C4CFN_TempTitle),destFilename.getData())) return false;
 	}
 
 	return true;
diff --git a/src/gui/C4StartupScenSelDlg.cpp b/src/gui/C4StartupScenSelDlg.cpp
index aec7707f2..16595b095 100644
--- a/src/gui/C4StartupScenSelDlg.cpp
+++ b/src/gui/C4StartupScenSelDlg.cpp
@@ -531,8 +531,7 @@ bool C4ScenarioListLoader::Entry::Load(C4Group *pFromGrp, const StdStrBuf *psFil
 			sDesc.Take(rtf.GetPlainText());
 		}
 		// load title
-		if (!fctTitle.Load(Group, C4CFN_ScenarioTitlePNG, C4FCT_Full, C4FCT_Full, false, true))
-			fctTitle.Load(Group, C4CFN_ScenarioTitle, C4FCT_Full, C4FCT_Full, true, true);
+		fctTitle.Load(Group, C4CFN_ScenarioTitle,C4FCT_Full,C4FCT_Full,false,true);
 		fExLoaded = true;
 		// load version
 		Group.LoadEntryString(C4CFN_Version, &sVersion);