From a04c487b929c3eba6e12631cec5f76e56a7a4e56 Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Fri, 3 Apr 2020 09:46:58 +0200
Subject: [PATCH] Fix per cambio nome icone

---
 channels/metalvideo.py      |  2 +-
 channels/polpotv.py         | 25 ++++++-----
 channels/porn/thumbzilla.py | 20 ++++-----
 channels/serietvu.py        |  2 +-
 channels/tunein.py          |  2 +-
 channelselector.py          | 83 ++++++++++++++++++-------------------
 core/channeltools.py        |  3 +-
 core/support.py             |  6 ++-
 specials/news.py            | 30 +++++++-------
 specials/search.py          | 22 +++++-----
 10 files changed, 99 insertions(+), 96 deletions(-)

diff --git a/channels/metalvideo.py b/channels/metalvideo.py
index 5f6b66f8..95ccad47 100644
--- a/channels/metalvideo.py
+++ b/channels/metalvideo.py
@@ -24,7 +24,7 @@ def mainlist(item):
     patronBlock = r'<ul class="dropdown-menu(?P<block>.*?)</ul> </div'
     patron = r'<a href="(?P<url>[^"]+)"(?: class="")?>(?P<title>[^<]+)<'
     def itemHook(item):
-        item.thumbnail = support.thumb(thumb='channels_music.png')
+        item.thumbnail = support.thumb(thumb='music.png')
         return item
     def itemlistHook(itemlist):
         itemlist.pop(0)
diff --git a/channels/polpotv.py b/channels/polpotv.py
index 096013ea..d17b786e 100644
--- a/channels/polpotv.py
+++ b/channels/polpotv.py
@@ -4,7 +4,7 @@
 # Canale polpotv
 # ------------------------------------------------------------ 
 
-from core import scrapertools, httptools, support, jsontools
+from core import support, jsontools
 from core.item import Item
 from platformcode import config
 import json, datetime
@@ -50,7 +50,7 @@ def peliculas(item):
     support.log()
     itemlist = []
     
-    data = httptools.downloadpage(item.url, headers=headers).data
+    data = support.match(item.url, headers=headers).data
     json_object = jsontools.load(data)
     for element in json_object['hydra:member']:
         if 'shows' not in item.url:
@@ -70,11 +70,11 @@ def peliculas(item):
 def episodios(item):
     support.log()
     itemlist = []
-    data = httptools.downloadpage(item.url, headers=headers).data
+    data = support.match(item.url, headers=headers).data
     json_object = jsontools.load(data)
     for season in json_object['seasons']:
         seas_url=host+season['@id']+'/releases'
-        itemlist_season=get_season(item.channel, seas_url, season['seasonNumber'])
+        itemlist_season=get_season(item, seas_url, season['seasonNumber'])
         if(len(itemlist_season)>0):
             itemlist.extend(itemlist_season)
 
@@ -82,18 +82,21 @@ def episodios(item):
 
     return itemlist
 
-def get_season(channel, seas_url, seasonNumber):
+def get_season(item, seas_url, seasonNumber):
     support.log()
     itemlist = []
