diff --git a/HBC/META.XML b/HBC/META.XML
index eb0c9fd3..ec7bc2fc 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>3.0 r1254</version>
-		<release_date>20150810170940</release_date>
+		<version>3.0 r1255</version>
+		<release_date>20150814142358</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index a0cc83aa..82c045a4 100644
--- a/Languages/czech.lang
+++ b/Languages/czech.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
 "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Každý)"
 
@@ -1627,6 +1630,12 @@ msgstr "Ofset"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Pouze oddíl s hrami"
 
@@ -1789,6 +1798,9 @@ msgstr "Vpravo"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Vibrace"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Zobrazit volné místo"
 
@@ -2140,6 +2155,9 @@ msgstr "Popisky"
 msgid "Transfer failed"
 msgstr "Prenos selhal"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/danish.lang b/Languages/danish.lang
index 9eb013b0..d11c9a90 100644
--- a/Languages/danish.lang
+++ b/Languages/danish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Alle)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Kun spil Partition"
 
@@ -1789,6 +1798,9 @@ msgstr "Højre"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Vibration"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "Vis kategorier"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Vis fri plads"
 
@@ -2140,6 +2155,9 @@ msgstr "Værktøjstips"
 msgid "Transfer failed"
 msgstr "Overførelse fejlede"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index b59d167c..ec8ff991 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Iedereen 3+)"
 
@@ -1627,6 +1630,12 @@ msgstr "Compensatie"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Alleen Spel Partitie"
 
@@ -1789,6 +1798,9 @@ msgstr "Rechts"
 msgid "Rotating Disc"
 msgstr "Draaiende Disk"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Trilfunctie"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "Toon categorieën"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Vrije ruimte weergeven"
 
@@ -2140,6 +2155,9 @@ msgstr "Hulpballonnen"
 msgid "Transfer failed"
 msgstr "Overdracht mislukt."
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/english.lang b/Languages/english.lang
index d85daff9..f4a4e03b 100644
--- a/Languages/english.lang
+++ b/Languages/english.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr ""
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr ""
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr ""
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr ""
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index afe90389..362c70e2 100644
--- a/Languages/finnish.lang
+++ b/Languages/finnish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Kaikille)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr "Oikea"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Värinä"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr "Vinkit"
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/french.lang b/Languages/french.lang
index 9385365d..06bab183 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -1,11 +1,11 @@
 # USB Loader GX language source file.
-# French.lang - r1254
+# French.lang - r1255
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Tous 3+)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr "Une ligne A"
+
+msgid "One Line B"
+msgstr "Une ligne B"
+
 msgid "Only Game Partition"
 msgstr "Uniquement la partition de jeu"
 
@@ -1789,6 +1798,9 @@ msgstr "Droite"
 msgid "Rotating Disc"
 msgstr "Disque rotatif"
 
+msgid "Round"
+msgstr "Arrondi"
+
 msgid "Rumble"
 msgstr "Vibrations"
 
@@ -1876,6 +1888,9 @@ msgstr "Fichier de configs"
 msgid "Show Categories"
 msgstr "Afficher les catégories"
 
+msgid "Show Favorite on banner"
+msgstr "Afficher les fav. sur bannières"
+
 msgid "Show Free Space"
 msgstr "Afficher l'espace libre"
 
@@ -2140,6 +2155,9 @@ msgstr "Info-bulles"
 msgid "Transfer failed"
 msgstr "Échec du transfert"
 
+msgid "Two Lines"
+msgstr "Deux lignes"
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/german.lang b/Languages/german.lang
index b0bdf9d4..dcb80684 100644
--- a/Languages/german.lang
+++ b/Languages/german.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: Sabykos\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Jeder)"
 
@@ -1627,6 +1630,12 @@ msgstr "Offset"
 msgid "Ok"
 msgstr "OK"
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Nur Spiele Partition"
 
@@ -1789,6 +1798,9 @@ msgstr "Rechts"
 msgid "Rotating Disc"
 msgstr "Rotierende Disk"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Rumble"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "Zeige Kategorien"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Zeige frei. Speicher"
 
@@ -2140,6 +2155,9 @@ msgstr "Quickinfo"
 msgid "Transfer failed"
 msgstr "Transfer fehlgeschlagen"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/greek.lang b/Languages/greek.lang
