116 files changed, 31 insertions, 6 deletions
diff --git a/displaymenu.c b/displaymenu.c
index 187857ff..10fca9ce 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -205,6 +205,7 @@ void cFlatDisplayMenu::Clear(void) {
     menuIconsBGPixmap->Fill(clrTransparent);
     scrollbarPixmap->Fill(clrTransparent);
     contentHeadPixmap->Fill(clrTransparent);
+    contentHeadIconsPixmap->Fill(clrTransparent);
     DecorBorderClearByFrom(BorderMenuItem);
     DecorBorderClearByFrom(BorderContent);
     DecorBorderClearAll();
@@ -2210,7 +2211,7 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) {
                            }
                          break;
                     case ecgChildrenYouth:
-                         switch (Event->Contents(i) & 0x0F) {
+                         switch (Event->Contents(i) & 0x0F) { // no icons
                            default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i));
                            case 0x00: GenreIcons.push_back("Childrens_Youth Programme"); break;
                            case 0x01: GenreIcons.push_back("Pre-school Childrens Programme"); break;
@@ -2233,7 +2234,7 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) {
                            }
                          break;
                     case ecgArtsCulture:
-                         switch (Event->Contents(i) & 0x0F) {
+                         switch (Event->Contents(i) & 0x0F) { // no icons
                            default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i));
                            case 0x00: GenreIcons.push_back("Arts_Culture"); break;
                            case 0x01: GenreIcons.push_back("Performing Arts"); break;