-    data = httptools.downloadpage(seas_url, headers=headers).data
+    data = support.match(seas_url, headers=headers).data
     json_object = jsontools.load(data)
     for episode in json_object['hydra:member']:
         itemlist.append(
-            Item(channel=channel,
+            Item(channel=item.channel,
                  action='findvideos',
                  contentType='episode',
                  title=str(seasonNumber)+"x"+str("%02d"%episode['episodeNumber']),
                  url=seas_url,
+                 thumbnail=item.thumbnail,
+                 fanart=item.fanart,
+                 plot=item.plot,
                  extra=str(len(json_object['hydra:member'])-episode['episodeNumber'])))
     return itemlist[::-1]
 
@@ -102,13 +105,13 @@ def search(item, texto):
     itemlist=[]
     try:
         item.url = host + "/api/movies?originalTitle="+texto+"&translations.name=" +texto
-        data = httptools.downloadpage(item.url, headers=headers).data
+        data = support.match(item.url, headers=headers).data
         json_object = jsontools.load(data)
         for movie in json_object['hydra:member']:
             item.contentType='movie'
             itemlist.extend(get_itemlist_element(movie,item))
         item.url = host + "/api/shows?originalTitle="+texto+"&translations.name=" +texto
-        data = httptools.downloadpage(item.url, headers=headers).data
+        data = support.match(item.url, headers=headers).data
         json_object = jsontools.load(data)
         for tvshow in json_object['hydra:member']:
             item.contentType='tvshow'
@@ -124,7 +127,7 @@ def search(item, texto):
 def search_movie_by_genre(item):
     support.log()
     itemlist = []
-    data = httptools.downloadpage(item.url, headers=headers).data
+    data = support.match(item.url, headers=headers).data
     json_object = jsontools.load(data)
     for genre in json_object['hydra:member']:
         itemlist.append(
@@ -155,7 +158,7 @@ def findvideos(item):
     support.log()
     itemlist = []
     try:
-        data = httptools.downloadpage(item.url, headers=headers).data
+        data = support.match(item.url, headers=headers).data
         json_object = jsontools.load(data)
         array_index=0
         if item.contentType!='movie':
diff --git a/channels/porn/thumbzilla.py b/channels/porn/thumbzilla.py
index d0273b3c..aab21aee 100644
--- a/channels/porn/thumbzilla.py
+++ b/channels/porn/thumbzilla.py
@@ -44,42 +44,42 @@ def mainlist(item):
     logger.info()
     itemlist = []
     itemlist.append(Item(channel=__channel__, action="videos", title="Más Calientes", url=host,
-                         viewmode="movie", thumbnail=get_thumb("channels_adult.png")))
+                         viewmode="movie", thumbnail=get_thumb("adult.png")))
 
     itemlist.append(Item(channel=__channel__, title="Nuevas", url=host + '/newest',
                          action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("channels_adult.png")))
+                         thumbnail=get_thumb("adult.png")))
 
     itemlist.append(Item(channel=__channel__, title="Tendencias", url=host + '/tending',
                          action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("channels_adult.png")))
+                         thumbnail=get_thumb("adult.png")))
 
     itemlist.append(Item(channel=__channel__, title="Mejores Videos", url=host + '/top',
                          action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("channels_adult.png")))
+                         thumbnail=get_thumb("adult.png")))
 
     itemlist.append(Item(channel=__channel__, title="Populares", url=host + '/popular',
                          action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("channels_adult.png")))
+                         thumbnail=get_thumb("adult.png")))
 
     itemlist.append(Item(channel=__channel__, title="Videos en HD", url=host + '/hd',
                          action="videos", viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("channels_adult.png")))
+                         thumbnail=get_thumb("adult.png")))
 
     itemlist.append(Item(channel=__channel__, title="Caseros", url=host + '/hd',
                          action="videos", viewmode="movie_with_plot", viewcontent='homemade',
-                         thumbnail=get_thumb("channels_adult.png")))
+                         thumbnail=get_thumb("adult.png")))
  
     itemlist.append(Item(channel=__channel__, title="PornStar", action="catalogo",
                          url=host + '/pornstars/', viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("channels_adult.png")))
+                         thumbnail=get_thumb("adult.png")))
  
     itemlist.append(Item(channel=__channel__, title="Categorías", action="categorias",
                          url=host + '/categories/', viewmode="movie_with_plot", viewcontent='movies',
-                         thumbnail=get_thumb("channels_adult.png")))
+                         thumbnail=get_thumb("adult.png")))
 
     itemlist.append(Item(channel=__channel__, title="Buscador", action="search", url=host,
-                         thumbnail=get_thumb("channels_adult.png"), extra="buscar"))
+                         thumbnail=get_thumb("adult.png"), extra="buscar"))
     return itemlist
 
 
