diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml
index 83cf558..4831017 100644
--- a/1080i/DialogContextMenu.xml
+++ b/1080i/DialogContextMenu.xml
@@ -4,32 +4,13 @@
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
-		<control type="label">
-			<visible>integer.IsGreater(Container(996).NumItems,0)</visible>
-			<posx>552</posx>
-			<posy>5-row</posy>
-			<width>12-col</width>
-			<height>2-row</height>
-			<font>pageTitle</font>
-			<textcolor>textActive</textcolor>
-			<label>[COLOR highlight]$LOCALIZE[31179][/COLOR] $INFO[listitem.title]</label>
-		</control>
-		<control type="label">
-			<visible>!integer.IsGreater(Container(996).NumItems,0)</visible>
-			<posx>552</posx>
-			<posy>5-row</posy>
-			<width>12-col</width>
-			<height>2-row</height>
-			<font>pageTitle</font>
-			<textcolor>textActive</textcolor>
-			<label>[COLOR highlight]$LOCALIZE[31179][/COLOR] $INFO[container(996).content]</label>
-		</control>
 		<control type="grouplist" id="996">
-            <posx>col-7-begin</posx>
-            <posy>8-row</posy>
+            <posx>col-9-begin</posx>
+            <posy>6-row</posy>
+            <width>8-col</width>
             <itemgap>0</itemgap>
 			<onright>9004</onright>
-			<height>16-row</height>
+			<height>18-row</height>
         </control>
 		<control type="group">
 			<control type="grouplist" id="9004">
@@ -37,7 +18,7 @@
 				<posx>col-7-begin</posx>
 	            <posy>8-row</posy>
 	            <itemgap>0</itemgap>
-	            <width>12-col</width>
+	            <width>8-col</width>
 	            <height>16-row</height>
 	            <itemgap>0</itemgap>
 				<onleft>996</onleft>
@@ -49,9 +30,13 @@
 	        </control>
 	        <control type="button" id="1000">
 	            <description>Buttons</description>
-	            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <texturenofocus colordiffuse="d0000000" diffuse="masks/contextMenu.png">colors/black.png</texturenofocus>
+	            <texturefocus colordiffuse="highlight" diffuse="masks/contextMenu.png">colors/white.png</texturefocus>
 	            <focusedcolor>textActive</focusedcolor>
-	            <width>12-col</width>
+	            <width>8-col</width>
+                <align>left</align>
+                <textoffsetx>24</textoffsetx>
+                <font>buttonTitle</font>
 	        </control>
 		</control>
         <!--debugging-->
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index ac468f0..8bda2c9 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -110,7 +110,7 @@
                             <width>66</width>
                             <height>66</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture>colors/white.png</texture>
+                            <texture diffuse="masks/square.png">colors/white.png</texture>
                             <colordiffuse>highlight</colordiffuse>
                         </control>
                         <control type="label">
diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index fc4a3d8..cd2e99f 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -7,7 +7,7 @@
             <visible>System.HasAddon(script.globalsearch)</visible>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>137</label>
             <onclick>RunScript(script.globalsearch,movies=true&amp;tvshows=true&amp;episodes=true&amp;livetv=true&amp;actors=true&amp;directors=true)</onclick>
         </control>
@@ -16,7 +16,7 @@
             <description>PVR Channel Group</description>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>31222</label>
 			<onclick condition="window.isactive(tvchannels)">sendclick(tvchannels,28)</onclick>
 			<onclick condition="window.isactive(tvguide)">sendclick(tvguide,28)</onclick>
@@ -27,7 +27,7 @@
             <description>PVR Timers</description>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>31087</label>
             <onclick>ActivateWindow(TVTimerRules)</onclick>
         </control>
@@ -35,14 +35,14 @@
 			<visible>!System.HasAddon(plugin.video.plexkodiconnect)</visible>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>653</label>
             <onclick>UpdateLibrary(video)</onclick>
         </control>
         <control type="radiobutton" id="11">
             <description>Unlock Shares</description>
             <label>20336</label>
-            <width>12-col</width>
+            <width>8-col</width>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
             <texturenofocus></texturenofocus>
@@ -60,7 +60,7 @@
             <description>Playlist</description>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>31123</label>
             <onclick>activateWindow(musicplaylist)</onclick>
         </control>
