diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index a1f9aa703..e7c316b98 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -510,6 +510,7 @@
         <value condition="!Skin.HasSetting(home.dontshowfanart) + [[Skin.HasSetting(home.vertical) + Skin.HasSetting(home.vertical.widgets)] | [!Skin.HasSetting(home.vertical) + !Skin.HasSetting(home.classicwidgets) + Skin.HasSetting(home.vertical.widgets)]] + Window.IsVisible(home) + String.IsEmpty(Container(301).ListItem.Property(Background)) + String.IsEmpty(Container(301).ListItem.Property(backgroundPlaylist)) + !String.IsEmpty(Container(301152).ListItem.Art(fanart)) + Integer.IsEqual(Container(301151).NumItems,0) + Control.IsVisible(301152) + !Control.HasFocus(301152) + String.IsEmpty(Container(300).ListItem.Property(background)) + [Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011)]">$INFO[Container(301152).ListItem.Art(fanart)]</value>
 
         <!-- Fallback, Other -->
+        <value condition="Window.IsVisible(home) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + String.IsEmpty(ListItem.Property(fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
         <value condition="Window.IsVisible(home) + String.IsEqual(Container(300).ListItem.Property(background),playlistBackground)">$INFO[Container(9988).ListItem.Art(fanart)]</value>
         <value condition="Window.IsVisible(home) + !String.IsEmpty(Container(300).ListItem.Property(Background)) + [String.IsEmpty(Skin.String(fanart.fallback)) | Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011)]">$INFO[Container(300).ListItem.Property(Background)]</value>
         <value condition="Window.IsVisible(home) + !String.IsEmpty(Skin.String(home.slideshowpath)) + [[String.IsEqual(Container(300).ListItem.Property(widget),weatherdaily) | String.IsEqual(Container(300).ListItem.Property(widget),weatherhourly)] | String.IsEmpty(Container(300).ListItem.Property(widget)) | Container(301).IsUpdating |  Skin.HasSetting(home.dontshowfanart)]">$INFO[Skin.String(home.slideshowpath)]</value>
@@ -519,6 +520,8 @@
         <value condition="Window.IsVisible(home) + !Container(301).IsUpdating + !String.IsEmpty(Container(301).ListItem.Property(Background))">$INFO[Container(301).ListItem.Property(Background)]</value>
         <value condition="Window.IsVisible(home) + !Container(301).IsUpdating + Skin.HasSetting(homemenu.netflix)">common/null.png</value>
         <value condition="Window.IsVisible(home) + !Container(301).IsUpdating">pvr/background.jpg</value>
+        <value condition="Window.IsVisible(tvchannels) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) +  Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.Fanart)]</value>
+        <value condition="Window.IsVisible(tvguide) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) +  Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.Fanart)]</value>
         <value condition="!String.IsEmpty(Window(Home).Property(SkinHelper.ExtraFanArtPath)) + Skin.HasSetting(SkinHelper.EnableExtraFanart) + System.AddonIsEnabled(script.skin.helper.service) + Window.IsVisible(MyVideoNav.xml)">$INFO[Window(Home).Property(SkinHelper.ExtraFanArtPath)]</value>
         <value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>
         <value condition="!String.IsEmpty(Container(9500).ListItem.Art(fanart))">$INFO[Container(9500).ListItem.Art(fanart)]</value>
diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index d4169056b..c9daa7da0 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -323,13 +323,17 @@
     </variable>
 
     <variable name="PVRThumb">
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
         <value condition="!String.IsEmpty(Window(Home).Property(SkinHelper.ListItem.Art.Fanart))">$INFO[Window(Home).Property(SkinHelper.ListItem.Art.Fanart)]</value>
         <value condition="Window.IsVisible(MyPVRRecordings.xml)">$INFO[ListItem.Icon]</value>
         <value condition="Window.IsVisible(DialogPVRInfo.xml)">$INFO[ListItem.Icon]</value>
     </variable>
 
     <variable name="ChannelListEPGIconVar">
-        <value condition="!String.IsEmpty(Listitem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
+        <value condition="!String.IsEmpty(ListItem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
         <value>$INFO[ListItem.Icon]</value>
     </variable>
 
diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
index 5459667a9..1b42a0338 100644
--- a/1080i/Includes_OSD.xml
+++ b/1080i/Includes_OSD.xml
@@ -2833,7 +2833,7 @@
                         <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
                     </control>
                     <control type="image">
-                        <visible>!VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(tvshow.poster)) | !String.IsEmpty(Player.Art(poster))]</visible>
+                        <visible>[!VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(tvshow.poster)) | !String.IsEmpty(Player.Art(poster))]] | [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
                         <left>-51</left>
                         <top>-241</top>
                         <width>272</width>
@@ -2857,6 +2857,15 @@
                         <texture colordiffuse="Box2" border="4" background="true">common/box21.png</texture>
                         <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + !Skin.HasSetting(osd.disable.icon.background.pvr)</visible>
                     </control>
+                    <control type="image">
+                        <left>-50</left>
+                        <top>-240</top>
+                        <width>270</width>
+                        <height>390</height>
+                        <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
+                        <texture>$INFO[Window(Home).Property(PVR.Artwork.poster)]</texture>
+                        <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)</visible>
+                    </control>
                     <control type="image">
                         <width>230</width>
                         <height>230</height>