diff --git a/channels/serietvu.py b/channels/serietvu.py
index 325320d5..abc80f88 100644
--- a/channels/serietvu.py
+++ b/channels/serietvu.py
@@ -137,7 +137,7 @@ def findvideos(item):
                  action='episodios',
                  contentTitle=item.contentSerieName,
                  plot = goseries + series + "con tutte le puntate",
-                 thumbnail = support.thumb(thumb='channels_tvshow.png')
+                 thumbnail = support.thumb(thumb='tvshow.png')
                 ))
 
         return itemlist
diff --git a/channels/tunein.py b/channels/tunein.py
index 9331c67a..212965bc 100644
--- a/channels/tunein.py
+++ b/channels/tunein.py
@@ -20,7 +20,7 @@ def mainlist(item):
     action = 'radio'
     patron = r'text="(?P<title>[^"]+)" URL="(?P<url>[^"]+)"'
     def itemHook(item):
-        item.thumbnail = support.thumb(thumb='channels_music.png')
+        item.thumbnail = support.thumb(thumb='music.png')
         return item
     def itemlistHook(itemlist):
         itemlist.append(
diff --git a/channelselector.py b/channelselector.py
index 433d1b99..e5ce23e8 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -113,14 +113,14 @@ def getchanneltypes(view="thumb_"):
     itemlist = list()
     title = config.get_localized_string(30121)
     itemlist.append(Item(title=title, channel="channelselector", action="filterchannels", view=view,
-                         category=title, channel_type="all", thumbnail=get_thumb("channels_all.png", view),
+                         category=title, channel_type="all", thumbnail=get_thumb("all.png", view),
                          viewmode="thumbnails"))
 
     for channel_type in channel_types:
         title = config.get_localized_category(channel_type)
         itemlist.append(Item(title=title, channel="channelselector", action="filterchannels", category=title,
                              channel_type=channel_type, viewmode="thumbnails",
-                             thumbnail=get_thumb("channels_%s.png" % channel_type, view)))
+                             thumbnail=get_thumb("%s.png" % channel_type, view)))
 
     # itemlist.append(Item(title='Oggi in TV', channel="filmontv", action="mainlist", view=view,
     #                      category=title, channel_type="all", thumbnail=get_thumb("on_the_air.png", view),
@@ -129,7 +129,7 @@ def getchanneltypes(view="thumb_"):
 
 
     itemlist.append(Item(title=config.get_localized_string(70685), channel="community", action="mainlist", view=view,
-                         category=config.get_localized_string(70685), channel_type="all", thumbnail=get_thumb("channels_community.png", view),
+                         category=config.get_localized_string(70685), channel_type="all", thumbnail=get_thumb("community.png", view),
                          viewmode="thumbnails"))
     return itemlist
 
@@ -374,58 +374,57 @@ def auto_filter(auto_lang=False):
 
 def thumb(item_or_itemlist=None, genre=False, thumb=''):
     import re
