diff --git a/data/gui/icons/License.txt b/data/gui/icons/License.txt
index 9d287ada3..5c3072a86 100644
--- a/data/gui/icons/License.txt
+++ b/data/gui/icons/License.txt
@@ -49,6 +49,8 @@ lap_flag.png, modified by Alayan, original by Alina Oleynik from The Noun Projec
 
 Android robot.png is licensed under the terms of the Creative Commons Attribution license
 
+tablet.png is licensed under public domain
+
 ====
 
 Glass Skin by Auria, under CC-BY-SA 3+
diff --git a/data/gui/icons/tablet.png b/data/gui/icons/tablet.png
new file mode 100644
index 000000000..68d3bca7b
Binary files /dev/null and b/data/gui/icons/tablet.png differ
diff --git a/src/states_screens/options/options_screen_input.cpp b/src/states_screens/options/options_screen_input.cpp
index 7b43aab1b..036b52485 100644
--- a/src/states_screens/options/options_screen_input.cpp
+++ b/src/states_screens/options/options_screen_input.cpp
@@ -62,12 +62,14 @@ void OptionsScreenInput::loadedFromFile()
     video::ITexture* icon2 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,"keyboard_off.png"   ));
     video::ITexture* icon3 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,"gamepad.png"    ));
     video::ITexture* icon4 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,"gamepad_off.png"));
+    video::ITexture* icon5 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,"tablet.png"    ));
 
     m_icon_bank = new irr::gui::STKModifiedSpriteBank( GUIEngine::getGUIEnv() );
     m_icon_bank->addTextureAsSprite(icon1);
     m_icon_bank->addTextureAsSprite(icon2);
     m_icon_bank->addTextureAsSprite(icon3);
     m_icon_bank->addTextureAsSprite(icon4);
+    m_icon_bank->addTextureAsSprite(icon5);
 
     // scale icons depending on font height
     const float scale = GUIEngine::getFontHeight() / 72.0f;
@@ -169,7 +171,7 @@ void OptionsScreenInput::buildDeviceList()
     if (touch_device != NULL)
     {
         devices->addItem("touch_device", (core::stringw("   ") + 
-                                                _("Touch Device")).c_str(), 2);
+                                                _("Touch Device")).c_str(), 4);
     }
 }   // buildDeviceList