diff --git a/planet/Graphics.ocg/Control.png b/planet/Graphics.ocg/Control.png
index 8e96f12e5..fcc3b5b68 100644
Binary files a/planet/Graphics.ocg/Control.png and b/planet/Graphics.ocg/Control.png differ
diff --git a/planet/Graphics.ocg/StartupPlrPropBG.png b/planet/Graphics.ocg/StartupPlrPropBG.png
index 3600a4066..dc8ae47ba 100644
Binary files a/planet/Graphics.ocg/StartupPlrPropBG.png and b/planet/Graphics.ocg/StartupPlrPropBG.png differ
diff --git a/src/control/C4PlayerControl.cpp b/src/control/C4PlayerControl.cpp
index 45337d7b8..f2443796b 100644
--- a/src/control/C4PlayerControl.cpp
+++ b/src/control/C4PlayerControl.cpp
@@ -619,8 +619,8 @@ C4Facet C4PlayerControlAssignmentSet::GetPicture() const
 	// get image to be drawn to represent this control set
 	// picture per set not implemented yet. So just default to out standard images
 	if (HasGamepad()) return ::GraphicsResource.fctGamepad.GetPhase(GetGamepadIndex());
-	if (HasMouse()) return ::GraphicsResource.fctMouse; // todo: probably mouse PLUS keyboard?
-	if (HasKeyboard()) return ::GraphicsResource.fctKeyboard.GetPhase(0 /* todo*/);
+//	if (HasMouse()) return ::GraphicsResource.fctMouse; // todo: probably mouse PLUS keyboard? // todo cancelled
+	if (HasKeyboard()) return ::GraphicsResource.fctKeyboard.GetPhase(Game.PlayerControlUserAssignmentSets.GetSetIndex(this));
 	return C4Facet();
 }
 
diff --git a/src/gui/C4StartupPlrSelDlg.cpp b/src/gui/C4StartupPlrSelDlg.cpp
index fce7645b2..8667a6f9f 100644
--- a/src/gui/C4StartupPlrSelDlg.cpp
+++ b/src/gui/C4StartupPlrSelDlg.cpp
@@ -1376,15 +1376,16 @@ C4StartupPlrPropertiesDlg::C4StartupPlrPropertiesDlg(C4StartupPlrSelDlg::PlayerL
 	AddElement(pBtn = new C4GUI::CallbackButton<C4StartupPlrPropertiesDlg, C4GUI::ArrowButton>(C4GUI::ArrowButton::Left, caControl.GetFromLeft(C4GUI::ArrowButton::GetDefaultWidth()), &C4StartupPlrPropertiesDlg::OnCtrlChangeLeft));
 	pBtn->SetToolTip(szTip);
 	int32_t ctrl_name_hgt = pSmallFont->GetLineHeight();
-	C4Rect ctrl_name_rect = caControl.GetFromBottom(ctrl_name_hgt); caControl.ExpandBottom(ctrl_name_hgt);
+	caControl.ExpandBottom(ctrl_name_hgt); C4Rect ctrl_name_rect = caControl.GetFromBottom(ctrl_name_hgt);
 	C4Facet &rfctCtrlPic = ::GraphicsResource.fctKeyboard; // UpdatePlayerControl() will alternatively set fctGamepad
 	AddElement(pCtrlImg = new C4GUI::Picture(caControl.GetFromLeft(rfctCtrlPic.GetWidthByHeight(caControl.GetHeight())), true));
 	pCtrlImg->SetToolTip(szTip);
 	AddElement(pBtn = new C4GUI::CallbackButton<C4StartupPlrPropertiesDlg, C4GUI::ArrowButton>(C4GUI::ArrowButton::Right, caControl.GetFromLeft(C4GUI::ArrowButton::GetDefaultWidth()), &C4StartupPlrPropertiesDlg::OnCtrlChangeRight));
 	pBtn->SetToolTip(szTip);
 	caControl.ExpandLeft(-10);
-	AddElement(pMouseBtn = new C4GUI::CallbackButton<C4StartupPlrPropertiesDlg, C4GUI::IconButton>(C4GUI::Ico_MouseOff, caControl.GetFromLeft(caControl.GetHeight()), 'M' /* 2do */, &C4StartupPlrPropertiesDlg::OnCtrlChangeMouse));
-	pMouseBtn->SetToolTip(LoadResStr("IDS_DLGTIP_PLAYERCONTROLMOUSE"));
+	// Mouse control, currently mandatory with keyboard and this will probably never change again!
+//	AddElement(pMouseBtn = new C4GUI::CallbackButton<C4StartupPlrPropertiesDlg, C4GUI::IconButton>(C4GUI::Ico_MouseOff, caControl.GetFromLeft(caControl.GetHeight()), 'M' /* 2do */, &C4StartupPlrPropertiesDlg::OnCtrlChangeMouse));
+//	pMouseBtn->SetToolTip(LoadResStr("IDS_DLGTIP_PLAYERCONTROLMOUSE"));
 	C4P.OldPrefControl = BoundBy<int32_t>(C4P.OldPrefControl, 0, C4MaxControlSet-1);
 	ctrl_name_lbl = new C4GUI::Label("CtrlName", ctrl_name_rect, ALeft, C4StartupFontClr, pSmallFont, false, false, true);
 	AddElement(ctrl_name_lbl);
@@ -1471,13 +1472,13 @@ void C4StartupPlrPropertiesDlg::UpdatePlayerControl()
 	if (control_set) fctCtrlPic = control_set->GetPicture();
 	pCtrlImg->SetFacet(fctCtrlPic);
 	if (control_set)
-		ctrl_name_lbl->SetText(control_set->GetName());
+		ctrl_name_lbl->SetText(control_set->GetGUIName());
 	else
 		ctrl_name_lbl->SetText("???");
 	// update mouse image
 	// button only available if selected control set offers mouse control
-	pMouseBtn->SetVisibility(control_set && control_set->HasMouse());
-	pMouseBtn->SetIcon((C4P.PrefMouse) ? C4GUI::Ico_MouseOn : C4GUI::Ico_MouseOff);
+//	pMouseBtn->SetVisibility(control_set && control_set->HasMouse());
+//	pMouseBtn->SetIcon((C4P.PrefMouse) ? C4GUI::Ico_MouseOn : C4GUI::Ico_MouseOff);
 }
 
 void C4StartupPlrPropertiesDlg::OnCtrlChangeLeft(C4GUI::Control *pBtn)