--- a/skin.xeebo/720p/DialogVideoInfo.xml
+++ b/skin.xeebo/720p/DialogVideoInfo.xml
@@ -803,81 +803,25 @@
 								<orientation>horizontal</orientation>
 								<control type="image">
 									<description>Video rez Image</description>
-									<width>55</width>
-									<height>35</height>
+									<width>60</width>
+									<height>33</height>
 									<aspectratio>keep</aspectratio>
-									<texture>$INFO[ListItem.VideoResolution,flagging/video/,.png]</texture>
+									<texture>$INFO[ListItem.VideoResolution,flagging/videoresolution/,.png]</texture>
 									<colordiffuse>white</colordiffuse>
 									<visible>!IsEmpty(ListItem.VideoResolution)</visible>
 								</control>
 								<control type="image">
-									<description>Common Codec Image</description>
-									<width>80</width>
-									<height>35</height>
+									<description>Codec Image</description>
+									<width>90</width>
+									<height>33</height>
 									<aspectratio>keep</aspectratio>
-									<texture>$INFO[ListItem.VideoCodec,flagging/video/,.png]</texture>
+									<texture>$VAR[ListItemCodecImage]</texture>
 									<colordiffuse>white</colordiffuse>
-									<!-- Don't show if its one of the 500 divx codecs -->
-									<visible>![substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
-								</control>
-								<control type="image">
-									<description>Divx Codec Image</description>
-									<width>80</width>
-									<height>35</height>
-									<aspectratio>keep</aspectratio>
-									<texture>flagging/video/divx.png</texture>
-									<colordiffuse>white</colordiffuse>
-									<visible>[substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
-								</control>
-								<control type="image">
-									<description>Bluray Image</description>
-									<width>80</width>
-									<height>35</height>
-									<aspectratio>keep</aspectratio>
-									<texture>flagging/video/bluray.png</texture>
-									<colordiffuse>white</colordiffuse>
-									<visible>[substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]</visible>
-								</control>
-								<control type="image">
-									<description>HDDVD Image</description>
-									<width>80</width>
-									<height>35</height>
-									<aspectratio>keep</aspectratio>
-									<texture>flagging/video/hddvd.png</texture>
-									<colordiffuse>white</colordiffuse>
-									<visible>substring(ListItem.FilenameAndPath,hddvd)</visible>
-								</control>
-								<control type="image">
-									<description>DVD Image</description>
-									<width>80</width>
-									<height>35</height>
-									<aspectratio>keep</aspectratio>
-									<texture>flagging/video/dvd.png</texture>
-									<colordiffuse>white</colordiffuse>
-									<visible>[substring(ListItem.FilenameAndPath,dvd) + ![substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]]</visible>
-								</control>
-								<control type="image">
-									<description>TV Types Image</description>
-									<width>80</width>
-									<height>35</height>
-									<aspectratio>keep</aspectratio>
-									<texture>flagging/video/TV.png</texture>
-									<colordiffuse>white</colordiffuse>
-									<visible>[substring(ListItem.FilenameAndPath,pdtv) | substring(ListItem.FilenameAndPath,hdtv) | substring(ListItem.FilenameAndPath,dsr) | substring(ListItem.FilenameAndPath,web)]</visible>
-								</control>
-								<control type="image">
-									<description>VHS Image</description>
-									<width>80</width>
-									<height>35</height>
-									<aspectratio>keep</aspectratio>
-									<texture>flagging/video/vhs.png</texture>
-									<colordiffuse>white</colordiffuse>
-									<visible>substring(ListItem.FilenameAndPath,vhs)</visible>
 								</control>
 								<control type="image">
 									<description>Aspectratio Image</description>
-									<width>55</width>
-									<height>35</height>
+									<width>60</width>
+									<height>33</height>
 									<aspectratio>keep</aspectratio>
 									<texture>$INFO[ListItem.VideoAspect,flagging/aspectratio/,.png]</texture>
 									<colordiffuse>white</colordiffuse>
@@ -886,19 +830,28 @@
 								<control type="image">
 									<description>Audio Codec Image</description>
 									<width>80</width>
-									<height>35</height>
+									<height>33</height>
 									<aspectratio>keep</aspectratio>
-									<texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>
+									<texture>$INFO[ListItem.AudioCodec,flagging/audiocodec/,.png]</texture>
 									<colordiffuse>white</colordiffuse>
+									<visible>!IsEmpty(ListItem.AudioCodec)</visible>
 								</control>
 								<control type="image">
 									<description>Audio Channel Image</description>
-									<width>55</width>
-									<height>35</height>
+									<width>60</width>
+									<height>33</height>
 									<aspectratio>keep</aspectratio>
-									<texture>$INFO[ListItem.AudioChannels,flagging/audio/,.png]</texture>
+									<texture>$INFO[ListItem.AudioChannels,flagging/audiochannels/,.png]</texture>
 									<colordiffuse>white</colordiffuse>
 									<visible>!IsEmpty(ListItem.AudioChannels)</visible>
+								</control>
+								<control type="image">
+									<description>Source Image</description>
+									<width>90</width>
+									<height>33</height>
+									<aspectratio>keep</aspectratio>
+									<texture>$VAR[ListItemSourceImage]</texture>
+									<colordiffuse>white</colordiffuse>
 								</control>
 							</control>
 						</control>