diff --git a/src/components/ComponentGrid.cpp b/src/components/ComponentGrid.cpp
index 18bff6bab..07bc8fd83 100644
--- a/src/components/ComponentGrid.cpp
+++ b/src/components/ComponentGrid.cpp
@@ -445,11 +445,11 @@ std::vector<HelpPrompt> ComponentGrid::getHelpPrompts()
 	}
 
 	if(canScrollHoriz && canScrollVert)
-		prompts.push_back(HelpPrompt("up/down/left/right", "move"));
+		prompts.push_back(HelpPrompt("up/down/left/right", "choose"));
 	else if(canScrollHoriz)
-		prompts.push_back(HelpPrompt("left/right", "move"));
+		prompts.push_back(HelpPrompt("left/right", "choose"));
 	else if(canScrollVert)
-		prompts.push_back(HelpPrompt("up/down", "move"));
+		prompts.push_back(HelpPrompt("up/down", "choose"));
 
 	return prompts;
 }
diff --git a/src/components/ComponentList.cpp b/src/components/ComponentList.cpp
index f5eaeea35..9a2d1c1dd 100644
--- a/src/components/ComponentList.cpp
+++ b/src/components/ComponentList.cpp
@@ -321,7 +321,7 @@ std::vector<HelpPrompt> ComponentList::getHelpPrompts()
 		}
 
 		if(addMovePrompt)
-			prompts.push_back(HelpPrompt("up/down", "move"));
+			prompts.push_back(HelpPrompt("up/down", "choose"));
 	}
 
 	return prompts;
diff --git a/src/components/ImageComponent.cpp b/src/components/ImageComponent.cpp
index e851739a2..5f33cd718 100644
--- a/src/components/ImageComponent.cpp
+++ b/src/components/ImageComponent.cpp
@@ -310,3 +310,10 @@ void ImageComponent::applyTheme(const std::shared_ptr<ThemeData>& theme, const s
 	if(properties & COLOR && elem->has("color"))
 		setColorShift(elem->get<unsigned int>("color"));
 }
+
+std::vector<HelpPrompt> ImageComponent::getHelpPrompts()
+{
+	std::vector<HelpPrompt> ret;
+	ret.push_back(HelpPrompt("a", "select"));
+	return ret;
+}
diff --git a/src/components/ImageComponent.h b/src/components/ImageComponent.h
index 7ce531d59..a05be6d29 100644
--- a/src/components/ImageComponent.h
+++ b/src/components/ImageComponent.h
@@ -60,6 +60,7 @@ public:
 
 	virtual void applyTheme(const std::shared_ptr<ThemeData>& theme, const std::string& view, const std::string& element, unsigned int properties) override;
 
+	virtual std::vector<HelpPrompt> getHelpPrompts() override;
 private:
 	Eigen::Vector2f mTargetSize;
 	Eigen::Vector2f mOrigin;
diff --git a/src/components/OptionListComponent.h b/src/components/OptionListComponent.h
index b20e9e389..903a4e468 100644
--- a/src/components/OptionListComponent.h
+++ b/src/components/OptionListComponent.h
@@ -82,8 +82,7 @@ private:
 				mMenu.addRow(row, (!mParent->mMultiSelect && it->selected));
 			}
 
-			if(mParent->mMultiSelect)
-				mMenu.addButton("BACK", "accept", [this] { delete this; });
+			mMenu.addButton("BACK", "accept", [this] { delete this; });
 
 			mMenu.setPosition((Renderer::getScreenWidth() - mMenu.getSize().x()) / 2, Renderer::getScreenHeight() * 0.15f);
 			addChild(&mMenu);
@@ -102,7 +101,9 @@ private:
 
 		std::vector<HelpPrompt> getHelpPrompts() override
 		{
-			return mMenu.getHelpPrompts();
+			auto prompts = mMenu.getHelpPrompts();
+			prompts.push_back(HelpPrompt("b", "back"));
+			return prompts;
 		}
 	};
 
@@ -274,7 +275,7 @@ private:
 		if(!mMultiSelect)
 			prompts.push_back(HelpPrompt("left/right", "change"));
 		
-		prompts.push_back(HelpPrompt("a", "change"));
+		prompts.push_back(HelpPrompt("a", "select"));
 		return prompts;
 	}
 
diff --git a/src/guis/GuiMenu.cpp b/src/guis/GuiMenu.cpp
index 3599580f2..df56a96cb 100644
--- a/src/guis/GuiMenu.cpp
+++ b/src/guis/GuiMenu.cpp
@@ -260,7 +260,8 @@ bool GuiMenu::input(InputConfig* config, Input input)
 std::vector<HelpPrompt> GuiMenu::getHelpPrompts()
 {
 	std::vector<HelpPrompt> prompts;
-	prompts.push_back(HelpPrompt("up/down", "move"));
-	prompts.push_back(HelpPrompt("a", "go"));
+	prompts.push_back(HelpPrompt("up/down", "choose"));
+	prompts.push_back(HelpPrompt("a", "select"));
+	prompts.push_back(HelpPrompt("start", "close"));
 	return prompts;
 }