diff --git a/data/images/leftArrow.png b/data/images/leftArrow.png
new file mode 100644
index 0000000..b3c8613
Binary files /dev/null and b/data/images/leftArrow.png differ
diff --git a/data/images/rightArrow.png b/data/images/rightArrow.png
new file mode 100644
index 0000000..895938d
Binary files /dev/null and b/data/images/rightArrow.png differ
diff --git a/src/gui/GuiIconGrid.cpp b/src/gui/GuiIconGrid.cpp
index 1df15a7..540e7f1 100644
--- a/src/gui/GuiIconGrid.cpp
+++ b/src/gui/GuiIconGrid.cpp
@@ -31,6 +31,24 @@ GuiIconGrid::GuiIconGrid(int32_t w, int32_t h, uint64_t GameIndex,bool sortByNam
       particleBgImage(w, h, 50, 60.0f, 90.0f, 0.6f, 1.0f)
     , touchTrigger(GuiTrigger::CHANNEL_1, GuiTrigger::VPAD_TOUCH)
     , wpadTouchTrigger(GuiTrigger::CHANNEL_2 | GuiTrigger::CHANNEL_3 | GuiTrigger::CHANNEL_4 | GuiTrigger::CHANNEL_5, GuiTrigger::BUTTON_A)
+    , leftTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_LEFT | GuiTrigger::STICK_L_LEFT, true)
+    , rightTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_RIGHT | GuiTrigger::STICK_L_RIGHT, true)
+    , downTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_DOWN | GuiTrigger::STICK_L_DOWN, true)
+    , upTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_UP | GuiTrigger::STICK_L_UP, true)
+    , buttonATrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_A, true)
+    , buttonLTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_L, true)
+    , buttonRTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_R, true)
+    , leftButton(w, h)
+    , rightButton(w, h)
+    , downButton(w, h)
+    , upButton(w, h)
+    , launchButton(w, h)
+    , arrowRightImageData(Resources::GetImageData("rightArrow.png"))
+    , arrowLeftImageData(Resources::GetImageData("leftArrow.png"))
+    , arrowRightImage(arrowRightImageData)
+    , arrowLeftImage(arrowLeftImageData)
+    , arrowRightButton(arrowRightImage.getWidth(), arrowRightImage.getHeight())
+    , arrowLeftButton(arrowLeftImage.getWidth(), arrowLeftImage.getHeight())
     , noIcon(Resources::GetFile("noGameIcon.png"), Resources::GetFileSize("noGameIcon.png"), GX2_TEX_CLAMP_MODE_MIRROR) {
 
     particleBgImage.setParent(this);
@@ -38,6 +56,26 @@ GuiIconGrid::GuiIconGrid(int32_t w, int32_t h, uint64_t GameIndex,bool sortByNam
     listOffset = selectedGame / (MAX_COLS * MAX_ROWS);
     targetLeftPosition = -listOffset * getWidth();
     currentLeftPosition = targetLeftPosition;
+
+    arrowLeftButton.setImage(&arrowLeftImage);
+    arrowLeftButton.setEffectGrow();
+    arrowLeftButton.setPosition(40, 0);
+    arrowLeftButton.setAlignment(ALIGN_LEFT | ALIGN_MIDDLE);
+    arrowLeftButton.setTrigger(&touchTrigger);
+    arrowLeftButton.setTrigger(&wpadTouchTrigger);
+    arrowLeftButton.setTrigger(&buttonLTrigger);
+    arrowLeftButton.setSoundClick(buttonClickSound);
+    arrowLeftButton.clicked.connect(this, &GuiIconGrid::OnLeftArrowClick);
+
+    arrowRightButton.setImage(&arrowRightImage);
+    arrowRightButton.setEffectGrow();
+    arrowRightButton.setPosition(-40, 0);
+    arrowRightButton.setAlignment(ALIGN_RIGHT | ALIGN_MIDDLE);
+    arrowRightButton.setTrigger(&touchTrigger);
+    arrowRightButton.setTrigger(&wpadTouchTrigger);
+    arrowRightButton.setTrigger(&buttonRTrigger);
+    arrowRightButton.setSoundClick(buttonClickSound);
+    arrowRightButton.clicked.connect(this, &GuiIconGrid::OnRightArrowClick);
 }
 
 GuiIconGrid::~GuiIconGrid() {
@@ -58,6 +96,8 @@ void GuiIconGrid::setSelectedGame(uint64_t idx) {
     GameInfoContainer * container = NULL;
     for (auto const& x : gameInfoContainers) {
         container = x.second;
+
+
         if(x.first == idx) {
             container->image->setSelected(true);
         } else {
@@ -117,6 +157,29 @@ void GuiIconGrid::OnGameTitleListUpdated(GameList * gameList) {
     bUpdatePositions = true;
 }
 
+void GuiIconGrid::OnLeftArrowClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
+
+}
+
+void GuiIconGrid::OnRightArrowClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
+
+}
+
+void GuiIconGrid::OnLeftClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
+
+}
+
+void GuiIconGrid::OnRightClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
+
+}
+
+void GuiIconGrid::OnDownClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
+
+}
+void GuiIconGrid::OnUpClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
+
+}
+
 void GuiIconGrid::OnLaunchClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
     //! do not auto launch when wiimote is pointing to screen and presses A
     //if((trigger == &buttonATrigger) && (controller->chan & (GuiTrigger::CHANNEL_2 | GuiTrigger::CHANNEL_3 | GuiTrigger::CHANNEL_4 | GuiTrigger::CHANNEL_5)) && controller->data.validPointer) {
diff --git a/src/gui/GuiIconGrid.h b/src/gui/GuiIconGrid.h
index 0ebdf08..35f793b 100644
--- a/src/gui/GuiIconGrid.h
+++ b/src/gui/GuiIconGrid.h
@@ -49,9 +49,36 @@ private:
 
     GuiTrigger touchTrigger;
     GuiTrigger wpadTouchTrigger;
+    GuiTrigger leftTrigger;
+    GuiTrigger rightTrigger;
+    GuiTrigger downTrigger;
+    GuiTrigger upTrigger;
+    GuiTrigger buttonATrigger;
+    GuiTrigger buttonLTrigger;
+    GuiTrigger buttonRTrigger;
+    GuiButton leftButton;
+    GuiButton rightButton;
+    GuiButton downButton;
+    GuiButton upButton;
+    GuiButton launchButton;
+
+    GuiImageData* arrowRightImageData;
+    GuiImageData* arrowLeftImageData;
+    GuiImage arrowRightImage;
+    GuiImage arrowLeftImage;
+    GuiButton arrowRightButton;
+    GuiButton arrowLeftButton;
 
     GuiImageData noIcon;
 
+    void OnLeftArrowClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
+    void OnRightArrowClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
+
+    void OnLeftClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
+    void OnRightClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
+    void OnDownClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
+    void OnUpClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
+
     void OnLaunchClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
     void OnGameButtonClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger);
     void updateButtonPositions();