@@ -69,14 +69,14 @@
             <visible>System.HasAddon(script.globalsearch)</visible>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>137</label>
             <onclick>RunScript(script.globalsearch,artists=true&amp;albums=true&amp;songs=true&amp;musicvideos=true)</onclick>
         </control>
         <control type="button" id="3">
             <visible>!String.IsEmpty(Container.SortMethod)</visible>
             <description>Sort by</description>
-            <width>12-col</width>
+            <width>8-col</width>
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
@@ -90,7 +90,7 @@
             <description>Sort direction</description>
             <label>31109</label>
             <altlabel>31110</altlabel>
-            <width>12-col</width>
+            <width>8-col</width>
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
@@ -104,7 +104,7 @@
             <description>PVR Channel Group</description>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>31222</label>
             <onclick>sendclick(radiochannels,28)</onclick>
         </control>
@@ -113,13 +113,13 @@
             <description>PVR Timers</description>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>31087</label>
             <onclick>ActivateWindow(RadioTimerRules)</onclick>
         </control>
         <control type="button" id="504">
 			<visible>!System.HasAddon(plugin.video.plexkodiconnect)</visible>
-            <width>12-col</width>
+            <width>8-col</width>
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <label>653</label>
@@ -128,7 +128,7 @@
         <control type="radiobutton" id="20">
             <!--<visible>musicPlaylist</visible>-->
             <description>Shuffle</description>
-            <width>12-col</width>
+            <width>8-col</width>
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <label>191</label>
@@ -142,7 +142,7 @@
         <control type="button" id="3">
             <visible>!String.IsEmpty(Container.SortMethod)</visible>
             <description>Sort by</description>
-            <width>12-col</width>
+            <width>8-col</width>
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <label>103</label>
@@ -153,7 +153,7 @@
             <description>Sort direction</description>
             <label>31109</label>
             <altlabel>31110</altlabel>
-            <width>12-col</width>
+            <width>8-col</width>
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
@@ -163,7 +163,7 @@
     <!--pictures submenu items-->
     <include name="addonsSideMenu">	
         <control type="radiobutton" id="7">
-            <width>12-col</width>
+            <width>8-col</width>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
             <textureradiofocus></textureradiofocus>
@@ -174,7 +174,7 @@
             <onclick>sendclick(addonbrowser,7)</onclick>
         </control>
         <control type="radiobutton" id="8">
-            <width>12-col</width>
+            <width>8-col</width>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
             <textureradiofocus></textureradiofocus>
@@ -187,7 +187,7 @@
         <control type="button" id="9">
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>24034</label>
             <onclick>sendclick(addonbrowser,9)</onclick>
         </control>
@@ -199,7 +199,7 @@
             <description>Sort by</description>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
+            <width>8-col</width>
             <label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
             <onclick>sendclick(games,3)</onclick>
         </control>
@@ -211,7 +211,7 @@
             <focusedcolor>textActive</focusedcolor>
             <label>31109</label>
             <altlabel>31110</altlabel>
-            <width>12-col</width>
+            <width>8-col</width>
             <onclick>sendclick(games,4)</onclick>
         </control>
 	</include>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index e7e58bf..971dcf7 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -43,11 +43,11 @@
                         </control>
                         <control type="image">
                             <posx>0</posx>
-                            <posy>3</posy>
-                            <width>66</width>
-                            <height>66</height>
+                            <posy>0</posy>
+                            <width>69</width>
+                            <height>69</height>
                             <aspectratio scalediffuse="false">stretch</aspectratio>
-                            <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            <texture fallback="colors/black.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
 							<colordiffuse>overlay</colordiffuse>
                         </control>
                         <control type="label">
@@ -62,7 +62,7 @@
                             <label>✓</label>
                         </control>
                         <control type="label">
-                            <posx>108</posx>
+                            <posx>96</posx>
                             <posy>0</posy>
                             <width>15-col</width>
                             <height>2-row</height>
@@ -90,7 +90,7 @@
                             <posx>1-col</posx>
                             <posy>0</posy>
                             <width>23-col</width>
-                            <height>2-row</height>
+                            <height>71</height>
                             <aspectratio>stretch</aspectratio>
     						<texture border="0">masks/tvChannel.png</texture>
     						<colordiffuse>highlight</colordiffuse>