@@ -2864,7 +2873,7 @@
                         <left>20</left>
                         <aspectratio>keep</aspectratio>
                         <texture>$INFO[Player.Art(thumb)]</texture>
-                        <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb))</visible>
+                        <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + [[String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)] | !Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
                     </control>
                 </control>
             </control>
diff --git a/1080i/Includes_PVR.xml b/1080i/Includes_PVR.xml
index d88887fa3..5808ce47b 100644
--- a/1080i/Includes_PVR.xml
+++ b/1080i/Includes_PVR.xml
@@ -178,17 +178,7 @@
                     <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
                 </control>
                 <control type="image">
-                    <left>10</left>
-                    <top>10</top>
-                    <right>10</right>
-                    <bottom>10</bottom>
-                    <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
-                    <texture diffuse="diffuse/pvrinfo.png" background="true">pvr/background.jpg</texture>
-                    <visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon) + String.IsEmpty(Listitem.Icon)</visible>
-                    <fadetime>PosterFanartFadetime</fadetime>
-                </control>
-                <control type="image">
-                    <visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon)</visible>
+                    <visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon) + [[String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)] | !Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
                     <left>70</left>
                     <top>30</top>
                     <right>70</right>
@@ -198,13 +188,13 @@
                     <fadetime>PosterFanartFadetime</fadetime>
                 </control>
                 <control type="image">
-                    <visible>!Player.HasVideo + !String.IsEmpty(Listitem.EpgEventIcon)</visible>
+                    <visible>!Player.HasVideo + [!String.IsEmpty(Listitem.EpgEventIcon) | !String.IsEmpty(ListItem.Icon) | [Skin.HasSetting(Skin_enablePvrArtwork) + [!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) | !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))]]]</visible>
                     <left>10</left>
                     <top>10</top>
                     <right>10</right>
                     <bottom>10</bottom>
                     <aspectratio align="center" aligny="center" scalediffuse="false">keep</aspectratio>
-                    <texture diffuse="diffuse/pvrinfo.png" background="true">$INFO[ListItem.EpgEventIcon]</texture>
+                    <texture diffuse="diffuse/pvrinfo.png" background="true">$VAR[ChannelListEPGIconVar]</texture>
                     <fadetime>PosterFanartFadetime</fadetime>
                 </control>
                 <control type="image">
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 5f1c97694..b8451747a 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -73,7 +73,8 @@
                         <width>240</width>
                         <bottom>0</bottom>
                         <aspectratio align="center" aligny="center">keep</aspectratio>
-                        <texture>$INFO[ListItem.Icon]</texture>
+                        <texture>$VAR[ChannelListEPGIconVar]</texture>
+                        <fadetime>PosterFanartFadetime</fadetime>
                     </control>
                 </control>
                 <control type="radiobutton" id="11441">
@@ -421,4 +422,4 @@
         </control>
         <include>PVRSideBlade</include>
     </controls>
-</window>
\ No newline at end of file
+</window>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index eb7021fc8..74f8bae92 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -2090,6 +2090,11 @@
                             <param name="visible" value="ControlGroup(9100).HasFocus(9113)"/>
                             <param name="addonname" value="script.module.animated_artwork"/>
                         </include>
+                        <include content="DefSkinAddons">
+                            <param name="id" value="11023"/>
+                            <param name="visible" value="ControlGroup(9100).HasFocus(9113)"/>
+                            <param name="addonname" value="script.module.pvr.artwork"/>
+                        </include>
                     </control>
 
                     <!-- Furniture -->
@@ -2467,6 +2472,15 @@
                             <selected>Skin.HasSetting(dontuselandscapemovies)</selected>
                             <onclick>Skin.ToggleSetting(dontuselandscapemovies)</onclick>
                         </control>
+                        <control type="radiobutton" id="11400">
+                            <width>1360</width>
+                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
+                            <include>DefSettingsButtonGradientSkinSettings</include>
+                            <label>$LOCALIZE[31675]</label>
+                            <selected>Skin.HasSetting(Skin_enablePvrArtwork)</selected>
+                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork)</onclick>
+                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
+                        </control>
 
                         <!-- Indicators -->
                         <control type="button" id="9590">
@@ -2982,7 +2996,6 @@
                             <onclick>Skin.ToggleSetting(lock.skinsettings)</onclick>
                             <enable>!Skin.HasSetting(disable.startup.window)</enable>
                         </control>
-                        
                         <control type="grouplist" id="12100">
                             <visible>ControlGroup(9100).HasFocus(9107)</visible>
                             <orientation>horizontal</orientation>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 5f6bb0fb9..6abde4909 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -2484,3 +2484,8 @@ msgstr ""
 msgctxt "#31674"
 msgid "Critics consensus"
 msgstr ""
+
+msgctxt "#31675"
+msgid "Use artwork module for PVR artwork"
+msgstr ""
+