index 4a6a53ec..940d4a5a 100644
--- a/Languages/greek.lang
+++ b/Languages/greek.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "Last-Translator: nakata6790\n"
 "Language-Team: nakata6790 (aka0107@gmail.com)\n"
 "MIME-Version: 1.0\n"
@@ -50,6 +50,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (¼ëïé)"
 
@@ -1626,6 +1629,12 @@ msgstr "Offset"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Müíï ôï partition ôùí ðáé÷íéäéþí"
 
@@ -1788,6 +1797,9 @@ msgstr "ÄåîéÜ"
 msgid "Rotating Disc"
 msgstr "Ðåñéóôñåöüìåíïò ïðôéêüò äßóêïò"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Äüíçóç"
 
@@ -1875,6 +1887,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "ÐñïâïëÞ êáôçãïñéþí"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "ÐñïâïëÞ åëåýèåñïõ åíáðïìåßíáíôïò ÷þñïõ"
 
@@ -2139,6 +2154,9 @@ msgstr "ÅôéêÝôåò"
 msgid "Transfer failed"
 msgstr "Áíåðéôõ÷Þò ìåôáöïñÜ áñ÷åßùí"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index df481e42..11f78b5e 100644
--- a/Languages/hungarian.lang
+++ b/Languages/hungarian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Mindenkinek)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr "Jobb"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Rezgés"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr "Súgók"
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/italian.lang b/Languages/italian.lang
index 9420111a..b06013d3 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: xFede\n"
 "Language-Team: xFede (fedeanto11@gmail.com)\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Tutti)"
 
@@ -1627,6 +1630,12 @@ msgstr "Offset"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Solo Partizione Gioco"
 
@@ -1789,6 +1798,9 @@ msgstr "Destra"
 msgid "Rotating Disc"
 msgstr "Ruotando il disco"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Vibrazione"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "Visualizza categorie"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Visualizza spazio libero"
 
@@ -2140,6 +2155,9 @@ msgstr "Suggerimenti"
 msgid "Transfer failed"
 msgstr "Trasferimento fallito"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 49045454..d5dcdd0e 100644
--- a/Languages/japanese.lang
+++ b/Languages/japanese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "セットしない"
 
@@ -1627,6 +1630,12 @@ msgstr "代替"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "ゲーム領域のみ"
 
@@ -1789,6 +1798,9 @@ msgstr "右ボタンで"
 msgid "Rotating Disc"
 msgstr "ディスク回転"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "振動機能"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "カテゴリを表示"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "空き容量の表示"
 
@@ -2140,6 +2155,9 @@ msgstr "ヒントバルーン"
 msgid "Transfer failed"
 msgstr "転送に失敗しました"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/korean.lang b/Languages/korean.lang
index 3d098c61..da5a171e 100644
--- a/Languages/korean.lang
+++ b/Languages/korean.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (모두다)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr "오른쪽"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "진동"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr "Tooltips"
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index cc8220b2..75846235 100644
--- a/Languages/norwegian.lang
+++ b/Languages/norwegian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Alle)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Kun spill partisjon"
 
@@ -1789,6 +1798,9 @@ msgstr "Høyre"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Vibrasjon"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "Vis kategorier"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Vis ledig plass"
 
@@ -2140,6 +2155,9 @@ msgstr "Verktøystips"
 msgid "Transfer failed"
 msgstr "Overføring feilet"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/polish.lang b/Languages/polish.lang
index 4b5a0bb0..e9a96f3e 100644
--- a/Languages/polish.lang
+++ b/Languages/polish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (dla kazdego)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr "Prawo"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Wibracje"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr "Chmurki z podpowiedziami"
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index a69a8497..e9ef060f 100644
--- a/Languages/portuguese_br.lang
+++ b/Languages/portuguese_br.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: Codemaster <javafangamers@hotmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Todos)"
 
@@ -1627,6 +1630,12 @@ msgstr "Offset"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Apenas Partição Jogos"
 
@@ -1789,6 +1798,9 @@ msgstr "Direita"
 msgid "Rotating Disc"
 msgstr "Disco Girando"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Vibração"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "Mostrar Categorias"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Mostrar Espaço Livre"
 
@@ -2140,6 +2155,9 @@ msgstr "Balões de dica"
 msgid "Transfer failed"
 msgstr "Transferência falhou"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index e7527108..c66c0f55 100644