-    icon_dict = {'channels_movie':['film'],
-                 'channels_tvshow':['serie','tv','episodi','episodio','fiction'],
-                 'channels_documentary':['documentari','documentario', 'documentary'],
-                 'channels_teenager':['ragazzi','teenager', 'teen'],
-                 'channels_learning':['learning'],
-                 'channels_all':['tutti'],
-                 'news':['novità', "novita'", 'aggiornamenti', 'nuovi', 'nuove'],
+    icon_dict = {'movie':['film', 'movie'],
+                 'tvshow':['serie','tv','episodi','episodio','fiction', 'show'],
+                 'documentary':['documentari','documentario', 'documentary'],
+                 'teenager':['ragazzi','teenager', 'teen'],
+                 'learning':['learning'],
+                 'all':['tutti', 'all'],
+                 'news':['novità', "novita'", 'aggiornamenti', 'nuovi', 'nuove', 'new', 'newest', 'news'],
                  'now_playing':['cinema', 'in sala'],
-                 'channels_anime':['anime'],
-                 'genres':['genere', 'generi', 'categorie', 'categoria'],
-                 'channels_animation': ['animazione', 'cartoni', 'cartoon', 'animation'],
-                 'channels_action':['azione', 'arti marziali', 'action'],
-                 'channels_adventure': ['avventura', 'adventure'],
-                 'channels_biographical':['biografico'],
-                 'channels_comedy':['comico','commedia', 'demenziale', 'comedy'],
-                 'channels_adult':['erotico', 'hentai', 'harem', 'ecchi'],
-                 'channels_drama':['drammatico', 'drama'],
-                 'channels_syfy':['fantascienza', 'science fiction'],
-                 'channels_fantasy':['fantasy', 'magia'],
-                 'channels_crime':['gangster','poliziesco', 'crime', 'crimine'],
-                 'channels_grotesque':['grottesco'],
-                 'channels_war':['guerra', 'war'],
-                 'channels_children':['bambini', 'kids'],
+                 'anime':['anime'],
+                 'genres':['genere', 'generi', 'categorie', 'categoria', 'category'],
+                 'animation': ['animazione', 'cartoni', 'cartoon', 'animation'],
+                 'action':['azione', 'arti marziali', 'action'],
+                 'adventure': ['avventura', 'adventure'],
+                 'biographical':['biografico', 'biographical'],
+                 'comedy':['comico', 'commedia', 'demenziale', 'comedy'],
+                 'adult':['erotico', 'hentai', 'harem', 'ecchi', 'adult'],
+                 'drama':['drammatico', 'drama'],
+                 'syfy':['fantascienza', 'science fiction', 'syfy'],
+                 'fantasy':['fantasy', 'magia', 'magic'],
+                 'crime':['gangster','poliziesco', 'crime', 'crimine'],
+                 'grotesque':['grottesco', 'grotesque'],
+                 'war':['guerra', 'war'],
+                 'children':['bambini', 'kids'],
                  'horror':['horror'],
-                 'lucky': ['fortunato'],
-                 'channels_music':['musical', 'musica', 'music'],
-                 'channels_mistery':['mistero', 'giallo', 'mystery'],
-                 'channels_noir':['noir'],
+                 'music':['musical', 'musica', 'music'],
+                 'mistery':['mistero', 'giallo', 'mystery'],
+                 'noir':['noir'],
                  'popular' : ['popolari','popolare', 'più visti'],
                  'thriller':['thriller'],
-                 'top_rated' : ['fortunato', 'votati'],
+                 'top_rated' : ['fortunato', 'votati', 'lucky'],
                  'on_the_air' : ['corso', 'onda', 'diretta', 'dirette'],
-                 'channels_western':['western'],
-                 'channels_vos':['sub','sub-ita'],
-                 'channels_romance':['romantico','sentimentale', 'romance'],
-                 'channels_family':['famiglia','famiglie', 'family'],
-                 'channels_historical':['storico', 'history', 'storia'],
-                 'channels_az':['lettera','lista','alfabetico','a-z'],
-                 'channels_year':['anno', 'anni'],
+                 'western':['western'],
+                 'vos':['sub','sub-ita'],
+                 'romance':['romantico','sentimentale', 'romance'],
+                 'family':['famiglia','famiglie', 'family', 'historical'],
+                 'historical':['storico', 'history', 'storia'],
+                 'az':['lettera','lista','alfabetico','a-z', 'alphabetical'],
+                 'year':['anno', 'anni', 'year'],
                  'update':['replay', 'update'],
                  'autoplay':[config.get_localized_string(60071)]
                 }
 
     suffix_dict = {'_hd':['hd','altadefinizione','alta definizione'],
                 '_4k':['4K'],
-                '_az':['lettera','lista','alfabetico','a-z'],
-                '_year':['anno', 'anni'],
+                '_az':['lettera','lista','alfabetico','a-z', 'alphabetical'],
+                '_year':['anno', 'anni', 'year'],
                 '_genre':['genere', 'generi', 'categorie', 'categoria']}
 
-    search = ['cerca']
+    search = ['cerca', 'search']
 
-    search_suffix ={'_movie':['film'],
+    search_suffix ={'_movie':['film', 'movie'],
                     '_tvshow':['serie','tv', 'fiction']}
 
     def autoselect_thumb(item, genre):
@@ -438,7 +437,7 @@ def thumb(item_or_itemlist=None, genre=False, thumb=''):
                             thumb = thumb + suffix
                     item.thumbnail = get_thumb(thumb + '.png')
                 elif any( word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in titles ):
-                    if thumb == 'channels_movie' or thumb == 'channels_tvshow':
+                    if thumb == 'movie' or thumb == 'tvshow':
                         for suffix, titles in suffix_dict.items():
                             if any( word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in titles ):
                                 thumb = thumb + suffix
diff --git a/core/channeltools.py b/core/channeltools.py
index b9209ef1..62bbdde9 100644
--- a/core/channeltools.py
+++ b/core/channeltools.py
@@ -44,8 +44,7 @@ def get_channel_parameters(channel_name):
                 channel_parameters["adult"] = channel_parameters.get("adult", False)
                 logger.info(channel_parameters["adult"])
                 if channel_parameters["adult"]:
-                    channel_parameters["update_url"] = channel_parameters.get("update_url",
-                                                                              DEFAULT_UPDATE_URL + 'porn/')
+                    channel_parameters["update_url"] = channel_parameters.get("update_url", DEFAULT_UPDATE_URL + 'porn/')
                 else:
                     channel_parameters["update_url"] = channel_parameters.get("update_url", DEFAULT_UPDATE_URL)
                 channel_parameters["language"] = channel_parameters.get("language", ["all"])
diff --git a/core/support.py b/core/support.py
index 97bfe82b..108fb4b5 100755
--- a/core/support.py
+++ b/core/support.py
@@ -972,18 +972,20 @@ def videolibrary(itemlist, item, typography='', function_level=1, function=''):
     if (function == 'findvideos' and contentType == 'movie') \
         or (function == 'episodios' and contentType != 'movie'):
         if config.get_videolibrary_support() and len(itemlist) > 0:
+            from  channelselector import get_thumb
             itemlist.append(
                 Item(channel=item.channel,
                         title=title,
                         fulltitle=item.fulltitle,
                         show=item.fulltitle,
                         contentType=contentType,
+                        contentTitle=contentTitle,
                         contentSerieName=contentSerieName,
                         url=item.url,
                         action=action,
                         extra=extra,
-                        contentTitle=contentTitle,
-                        path=item.path
+                        path=item.path,
+                        thumbnail=get_thumb('videolibrary_%s.png') % contentType
                         ))
 
     return itemlist
diff --git a/specials/news.py b/specials/news.py
index 21bb5f41..bbb38ac9 100644
--- a/specials/news.py
+++ b/specials/news.py
@@ -57,14 +57,14 @@ def mainlist(item):
         channel_language = auto_filter()
 
     #if list_canales['peliculas']:
-    thumbnail = get_thumb("channels_movie.png")
+    thumbnail = get_thumb("movie.png")
     new_item = Item(channel=item.channel, action="novedades", extra="peliculas", title=config.get_localized_string(30122),
                     thumbnail=thumbnail)
 
     set_category_context(new_item)
     itemlist.append(new_item)
 
-    # thumbnail = get_thumb("channels_movie_4k.png")
+    # thumbnail = get_thumb("movie_4k.png")
     # new_item = Item(channel=item.channel, action="novedades", extra="4k", title=config.get_localized_string(70208), thumbnail=thumbnail)
     #
     # set_category_context(new_item)
@@ -78,21 +78,21 @@ def mainlist(item):
     # itemlist.append(new_item)
 
     #if list_canales['infantiles']:
-    # thumbnail = get_thumb("channels_children.png")
+    # thumbnail = get_thumb("children.png")
     # new_item = Item(channel=item.channel, action="novedades", extra="infantiles", title=config.get_localized_string(60510),
     #                 thumbnail=thumbnail)
     # set_category_context(new_item)
     # itemlist.append(new_item)
 
     #if list_canales['series']:
-    thumbnail = get_thumb("channels_tvshow.png")
+    thumbnail = get_thumb("tvshow.png")
     new_item = Item(channel=item.channel, action="novedades", extra="series", title=config.get_localized_string(60511),
                     thumbnail=thumbnail)
     set_category_context(new_item)
     itemlist.append(new_item)
 
     #if list_canales['anime']:
-    thumbnail = get_thumb("channels_anime.png")
+    thumbnail = get_thumb("anime.png")
     new_item = Item(channel=item.channel, action="novedades", extra="anime", title=config.get_localized_string(60512),
                     thumbnail=thumbnail)
     set_category_context(new_item)
@@ -113,7 +113,7 @@ def mainlist(item):
     # itemlist.append(new_item)
 
     #if list_canales['documentales']:
-    thumbnail = get_thumb("channels_documentary.png")
+    thumbnail = get_thumb("documentary.png")
     new_item = Item(channel=item.channel, action="novedades", extra="documentales", title=config.get_localized_string(60513),
                     thumbnail=thumbnail)
     set_category_context(new_item)
@@ -575,34 +575,34 @@ def menu_opciones(item):
                          text_bold = True, thumbnail=get_thumb("setting_0.png"),
                          folder=False))
     itemlist.append(Item(channel=item.channel, action="setting_channel", extra="peliculas", title=config.get_localized_string(60526),
-                         thumbnail=get_thumb("channels_movie.png"),
+                         thumbnail=get_thumb("movie.png"),
                          folder=False))
     # itemlist.append(Item(channel=item.channel, action="setting_channel", extra="4K", title=config.get_localized_string(70207),