@@ -99,14 +99,16 @@
                             <animation type="focus" loop="false" reversible="false">
                                 <effect type="fade" time="500"/>
                                 <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                                <effect type="fade" start="100" end="50" time="0"/>
                             </animation>
                             <control type="image">
                                 <posx>0</posx>
-                                <posy>3</posy>
-                                <width>66</width>
-                                <height>66</height>
+                                <posy>0</posy>
+                                <width>69</width>
+                                <height>69</height>
                                 <aspectratio scalediffuse="false">stretch</aspectratio>
-                                <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <texture fallback="colors/white.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <colordiffuse>highlight</colordiffuse>
                             </control>
                             <control type="label">
                                 <visible>!String.IsEmpty(ListItem.playcount) + !ListItem.IsResumable</visible>
@@ -121,7 +123,7 @@
                             </control>
                         </control>
                         <control type="label">
-                            <posx>108</posx>
+                            <posx>96</posx>
                             <posy>0</posy>
                             <width>15-col</width>
                             <height>2-row</height>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 7c72f2b..2ab9578 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -113,7 +113,7 @@
                         <width>1-col-textbox</width>
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture diffuse="masks/circle.png">colors/black.png</texture>
+                        <texture diffuse="masks/iconEndCapLeft.png">colors/black.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
@@ -189,7 +189,7 @@
                         <width>1-col-textbox</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture diffuse="masks/circle.png">colors/white.png</texture>
+                        <texture diffuse="masks/iconEndCapLeft.png">colors/white.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>highlight</colordiffuse>
                     </control>
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index 24c8f52..15b3545 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -26,15 +26,15 @@
 					</control>
 					<control type="image">
 						<posx>0</posx>
-						<posy>3</posy>
+						<posy>0</posy>
 						<width>69</width>
 						<height>69</height>
 						<aspectratio>stretch</aspectratio>
-						<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+						<texture fallback="colors/black.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
 						<colordiffuse>d0000000</colordiffuse>
 					</control>
 					<control type="label">
-						<posx>108</posx>
+						<posx>96</posx>
 						<posy>0</posy>
 						<width>276</width>
 						<height>2-row</height>
@@ -95,25 +95,27 @@
 						<posx>1-col</posx>
 						<posy>0</posy>
 						<width>23-col</width>
-						<height>2-row</height>
+						<height>71</height>
 						<aspectratio>stretch</aspectratio>
 						<texture border="0">masks/tvChannel.png</texture>
 						<colordiffuse>highlight</colordiffuse>
 					</control>
 					<control type="image">
 						<posx>0</posx>
-						<posy>3</posy>
-						<width>66</width>
-						<height>66</height>
-						<aspectratio>keep</aspectratio>
-						<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+						<posy>0</posy>
+						<width>69</width>
+						<height>69</height>
+						<aspectratio>stretch</aspectratio>
+						<texture fallback="colors/white.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
 						<animation type="focus" loop="false" reversible="false">
 							<effect type="fade" time="500"/>
 							<effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                            <effect type="fade" start="100" end="50" time="0"/>
 						</animation>
+                        <colordiffuse>highlight</colordiffuse>
 					</control>
 					<control type="label">
-						<posx>108</posx>
+						<posx>96</posx>
 						<posy>0</posy>
 						<width>276</width>
 						<height>2-row</height>
diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml
index d8e73ba..2cbb3fb 100644
--- a/1080i/View_MusicFiles.xml
+++ b/1080i/View_MusicFiles.xml
@@ -19,12 +19,12 @@
                 <itemlayout width="24-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>3</posy>
-                        <width>66</width>
-                        <height>66</height>
+                        <posy>0</posy>
+                        <width>69</width>
+                        <height>69</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
-						<colordiffuse>overlay</colordiffuse>
+                        <texture diffuse="masks/iconEndCapLeft.png" border="0">colors/black.png</texture>
+    					<colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
@@ -36,7 +36,7 @@
 						<colordiffuse>d0000000</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>108</posx>
+                        <posx>96</posx>
                         <posy>0</posy>
                         <width>23-col-gutter</width>
                         <height>2-row</height>
