diff --git a/1080i/Custom_1134_PVRNextUp.xml b/1080i/Custom_1134_PVRNextUp.xml
new file mode 100644
index 000000000..80fd7e7d8
--- /dev/null
+++ b/1080i/Custom_1134_PVRNextUp.xml
@@ -0,0 +1,63 @@
+<window type="dialog" id="1134">
+	<onload>RunScript(script.module.pvr.artwork,get_artwork,prefix=PVR.Nextup&amp;title=$INFO[VideoPlayer.NextTitle]&amp;genre=$INFO[VideoPlayer.NextGenre]&amp;channel=$INFO[VideoPlayer.ChannelName])</onload>
+	<onunload>RunScript(script.module.pvr.artwork,clear_artwork,prefix=PVR.Nextup)</onunload>
+	<visible>Window.IsActive(fullscreenvideo) + VideoPlayer.Content(livetv) + !Skin.HasSetting(disable_PVRNextUp)</visible>
+	<visible>!Window.IsVisible(VideoOSD.xml) + !Window.IsVisible(DialogPVRChannelsOSD.xml) + !Window.IsVisible(DialogPVRChannelGuide.xml) + !Window.IsVisible(DialogFullScreenInfo.xml) + !Window.IsVisible(Custom_1135_PVROverlay.xml)</visible>
+    <defaultcontrol always="true">3012</defaultcontrol>
+    <zorder>10</zorder>
+    <controls>
+        <control type="label" id="3000">
+            <visible>false</visible>
+        </control>
+        <control type="label" id="3002">
+            <visible>false</visible>
+        </control>
+        <control type="group">
+            <visible>!Window.IsVisible(videoosd) + Window.IsVisible(fullscreenvideo) + [Integer.IsEqual(PVR.EpgEventRemainingTime(hh),0) + Integer.IsEqual(PVR.EpgEventRemainingTime(mm),0) +  Integer.IsLess(PVR.EpgEventRemainingTime(ss),36) + Integer.IsGreater(PVR.EpgEventRemainingTime(ss),4)]</visible>
+            <include>Animation.FadeIn.Slide</include>
+            <include>Animation.FadeOut</include>
+            <right>64</right>
+            <bottom>64</bottom>
+            <width>480</width>
+            <height>270</height>
+            <control type="label" description="text">
+                <top>-64</top>
+                <left>0</left>
+                <right>20</right>
+                <height>64</height>
+                <aligny>center</aligny>
+                <font>Small</font>
+                <label>$ADDON[service.upnext 30008]... </label>
+                <textcolor>ffededed</textcolor>
+                <shadowcolor>bf000000</shadowcolor>
+            </control>
+            <control type="image" description="fanart">
+                <width>100%</width>
+                <height>100%</height>
+                <fadetime>350</fadetime>
+                <aspectratio scalediffuse="false">scale</aspectratio>
+                <texture diffuse="diffuse/widgetfanart_new.png">$VAR[PVRUpNextImage]</texture>
+            </control>
+            <control type="image" description="blackline">
+                <width>100%</width>
+                <height>64</height>
+                <bottom>0</bottom>
+                <texture colordiffuse="df000000" border="4">diffuse/blackline_nextup.png</texture>
+            </control>
+            <control type="label" description="text">
+                <left>20</left>
+                <right>120</right>
+                <height>64</height>
+                <bottom>2</bottom>
+                <aligny>center</aligny>
+                <font>Small</font>
+                <label>$INFO[VideoPlayer.NextTitle]</label>
+                <textcolor>PanelWhite100</textcolor>
+            </control>
+            <control type="image">
+                <texture colordiffuse="Box2" background="true" border="4">common/box21.png</texture>
+                <visible>!Skin.HasSetting(thumbnails.white)</visible>
+            </control>
+        </control>
+    </controls>
+</window>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index dd915feb5..338ecac97 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -535,8 +535,23 @@
         <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.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="Window.IsVisible(home) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.thumb)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.thumb)]</value>
         <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30111).ListItem.EpgEventIcon)">$INFO[Container(30111).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30121).ListItem.EpgEventIcon)">$INFO[Container(30121).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30131).ListItem.EpgEventIcon)">$INFO[Container(30131).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30141).ListItem.EpgEventIcon)">$INFO[Container(30141).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30151).ListItem.EpgEventIcon)">$INFO[Container(30151).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30161).ListItem.EpgEventIcon)">$INFO[Container(30161).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30171).ListItem.EpgEventIcon)">$INFO[Container(30171).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30181).ListItem.EpgEventIcon)">$INFO[Container(30181).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(30191).ListItem.EpgEventIcon)">$INFO[Container(30191).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(301101).ListItem.EpgEventIcon)">$INFO[Container(301101).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(301111).ListItem.EpgEventIcon)">$INFO[Container(301111).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(301121).ListItem.EpgEventIcon)">$INFO[Container(301121).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(301131).ListItem.EpgEventIcon)">$INFO[Container(301131).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(301141).ListItem.EpgEventIcon)">$INFO[Container(301141).ListItem.EpgEventIcon]</value>
+        <value condition="Window.IsVisible(home) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + !String.IsEmpty(Container(301151).ListItem.EpgEventIcon)">$INFO[Container(301151).ListItem.EpgEventIcon]</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>
diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index 4e0c6b31e..5ad1adf7f 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -332,15 +332,20 @@
 
     <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(PVR.Artwork.thumb)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.thumb)]</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="PVRUpNextImage">
+        <value condition="!String.IsEmpty(Window(10000).Property(PVR.Nextup.fanart))">$INFO[Window(10000).Property(PVR.Nextup.fanart)]</value>
+	<value condition="!String.IsEmpty(Player.Art(thumb))">$INFO[Player.Art(thumb)]</value>
+    </variable>
+
     <variable name="ChannelListEPGIconVar">
         <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(PVR.Artwork.thumb)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.thumb)]</value>
         <value condition="!String.IsEmpty(ListItem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
         <value>$INFO[ListItem.Icon]</value>
     </variable>
@@ -471,4 +476,4 @@
         <value condition="!String.IsEmpty(Window(home).Property(SkinHelperPING))">dialog/on.png</value>
         <value>dialog/off.png</value>
     </variable>
-</includes>
\ No newline at end of file
+</includes>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 8d8064224..d8228c5fb 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -3051,6 +3051,15 @@
                             <selected>Skin.HasSetting(addon.upnext.use.thumbnail)</selected>
                             <onclick>Skin.ToggleSetting(addon.upnext.use.thumbnail)</onclick>
                         </control>
+                        <control type="radiobutton" id="12303">
+                            <width>1360</width>
+                            <visible>ControlGroup(9100).HasFocus(9107)</visible>
+                            <include>DefSettingsButtonGradientSkinSettings</include>
+                            <label>31534</label>
+                            <selected>Skin.HasSetting(disable_PVRNextUp)</selected>
+                            <onclick>Skin.ToggleSetting(disable_PVRNextUp)</onclick>
+                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
+                        </control>
                         <control type="grouplist" id="12023">
                             <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 e2773b336..4ce189a03 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -2575,4 +2575,8 @@ msgstr ""
 
 msgctxt "#31701"
 msgid "Color palette"
-msgstr ""
\ No newline at end of file
+msgstr ""
+
+msgctxt "#31534"
+msgid "Disable Up Next for PVR"
+msgstr ""