--- a/Languages/portuguese_pt.lang
+++ b/Languages/portuguese_pt.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Todos)"
 
@@ -1627,6 +1630,12 @@ msgstr "Offset"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Apenas Partição Jogos"
 
@@ -1789,6 +1798,9 @@ msgstr "Direita"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Vibração"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "Mostrar Categorias"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Mostrar Espaço Livre"
 
@@ -2140,6 +2155,9 @@ msgstr "Dicas"
 msgid "Transfer failed"
 msgstr "Transferência falhada"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/russian.lang b/Languages/russian.lang
index 31d926b3..9951a502 100644
--- a/Languages/russian.lang
+++ b/Languages/russian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Для всех)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr "Направо"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Вибрация"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr "Подсказки"
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index 980929a1..338fac37 100644
--- a/Languages/schinese.lang
+++ b/Languages/schinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2013-08-13 07:03+0800\n"
 "Last-Translator: \n"
 "Language-Team: oCameLo\n"
@@ -51,6 +51,9 @@ msgstr "--==   DIOS MIOS (Lite) "
 msgid "--==  DM(L) + Nintendont"
 msgstr "--==  DM(L) + Nintendont"
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (全年龄)"
 
@@ -1627,6 +1630,12 @@ msgstr "偏移位"
 msgid "Ok"
 msgstr "确定"
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "仅游戏分区"
 
@@ -1789,6 +1798,9 @@ msgstr "右"
 msgid "Rotating Disc"
 msgstr "选择光盘"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "震动"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "显示分类"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "显示剩余空间"
 
@@ -2140,6 +2155,9 @@ msgstr "提示信息"
 msgid "Transfer failed"
 msgstr "传输失败"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index 7af4e41f..bc91ac2b 100644
--- a/Languages/spanish.lang
+++ b/Languages/spanish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
@@ -51,6 +51,9 @@ msgstr "-- DIOS MIOS (Lite) "
 msgid "--==  DM(L) + Nintendont"
 msgstr "-- DM(L)/Nintendont "
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Todos)"
 
@@ -1627,6 +1630,12 @@ msgstr "Desfasaje"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "Solo Partición de Juegos"
 
@@ -1789,6 +1798,9 @@ msgstr "Derecha"
 msgid "Rotating Disc"
 msgstr "Disco girando"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Vibración"
 
@@ -1876,6 +1888,9 @@ msgstr "Configuración"
 msgid "Show Categories"
 msgstr "Mostrar Categorías"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "Mostrar Espacio Libre"
 
@@ -2140,6 +2155,9 @@ msgstr "Descripción"
 msgid "Transfer failed"
 msgstr "Transferencia fallida"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index 1dce8331..61180900 100644
--- a/Languages/swedish.lang
+++ b/Languages/swedish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Alla)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr "Höger"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Vibration"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr "Verktygstips"
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index 5cd89745..6e7a97cc 100644
--- a/Languages/tchinese.lang
+++ b/Languages/tchinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2010-02-15 21:00+0800\n"
 "Last-Translator: Jane.H\n"
 "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (全年齡)"
 
@@ -1627,6 +1630,12 @@ msgstr "偏移"
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr "僅遊戲分區"
 
@@ -1789,6 +1798,9 @@ msgstr "右"
 msgid "Rotating Disc"
 msgstr "旋轉光碟"
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "震動"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr "顯示類別"
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr "顯示可用空間"
 
@@ -2140,6 +2155,9 @@ msgstr "提示訊息"
 msgid "Transfer failed"
 msgstr "傳輸失敗"
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/thai.lang b/Languages/thai.lang
index df783b24..371b2ce2 100644
--- a/Languages/thai.lang
+++ b/Languages/thai.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (ทุกคน)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr "ขวา"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "สั่น"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr "คำแนะนำ"
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index f784fdae..a08270da 100644
--- a/Languages/turkish.lang
+++ b/Languages/turkish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 18:36+0200\n"
+"POT-Creation-Date: 2015-08-14 16:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "--==  DM(L) + Nintendont"
 msgstr ""
 
+msgid "/\\/\\"
+msgstr ""
+
 msgid "0 (Everyone)"
 msgstr "0 (Herkes)"
 