@@ -50,27 +50,29 @@
                 <focusedlayout width="24-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>3</posy>
-                        <width>66</width>
-                        <height>66</height>
+                        <posy>0</posy>
+                        <width>69</width>
+                        <height>69</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
+                        <texture diffuse="masks/iconEndCapLeft.png" border="0">colors/white.png</texture>
                         <animation type="focus" loop="false" reversible="false">
                             <effect type="fade" time="500"/>
                             <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                            <effect type="fade" start="100" end="50" time="0"/>
                         </animation>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
                         <width>23-col</width>
-                        <height>2-row</height>
+                        <height>71</height>
                         <aspectratio>stretch</aspectratio>
 						<texture border="0">masks/tvChannel.png</texture>
 						<colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>108</posx>
+                        <posx>96</posx>
                         <posy>0</posy>
                         <width>23-col-gutter</width>
                         <height>2-row</height>
diff --git a/1080i/View_MusicGenres.xml b/1080i/View_MusicGenres.xml
index 8e2b028..4ed71a9 100644
--- a/1080i/View_MusicGenres.xml
+++ b/1080i/View_MusicGenres.xml
@@ -13,7 +13,7 @@
             <ondown>55</ondown>
             <onup>55</onup>
             <pagecontrol>60</pagecontrol>
-            <itemlayout width="8-col" height="84">
+            <itemlayout width="8-col" height="96">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
@@ -35,7 +35,7 @@
                     <label>$INFO[ListItem.Label]</label>
                 </control>
             </itemlayout>
-            <focusedlayout width="8-col" height="84">
+            <focusedlayout width="8-col" height="96">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index 9683697..c2c596a 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -71,7 +71,7 @@
 					<width>1-col-textbox</width>
 					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture diffuse="masks/circle.png">colors/black.png</texture>
+					<texture diffuse="masks/iconEndCapLeft.png">colors/black.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>textboxInactive</colordiffuse>
 				</control>
@@ -86,9 +86,9 @@
 					<posx>0</posx>
 					<posy>0</posy>
 					<width>1-col-textbox</width>
-					<height>2-row</height>
+					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture diffuse="masks/circle.png">colors/white.png</texture>
+					<texture diffuse="masks/iconEndCapLeft.png">colors/white.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>highlight</colordiffuse>
 				</control>
@@ -132,7 +132,7 @@
 					<width>861</width>
 					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture diffuse="masks/songList1.png">colors/black.png</texture>
+					<texture>colors/black.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>textboxInactive</colordiffuse>
 				</control>
@@ -146,7 +146,7 @@
 					<width>861</width>
 					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture diffuse="masks/songList1.png">colors/white.png</texture>
+					<texture>colors/white.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>highlight</colordiffuse>
 				</control>
@@ -158,7 +158,7 @@
 					<posx>13-col</posx>
 					<posy>0</posy>
 					<width>141</width>
-					<height>71</height>
+					<height>69</height>
 					<aspectratio>stretch</aspectratio>
 					<texture diffuse="masks/songList2.png">colors/white.png</texture>
 					<bordersize>0</bordersize>
@@ -177,7 +177,7 @@
 				</control>
 				<control type="label">
 					<visible>ListItem.IsParentFolder</visible>
-					<posx>108</posx>
+					<posx>96</posx>
 					<posy>0</posy>
 					<width>11-col-gutter</width>
 					<height>2-row</height>
@@ -188,7 +188,7 @@
 					<label>..</label>
 				</control>
 				<control type="label">
-					<posx>108</posx>
+					<posx>96</posx>
 					<posy>0</posy>
 					<width>11-col-gutter</width>
 					<height>2-row</height>
@@ -219,9 +219,9 @@
 					<posx>0</posx>
 					<posy>0</posy>
 					<width>1-col-textbox</width>
-					<height>2-row</height>
+					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture diffuse="masks/circle.png">colors/white.png</texture>
+					<texture diffuse="masks/iconEndCapLeft.png">colors/white.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>highlight</colordiffuse>
 					<include>spinFocusIcon</include>
@@ -232,7 +232,7 @@
 					<posy>0</posy>
 					<width>1-col-gutter</width>
 					<height>1-col-gutter</height>