-    #                      thumbnail=get_thumb("channels_movie.png"), folder=False))
+    #                      thumbnail=get_thumb("movie.png"), folder=False))
     # itemlist.append(Item(channel=item.channel, action="setting_channel", extra="infantiles", title=config.get_localized_string(60527),
-    #                      thumbnail=get_thumb("channels_children.png"),
+    #                      thumbnail=get_thumb("children.png"),
     #                      folder=False))
     itemlist.append(Item(channel=item.channel, action="setting_channel", extra="series",
                          title=config.get_localized_string(60528),
-                         thumbnail=get_thumb("channels_tvshow.png"),
+                         thumbnail=get_thumb("tvshow.png"),
                          folder=False))
     itemlist.append(Item(channel=item.channel, action="setting_channel", extra="anime",
                          title=config.get_localized_string(60529),
-                         thumbnail=get_thumb("channels_anime.png"),
+                         thumbnail=get_thumb("anime.png"),
                          folder=False))
     # itemlist.append(
     #     Item(channel=item.channel, action="setting_channel", extra="castellano", title=config.get_localized_string(70212),
-    #          thumbnail=get_thumb("channels_documentary.png"), folder=False))
+    #          thumbnail=get_thumb("documentary.png"), folder=False))
 
     # itemlist.append(Item(channel=item.channel, action="setting_channel", extra="latino", title=config.get_localized_string(70213),