@@ -2394,17 +2395,23 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) {
         }
     }
     while( !GenreIcons.empty() ) {
+        GenreIcons.sort();
+        GenreIcons.unique();
         cString iconName = cString::sprintf("EPGInfo/Genre/%s", GenreIcons.back().c_str());
         cImage *img = imgLoader.LoadIcon(*iconName, fontHeight, fontHeight);
+        bool isUnknownDrawn = false;
         if( img ) {
             contentHeadIconsPixmap->DrawImage(cPoint(headIconLeft, headIconTop), *img);
             headIconLeft -= fontHeight + marginItem;
         } else {
             isyslog("skinflatplus: Genre icon not found: %s", *iconName);
-            img = imgLoader.LoadIcon("EPGInfo/Genre/unknown", fontHeight, fontHeight);
-            if( img ) {
-                contentHeadIconsPixmap->DrawImage(cPoint(headIconLeft, headIconTop), *img);
-                headIconLeft -= fontHeight + marginItem;
+            if( !isUnknownDrawn ) {
+                img = imgLoader.LoadIcon("EPGInfo/Genre/unknown", fontHeight, fontHeight);
+                if( img ) {
+                    contentHeadIconsPixmap->DrawImage(cPoint(headIconLeft, headIconTop), *img);
+                    headIconLeft -= fontHeight + marginItem;
+                    isUnknownDrawn = true;
+                }
             }
         }
         GenreIcons.pop_back();
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Abenteuer.png b/icons/default/EPGInfo/Genre/A0A0A0/Abenteuer.png
new file mode 100644
index 00000000..c348372c
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Abenteuer.png
diff --git a/icons/default/EPGInfo/Genre/g_Action.png b/icons/default/EPGInfo/Genre/A0A0A0/Action.png
index 3d29e730..3d29e730 100644
--- a/icons/default/EPGInfo/Genre/g_Action.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Action.png
diff --git a/icons/default/EPGInfo/Genre/g_Action2.png b/icons/default/EPGInfo/Genre/A0A0A0/Action2.png
index 9a79c298..9a79c298 100644
--- a/icons/default/EPGInfo/Genre/g_Action2.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Action2.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Conference.png b/icons/default/EPGInfo/Genre/A0A0A0/Conference.png
new file mode 100644
index 00000000..7d8cbaa2
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Conference.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Detektiv.png b/icons/default/EPGInfo/Genre/A0A0A0/Detektiv.png
new file mode 100644
index 00000000..1047aae2
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Detektiv.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Dokumentation.png b/icons/default/EPGInfo/Genre/A0A0A0/Dokumentation.png
new file mode 100644
index 00000000..aa879fad
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Dokumentation.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Drama.png b/icons/default/EPGInfo/Genre/A0A0A0/Drama.png
new file mode 100644
index 00000000..cd58061a
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Drama.png
diff --git a/icons/default/EPGInfo/Genre/g_Erotik.png b/icons/default/EPGInfo/Genre/A0A0A0/Erotik.png
index 90b2755c..90b2755c 100644
--- a/icons/default/EPGInfo/Genre/g_Erotik.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Erotik.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Erotik2.png b/icons/default/EPGInfo/Genre/A0A0A0/Erotik2.png
new file mode 100644
index 00000000..d71b1a9e
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Erotik2.png
diff --git a/icons/default/EPGInfo/Genre/g_Fantasie.png b/icons/default/EPGInfo/Genre/A0A0A0/Fantasie.png
index 9cca154c..9cca154c 100644
--- a/icons/default/EPGInfo/Genre/g_Fantasie.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Fantasie.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Historisch.png b/icons/default/EPGInfo/Genre/A0A0A0/Historisch.png
new file mode 100644
index 00000000..f415befa
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Historisch.png
diff --git a/icons/default/EPGInfo/Genre/g_Horror.png b/icons/default/EPGInfo/Genre/A0A0A0/Horror.png
index 38f197e0..38f197e0 100644
--- a/icons/default/EPGInfo/Genre/g_Horror.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Horror.png
diff --git a/icons/default/EPGInfo/Genre/g_Komödie.png b/icons/default/EPGInfo/Genre/A0A0A0/Komödie.png
index 7b313678..7b313678 100644
--- a/icons/default/EPGInfo/Genre/g_Komödie.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Komödie.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Komödie2.png b/icons/default/EPGInfo/Genre/A0A0A0/Komödie2.png
new file mode 100644
index 00000000..ba51a814
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Komödie2.png
diff --git a/icons/default/EPGInfo/Genre/g_Krimi.png b/icons/default/EPGInfo/Genre/A0A0A0/Krimi.png
index 9b67ed6f..9b67ed6f 100644
--- a/icons/default/EPGInfo/Genre/g_Krimi.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Krimi.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Literature.png b/icons/default/EPGInfo/Genre/A0A0A0/Literature.png
new file mode 100644
index 00000000..e25c006c
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Literature.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Musik.png b/icons/default/EPGInfo/Genre/A0A0A0/Musik.png
new file mode 100644
index 00000000..c421d37c
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Musik.png
diff --git a/icons/default/EPGInfo/Genre/g_Märchen.png b/icons/default/EPGInfo/Genre/A0A0A0/Märchen.png
index c15a722c..c15a722c 100644
--- a/icons/default/EPGInfo/Genre/g_Märchen.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Märchen.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Newspaper.png b/icons/default/EPGInfo/Genre/A0A0A0/Newspaper.png
new file mode 100644
index 00000000..e830d1cd
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Newspaper.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Palm-Tree.png b/icons/default/EPGInfo/Genre/A0A0A0/Palm-Tree.png
new file mode 100644
index 00000000..87eb08d4
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Palm-Tree.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Restaurant.png b/icons/default/EPGInfo/Genre/A0A0A0/Restaurant.png
new file mode 100644
index 00000000..8f1ad8bc
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Restaurant.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Roman.png b/icons/default/EPGInfo/Genre/A0A0A0/Roman.png
new file mode 100644
index 00000000..c98a274c
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Roman.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Science-Fiction.png b/icons/default/EPGInfo/Genre/A0A0A0/Science-Fiction.png
new file mode 100644
index 00000000..adc539ba
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Science-Fiction.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Shopping.png b/icons/default/EPGInfo/Genre/A0A0A0/Shopping.png
new file mode 100644
index 00000000..725c1a01
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Shopping.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Spiel.png b/icons/default/EPGInfo/Genre/A0A0A0/Spiel.png
new file mode 100644
index 00000000..150150c2
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Spiel.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Sport.png b/icons/default/EPGInfo/Genre/A0A0A0/Sport.png
new file mode 100644
index 00000000..7ea16e45
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Sport.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Student.png b/icons/default/EPGInfo/Genre/A0A0A0/Student.png
new file mode 100644
index 00000000..1706adbd
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Student.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Talk.png b/icons/default/EPGInfo/Genre/A0A0A0/Talk.png
new file mode 100644
index 00000000..f2f38bc6
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Talk.png
diff --git a/icons/default/EPGInfo/Genre/g_Thriller.png b/icons/default/EPGInfo/Genre/A0A0A0/Thriller.png
index 7cca988d..7cca988d 100644
--- a/icons/default/EPGInfo/Genre/g_Thriller.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Thriller.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Weather.png b/icons/default/EPGInfo/Genre/A0A0A0/Weather.png
new file mode 100644
index 00000000..b0e590d2
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Weather.png
diff --git a/icons/default/EPGInfo/Genre/g_Western.png b/icons/default/EPGInfo/Genre/A0A0A0/Western.png
index c9ab13d9..c9ab13d9 100644
--- a/icons/default/EPGInfo/Genre/g_Western.png
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Western.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/Zombie.png b/icons/default/EPGInfo/Genre/A0A0A0/Zombie.png
new file mode 100644
index 00000000..bd7078fe
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/Zombie.png
diff --git a/icons/default/EPGInfo/Genre/A0A0A0/unknown.png b/icons/default/EPGInfo/Genre/A0A0A0/unknown.png
new file mode 100644
index 00000000..a544f7bc
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/A0A0A0/unknown.png
diff --git a/icons/default/EPGInfo/Genre/Adult Movie_Drama.png b/icons/default/EPGInfo/Genre/Adult Movie_Drama.png
index d71b1a9e..1f89a5b3 100644..120000
--- a/icons/default/EPGInfo/Genre/Adult Movie_Drama.png
+++ b/icons/default/EPGInfo/Genre/Adult Movie_Drama.png
diff --git a/icons/default/EPGInfo/Genre/Adventure_Western_War.png b/icons/default/EPGInfo/Genre/Adventure_Western_War.png
index c348372c..0b30343e 100644..120000
--- a/icons/default/EPGInfo/Genre/Adventure_Western_War.png
+++ b/icons/default/EPGInfo/Genre/Adventure_Western_War.png
diff --git a/icons/default/EPGInfo/Genre/Advertisement_Shopping.png b/icons/default/EPGInfo/Genre/Advertisement_Shopping.png
new file mode 120000
index 00000000..3af3e914
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Advertisement_Shopping.png
@@ -0,0 +1 @@
+A0A0A0/Shopping.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Athletics.png b/icons/default/EPGInfo/Genre/Athletics.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Athletics.png
+++ b/icons/default/EPGInfo/Genre/Athletics.png
diff --git a/icons/default/EPGInfo/Genre/Ballet.png b/icons/default/EPGInfo/Genre/Ballet.png
index c421d37c..27dc6ab2 100644..120000
--- a/icons/default/EPGInfo/Genre/Ballet.png
+++ b/icons/default/EPGInfo/Genre/Ballet.png
diff --git a/icons/default/EPGInfo/Genre/Comedy.png b/icons/default/EPGInfo/Genre/Comedy.png
index ba51a814..b6b60bf1 100644..120000
--- a/icons/default/EPGInfo/Genre/Comedy.png
+++ b/icons/default/EPGInfo/Genre/Comedy.png
diff --git a/icons/default/EPGInfo/Genre/Detective_Thriller.png b/icons/default/EPGInfo/Genre/Detective_Thriller.png
index 1047aae2..a04d6f69 100644..120000
--- a/icons/default/EPGInfo/Genre/Detective_Thriller.png
+++ b/icons/default/EPGInfo/Genre/Detective_Thriller.png
diff --git a/icons/default/EPGInfo/Genre/Discussion_Inverview_Debate.png b/icons/default/EPGInfo/Genre/Discussion_Inverview_Debate.png
new file mode 120000
index 00000000..7b9d5784
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Discussion_Inverview_Debate.png
@@ -0,0 +1 @@
+A0A0A0/Conference.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Documentary.png b/icons/default/EPGInfo/Genre/Documentary.png
index aa879fad..dff07a9a 100644..120000
--- a/icons/default/EPGInfo/Genre/Documentary.png
+++ b/icons/default/EPGInfo/Genre/Documentary.png
diff --git a/icons/default/EPGInfo/Genre/Education_Science_Factual.png b/icons/default/EPGInfo/Genre/Education_Science_Factual.png
new file mode 120000
index 00000000..aa50fc7d
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Education_Science_Factual.png
@@ -0,0 +1 @@
+A0A0A0/Student.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Equestrian.png b/icons/default/EPGInfo/Genre/Equestrian.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Equestrian.png
+++ b/icons/default/EPGInfo/Genre/Equestrian.png
diff --git a/icons/default/EPGInfo/Genre/Abenteuer.png b/icons/default/EPGInfo/Genre/FFFFFF/Abenteuer.png
index 005ff7de..005ff7de 100644
--- a/icons/default/EPGInfo/Genre/Abenteuer.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Abenteuer.png
diff --git a/icons/default/EPGInfo/Genre/Action.png b/icons/default/EPGInfo/Genre/FFFFFF/Action.png
index ebd8a3ea..ebd8a3ea 100644
--- a/icons/default/EPGInfo/Genre/Action.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Action.png
diff --git a/icons/default/EPGInfo/Genre/Action2.png b/icons/default/EPGInfo/Genre/FFFFFF/Action2.png
index 0f8cd3df..0f8cd3df 100644
--- a/icons/default/EPGInfo/Genre/Action2.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Action2.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Conference.png b/icons/default/EPGInfo/Genre/FFFFFF/Conference.png
new file mode 100644
index 00000000..0198b42a
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Conference.png
diff --git a/icons/default/EPGInfo/Genre/Detektiv.png b/icons/default/EPGInfo/Genre/FFFFFF/Detektiv.png
index ec2c12fe..ec2c12fe 100644
--- a/icons/default/EPGInfo/Genre/Detektiv.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Detektiv.png
diff --git a/icons/default/EPGInfo/Genre/Dokumentation.png b/icons/default/EPGInfo/Genre/FFFFFF/Dokumentation.png
index f08ea46f..f08ea46f 100644
--- a/icons/default/EPGInfo/Genre/Dokumentation.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Dokumentation.png
diff --git a/icons/default/EPGInfo/Genre/Drama.png b/icons/default/EPGInfo/Genre/FFFFFF/Drama.png
index 60a19e6a..60a19e6a 100644
--- a/icons/default/EPGInfo/Genre/Drama.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Drama.png
diff --git a/icons/default/EPGInfo/Genre/Erotik.png b/icons/default/EPGInfo/Genre/FFFFFF/Erotik.png
index a0cba9cd..a0cba9cd 100644
--- a/icons/default/EPGInfo/Genre/Erotik.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Erotik.png
diff --git a/icons/default/EPGInfo/Genre/Erotik2.png b/icons/default/EPGInfo/Genre/FFFFFF/Erotik2.png
index 5bf69502..5bf69502 100644
--- a/icons/default/EPGInfo/Genre/Erotik2.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Erotik2.png
diff --git a/icons/default/EPGInfo/Genre/Fantasie.png b/icons/default/EPGInfo/Genre/FFFFFF/Fantasie.png
index b00225ac..b00225ac 100644
--- a/icons/default/EPGInfo/Genre/Fantasie.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Fantasie.png
diff --git a/icons/default/EPGInfo/Genre/Historisch.png b/icons/default/EPGInfo/Genre/FFFFFF/Historisch.png
index 75988f8a..75988f8a 100644
--- a/icons/default/EPGInfo/Genre/Historisch.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Historisch.png
diff --git a/icons/default/EPGInfo/Genre/Horror.png b/icons/default/EPGInfo/Genre/FFFFFF/Horror.png
index d601f031..d601f031 100644
--- a/icons/default/EPGInfo/Genre/Horror.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Horror.png
diff --git a/icons/default/EPGInfo/Genre/Komödie.png b/icons/default/EPGInfo/Genre/FFFFFF/Komödie.png
index 193020ed..193020ed 100644
--- a/icons/default/EPGInfo/Genre/Komödie.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Komödie.png
diff --git a/icons/default/EPGInfo/Genre/Komödie2.png b/icons/default/EPGInfo/Genre/FFFFFF/Komödie2.png
index 66008085..66008085 100644
--- a/icons/default/EPGInfo/Genre/Komödie2.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Komödie2.png
diff --git a/icons/default/EPGInfo/Genre/Krimi.png b/icons/default/EPGInfo/Genre/FFFFFF/Krimi.png
index e436e107..e436e107 100644
--- a/icons/default/EPGInfo/Genre/Krimi.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Krimi.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Literature.png b/icons/default/EPGInfo/Genre/FFFFFF/Literature.png
new file mode 100644
index 00000000..72b8d6d0
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Literature.png
diff --git a/icons/default/EPGInfo/Genre/Musik.png b/icons/default/EPGInfo/Genre/FFFFFF/Musik.png
index 24c4f9a8..24c4f9a8 100644
--- a/icons/default/EPGInfo/Genre/Musik.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Musik.png
diff --git a/icons/default/EPGInfo/Genre/Märchen.png b/icons/default/EPGInfo/Genre/FFFFFF/Märchen.png
index f72344e0..f72344e0 100644
--- a/icons/default/EPGInfo/Genre/Märchen.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Märchen.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Newspaper.png b/icons/default/EPGInfo/Genre/FFFFFF/Newspaper.png
new file mode 100644
index 00000000..52c684b1
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Newspaper.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Palm-Tree.png b/icons/default/EPGInfo/Genre/FFFFFF/Palm-Tree.png
new file mode 100644
index 00000000..a9beb3cd
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Palm-Tree.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Restaurant.png b/icons/default/EPGInfo/Genre/FFFFFF/Restaurant.png
new file mode 100644
index 00000000..9456a28c
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Restaurant.png
diff --git a/icons/default/EPGInfo/Genre/Roman.png b/icons/default/EPGInfo/Genre/FFFFFF/Roman.png
index 6358e8c0..6358e8c0 100644
--- a/icons/default/EPGInfo/Genre/Roman.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Roman.png
diff --git a/icons/default/EPGInfo/Genre/Science-Fiction.png b/icons/default/EPGInfo/Genre/FFFFFF/Science-Fiction.png
index 1cacb15d..1cacb15d 100644
--- a/icons/default/EPGInfo/Genre/Science-Fiction.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Science-Fiction.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Shopping.png b/icons/default/EPGInfo/Genre/FFFFFF/Shopping.png
new file mode 100644
index 00000000..76df2fcb
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Shopping.png
diff --git a/icons/default/EPGInfo/Genre/Spiel.png b/icons/default/EPGInfo/Genre/FFFFFF/Spiel.png
index e0699f92..e0699f92 100644
--- a/icons/default/EPGInfo/Genre/Spiel.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Spiel.png
diff --git a/icons/default/EPGInfo/Genre/Sport.png b/icons/default/EPGInfo/Genre/FFFFFF/Sport.png
index 37f34c28..37f34c28 100644
--- a/icons/default/EPGInfo/Genre/Sport.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Sport.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Student.png b/icons/default/EPGInfo/Genre/FFFFFF/Student.png
new file mode 100644
index 00000000..27956f1d
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Student.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Talk.png b/icons/default/EPGInfo/Genre/FFFFFF/Talk.png
new file mode 100644
index 00000000..d8f90fcd
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Talk.png
diff --git a/icons/default/EPGInfo/Genre/Thriller.png b/icons/default/EPGInfo/Genre/FFFFFF/Thriller.png
index 91db7292..91db7292 100644
--- a/icons/default/EPGInfo/Genre/Thriller.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Thriller.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Weather.png b/icons/default/EPGInfo/Genre/FFFFFF/Weather.png
new file mode 100644
index 00000000..b5acf3fb
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Weather.png
diff --git a/icons/default/EPGInfo/Genre/Western.png b/icons/default/EPGInfo/Genre/FFFFFF/Western.png
index 948b8ddd..948b8ddd 100644
--- a/icons/default/EPGInfo/Genre/Western.png
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Western.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/Zombie.png b/icons/default/EPGInfo/Genre/FFFFFF/Zombie.png
new file mode 100644
index 00000000..a0c4b31b
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/Zombie.png
diff --git a/icons/default/EPGInfo/Genre/FFFFFF/unknown.png b/icons/default/EPGInfo/Genre/FFFFFF/unknown.png
new file mode 100644
index 00000000..600416d2
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/FFFFFF/unknown.png
diff --git a/icons/default/EPGInfo/Genre/Film_Cinema.png b/icons/default/EPGInfo/Genre/Film_Cinema.png
new file mode 120000
index 00000000..dff07a9a
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Film_Cinema.png
@@ -0,0 +1 @@
+A0A0A0/Dokumentation.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Folk_Tradional Music.png b/icons/default/EPGInfo/Genre/Folk_Tradional Music.png
index c421d37c..27dc6ab2 100644..120000
--- a/icons/default/EPGInfo/Genre/Folk_Tradional Music.png
+++ b/icons/default/EPGInfo/Genre/Folk_Tradional Music.png
diff --git a/icons/default/EPGInfo/Genre/Football_Soccer.png b/icons/default/EPGInfo/Genre/Football_Soccer.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Football_Soccer.png
+++ b/icons/default/EPGInfo/Genre/Football_Soccer.png
diff --git a/icons/default/EPGInfo/Genre/Further Education.png b/icons/default/EPGInfo/Genre/Further Education.png
new file mode 120000
index 00000000..aa50fc7d
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Further Education.png
@@ -0,0 +1 @@
+A0A0A0/Student.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Game Show_Quiz_Contest.png b/icons/default/EPGInfo/Genre/Game Show_Quiz_Contest.png
index 150150c2..2909df8b 100644..120000
--- a/icons/default/EPGInfo/Genre/Game Show_Quiz_Contest.png
+++ b/icons/default/EPGInfo/Genre/Game Show_Quiz_Contest.png
diff --git a/icons/default/EPGInfo/Genre/Jazz.png b/icons/default/EPGInfo/Genre/Jazz.png
index c421d37c..27dc6ab2 100644..120000
--- a/icons/default/EPGInfo/Genre/Jazz.png
+++ b/icons/default/EPGInfo/Genre/Jazz.png
diff --git a/icons/default/EPGInfo/Genre/Languages.png b/icons/default/EPGInfo/Genre/Languages.png
new file mode 120000
index 00000000..3b83e82b
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Languages.png
@@ -0,0 +1 @@
+A0A0A0/Literature.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Leisure_Hobbies.png b/icons/default/EPGInfo/Genre/Leisure_Hobbies.png
new file mode 120000
index 00000000..136bad3c
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Leisure_Hobbies.png
@@ -0,0 +1 @@
+A0A0A0/Sport.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Literature.png b/icons/default/EPGInfo/Genre/Literature.png
new file mode 120000
index 00000000..3b83e82b
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Literature.png
@@ -0,0 +1 @@
+A0A0A0/Literature.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Magazine_Report_Documentary.png b/icons/default/EPGInfo/Genre/Magazine_Report_Documentary.png
new file mode 120000
index 00000000..dff07a9a
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Magazine_Report_Documentary.png
@@ -0,0 +1 @@
+A0A0A0/Dokumentation.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Martial Sports.png b/icons/default/EPGInfo/Genre/Martial Sports.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Martial Sports.png
+++ b/icons/default/EPGInfo/Genre/Martial Sports.png
diff --git a/icons/default/EPGInfo/Genre/Motor Sport.png b/icons/default/EPGInfo/Genre/Motor Sport.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Motor Sport.png
+++ b/icons/default/EPGInfo/Genre/Motor Sport.png
diff --git a/icons/default/EPGInfo/Genre/Movie_Drama.png b/icons/default/EPGInfo/Genre/Movie_Drama.png
index cd58061a..bc7e8829 100644..120000
--- a/icons/default/EPGInfo/Genre/Movie_Drama.png
+++ b/icons/default/EPGInfo/Genre/Movie_Drama.png
diff --git a/icons/default/EPGInfo/Genre/Music_Ballet_Dance.png b/icons/default/EPGInfo/Genre/Music_Ballet_Dance.png
index c421d37c..27dc6ab2 100644..120000
--- a/icons/default/EPGInfo/Genre/Music_Ballet_Dance.png
+++ b/icons/default/EPGInfo/Genre/Music_Ballet_Dance.png
diff --git a/icons/default/EPGInfo/Genre/Musical_Opera.png b/icons/default/EPGInfo/Genre/Musical_Opera.png
index c421d37c..27dc6ab2 100644..120000
--- a/icons/default/EPGInfo/Genre/Musical_Opera.png
+++ b/icons/default/EPGInfo/Genre/Musical_Opera.png
diff --git a/icons/default/EPGInfo/Genre/Nature_Animals_Environment.png b/icons/default/EPGInfo/Genre/Nature_Animals_Environment.png
new file mode 120000
index 00000000..0b30343e
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Nature_Animals_Environment.png
@@ -0,0 +1 @@
+A0A0A0/Abenteuer.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/News Magazine.png b/icons/default/EPGInfo/Genre/News Magazine.png
new file mode 120000
index 00000000..62c4504f
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/News Magazine.png
@@ -0,0 +1 @@
+A0A0A0/Newspaper.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/News_Current Affairs.png b/icons/default/EPGInfo/Genre/News_Current Affairs.png
new file mode 120000
index 00000000..62c4504f
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/News_Current Affairs.png
@@ -0,0 +1 @@
+A0A0A0/Newspaper.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/News_Weather Report.png b/icons/default/EPGInfo/Genre/News_Weather Report.png
new file mode 120000
index 00000000..25b3ad81
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/News_Weather Report.png
@@ -0,0 +1 @@
+A0A0A0/Weather.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Remarkable People.png b/icons/default/EPGInfo/Genre/Remarkable People.png
new file mode 120000
index 00000000..7b9d5784
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Remarkable People.png
@@ -0,0 +1 @@
+A0A0A0/Conference.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Rock_Pop.png b/icons/default/EPGInfo/Genre/Rock_Pop.png
index c421d37c..27dc6ab2 100644..120000
--- a/icons/default/EPGInfo/Genre/Rock_Pop.png
+++ b/icons/default/EPGInfo/Genre/Rock_Pop.png
diff --git a/icons/default/EPGInfo/Genre/Romance.png b/icons/default/EPGInfo/Genre/Romance.png
index c98a274c..59ae1a70 100644..120000
--- a/icons/default/EPGInfo/Genre/Romance.png
+++ b/icons/default/EPGInfo/Genre/Romance.png
diff --git a/icons/default/EPGInfo/Genre/Science Fiction_Fantasy_Horror.png b/icons/default/EPGInfo/Genre/Science Fiction_Fantasy_Horror.png
index adc539ba..92fba7e1 100644..120000
--- a/icons/default/EPGInfo/Genre/Science Fiction_Fantasy_Horror.png
+++ b/icons/default/EPGInfo/Genre/Science Fiction_Fantasy_Horror.png
diff --git a/icons/default/EPGInfo/Genre/Serious_Classical Music.png b/icons/default/EPGInfo/Genre/Serious_Classical Music.png
index c421d37c..27dc6ab2 100644..120000
--- a/icons/default/EPGInfo/Genre/Serious_Classical Music.png
+++ b/icons/default/EPGInfo/Genre/Serious_Classical Music.png
diff --git a/icons/default/EPGInfo/Genre/Serious_Classical_Religious_Historical Movie_Drama.png b/icons/default/EPGInfo/Genre/Serious_Classical_Religious_Historical Movie_Drama.png
index f415befa..2e8ff3a2 100644..120000
--- a/icons/default/EPGInfo/Genre/Serious_Classical_Religious_Historical Movie_Drama.png
+++ b/icons/default/EPGInfo/Genre/Serious_Classical_Religious_Historical Movie_Drama.png
diff --git a/icons/default/EPGInfo/Genre/Show_Game Show.png b/icons/default/EPGInfo/Genre/Show_Game Show.png
index 150150c2..2909df8b 100644..120000
--- a/icons/default/EPGInfo/Genre/Show_Game Show.png
+++ b/icons/default/EPGInfo/Genre/Show_Game Show.png
diff --git a/icons/default/EPGInfo/Genre/Soap_Melodrama_Folkloric.png b/icons/default/EPGInfo/Genre/Soap_Melodrama_Folkloric.png
index c98a274c..59ae1a70 100644..120000
--- a/icons/default/EPGInfo/Genre/Soap_Melodrama_Folkloric.png
+++ b/icons/default/EPGInfo/Genre/Soap_Melodrama_Folkloric.png
diff --git a/icons/default/EPGInfo/Genre/Sport Magazine.png b/icons/default/EPGInfo/Genre/Sport Magazine.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Sport Magazine.png
+++ b/icons/default/EPGInfo/Genre/Sport Magazine.png
diff --git a/icons/default/EPGInfo/Genre/Sports.png b/icons/default/EPGInfo/Genre/Sports.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Sports.png
+++ b/icons/default/EPGInfo/Genre/Sports.png
diff --git a/icons/default/EPGInfo/Genre/Talk Show.png b/icons/default/EPGInfo/Genre/Talk Show.png
new file mode 120000
index 00000000..d9fbb431
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Talk Show.png
@@ -0,0 +1 @@
+A0A0A0/Talk.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Team Sports.png b/icons/default/EPGInfo/Genre/Team Sports.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Team Sports.png
+++ b/icons/default/EPGInfo/Genre/Team Sports.png
diff --git a/icons/default/EPGInfo/Genre/Technology_Natural Sciences.png b/icons/default/EPGInfo/Genre/Technology_Natural Sciences.png
new file mode 120000
index 00000000..aa50fc7d
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Technology_Natural Sciences.png
@@ -0,0 +1 @@
+A0A0A0/Student.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Tennis_Squash.png b/icons/default/EPGInfo/Genre/Tennis_Squash.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Tennis_Squash.png
+++ b/icons/default/EPGInfo/Genre/Tennis_Squash.png
diff --git a/icons/default/EPGInfo/Genre/Tourism_Travel.png b/icons/default/EPGInfo/Genre/Tourism_Travel.png
new file mode 120000
index 00000000..43b32779
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Tourism_Travel.png
@@ -0,0 +1 @@
+A0A0A0/Palm-Tree.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Variety Show.png b/icons/default/EPGInfo/Genre/Variety Show.png
new file mode 120000
index 00000000..d9fbb431
--- /dev/null
+++ b/icons/default/EPGInfo/Genre/Variety Show.png
@@ -0,0 +1 @@
+A0A0A0/Talk.png
+\ No newline at end of file
diff --git a/icons/default/EPGInfo/Genre/Water Sport.png b/icons/default/EPGInfo/Genre/Water Sport.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Water Sport.png
+++ b/icons/default/EPGInfo/Genre/Water Sport.png
diff --git a/icons/default/EPGInfo/Genre/Winter Sports.png b/icons/default/EPGInfo/Genre/Winter Sports.png
index 7ea16e45..136bad3c 100644..120000
--- a/icons/default/EPGInfo/Genre/Winter Sports.png
+++ b/icons/default/EPGInfo/Genre/Winter Sports.png
diff --git a/icons/default/EPGInfo/Genre/unknown.png b/icons/default/EPGInfo/Genre/unknown.png
deleted file mode 100644
index 6c712c72..00000000
--- a/icons/default/EPGInfo/Genre/unknown.png
+++ /dev/null