@@ -1627,6 +1630,12 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+msgid "One Line A"
+msgstr ""
+
+msgid "One Line B"
+msgstr ""
+
 msgid "Only Game Partition"
 msgstr ""
 
@@ -1789,6 +1798,9 @@ msgstr "Sağ"
 msgid "Rotating Disc"
 msgstr ""
 
+msgid "Round"
+msgstr ""
+
 msgid "Rumble"
 msgstr "Titreşim"
 
@@ -1876,6 +1888,9 @@ msgstr ""
 msgid "Show Categories"
 msgstr ""
 
+msgid "Show Favorite on banner"
+msgstr ""
+
 msgid "Show Free Space"
 msgstr ""
 
@@ -2140,6 +2155,9 @@ msgstr "Yardımlar"
 msgid "Transfer failed"
 msgstr ""
 
+msgid "Two Lines"
+msgstr ""
+
 msgid "USB"
 msgstr ""
 
diff --git a/source/menu/GameBrowseMenu.cpp b/source/menu/GameBrowseMenu.cpp
index a6b7981f..1621029a 100644
--- a/source/menu/GameBrowseMenu.cpp
+++ b/source/menu/GameBrowseMenu.cpp
@@ -917,7 +917,12 @@ int GameBrowseMenu::MainLoop()
 	else if (poweroffBtn->GetState() == STATE_CLICKED)
 	{
 		gprintf("\tpoweroffBtn clicked\n");
-		int choice = WindowPrompt(tr( "How to Shutdown?" ), 0, tr( "Full shutdown" ), tr( "Standby" ), tr( "Cancel" ));
+		int choice = 0;
+		if(isWiiU())
+			choice = WindowPrompt(tr( "How to Shutdown?" ), 0, tr( "Full shutdown" ), tr("Cancel"));
+		else
+			choice = WindowPrompt(tr( "How to Shutdown?" ), 0, tr( "Full shutdown" ), tr( "Standby" ), tr( "Cancel" ));
+		
 		if (choice == 2)
 			Sys_ShutdownToIdle();
 		else if (choice == 1)
diff --git a/source/network/http.c b/source/network/http.c
index db3cf749..f3228bb9 100644
--- a/source/network/http.c
+++ b/source/network/http.c
@@ -469,6 +469,11 @@ struct block downloadfile(const char *url)
 		displayProgressWindow = false;
 	}
 
+	result = HTTPR_OK;
+	if(http_port == 443)
+		ssl_shutdown(sslcontext);
+	net_close (connection);
+	
 	return response;
 }
 
diff --git a/source/prompts/BannerWindow.cpp b/source/prompts/BannerWindow.cpp
index 216a2a52..702b8004 100644
--- a/source/prompts/BannerWindow.cpp
+++ b/source/prompts/BannerWindow.cpp
@@ -87,6 +87,8 @@ BannerWindow::BannerWindow(GameBrowseMenu *m, struct discHdr *header)
 
 	gameBanner = new Banner;
 
+	imgFavorite = Resources::GetImageData("favorite.png");
+	imgNotFavorite = Resources::GetImageData("not_favorite.png");
 	imgLeft = Resources::GetImageData("startgame_arrow_left.png");
 	imgRight = Resources::GetImageData("startgame_arrow_right.png");
 
@@ -130,6 +132,106 @@ BannerWindow::BannerWindow(GameBrowseMenu *m, struct discHdr *header)
 	backBtn->SetTrigger(0, trigA);
 	backBtn->SetTrigger(1, trigB);
 