-    #                      thumbnail=get_thumb("channels_documentary.png"), folder=False))
+    #                      thumbnail=get_thumb("documentary.png"), folder=False))
 
     # itemlist.append(Item(channel=item.channel, action="setting_channel", extra="torrent", title=config.get_localized_string(70214),
-    #                      thumbnail=get_thumb("channels_documentary.png"), folder=False))
+    #                      thumbnail=get_thumb("documentary.png"), folder=False))
 
     itemlist.append(Item(channel=item.channel, action="setting_channel", extra="documentales",
                          title=config.get_localized_string(60530),
-                         thumbnail=get_thumb("channels_documentary.png"),
+                         thumbnail=get_thumb("documentary.png"),
                          folder=False))
     itemlist.append(Item(channel=item.channel, action="settings", title=config.get_localized_string(60531),
                          thumbnail=get_thumb("setting_0.png"),
diff --git a/specials/search.py b/specials/search.py
index 8ae4da42..0f9a761f 100644
--- a/specials/search.py
+++ b/specials/search.py
@@ -56,25 +56,25 @@ def mainlist(item):
 def sub_menu(item):
     logger.info()
 
-    itemlist = [Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70306), mode='movie', thumbnail=get_thumb("channels_movie_genre.png")),
+    itemlist = [Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70306), mode='movie', thumbnail=get_thumb("movie_genre.png")),
 
