diff --git a/channelselector.py b/channelselector.py
index ddc5ac4d..10452461 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -188,31 +188,32 @@ def filterchannels(category, view="thumb_"):
 
     channelslist.sort(key=lambda item: item.title.lower().strip())
 
-    if category == "all":
-        channel_parameters = channeltools.get_channel_parameters('url')
-        # If you prefer the banner and the channel has it, now change your mind
-        if view == "banner_" and "banner" in channel_parameters:
-            channel_parameters["thumbnail"] = channel_parameters["banner"]
+    if not config.get_setting("only_channel_icons"):
+        if category == "all":
+            channel_parameters = channeltools.get_channel_parameters('url')
+            # If you prefer the banner and the channel has it, now change your mind
+            if view == "banner_" and "banner" in channel_parameters:
+                channel_parameters["thumbnail"] = channel_parameters["banner"]
 
-        channelslist.insert(0, Item(title=config.get_localized_string(60088), action="mainlist", channel="url",
-                                    thumbnail=channel_parameters["thumbnail"], type="generic", viewmode="list"))
-    # Special Category
-    if category in ['movie', 'tvshow']:
-        titles = [config.get_localized_string(70028), config.get_localized_string(30985), config.get_localized_string(70559), config.get_localized_string(60264), config.get_localized_string(70560)]
-        ids = ['popular', 'top_rated', 'now_playing', 'on_the_air']
-        for x in range(0,3):
-            if x == 2 and category != 'movie':
-                title=titles[x+1]
-                id = ids[x+1]
-            else:
-                title=titles[x]
-                id = ids[x]
-            channelslist.insert(x,
-                Item(channel='search', action='discover_list', title=title, search_type='list',
-                     list_type='%s/%s' % (category.replace('show',''), id), mode=category, thumbnail=get_thumb(id+".png")))
+            channelslist.insert(0, Item(title=config.get_localized_string(60088), action="mainlist", channel="url",
+                                        thumbnail=channel_parameters["thumbnail"], type="generic", viewmode="list"))
+        # Special Category
+        if category in ['movie', 'tvshow']:
+            titles = [config.get_localized_string(70028), config.get_localized_string(30985), config.get_localized_string(70559), config.get_localized_string(60264), config.get_localized_string(70560)]
+            ids = ['popular', 'top_rated', 'now_playing', 'on_the_air']
+            for x in range(0,3):
+                if x == 2 and category != 'movie':
+                    title=titles[x+1]
+                    id = ids[x+1]
+                else:
+                    title=titles[x]
+                    id = ids[x]
+                channelslist.insert(x,
+                    Item(channel='search', action='discover_list', title=title, search_type='list',
+                         list_type='%s/%s' % (category.replace('show',''), id), mode=category, thumbnail=get_thumb(id+".png")))
 
-        channelslist.insert(3, Item(channel='search', action='genres_menu', title=config.get_localized_string(30987),
-                                    type=category.replace('show',''), mode=category ,thumbnail=get_thumb("genres.png")))
+            channelslist.insert(3, Item(channel='search', action='genres_menu', title=config.get_localized_string(30987),
+                                        type=category.replace('show',''), mode=category ,thumbnail=get_thumb("genres.png")))
 
     return channelslist
 
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 27e9a53e..893654b7 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -23,12 +23,16 @@ msgctxt "#20001"
 msgid "eng"
 msgstr ""
 
+msgctxt "#30000"
+msgid "View"
+msgstr ""
+
 msgctxt "#30001"
 msgid "Check for updates"
 msgstr ""
 
 msgctxt "#30002"
-msgid "Touch optimized view"
+msgid "Enable touch view"
 msgstr ""
 
 msgctxt "#30003"
@@ -55,6 +59,10 @@ msgctxt "#30008"
 msgid "High"
 msgstr ""
 
+msgctxt "#30009"
+msgid "Show only channels"
+msgstr ""
+
 msgctxt "#30010"
 msgid "Channel icons view"
 msgstr ""
diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po
index 4fe3d6e6..6e44a38e 100644
--- a/resources/language/Italian/strings.po
+++ b/resources/language/Italian/strings.po
@@ -23,13 +23,17 @@ msgctxt "#20001"
 msgid "eng"
 msgstr "ita"
 
+msgctxt "#30000"
+msgid "View"
+msgstr "Vista"
+
 msgctxt "#30001"
 msgid "Check for updates"
 msgstr "Verifica aggiornamenti"
 
 msgctxt "#30002"
-msgid "Touch optimized view"
-msgstr "Vista ottimizzata touch"
+msgid "Enable touch view"
+msgstr "Abilita vista touch"
 
 msgctxt "#30003"
 msgid "Enable debug logging"
@@ -55,6 +59,10 @@ msgctxt "#30008"
 msgid "High"
 msgstr "Alta"
 
+msgctxt "#30009"
+msgid "Show only channels"
+msgstr "Mostra solo canali"
+
 msgctxt "#30010"
 msgid "Channel icons view"
 msgstr "Visualizzazione icone dei canali"
diff --git a/resources/settings.xml b/resources/settings.xml
index d8e9cb72..3d108c2b 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -125,8 +125,8 @@
         <setting id="enable_link_menu" label="70527" type="bool" default="true"/>
         <setting id="enable_fav_menu" label="30102" type="bool" default="true"/>
         <setting id="enable_library_menu" label="30131" type="bool" default="true"/>
-        <setting label="30002" type="lsep"/>
-        <setting id="touch_view" label='70121' type="bool" default="false"/>
+        <setting label="30000" type="lsep"/>
+        <setting id="touch_view" label='30002' type="bool" default="false"/>
         <!-- View Mode (hidden)-->
         <setting id="skin_name" label='Skin Name' type="text" default="skin.estuary" visible="false"/>
         <setting id="view_mode_addon" type="action" label="70009" default= "Default, 0" visible="false"/>
@@ -158,6 +158,7 @@
 		<!-- Others -->
         <setting label="70149" type="lsep"/>
         <setting id="icon_set" type="select" label="70108" values="default|light|dark|alfa|mike" default="default"/>
+        <setting id="only_channel_icons" type="bool" label="30009" default="false"/>
         <setting id="enable_custom_theme" type="bool" label="70564" default="false"/>
         <setting id="custom_theme" type="folder" label="70565" default="" visible="eq(-1,true)"/>
         <setting id="video_thumbnail_type" type="select" label="70131" lvalues="70132|70133" default="1"/>