+	// Set favorite button position
+	int xPos = -198-(3*27)-14;
+	if(Settings.bannerFavIcon == BANNER_FAVICON_SINGLE_LINEA) // push more to the screen border
+		xPos += -14;
+	int yPos = 175-27;
+	float angle = 3*M_PI/2;	
+	for(int i = 0; i < FAVORITE_STARS; ++i)
+	{
+		
+		if(Settings.bannerFavIcon == BANNER_FAVICON_CIRC)
+		{
+			/*
+			Arrangement:
+			   0
+			  1
+			 2
+			  3
+			   4
+			*/
+			
+			if (i==0 || i == 4){
+				xPos = (-180-70 - 40*cos(angle)); //litte adjustment, image looks too far
+			}
+			else{
+				xPos = (-180-65 - 40*cos(angle));
+			}
+			yPos = (169 + 40*sin(angle));
+			angle += M_PI/4;
+			
+			/*
+			if (i == 0){
+				xPos += 27+14;
+			}else if (i < 3){
+				xPos += -14;
+				yPos += 27;
+			} else if (i >= 3){
+				xPos += 14;
+				yPos += 27;
+			}
+			*/
+		}
+		else if(Settings.bannerFavIcon == BANNER_FAVICON_SIN)
+		{
+			/*
+			Arrangement:
+			0 2 4
+			 1 3
+			*/
+			
+			xPos += 27;
+			xPos += -14;
+			if ((i&1)==0)
+			{
+				yPos += 27;
+			}
+			else
+			{
+				yPos -= 27;
+			}
+		}
+		else if(Settings.bannerFavIcon == BANNER_FAVICON_MULTI_LINE)
+		{
+			/*
+			Sequential arrangement, 3 on top, 2 at bottom:
+			1 2 3
+			 4 5
+			*/
+			
+			xPos += 27;
+			if (i==2){
+				xPos += -27-27-14;
+				yPos += 27;
+			}
+		
+		}
+		else if(Settings.bannerFavIcon == BANNER_FAVICON_SINGLE_LINEA)
+		{
+			/* Arrangement : inline above the settings */
+			xPos += 27;
+			yPos = 95;
+		}
+		else if(Settings.bannerFavIcon == BANNER_FAVICON_SINGLE_LINEB)
+		{
+			/* Arrangement : inline below the settings */
+			xPos += 27;
+			yPos = 210;
+		}
+		
+		FavoriteBtnImg[i] = new GuiImage;
+		FavoriteBtnImg[i]->SetWidescreen(Settings.widescreen);
+		FavoriteBtn[i] = new GuiButton(imgFavorite->GetWidth(), imgFavorite->GetHeight());
+		FavoriteBtn[i]->SetAlignment(ALIGN_CENTER, ALIGN_MIDDLE);
+		FavoriteBtn[i]->SetPosition(xPos, yPos);
+		FavoriteBtn[i]->SetImage(FavoriteBtnImg[i]);
+		FavoriteBtn[i]->SetSoundOver(btnSoundOver);
+		FavoriteBtn[i]->SetSoundClick(btnSoundClick2);
+		FavoriteBtn[i]->SetTrigger(trigA);
+		FavoriteBtn[i]->SetEffectGrow();
+	}
+
 	btnLeftImg = new GuiImage(imgLeft);
 	if (Settings.wsprompt) btnLeftImg->SetWidescreen(Settings.widescreen);
 	btnLeft = new GuiButton(btnLeftImg, btnLeftImg, ALIGN_LEFT, ALIGN_MIDDLE, 20, -50, trigA, btnSoundOver, btnSoundClick2, 1);
@@ -159,6 +261,9 @@ BannerWindow::BannerWindow(GameBrowseMenu *m, struct discHdr *header)
 	{
 		bannerFrame.SetButtonAText(tr("Settings"));
 		Append(settingsBtn);
+		if(Settings.bannerFavIcon != BANNER_FAVICON_OFF)
+			for(int i = 0; i < FAVORITE_STARS; ++i)
+				Append(FavoriteBtn[i]);
 	}
 	else
 	{
@@ -185,6 +290,8 @@ BannerWindow::~BannerWindow()
 	delete trigPlus;
 	delete trigMinus;
 
+	delete imgFavorite;
+	delete imgNotFavorite;
 	delete imgLeft;
 	delete imgRight;
 
@@ -199,6 +306,12 @@ BannerWindow::~BannerWindow()
 	delete btnLeft;
 	delete btnRight;
 
+	for(int i = 0; i < FAVORITE_STARS; ++i)
+	{
+		delete FavoriteBtnImg[i];
+		delete FavoriteBtn[i];
+	}
+
 	if(gameSound) gameSound->Stop();
 	delete gameSound;
 	bgMusic->SetVolume(Settings.volume);
@@ -276,6 +389,10 @@ void BannerWindow::ChangeGame(bool playsound)
 		}
 	}
 
+	int favoritevar = GameStatistics.GetFavoriteRank(header->id);
+	for(int i = 0; i < FAVORITE_STARS; ++i)
+		FavoriteBtnImg[i]->SetImage(favoritevar >= i+1 ? imgFavorite : imgNotFavorite);
+
 	//! Resume all threads
 	BannerAsync::ResumeThread();
 	ResumeGui();
