diff --git a/default.py b/default.py
index 5c661387..8cfb9ae9 100644
--- a/default.py
+++ b/default.py
@@ -99,6 +99,11 @@ class Main():
             entrypoint.getVideoFiles(plexid, plexpath)
             return
 
+        if mode == 'fanart':
+            log.info('User requested fanarttv refresh')
+            utils.window('plex_runLibScan', value='fanart')
+            return
+
         # Called by e.g. 3rd party plugin video extras
         if ("/Extras" in sys.argv[0] or "/VideoFiles" in sys.argv[0] or
                 "/Extras" in sys.argv[2]):
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 5850605a..db6fb9dc 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -446,6 +446,10 @@
     <string id="39219">Abort (Yes) or save address anyway (No)?</string>
     <string id="39220">connected</string>
     <string id="39221">plex.tv toggle successful</string>
+    <string id="39222">Look for missing fanart on FanartTV</string>
+    <string id="39223">Only look for missing fanart or refresh all fanart? The scan will take quite a while and happen in the background.</string>
+    <string id="39224">Refresh all</string>
+    <string id="39225">Missing only</string>    
 
 
     <!-- Plex Artwork.py -->
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index d35b2963..16176b81 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -384,6 +384,11 @@
     <string id="39219">Abbrechen (Ja) oder PMS Adresse trotzdem speichern (Nein)?</string>
     <string id="39220">verbunden</string>
     <string id="39221">plex.tv wechsel OK</string>
+    <string id="39222">Nach zusätzlicher Fanart auf FanartTV suchen</string>
+    <string id="39223">Nur nach fehlender Fanart suchen oder alle Fanart neu herunterladen? Die Suche wird lange dauern und komplett im Hintergrund stattfinden!</string>
+    <string id="39224">Alle</string>
+    <string id="39225">Fehlend</string>    
+
 
     <!-- Plex Artwork.py -->
     <string id="39250">Alle Plex Bilder in Kodi zwischenzuspeichern kann sehr lange dauern. Möchten Sie wirklich fortfahren?</string>
diff --git a/resources/lib/entrypoint.py b/resources/lib/entrypoint.py
index e1397ce7..d2a5ebd7 100644
--- a/resources/lib/entrypoint.py
+++ b/resources/lib/entrypoint.py
@@ -275,7 +275,8 @@ def doMainListing():
     # addDirectoryItem("Add user to session", "plugin://plugin.video.plexkodiconnect/?mode=adduser")
     addDirectoryItem(lang(39203), "plugin://plugin.video.plexkodiconnect/?mode=refreshplaylist")
     addDirectoryItem(lang(39204), "plugin://plugin.video.plexkodiconnect/?mode=manualsync")
-
+    if settings('FanartTV') == 'true':
+        addDirectoryItem(lang(39222), "plugin://plugin.video.plexkodiconnect/?mode=fanart")
     xbmcplugin.endOfDirectory(int(sys.argv[1]))
 
 
diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py
index 4b7c937e..0bc25f31 100644
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@@ -1788,6 +1788,15 @@ class LibrarySync(Thread):
                                           forced=True,
                                           icon="error")
                     window('plex_dbScan', clear=True)
+                elif window('plex_runLibScan') == 'fanart':
+                    window('plex_runLibScan', clear=True)
+                    # Only look for missing fanart (No)
+                    # or refresh all fanart (Yes)
+                    self.fanartSync(refresh=self.dialog.yesno(
+                        heading=addonName,
+                        line1=lang(39223),
+                        nolabel=lang(39224),
+                        yeslabel=lang(39225)))
                 else:
                     now = getUnixTimestamp()
                     if (now - lastSync > fullSyncInterval and