diff --git a/source/cfg.c b/source/cfg.c
index 6a43fd6d..7d32ac5c 100644
--- a/source/cfg.c
+++ b/source/cfg.c
@@ -909,6 +909,7 @@ bool cfg_save_global()// save global settings
 	fprintf(f, "cios = %d\n ", Settings.cios);
 	fprintf(f, "xflip = %d\n ", Settings.xflip);
 	fprintf(f, "qboot = %d\n ", Settings.qboot);
+	fprintf(f, "wsprompt = %d\n", Settings.wsprompt);
 	fprintf(f, "parentalcontrol = %d\n ", CFG.parentalcontrol);
 	fprintf(f, "cover_path = %s\n ", CFG.covers_path);
 	if(CFG.widescreen) {
diff --git a/source/images/nocover.png b/source/images/nocover.png
index 3e96c5e8..8695b451 100644
Binary files a/source/images/nocover.png and b/source/images/nocover.png differ
diff --git a/source/menu.cpp b/source/menu.cpp
index c230798e..4b72b1fc 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -808,7 +808,7 @@ int GameWindowPrompt()
 			strncat(gameName, "...", 3);
 		}
 
-		snprintf(imgPath,sizeof(imgPath),"%s%s.png", CFG.disc_path, ID); //changed to current id
+		snprintf(imgPath,sizeof(imgPath),"%s%s.png", CFG.disc_path, IDFull); //changed to current id
 
 		if (diskCover)
 			delete diskCover;
@@ -818,7 +818,7 @@ int GameWindowPrompt()
 		if (!diskCover->GetImage())
 		{
 			delete diskCover;
-			snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.disc_path, IDFull); //changed to current full id
+			snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.disc_path, ID); //changed to current full id
 			diskCover = new GuiImageData(imgPath, 0);
 			if (!diskCover->GetImage())
 			{
@@ -890,7 +890,7 @@ int GameWindowPrompt()
 				choice = 3;
 				promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
 			}
-			// this next part is long because nobody could agree on what the left/right buttons should do 
+			// this next part is long because nobody could agree on what the left/right buttons should do
 			else if((btnRight.GetState() == STATE_CLICKED) && (Settings.xflip == no)){//next game
 				promptWindow.SetEffect(EFFECT_SLIDE_RIGHT | EFFECT_SLIDE_OUT, 50);
 				changed = 1;
@@ -926,7 +926,7 @@ int GameWindowPrompt()
 				btnLeft.ResetState();
 				break;
 			}
-			
+
 			else if((btnRight.GetState() == STATE_CLICKED) && (Settings.xflip == sysmenu)){//previous game
 				promptWindow.SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_OUT, 50);
 				changed = 2;
@@ -944,7 +944,7 @@ int GameWindowPrompt()
 				btnLeft.ResetState();
 				break;
 			}
-			
+
 			else if((btnRight.GetState() == STATE_CLICKED) && (Settings.xflip == wtf)){//previous game
 				promptWindow.SetEffect(EFFECT_SLIDE_RIGHT | EFFECT_SLIDE_OUT, 50);
 				changed = 1;
@@ -1706,7 +1706,7 @@ UpdateGUI (void *arg)
 		else
 		{
 			mainWindow->Draw();
-			//if (Settings.tooltips == TooltipsOn && THEME.showToolTip != 0)
+			if (Settings.tooltips == TooltipsOn && THEME.showToolTip != 0)
 				mainWindow->DrawTooltip();
 
 			#ifdef HW_RVL
@@ -2713,12 +2713,12 @@ static int MenuDiscList()
 					cover = NULL;
 				}
 
-				snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, ID);
+				snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, IDfull);
 				cover = new GuiImageData(imgPath,0); //load short id
 				if (!cover->GetImage()) //if could not load the short id image
 				{
 					delete cover;
-					snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, IDfull);
+					snprintf(imgPath, sizeof(imgPath), "%s%s.png", CFG.covers_path, ID);
 					cover = new GuiImageData(imgPath, 0); //load full id image
 					if (!cover->GetImage())
 					{
@@ -3643,9 +3643,9 @@ static int MenuSettings()
 							mainWindow->Remove(&page2Btn);
 							w.Remove(&backBtn);
 							w.Remove(&lockBtn);
-							char entered[20] = "";
+							char entered[50] = "";
 							strncpy(entered, CFG.covers_path, sizeof(entered));
-							int result = OnScreenKeyboard(entered, 20);
+							int result = OnScreenKeyboard(entered, 50);
 							mainWindow->Append(&optionBrowser2);
 							mainWindow->Append(&page1Btn);
 							mainWindow->Append(&page2Btn);
@@ -3671,9 +3671,9 @@ static int MenuSettings()
 							mainWindow->Remove(&page2Btn);
 							w.Remove(&backBtn);
 							w.Remove(&lockBtn);
-							char entered[20] = "";
+							char entered[50] = "";
 							strncpy(entered, CFG.disc_path, sizeof(entered));
-							int result = OnScreenKeyboard(entered, 20);
+							int result = OnScreenKeyboard(entered, 50);
 							mainWindow->Append(&optionBrowser2);
 							mainWindow->Append(&page1Btn);
 							mainWindow->Append(&page2Btn);
@@ -3699,9 +3699,9 @@ static int MenuSettings()
 							mainWindow->Remove(&page2Btn);
 							w.Remove(&backBtn);
 							w.Remove(&lockBtn);
-							char entered[20] = "";
+							char entered[50] = "";
 							strncpy(entered, CFG.theme_path, sizeof(entered));
-							int result = OnScreenKeyboard(entered, 20);
+							int result = OnScreenKeyboard(entered, 50);
 							mainWindow->Append(&optionBrowser2);
 							mainWindow->Append(&page1Btn);
 							mainWindow->Append(&page2Btn);
@@ -3772,8 +3772,8 @@ static int MenuSettings()
 							mainWindow->Remove(&page2Btn);
 							w.Remove(&backBtn);
 							w.Remove(&lockBtn);
-						char entered[20] = "";
-					int result = OnScreenKeyboard(entered, 20);
+                            char entered[20] = "";
+                            int result = OnScreenKeyboard(entered, 20);
 							mainWindow->Append(&page1Btn);
 							mainWindow->Append(&page2Btn);
 							mainWindow->Append(&optionBrowser2);