@@ -422,6 +539,23 @@ int BannerWindow::MainLoop()
 		}
 	}
 
+	for(int i = 0; i < FAVORITE_STARS; ++i)
+	{
+		if(FavoriteBtn[i]->GetState() == STATE_CLICKED)
+		{
+			// This button can only be clicked when this is not a dvd header
+			struct discHdr * header = gameList[gameSelected];
+			int FavoriteRank = (i+1 == GameStatistics.GetFavoriteRank(header->id)) ? 0 : i+1; // Press the current rank to reset the rank
+
+			GameStatistics.SetFavoriteRank(header->id, FavoriteRank);
+			GameStatistics.Save();
+			for(int j = 0; j < FAVORITE_STARS; ++j)
+				FavoriteBtnImg[j]->SetImage(FavoriteRank >= j+1 ? imgFavorite : imgNotFavorite);
+
+			FavoriteBtn[i]->ResetState();
+		}
+	}
+
 	return returnVal;
 }
 
diff --git a/source/prompts/BannerWindow.hpp b/source/prompts/BannerWindow.hpp
index b0977024..d90275ee 100644
--- a/source/prompts/BannerWindow.hpp
+++ b/source/prompts/BannerWindow.hpp
@@ -79,11 +79,14 @@ class BannerWindow : public GuiWindow
 		GuiTrigger * trigPlus;
 		GuiTrigger * trigMinus;
 
+		GuiImageData * imgFavorite;
+		GuiImageData * imgNotFavorite;
 		GuiImageData * imgLeft;
 		GuiImageData * imgRight;
 
 		GuiImage * btnLeftImg;
 		GuiImage * btnRightImg;
+		GuiImage * FavoriteBtnImg[FAVORITE_STARS];
 
 		GuiText * playcntTxt;
 
@@ -92,6 +95,7 @@ class BannerWindow : public GuiWindow
 		GuiButton * settingsBtn;
 		GuiButton * btnLeft;
 		GuiButton * btnRight;
+		GuiButton * FavoriteBtn[FAVORITE_STARS];
 
 		GuiSound * gameSound;
 };
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index 45979631..13a61d76 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -59,7 +59,7 @@ void CSettings::SetDefault()
 	snprintf(covers2d_path, sizeof(covers2d_path), "%simages/2D/", ConfigPath);
 	snprintf(coversFull_path, sizeof(coversFull_path), "%simages/full/", ConfigPath);
 	snprintf(disc_path, sizeof(disc_path), "%simages/disc/", ConfigPath);
-	snprintf(titlestxt_path, sizeof(titlestxt_path), "%stitles/", ConfigPath);
+	snprintf(titlestxt_path, sizeof(titlestxt_path), "%s", ConfigPath);
 	snprintf(languagefiles_path, sizeof(languagefiles_path), "%slanguage/", ConfigPath);
 	snprintf(update_path, sizeof(update_path), "%s/apps/usbloader_gx/", BootDevice);
 	snprintf(BNRCachePath, sizeof(BNRCachePath), "%s/apps/usbloader_gx/cache_bnr/", BootDevice);
@@ -152,6 +152,7 @@ void CSettings::SetDefault()
 	WiirdDebugger = OFF;
 	WiirdDebuggerPause = OFF;
 	ShowPlayCount = ON;
+	bannerFavIcon = BANNER_FAVICON_SINGLE_LINEA;
 	RememberUnlock = ON;
 	LoaderMode = MODE_WIIGAMES | MODE_GCGAMES;
 	SearchMode = SEARCH_BEGINNING;
@@ -406,6 +407,7 @@ bool CSettings::Save()
 	fprintf(file, "WiirdDebugger = %d\n", WiirdDebugger);
 	fprintf(file, "WiirdDebuggerPause = %d\n", WiirdDebuggerPause);
 	fprintf(file, "ShowPlayCount = %d\n", ShowPlayCount);
+	fprintf(file, "bannerFavIcon = %d\n", bannerFavIcon);
 	fprintf(file, "LoaderMode = %d\n", LoaderMode);
 	fprintf(file, "SearchMode = %d\n", SearchMode);
 	fprintf(file, "GameAspectRatio = %d\n", GameAspectRatio);
