diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp
index 27dfca0e93..4d979a5027 100644
--- a/es-app/src/views/gamelist/GridGameListView.cpp
+++ b/es-app/src/views/gamelist/GridGameListView.cpp
@@ -1,6 +1,8 @@
 #include "views/gamelist/GridGameListView.h"
 
+#include "views/UIModeController.h"
 #include "views/ViewController.h"
+#include "CollectionSystemManager.h"
 #include "Settings.h"
 #include "SystemData.h"
 
@@ -101,12 +103,16 @@ std::vector<HelpPrompt> GridGameListView::getHelpPrompts()
 	std::vector<HelpPrompt> prompts;
 
 	if(Settings::getInstance()->getBool("QuickSystemSelect"))
-	{
-		prompts.push_back(HelpPrompt("l", "system"));
-		prompts.push_back(HelpPrompt("r", "system"));
-	}
-	prompts.push_back(HelpPrompt("up/down/left/right", "scroll"));
+		prompts.push_back(HelpPrompt("lr", "system"));
+	prompts.push_back(HelpPrompt("up/down/left/right", "choose"));
 	prompts.push_back(HelpPrompt("a", "launch"));
 	prompts.push_back(HelpPrompt("b", "back"));
+	prompts.push_back(HelpPrompt("select", "options"));
+	prompts.push_back(HelpPrompt("x", "random"));
+	if(mRoot->getSystem()->isGameSystem() && !UIModeController::getInstance()->isUIModeKid())
+	{
+		std::string prompt = CollectionSystemManager::get()->getEditingCollection();
+		prompts.push_back(HelpPrompt("y", prompt));
+	}
 	return prompts;
 }
diff --git a/es-core/src/components/HelpComponent.cpp b/es-core/src/components/HelpComponent.cpp
index 55a97a37fa..93a0f937d4 100644
--- a/es-core/src/components/HelpComponent.cpp
+++ b/es-core/src/components/HelpComponent.cpp
@@ -24,6 +24,7 @@ static const std::map<std::string, const char*> ICON_PATH_MAP {
 	{ "y", ":/help/button_y.svg" },
 	{ "l", ":/help/button_l.svg" },
 	{ "r", ":/help/button_r.svg" },
+	{ "lr", ":/help/button_lr.svg" },
 	{ "start", ":/help/button_start.svg" },
 	{ "select", ":/help/button_select.svg" }
 };
diff --git a/resources/help/button_lr.svg b/resources/help/button_lr.svg
new file mode 100644
index 0000000000..0093848c47
--- /dev/null
+++ b/resources/help/button_lr.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="_x30_"
+   x="0px"
+   y="0px"
+   width="37.061px"
+   height="37.061px"
+   viewBox="0 0 37.061 37.061"
+   enable-background="new 0 0 37.061 37.061"
+   xml:space="preserve"
+   sodipodi:docname="button_lr.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata3786"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3784" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="1050"
+     id="namedview3782"
+     showgrid="false"
+     showguides="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="11.313709"
+     inkscape:cx="14.821546"
+     inkscape:cy="23.788243"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="_x30_"><inkscape:grid
+       type="xygrid"
+       id="grid3879" /></sodipodi:namedview><g
+     id="g3777"
+     transform="translate(0,-10)"><path
+       d="m 29.254,11.526 c 3.478,0 6.307,3.14 6.307,6.997 0,3.866 -2.829,7.011 -6.307,7.011 H 7.76 C 4.308,25.504 1.5,22.357 1.5,18.523 c 0,-3.828 2.808,-6.966 6.247,-6.997 h 21.507 m 0,-1.5 c -0.021,0 -21.507,0 -21.507,0 C 3.466,10.064 0,13.846 0,18.523 c 0,4.678 3.466,8.473 7.747,8.511 0,0 21.483,0 21.507,0 4.313,0 7.807,-3.812 7.807,-8.511 0,-4.699 -3.495,-8.497 -7.807,-8.497 z"
+       id="path3775"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /></g><polygon
+     points="21.141,22.212 21.141,20.85 17.543,20.85 17.543,14.833 15.92,14.833 15.92,22.212 "
+     id="polygon3779"
+     transform="translate(0,-10)"
+     style="fill:#ffffff" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff"
+     d="m 16.97907,26.118344 h 1.779 c 0.722,0 1.117,0.312 1.117,1.022 0,0.747 -0.396,1.06 -1.117,1.06 h -1.779 z m -1.62,6.126 h 1.62 v -2.886 h 1.625 c 0.816,0 1.117,0.342 1.23,1.118 0.082,0.589 0.061,1.304 0.258,1.769 h 1.621 c -0.289,-0.414 -0.279,-1.28 -0.313,-1.748 -0.051,-0.744 -0.275,-1.521 -1.07,-1.728 0,0 1.166,-0.303 1.166,-1.873 0,-1.118 -0.838,-2.036 -2.16,-2.036 h -3.979 z"
+     id="path3845" /><g
+     transform="translate(0.00606965,10.032344)"
+     id="g3849"><path
+       style="fill:#ffffff"
+       inkscape:connector-curvature="0"
+       d="m 29.254,11.526 c 3.478,0 6.307,3.14 6.307,6.996 0,3.866 -2.829,7.012 -6.307,7.012 H 7.76 C 4.308,25.504 1.5,22.357 1.5,18.522 c 0,-3.827 2.808,-6.966 6.247,-6.996 h 21.507 m 0,-1.5 c -0.021,0 -21.507,0 -21.507,0 C 3.466,10.063 0,13.846 0,18.522 c 0,4.679 3.466,8.473 7.747,8.512 0,0 21.483,0 21.507,0 4.313,0 7.807,-3.812 7.807,-8.512 0,-4.699 -3.495,-8.496 -7.807,-8.496 z"
+       id="path3847" /></g></svg>
\ No newline at end of file