-					<texture diffuse="masks/circle.png">equaliser.gif</texture>
+					<texture diffuse="masks/iconEndCapLeft.png">equaliser.gif</texture>
 				</control>
 				<control type="label">
 					<visible>ListItem.IsPlaying + player.paused</visible>
@@ -269,7 +269,7 @@
 					<width>861</width>
 					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture diffuse="masks/songList1.png">colors/white.png</texture>
+					<texture>colors/white.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>highlight</colordiffuse>
 				</control>
@@ -280,7 +280,7 @@
 					<posx>13-col</posx>
 					<posy>0</posy>
 					<width>141</width>
-					<height>71</height>
+					<height>69</height>
 					<aspectratio>stretch</aspectratio>
 					<texture diffuse="masks/songList2.png">colors/white.png</texture>
 					<bordersize>0</bordersize>
@@ -288,7 +288,7 @@
 				</control>
 				<control type="label">
 					<visible>ListItem.IsParentFolder</visible>
-					<posx>108</posx>
+					<posx>96</posx>
 					<posy>0</posy>
 					<width>11-col-gutter</width>
 					<height>2-row</height>
@@ -299,7 +299,7 @@
 					<label>..</label>
 				</control>
 				<control type="label">
-					<posx>108</posx>
+					<posx>96</posx>
 					<posy>0</posy>
 					<width>11-col-gutter</width>
 					<height>2-row</height>
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index cc9d7b7..7140079 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -26,11 +26,11 @@
             <itemlayout width="24-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
-                    <posy>3</posy>
-                    <width>66</width>
-                    <height>66</height>
+                    <posy>0</posy>
+                    <width>69</width>
+                    <height>69</height>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                    <texture fallback="colors/black.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
 					<colordiffuse>overlay</colordiffuse>
                 </control>
                 <control type="image">
@@ -43,7 +43,7 @@
                     <colordiffuse>d0000000</colordiffuse>
                 </control>
                 <control type="label">
-                    <posx>108</posx>
+                    <posx>96</posx>
                     <posy>0</posy>
                     <width>22-col-gutter</width>
                     <height>2-row</height>
@@ -70,27 +70,29 @@
             <focusedlayout width="24-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
-                    <posy>3</posy>
-                    <width>66</width>
-                    <height>66</height>
+                    <posy>0</posy>
+                    <width>69</width>
+                    <height>69</height>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                    <texture fallback="colors/white.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
                     <animation type="focus" loop="false" reversible="false">
                         <effect type="fade" time="500"/>
                         <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                        <effect type="fade" start="100" end="50" time="0"/>
                     </animation>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>1-col</posx>
                     <posy>0</posy>
                     <width>23-col</width>
-                    <height>2-row</height>
+                    <height>69</height>
                     <aspectratio>stretch</aspectratio>
 					<texture border="0">masks/tvChannel.png</texture>
 					<colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="label">
-                    <posx>108</posx>
+                    <posx>96</posx>
                     <posy>0</posy>
                     <width>22-col-gutter</width>
                     <height>2-row</height>
diff --git a/media/masks/contextMenu.png b/media/masks/contextMenu.png
new file mode 100644
index 0000000..f0d8ec2
Binary files /dev/null and b/media/masks/contextMenu.png differ
diff --git a/media/masks/episodeMenu.png b/media/masks/episodeMenu.png
index 5af90ed..fe3fdc8 100644
Binary files a/media/masks/episodeMenu.png and b/media/masks/episodeMenu.png differ
diff --git a/media/masks/genre.png b/media/masks/genre.png
index d964afe..fec4351 100644
Binary files a/media/masks/genre.png and b/media/masks/genre.png differ
diff --git a/media/masks/iconEndCapLeft.png b/media/masks/iconEndCapLeft.png
new file mode 100644
index 0000000..9aec293
Binary files /dev/null and b/media/masks/iconEndCapLeft.png differ
diff --git a/media/masks/songList2.png b/media/masks/songList2.png
index 20132e7..66925eb 100644
Binary files a/media/masks/songList2.png and b/media/masks/songList2.png differ
diff --git a/media/masks/tvChannel.png b/media/masks/tvChannel.png
index 662d74b..91d813a 100644
Binary files a/media/masks/tvChannel.png and b/media/masks/tvChannel.png differ