-                Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70742), mode='movie', thumbnail=get_thumb("channels_movie_year.png")),
+                Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70742), mode='movie', thumbnail=get_thumb("movie_year.png")),
 
-                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70307), search_type='list', list_type='movie/popular', mode='movie', thumbnail=get_thumb("channels_movie_popular.png")),
+                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70307), search_type='list', list_type='movie/popular', mode='movie', thumbnail=get_thumb("movie_popular.png")),
 
-                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70308), search_type='list', list_type='movie/top_rated', mode='movie', thumbnail=get_thumb("channels_movie_top.png")),
+                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70308), search_type='list', list_type='movie/top_rated', mode='movie', thumbnail=get_thumb("movie_top.png")),
 
-                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70309), search_type='list', list_type='movie/now_playing', mode='movie', thumbnail=get_thumb("channels_movie_now_playing.png")),
+                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70309), search_type='list', list_type='movie/now_playing', mode='movie', thumbnail=get_thumb("movie_now_playing.png")),
 
-                Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70310), mode='tvshow', thumbnail=get_thumb("channels_tvshow_genre.png")),
+                Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70310), mode='tvshow', thumbnail=get_thumb("tvshow_genre.png")),
 
-                Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70743), mode='tvshow', thumbnail=get_thumb("channels_tvshow_year.png")),
+                Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70743), mode='tvshow', thumbnail=get_thumb("tvshow_year.png")),
 
                 Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70311), search_type='list', list_type='tv/popular', mode='tvshow', thumbnail=get_thumb("popular.png")),
 
-                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70312), search_type='list', list_type='tv/on_the_air', mode='tvshow', thumbnail=get_thumb("channels_tvshow_on_the_air.png")),
+                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70312), search_type='list', list_type='tv/on_the_air', mode='tvshow', thumbnail=get_thumb("tvshow_on_the_air.png")),
 
-                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70313), search_type='list', list_type='tv/top_rated', mode='tvshow', thumbnail=get_thumb("channels_tvshow_top.png")),
+                Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70313), search_type='list', list_type='tv/top_rated', mode='tvshow', thumbnail=get_thumb("tvshow_top.png")),
 
                 Item(channel="tvmoviedb", action="mainlist", title=config.get_localized_string(70274), thumbnail=get_thumb("search.png"))]
 
@@ -512,11 +512,11 @@ def years_menu(item):
     mode = item.mode.replace('show', '')
 
     par_year = 'primary_release_year'
-    thumb = channelselector.get_thumb('channels_movie_year.png')
+    thumb = channelselector.get_thumb('movie_year.png')
 
     if mode != 'movie':
         par_year = 'first_air_date_year'
-        thumb = channelselector.get_thumb('channels_tvshow_year.png')
+        thumb = channelselector.get_thumb('tvshow_year.png')
 
     c_year = datetime.datetime.now().year + 1
     l_year = c_year - 31