@@ -651,6 +653,11 @@ bool CSettings::SetSetting(char *name, char *value)
 		ShowPlayCount = atoi(value);
 		return true;
 	}
+	else if (strcmp(name, "bannerFavIcon") == 0)
+	{
+		bannerFavIcon = atoi(value);
+		return true;
+	}
 	else if (strcmp(name, "ShowFreeSpace") == 0)
 	{
 		ShowFreeSpace = atoi(value);
diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h
index 3c4c842e..29a0a740 100644
--- a/source/settings/CSettings.h
+++ b/source/settings/CSettings.h
@@ -156,6 +156,7 @@ class CSettings
 		short WiirdDebugger;
 		short WiirdDebuggerPause;
 		short ShowPlayCount;
+		short bannerFavIcon;
 		short RememberUnlock;
 		short LoaderMode;
 		short SearchMode;
diff --git a/source/settings/SettingsEnums.h b/source/settings/SettingsEnums.h
index d9616c83..453d0688 100644
--- a/source/settings/SettingsEnums.h
+++ b/source/settings/SettingsEnums.h
@@ -211,6 +211,17 @@ enum
 	DISCARTS_MAX_CHOICE
 };
 
+enum
+{
+	BANNER_FAVICON_OFF,
+	BANNER_FAVICON_CIRC,
+	BANNER_FAVICON_SIN,
+	BANNER_FAVICON_MULTI_LINE,
+	BANNER_FAVICON_SINGLE_LINEA,
+	BANNER_FAVICON_SINGLE_LINEB,
+	BANNER_FAVICON_MAX_CHOICE
+};
+
 enum
 {
 	COVERSFULL_HQ,
diff --git a/source/settings/menus/GUISettingsMenu.cpp b/source/settings/menus/GUISettingsMenu.cpp
index d887ee24..07c4bd6f 100644
--- a/source/settings/menus/GUISettingsMenu.cpp
+++ b/source/settings/menus/GUISettingsMenu.cpp
@@ -108,6 +108,16 @@ static const char *ScreensaverText[SCREENSAVER_MAX] =
 	trNOOP( "1 hour" )
 };
 
+static const char * BannerFavIconText[BANNER_FAVICON_MAX_CHOICE] =
+{
+	trNOOP( "OFF" ),
+	trNOOP( "Round" ),
+	trNOOP( "/\\/\\" ),
+	trNOOP( "Two Lines" ),
+	trNOOP( "One Line A" ),
+	trNOOP( "One Line B" )
+};
+
 static const char * HomeMenuText[HOME_MENU_MAX_CHOICE] =
 {
 	trNOOP( "System Default" ),
@@ -136,6 +146,7 @@ GuiSettingsMenu::GuiSettingsMenu()
 	Options->SetName(Idx++, "%s", tr( "Screensaver" ));
 	Options->SetName(Idx++, "%s", tr( "Mark new games" ));
 	Options->SetName(Idx++, "%s", tr( "Show Play Count" ));
+	Options->SetName(Idx++, "%s", tr( "Show Favorite on banner" ));
 	Options->SetName(Idx++, "%s", tr( "Show Free Space" ));
 	Options->SetName(Idx++, "%s", tr( "HOME Menu" ));
 	Options->SetName(Idx++, "%s", tr( "Use System Font" ));
@@ -213,6 +224,9 @@ void GuiSettingsMenu::SetOptionValues()
 	//! Settings: Show Play Count
 	Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.ShowPlayCount] ));
 
+	//! Settings: Show Favorite on banner window
+	Options->SetValue(Idx++, "%s", tr( BannerFavIconText[Settings.bannerFavIcon] ));
+
 	//! Settings: Show Free Space
 	Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.ShowFreeSpace] ));
 
@@ -401,6 +415,12 @@ int GuiSettingsMenu::GetMenuInternal()
 		if (++Settings.ShowPlayCount >= MAX_ON_OFF) Settings.ShowPlayCount = 0;
 	}
 
+	//! Settings: Show favorite on banner window
+	else if (ret == ++Idx)
+	{
+		if (++Settings.bannerFavIcon >= BANNER_FAVICON_MAX_CHOICE) Settings.bannerFavIcon = 0;
+	}
+
 	//! Settings: Show Free Space
 	else if (ret == ++Idx)
 	{