diff --git a/Dockerfile b/Dockerfile
index 67fd615f77..ac9f42dc44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -196,7 +196,7 @@ RUN mkdir /var/www/cms/openooh \
     && curl -o /var/www/cms/openooh/specification.json https://raw.githubusercontent.com/openooh/venue-taxonomy/main/specification.json
 
 # Help Links
-RUN curl -o help_links.yaml https://raw.githubusercontent.com/xibosignage/xibo-manual/develop/help_links.yaml || true
+RUN curl -o help-links.yaml https://raw.githubusercontent.com/xibosignage/xibo-manual/develop/help-links.yaml || true
 
 # Git commit fallback
 RUN echo $GIT_COMMIT > /var/www/cms/commit.sha
diff --git a/lib/Controller/Connector.php b/lib/Controller/Connector.php
index 19713a3486..5bd752eb17 100644
--- a/lib/Controller/Connector.php
+++ b/lib/Controller/Connector.php
@@ -73,11 +73,13 @@ public function grid(Request $request, Response $response)
             // Instantiate and decorate the entity
             try {
                 $connector->decorate($this->connectorFactory->create($connector));
-            } catch (NotFoundException $ignored) {
+            } catch (NotFoundException) {
                 $this->getLog()->info('Connector installed which is not found in this CMS. ' . $connector->className);
+                $connector->setUnmatchedProperty('isHidden', 1);
             } catch (\Exception $e) {
                 $this->getLog()->error('Incorrectly configured connector '
                     . $connector->className . '. e=' . $e->getMessage());
+                $connector->setUnmatchedProperty('isHidden', 1);
             }
         }
 
diff --git a/lib/Controller/PlaylistDashboard.php b/lib/Controller/PlaylistDashboard.php
index 45627d99db..edbcd2531c 100644
--- a/lib/Controller/PlaylistDashboard.php
+++ b/lib/Controller/PlaylistDashboard.php
@@ -201,6 +201,7 @@ public function show(Request $request, Response $response, $id)
                 $module = $this->moduleFactory->getByType($widget->type);
                 $widget->setUnmatchedProperty('name', $widget->getOptionValue('name', $module->name));
                 $widget->setUnmatchedProperty('regionSpecific', $module->regionSpecific);
+                $widget->setUnmatchedProperty('moduleIcon', $module->icon);
 
                 // Check my permissions
                 if ($module->regionSpecific == 0) {
diff --git a/lib/Controller/Region.php b/lib/Controller/Region.php
index 6836e00926..99e9211611 100644
--- a/lib/Controller/Region.php
+++ b/lib/Controller/Region.php
@@ -240,7 +240,7 @@ public function add(Request $request, Response $response, $id)
         $region = $this->regionFactory->create(
             $sanitizedParams->getString('type', ['default' => 'frame']),
             $this->getUser()->userId,
-            $layout->layout . '-' . (count($layout->regions) + 1),
+            '',
             $sanitizedParams->getInt('width', ['default' => 250]),
             $sanitizedParams->getInt('height', ['default' => 250]),
             $sanitizedParams->getInt('top', ['default' => 50]),
diff --git a/lib/Entity/Module.php b/lib/Entity/Module.php
index 895ff3fa68..28dc823965 100644
--- a/lib/Entity/Module.php
+++ b/lib/Entity/Module.php
@@ -68,6 +68,12 @@ class Module implements \JsonSerializable
      */
     public $description;
 
+    /**
+     * @SWG\Property(description="An icon to use in the toolbar")
+     * @var string
+     */
+    public $icon;
+
     /**
      * @SWG\Property(description="The type code for this module")
      * @var string
diff --git a/lib/Entity/ModuleTemplate.php b/lib/Entity/ModuleTemplate.php
index e410c7ce82..9af2a56510 100644
--- a/lib/Entity/ModuleTemplate.php
+++ b/lib/Entity/ModuleTemplate.php
@@ -51,6 +51,12 @@ class ModuleTemplate implements \JsonSerializable
     /** @var string The title */
     public $title;
 
+    /**
+     * Icon
+     * @var string
+     */
+    public $icon;
+
     /**
      * Thumbnail
      * this is the location to a module template's thumbnail, which should be added to the installation
diff --git a/lib/Factory/ModuleFactory.php b/lib/Factory/ModuleFactory.php
index 829915e23f..89ebdf3de4 100644
--- a/lib/Factory/ModuleFactory.php
+++ b/lib/Factory/ModuleFactory.php
@@ -646,6 +646,7 @@ private function createFromXml(string $file, array $modulesWithSettings): Module
         $module->name = __($this->getFirstValueOrDefaultFromXmlNode($xml, 'name'));
         $module->author = $this->getFirstValueOrDefaultFromXmlNode($xml, 'author');
         $module->description = __($this->getFirstValueOrDefaultFromXmlNode($xml, 'description'));
+        $module->icon = $this->getFirstValueOrDefaultFromXmlNode($xml, 'icon');
         $module->class = $this->getFirstValueOrDefaultFromXmlNode($xml, 'class');
         $module->type = $this->getFirstValueOrDefaultFromXmlNode($xml, 'type');
         $module->thumbnail = $this->getFirstValueOrDefaultFromXmlNode($xml, 'thumbnail');
diff --git a/lib/Factory/ModuleTemplateFactory.php b/lib/Factory/ModuleTemplateFactory.php
index 05945afafd..e7baf0b8e6 100644
--- a/lib/Factory/ModuleTemplateFactory.php
+++ b/lib/Factory/ModuleTemplateFactory.php
@@ -226,6 +226,7 @@ private function createFromXml(\DOMElement $xml): ModuleTemplate
         $template->dataType = $this->getFirstValueOrDefaultFromXmlNode($xml, 'dataType');
         $template->title = __($this->getFirstValueOrDefaultFromXmlNode($xml, 'title'));
         $template->thumbnail = $this->getFirstValueOrDefaultFromXmlNode($xml, 'thumbnail');
+        $template->icon = $this->getFirstValueOrDefaultFromXmlNode($xml, 'icon');
         $template->isVisible = $this->getFirstValueOrDefaultFromXmlNode($xml, 'isVisible') !== 'false';
         $template->startWidth = intval($this->getFirstValueOrDefaultFromXmlNode($xml, 'startWidth'));
         $template->startHeight = intval($this->getFirstValueOrDefaultFromXmlNode($xml, 'startHeight'));
diff --git a/lib/Service/HelpService.php b/lib/Service/HelpService.php
index 20a7734377..e4bdc5a1bb 100644
--- a/lib/Service/HelpService.php
+++ b/lib/Service/HelpService.php
@@ -65,7 +65,6 @@ private function loadLinks(): void
             if (file_exists(PROJECT_ROOT . '/custom/help-links.yaml')) {
                 $links = (array)Yaml::parseFile(PROJECT_ROOT . '/custom/help-links.yaml');
             } else if (file_exists(PROJECT_ROOT . '/help-links.yaml')) {
-                // TODO: pull these in from the manual on build.
                 $links = (array)Yaml::parseFile(PROJECT_ROOT . '/help-links.yaml');
             } else {
                 $this->links = [];
@@ -76,11 +75,16 @@ private function loadLinks(): void
         }
 
         // Parse links.
+        $this->links = [];
+
         foreach ($links as $pageName => $page) {
+            // New page
+            $this->links[$pageName] = [];
+
             foreach ($page as $link) {
                 $helpLink = new HelpLink($link);
                 if (!Str::startsWith($helpLink->url, ['http://', 'https://'])) {
-                    $helpLink->url = $this->helpBase .= $helpLink->url;
+                    $helpLink->url = $this->helpBase . $helpLink->url;
                 }
                 if (!empty($helpLink->summary)) {
                     $helpLink->summary = \Parsedown::instance()->line($helpLink->summary);
diff --git a/lib/Widget/Render/WidgetHtmlRenderer.php b/lib/Widget/Render/WidgetHtmlRenderer.php
index 8794007298..161173ae7b 100644
--- a/lib/Widget/Render/WidgetHtmlRenderer.php
+++ b/lib/Widget/Render/WidgetHtmlRenderer.php
@@ -160,7 +160,8 @@ public function preview(
         // Render an icon.
         return $this->twig->fetch('module-icon-preview.twig', [
             'moduleName' => $module->name,
-            'moduleType' => $module->type
+            'moduleType' => $module->type,
+            'moduleIcon' => $module->icon,
         ]);
     }
 
diff --git a/lib/XTR/WidgetSyncTask.php b/lib/XTR/WidgetSyncTask.php
index bdea7221f4..fe0796aef0 100644
--- a/lib/XTR/WidgetSyncTask.php
+++ b/lib/XTR/WidgetSyncTask.php
@@ -71,6 +71,7 @@ public function run()
         // Track the total time we've spent caching
         $timeCaching = 0.0;
         $countWidgets = 0;
+        $cutOff = Carbon::now()->subHours(2);
 
         // Update for widgets which are active on displays, or for displays which have been active recently.
         $sql = '
@@ -84,7 +85,7 @@ public function run()
         ';
 
         $smt = $this->store->getConnection()->prepare($sql);
-        $smt->execute(['lastAccessed' => Carbon::now()->subHours(2)]);
+        $smt->execute(['lastAccessed' => $cutOff->unix()]);
 
         $row = true;
         while ($row) {
@@ -166,7 +167,7 @@ public function run()
         }
 
         // Remove display_media records which have not been touched for a defined period of time.
-        $this->removeOldDisplayLinks();
+        $this->removeOldDisplayLinks($cutOff);
 
         $this->log->info('Total time spent caching is ' . $timeCaching . ', synced ' . $countWidgets . ' widgets');
 
@@ -337,15 +338,27 @@ private function linkDisplays(array $displays, array $mediaIds): void
     }
 
     /**
-     * Remove any display/media links which are older than $days days
-     * @param int $days
+     * Remove any display/media links which have expired.
+     * @param Carbon $cutOff
      * @return void
      */
-    private function removeOldDisplayLinks(int $days = 5): void
+    private function removeOldDisplayLinks(Carbon $cutOff): void
     {
-        $sql = 'DELETE FROM `display_media` WHERE `modifiedAt` < :modifiedAt';
+        $sql = '
+            DELETE 
+                FROM `display_media`
+             WHERE `modifiedAt` < :modifiedAt
+                AND `display_media`.`displayId` IN (
+                    SELECT `displayId` 
+                      FROM `display`
+                     WHERE `display`.`loggedIn` = 1
+                        OR `display`.`lastAccessed` > :lastAccessed
+                )
+        ';
+        
         $this->store->update($sql, [
-            'modifiedAt' => Carbon::now()->subDays($days)->format(DateFormatHelper::getSystemFormat()),
+            'modifiedAt' => Carbon::now()->subDay()->format(DateFormatHelper::getSystemFormat()),
+            'lastAccessed' => $cutOff->unix(),
         ]);
     }
 }
diff --git a/modules/assets/template-thumbnails/article/elements/article-author.png b/modules/assets/template-thumbnails/article/elements/article-author.png
deleted file mode 100644
index bf2bfc0705..0000000000
Binary files a/modules/assets/template-thumbnails/article/elements/article-author.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/article/elements/article-content.png b/modules/assets/template-thumbnails/article/elements/article-content.png
deleted file mode 100644
index e713ec51c6..0000000000
Binary files a/modules/assets/template-thumbnails/article/elements/article-content.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/article/elements/article-link.png b/modules/assets/template-thumbnails/article/elements/article-link.png
deleted file mode 100644
index 83cab92cc0..0000000000
Binary files a/modules/assets/template-thumbnails/article/elements/article-link.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/article/elements/article-summary.png b/modules/assets/template-thumbnails/article/elements/article-summary.png
deleted file mode 100644
index ef4c1127be..0000000000
Binary files a/modules/assets/template-thumbnails/article/elements/article-summary.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/article/elements/article-title.png b/modules/assets/template-thumbnails/article/elements/article-title.png
deleted file mode 100644
index 37609ca3ae..0000000000
Binary files a/modules/assets/template-thumbnails/article/elements/article-title.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/currency/elements/currency-change-icon.png b/modules/assets/template-thumbnails/currency/elements/currency-change-icon.png
deleted file mode 100644
index f23dee7b27..0000000000
Binary files a/modules/assets/template-thumbnails/currency/elements/currency-change-icon.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/currency/elements/currency-change-percentage.png b/modules/assets/template-thumbnails/currency/elements/currency-change-percentage.png
deleted file mode 100644
index e6443cb52b..0000000000
Binary files a/modules/assets/template-thumbnails/currency/elements/currency-change-percentage.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/currency/elements/currency-last-trade-price.png b/modules/assets/template-thumbnails/currency/elements/currency-last-trade-price.png
deleted file mode 100644
index 4469d3a476..0000000000
Binary files a/modules/assets/template-thumbnails/currency/elements/currency-last-trade-price.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/currency/elements/currency-logo.png b/modules/assets/template-thumbnails/currency/elements/currency-logo.png
deleted file mode 100644
index fd026f2ff3..0000000000
Binary files a/modules/assets/template-thumbnails/currency/elements/currency-logo.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/currency/elements/currency-name.png b/modules/assets/template-thumbnails/currency/elements/currency-name.png
deleted file mode 100644
index 9ea1ec1314..0000000000
Binary files a/modules/assets/template-thumbnails/currency/elements/currency-name.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/dataset/elements/dataset-html.png b/modules/assets/template-thumbnails/dataset/elements/dataset-html.png
deleted file mode 100644
index b7401ad173..0000000000
Binary files a/modules/assets/template-thumbnails/dataset/elements/dataset-html.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/dataset/elements/dataset-number.png b/modules/assets/template-thumbnails/dataset/elements/dataset-number.png
deleted file mode 100644
index 1adaf56329..0000000000
Binary files a/modules/assets/template-thumbnails/dataset/elements/dataset-number.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/dataset/elements/dataset-string.png b/modules/assets/template-thumbnails/dataset/elements/dataset-string.png
deleted file mode 100644
index 94da33bcd0..0000000000
Binary files a/modules/assets/template-thumbnails/dataset/elements/dataset-string.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/event/elements/calendar-event-detailed.png b/modules/assets/template-thumbnails/event/elements/calendar-event-detailed.png
deleted file mode 100644
index 0f7deb1cc9..0000000000
Binary files a/modules/assets/template-thumbnails/event/elements/calendar-event-detailed.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/event/elements/calendar-event-row.png b/modules/assets/template-thumbnails/event/elements/calendar-event-row.png
deleted file mode 100644
index 97245c85a6..0000000000
Binary files a/modules/assets/template-thumbnails/event/elements/calendar-event-row.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/event/elements/calendar-event-simple.png b/modules/assets/template-thumbnails/event/elements/calendar-event-simple.png
deleted file mode 100644
index 5ba7b5472f..0000000000
Binary files a/modules/assets/template-thumbnails/event/elements/calendar-event-simple.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/event/elements/event-description.png b/modules/assets/template-thumbnails/event/elements/event-description.png
deleted file mode 100644
index fc8b885da0..0000000000
Binary files a/modules/assets/template-thumbnails/event/elements/event-description.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/event/elements/event-location.png b/modules/assets/template-thumbnails/event/elements/event-location.png
deleted file mode 100644
index 7ddbd8dbc1..0000000000
Binary files a/modules/assets/template-thumbnails/event/elements/event-location.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/event/elements/event-summary.png b/modules/assets/template-thumbnails/event/elements/event-summary.png
deleted file mode 100644
index 5a12371668..0000000000
Binary files a/modules/assets/template-thumbnails/event/elements/event-summary.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-attribution.png b/modules/assets/template-thumbnails/forecast/elements/weather-attribution.png
deleted file mode 100644
index 0fe64d0440..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-attribution.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-condition-bg-image.png b/modules/assets/template-thumbnails/forecast/elements/weather-condition-bg-image.png
deleted file mode 100644
index 95b85f4a2a..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-condition-bg-image.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-date.png b/modules/assets/template-thumbnails/forecast/elements/weather-date.png
deleted file mode 100644
index 427e66c3ce..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-date.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-humidity-percent.png b/modules/assets/template-thumbnails/forecast/elements/weather-humidity-percent.png
deleted file mode 100644
index 734f4a27fd..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-humidity-percent.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-icon.png b/modules/assets/template-thumbnails/forecast/elements/weather-icon.png
deleted file mode 100644
index 1cc26bae58..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-icon.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-max-temperature.png b/modules/assets/template-thumbnails/forecast/elements/weather-max-temperature.png
deleted file mode 100644
index 2f561a9561..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-max-temperature.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-summary.png b/modules/assets/template-thumbnails/forecast/elements/weather-summary.png
deleted file mode 100644
index 6f23ab7902..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-summary.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-temperature.png b/modules/assets/template-thumbnails/forecast/elements/weather-temperature.png
deleted file mode 100644
index 003090d930..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-temperature.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-wind-direction.png b/modules/assets/template-thumbnails/forecast/elements/weather-wind-direction.png
deleted file mode 100644
index d80038b0d8..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-wind-direction.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-wind-speed-unit.png b/modules/assets/template-thumbnails/forecast/elements/weather-wind-speed-unit.png
deleted file mode 100644
index 5ebdd0a811..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-wind-speed-unit.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/forecast/elements/weather-wind-speed.png b/modules/assets/template-thumbnails/forecast/elements/weather-wind-speed.png
deleted file mode 100644
index 98be355202..0000000000
Binary files a/modules/assets/template-thumbnails/forecast/elements/weather-wind-speed.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/social-media/elements/social-media-description.png b/modules/assets/template-thumbnails/social-media/elements/social-media-description.png
deleted file mode 100644
index 8432e84819..0000000000
Binary files a/modules/assets/template-thumbnails/social-media/elements/social-media-description.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/social-media/elements/social-media-post-dark.png b/modules/assets/template-thumbnails/social-media/elements/social-media-post-dark.png
deleted file mode 100644
index 928b22be0a..0000000000
Binary files a/modules/assets/template-thumbnails/social-media/elements/social-media-post-dark.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/social-media/elements/social-media-post-horizontal.png b/modules/assets/template-thumbnails/social-media/elements/social-media-post-horizontal.png
deleted file mode 100644
index 9fe23a4a2d..0000000000
Binary files a/modules/assets/template-thumbnails/social-media/elements/social-media-post-horizontal.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/social-media/elements/social-media-post-photo.png b/modules/assets/template-thumbnails/social-media/elements/social-media-post-photo.png
deleted file mode 100644
index caa109cc1a..0000000000
Binary files a/modules/assets/template-thumbnails/social-media/elements/social-media-post-photo.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/social-media/elements/social-media-post-vintage-photo.png b/modules/assets/template-thumbnails/social-media/elements/social-media-post-vintage-photo.png
deleted file mode 100644
index 636ed404c7..0000000000
Binary files a/modules/assets/template-thumbnails/social-media/elements/social-media-post-vintage-photo.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/social-media/elements/social-media-profile-photo.png b/modules/assets/template-thumbnails/social-media/elements/social-media-profile-photo.png
deleted file mode 100644
index 56c5a04b20..0000000000
Binary files a/modules/assets/template-thumbnails/social-media/elements/social-media-profile-photo.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/social-media/elements/social-media-username.png b/modules/assets/template-thumbnails/social-media/elements/social-media-username.png
deleted file mode 100644
index 311af509dc..0000000000
Binary files a/modules/assets/template-thumbnails/social-media/elements/social-media-username.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/social-media/fulltime-np.png b/modules/assets/template-thumbnails/social-media/fulltime-np.png
index f588c34bf1..262e31358d 100644
Binary files a/modules/assets/template-thumbnails/social-media/fulltime-np.png and b/modules/assets/template-thumbnails/social-media/fulltime-np.png differ
diff --git a/modules/assets/template-thumbnails/social-media/fulltime.png b/modules/assets/template-thumbnails/social-media/fulltime.png
index 22438c0d59..eda7e5a665 100644
Binary files a/modules/assets/template-thumbnails/social-media/fulltime.png and b/modules/assets/template-thumbnails/social-media/fulltime.png differ
diff --git a/modules/assets/template-thumbnails/social-media/profileleft.png b/modules/assets/template-thumbnails/social-media/profileleft.png
index e3cfd15eee..0c2d589c0b 100644
Binary files a/modules/assets/template-thumbnails/social-media/profileleft.png and b/modules/assets/template-thumbnails/social-media/profileleft.png differ
diff --git a/modules/assets/template-thumbnails/social-media/profileright.png b/modules/assets/template-thumbnails/social-media/profileright.png
index c18811c8ec..07ee31d5b5 100644
Binary files a/modules/assets/template-thumbnails/social-media/profileright.png and b/modules/assets/template-thumbnails/social-media/profileright.png differ
diff --git a/modules/assets/template-thumbnails/social-media/twitter1.png b/modules/assets/template-thumbnails/social-media/twitter1.png
index 9e5dc58223..eced2422dc 100644
Binary files a/modules/assets/template-thumbnails/social-media/twitter1.png and b/modules/assets/template-thumbnails/social-media/twitter1.png differ
diff --git a/modules/assets/template-thumbnails/social-media/twitter2.png b/modules/assets/template-thumbnails/social-media/twitter2.png
index 61fbed5878..2a863c37d9 100644
Binary files a/modules/assets/template-thumbnails/social-media/twitter2.png and b/modules/assets/template-thumbnails/social-media/twitter2.png differ
diff --git a/modules/assets/template-thumbnails/social-media/twitter4.png b/modules/assets/template-thumbnails/social-media/twitter4.png
index 1364a3f5b4..bbe789f441 100644
Binary files a/modules/assets/template-thumbnails/social-media/twitter4.png and b/modules/assets/template-thumbnails/social-media/twitter4.png differ
diff --git a/modules/assets/template-thumbnails/social-media/twitter6np.png b/modules/assets/template-thumbnails/social-media/twitter6np.png
index 2b713dc936..ce55e11dd4 100644
Binary files a/modules/assets/template-thumbnails/social-media/twitter6np.png and b/modules/assets/template-thumbnails/social-media/twitter6np.png differ
diff --git a/modules/assets/template-thumbnails/social-media/twitter6pl.png b/modules/assets/template-thumbnails/social-media/twitter6pl.png
index da125c5760..c6dd5fed84 100644
Binary files a/modules/assets/template-thumbnails/social-media/twitter6pl.png and b/modules/assets/template-thumbnails/social-media/twitter6pl.png differ
diff --git a/modules/assets/template-thumbnails/social-media/twitter7.png b/modules/assets/template-thumbnails/social-media/twitter7.png
index bd38f1e97d..dbdc6bd653 100644
Binary files a/modules/assets/template-thumbnails/social-media/twitter7.png and b/modules/assets/template-thumbnails/social-media/twitter7.png differ
diff --git a/modules/assets/template-thumbnails/social-media/twitter8.png b/modules/assets/template-thumbnails/social-media/twitter8.png
index 8ddae61486..12c54cc85f 100644
Binary files a/modules/assets/template-thumbnails/social-media/twitter8.png and b/modules/assets/template-thumbnails/social-media/twitter8.png differ
diff --git a/modules/assets/template-thumbnails/stocks/elements/stock-change-icon.png b/modules/assets/template-thumbnails/stocks/elements/stock-change-icon.png
deleted file mode 100644
index f23dee7b27..0000000000
Binary files a/modules/assets/template-thumbnails/stocks/elements/stock-change-icon.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/stocks/elements/stock-change-percentage.png b/modules/assets/template-thumbnails/stocks/elements/stock-change-percentage.png
deleted file mode 100644
index 7df737e50c..0000000000
Binary files a/modules/assets/template-thumbnails/stocks/elements/stock-change-percentage.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/stocks/elements/stock-last-trade-price.png b/modules/assets/template-thumbnails/stocks/elements/stock-last-trade-price.png
deleted file mode 100644
index fc05c2e933..0000000000
Binary files a/modules/assets/template-thumbnails/stocks/elements/stock-last-trade-price.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/stocks/elements/stock-name.png b/modules/assets/template-thumbnails/stocks/elements/stock-name.png
deleted file mode 100644
index 95622a58a9..0000000000
Binary files a/modules/assets/template-thumbnails/stocks/elements/stock-name.png and /dev/null differ
diff --git a/modules/assets/template-thumbnails/stocks/elements/stock-symbol.png b/modules/assets/template-thumbnails/stocks/elements/stock-symbol.png
deleted file mode 100644
index ed76410f77..0000000000
Binary files a/modules/assets/template-thumbnails/stocks/elements/stock-symbol.png and /dev/null differ
diff --git a/modules/assets/twitter_blue.png b/modules/assets/twitter_blue.png
deleted file mode 100644
index 64bbc7cb13..0000000000
Binary files a/modules/assets/twitter_blue.png and /dev/null differ
diff --git a/modules/assets/twitter_content_photo.jpg b/modules/assets/twitter_content_photo.jpg
deleted file mode 100644
index 2fd2e4e798..0000000000
Binary files a/modules/assets/twitter_content_photo.jpg and /dev/null differ
diff --git a/modules/assets/twitter_profile_photo.jpg b/modules/assets/twitter_profile_photo.jpg
deleted file mode 100644
index 40b3c70723..0000000000
Binary files a/modules/assets/twitter_profile_photo.jpg and /dev/null differ
diff --git a/modules/assets/twitter_profile_photo_bigger.jpg b/modules/assets/twitter_profile_photo_bigger.jpg
deleted file mode 100644
index ac669082d1..0000000000
Binary files a/modules/assets/twitter_profile_photo_bigger.jpg and /dev/null differ
diff --git a/modules/assets/twitter_profile_photo_mini.jpg b/modules/assets/twitter_profile_photo_mini.jpg
deleted file mode 100644
index 21726f19e6..0000000000
Binary files a/modules/assets/twitter_profile_photo_mini.jpg and /dev/null differ
diff --git a/modules/assets/twitter_white.png b/modules/assets/twitter_white.png
deleted file mode 100644
index 98fb257e2a..0000000000
Binary files a/modules/assets/twitter_white.png and /dev/null differ
diff --git a/modules/audio.xml b/modules/audio.xml
index d5d1153feb..65c260162b 100644
--- a/modules/audio.xml
+++ b/modules/audio.xml
@@ -1,7 +1,7 @@
 <!--
-  ~ Copyright (C) 2022 Xibo Signage Ltd
+  ~ Copyright (C) 2023 Xibo Signage Ltd
   ~
-  ~ Xibo - Digital Signage - http://www.xibo.org.uk
+  ~ Xibo - Digital Signage - https://xibosignage.com
   ~
   ~ This file is part of Xibo.
   ~
@@ -23,6 +23,7 @@
     <name>Audio</name>
     <author>Core</author>
     <description>Upload Audio files to assign to Layouts</description>
+    <icon>fa fa-file-audio</icon>
     <class>\Xibo\Widget\AudioProvider</class>
     <type>audio</type>
     <dataType></dataType>
diff --git a/modules/calendar.xml b/modules/calendar.xml
index 4409c37251..bf3ce58525 100644
--- a/modules/calendar.xml
+++ b/modules/calendar.xml
@@ -23,6 +23,7 @@
     <name>Calendar</name>
     <author>Core</author>
     <description>A module for displaying a calendar based on an iCal feed</description>
+    <icon>fa fa-calendar-alt</icon>
     <class>Xibo\Widget\IcsProvider</class>
     <type>ics-calendar</type>
     <legacyType>calendaradvanced</legacyType>
diff --git a/modules/clock-analogue.xml b/modules/clock-analogue.xml
index 6db14c9a2b..3c80227daf 100644
--- a/modules/clock-analogue.xml
+++ b/modules/clock-analogue.xml
@@ -23,10 +23,11 @@
     <name>Clock - Analogue</name>
     <author>Core</author>
     <description>Analogue Clock</description>
+    <icon>fa fa-clock-o</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\ClockWidgetCompatibility</compatibilityClass>
     <type>clock-analogue</type>
-    <group id="clock" icon="clock">Clock</group>
+    <group id="clock" icon="fa fa-clock">Clock</group>
     <legacyType condition="clockTypeId==1">clock</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/clock-digital.xml b/modules/clock-digital.xml
index ad003533ff..8c2f6cacb7 100644
--- a/modules/clock-digital.xml
+++ b/modules/clock-digital.xml
@@ -23,10 +23,11 @@
     <name>Clock - Digital</name>
     <author>Core</author>
     <description>Digital Clock</description>
+    <icon>fa fa-clock-o</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\ClockWidgetCompatibility</compatibilityClass>
     <type>clock-digital</type>
-    <group id="clock" icon="clock">Clock</group>
+    <group id="clock" icon="fa fa-clock">Clock</group>
     <legacyType condition="clockTypeId==2">clock</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/clock-flip.xml b/modules/clock-flip.xml
index 69e9d0e859..5e3e6f86e7 100644
--- a/modules/clock-flip.xml
+++ b/modules/clock-flip.xml
@@ -23,10 +23,11 @@
     <name>Clock - Flip</name>
     <author>Core</author>
     <description>Flip Clock</description>
+    <icon>fa fa-clock-o</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\ClockWidgetCompatibility</compatibilityClass>
     <type>clock-flip</type>
-    <group id="clock" icon="clock">Clock</group>
+    <group id="clock" icon="fa fa-clock">Clock</group>
     <legacyType condition="clockTypeId==3">clock</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/countdown-clock.xml b/modules/countdown-clock.xml
index 12fd2b49d0..ee98668b40 100755
--- a/modules/countdown-clock.xml
+++ b/modules/countdown-clock.xml
@@ -23,10 +23,11 @@
     <name>Countdown - Clock</name>
     <author>Core</author>
     <description>A module for displaying a Countdown timer as a clock</description>
+    <icon>fa fa-hourglass-o</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\CountDownWidgetCompatibility</compatibilityClass>
     <type>countdown-clock</type>
-    <group id="countdown" icon="countdown">Countdown</group>
+    <group id="countdown" icon="fa fa-hourglass-o">Countdown</group>
     <legacyType condition="templateId==countdown2">countdown</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/countdown-custom.xml b/modules/countdown-custom.xml
index 570014decd..f739d58975 100755
--- a/modules/countdown-custom.xml
+++ b/modules/countdown-custom.xml
@@ -23,10 +23,11 @@
     <name>Countdown - Custom</name>
     <author>Core</author>
     <description>A module for displaying a custom Countdown timer</description>
+    <icon>fa fa-hourglass-o</icon>
     <class></class>
     <showIn>none</showIn>
     <type>countdown-custom</type>
-    <group id="countdown" icon="countdown">Countdown</group>
+    <group id="countdown" icon="fa fa-hourglass-o">Countdown</group>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
     <assignable>1</assignable>
diff --git a/modules/countdown-days.xml b/modules/countdown-days.xml
index c31895e0ec..d4a454ca3a 100755
--- a/modules/countdown-days.xml
+++ b/modules/countdown-days.xml
@@ -23,10 +23,11 @@
     <name>Countdown - Days</name>
     <author>Core</author>
     <description>A module for displaying a Countdown timer for days</description>
+    <icon>fa fa-hourglass-o</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\CountDownWidgetCompatibility</compatibilityClass>
     <type>countdown-days</type>
-    <group id="countdown" icon="countdown">Countdown</group>
+    <group id="countdown" icon="fa fa-hourglass-o">Countdown</group>
     <legacyType condition="templateId==countdown4">countdown</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/countdown-table.xml b/modules/countdown-table.xml
index 4a5e4dd201..bdf4e4e431 100755
--- a/modules/countdown-table.xml
+++ b/modules/countdown-table.xml
@@ -23,10 +23,11 @@
     <name>Countdown - Table</name>
     <author>Core</author>
     <description>A module for displaying a Countdown timer in a table</description>
+    <icon>fa fa-hourglass-o</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\CountDownWidgetCompatibility</compatibilityClass>
     <type>countdown-table</type>
-    <group id="countdown" icon="countdown">Countdown</group>
+    <group id="countdown" icon="fa fa-hourglass-o">Countdown</group>
     <legacyType condition="templateId==countdown3">countdown</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/countdown-text.xml b/modules/countdown-text.xml
index 6616b26261..713b5649d7 100755
--- a/modules/countdown-text.xml
+++ b/modules/countdown-text.xml
@@ -23,10 +23,11 @@
     <name>Countdown - Simple Text</name>
     <author>Core</author>
     <description>A module for displaying a Countdown timer with Simple Text</description>
+    <icon>fa fa-hourglass-o</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\CountDownWidgetCompatibility</compatibilityClass>
     <type>countdown-text</type>
-    <group id="countdown" icon="countdown">Countdown</group>
+    <group id="countdown" icon="fa fa-hourglass-o">Countdown</group>
     <legacyType condition="templateId==countdown1">countdown</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/currencies.xml b/modules/currencies.xml
index 13f6d84219..c8e676019e 100755
--- a/modules/currencies.xml
+++ b/modules/currencies.xml
@@ -23,6 +23,7 @@
     <name>Currencies</name>
     <author>Core</author>
     <description>A module for showing Currency pairs and exchange rates</description>
+    <icon>fa fa-line-chart</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\CurrenciesWidgetCompatibility</compatibilityClass>
     <type>currencies</type>
diff --git a/modules/dashboard.xml b/modules/dashboard.xml
index 9ce2e65e3a..50f263175b 100644
--- a/modules/dashboard.xml
+++ b/modules/dashboard.xml
@@ -23,6 +23,7 @@
     <name>Dashboards</name>
     <author>Core</author>
     <description>Securely connect to services like Microsoft PowerBI and display dashboards</description>
+    <icon>fa fa-file-image</icon>
     <class>\Xibo\Widget\DashboardProvider</class>
     <dataCacheKey>%widgetId%_%displayId%</dataCacheKey>
     <type>dashboard</type>
diff --git a/modules/dataset.xml b/modules/dataset.xml
index 5733b45d3a..fa8c05bc51 100755
--- a/modules/dataset.xml
+++ b/modules/dataset.xml
@@ -23,6 +23,7 @@
     <name>Dataset</name>
     <author>Core</author>
     <description>Display DataSet content</description>
+    <icon>fa fa-table</icon>
     <class>\Xibo\Widget\DataSetProvider</class>
     <compatibilityClass>\Xibo\Widget\Compatibility\DatasetWidgetCompatibility</compatibilityClass>
     <dataCacheKey>%dataSetId%_%lowerLimit%_%lowerLimit%_%numItems%_%orderClauses%_%useOrderingClause%_%ordering%_%filterClauses%_%useFilteringClause%_%filter%</dataCacheKey>
diff --git a/modules/embedded.xml b/modules/embedded.xml
index 9270d84916..40769a582b 100644
--- a/modules/embedded.xml
+++ b/modules/embedded.xml
@@ -23,6 +23,7 @@
     <name>Embedded</name>
     <author>Core</author>
     <description>Embed HTML and JavaScript</description>
+    <icon>fa fa-code</icon>
     <class></class>
     <type>embedded</type>
     <dataType></dataType>
diff --git a/modules/flash.xml b/modules/flash.xml
index 544f7c3291..e432d7ae67 100644
--- a/modules/flash.xml
+++ b/modules/flash.xml
@@ -1,7 +1,7 @@
 <!--
-  ~ Copyright (C) 2022 Xibo Signage Ltd
+  ~ Copyright (C) 2023 Xibo Signage Ltd
   ~
-  ~ Xibo - Digital Signage - http://www.xibo.org.uk
+  ~ Xibo - Digital Signage - https://xibosignage.com
   ~
   ~ This file is part of Xibo.
   ~
@@ -23,6 +23,7 @@
     <name>Flash</name>
     <author>Core</author>
     <description>Upload SWF files to assign to Layouts</description>
+    <icon>fa fa-flash</icon>
     <class></class>
     <type>flash</type>
     <dataType></dataType>
diff --git a/modules/forecastio.xml b/modules/forecastio.xml
index 31ad845fa1..6e91cdeb4b 100755
--- a/modules/forecastio.xml
+++ b/modules/forecastio.xml
@@ -23,6 +23,7 @@
     <name>Weather</name>
     <author>Core</author>
     <description>A module for displaying weather information. Uses the Forecast API</description>
+    <icon>fa fa-cloud</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\WeatherWidgetCompatibility</compatibilityClass>
     <validatorClass>\Xibo\Widget\Validator\DisplayOrGeoValidator</validatorClass>
diff --git a/modules/googletraffic.xml b/modules/googletraffic.xml
index 3dfc40fa5a..b28ee94e43 100755
--- a/modules/googletraffic.xml
+++ b/modules/googletraffic.xml
@@ -23,6 +23,7 @@
     <name>Google Traffic</name>
     <author>Core</author>
     <description>A module for displaying traffic information using Google Maps</description>
+    <icon>fa fa-car</icon>
     <class></class>
     <type>googletraffic</type>
     <dataType></dataType>
diff --git a/modules/hls.xml b/modules/hls.xml
index 99e731c5b1..3c5b1e848a 100644
--- a/modules/hls.xml
+++ b/modules/hls.xml
@@ -23,6 +23,7 @@
     <name>HLS</name>
     <author>Core</author>
     <description>A module for displaying HLS video streams</description>
+    <icon>fa fa-video-camera</icon>
     <class></class>
     <type>hls</type>
     <dataType></dataType>
diff --git a/modules/htmlpackage.xml b/modules/htmlpackage.xml
index ba3c93600f..baa209f90f 100644
--- a/modules/htmlpackage.xml
+++ b/modules/htmlpackage.xml
@@ -23,6 +23,7 @@
     <name>HTML Package</name>
     <author>Core</author>
     <description>Upload a complete package to distribute to Players</description>
+    <icon>fa fa-file-code-o</icon>
     <class></class>
     <type>htmlpackage</type>
     <dataType></dataType>
diff --git a/modules/image.xml b/modules/image.xml
index 3e8577fbac..3fc07be758 100644
--- a/modules/image.xml
+++ b/modules/image.xml
@@ -23,6 +23,7 @@
     <name>Image</name>
     <author>Core</author>
     <description>Upload Image files to assign to Layouts</description>
+    <icon>fa fa-file-image-o</icon>
     <class></class>
     <type>image</type>
     <dataType></dataType>
diff --git a/modules/localvideo.xml b/modules/localvideo.xml
index 74161d6e3d..fa322fb0c7 100644
--- a/modules/localvideo.xml
+++ b/modules/localvideo.xml
@@ -23,6 +23,7 @@
     <name>Local Video</name>
     <author>Core</author>
     <description>Display Video that only exists on the Display by providing a local file path or URL</description>
+    <icon>fa fa-file-video-o</icon>
     <validatorClass>\Xibo\Widget\Validator\RemoteUrlsZeroDurationValidator</validatorClass>
     <type>localvideo</type>
     <dataType></dataType>
diff --git a/modules/mastodon.xml b/modules/mastodon.xml
index 7648fc4fe6..68aed9cfe2 100644
--- a/modules/mastodon.xml
+++ b/modules/mastodon.xml
@@ -23,6 +23,7 @@
     <name>Mastodon</name>
     <author>Core</author>
     <description>Mastodon</description>
+    <icon>fab fa-mastodon</icon>
     <class>\Xibo\Widget\MastodonProvider</class>
     <type>mastodon</type>
     <dataType>social-media</dataType>
diff --git a/modules/menuboard-category.xml b/modules/menuboard-category.xml
index 471d8472f4..5860f77684 100644
--- a/modules/menuboard-category.xml
+++ b/modules/menuboard-category.xml
@@ -23,6 +23,7 @@
     <name>Menu Board: Category</name>
     <author>Core</author>
     <description>Display categories from a Menu Board</description>
+    <icon>fa fa-list-alt</icon>
     <class>\Xibo\Widget\MenuBoardCategoryProvider</class>
     <dataCacheKey>%menuId%_%categoryId%</dataCacheKey>
     <type>menuboard-category</type>
diff --git a/modules/menuboard-product.xml b/modules/menuboard-product.xml
index 29166be1f1..24c3709b32 100644
--- a/modules/menuboard-product.xml
+++ b/modules/menuboard-product.xml
@@ -23,6 +23,7 @@
     <name>Menu Board: Products</name>
     <author>Core</author>
     <description>Display products from a Menu Board</description>
+    <icon>fas fa-hamburger</icon>
     <class>\Xibo\Widget\MenuBoardProductProvider</class>
     <dataCacheKey>%menuId%_%categoryId%_%showUnavailable%_%sortField%_%sortDescending%_%lowerLimit%_%upperLimit%_%showUnavailable%</dataCacheKey>
     <type>menuboard-product</type>
diff --git a/modules/notificationview.xml b/modules/notificationview.xml
index 83cd072592..88559c3e05 100644
--- a/modules/notificationview.xml
+++ b/modules/notificationview.xml
@@ -23,6 +23,7 @@
     <name>Notification</name>
     <author>Core</author>
     <description>Display messages created in the Notification Drawer of the CMS</description>
+    <icon>fa fa-bell-o</icon>
     <class>\Xibo\Widget\NotificationProvider</class>
     <compatibilityClass>\Xibo\Widget\Compatibility\NotificationViewCompatibility</compatibilityClass>
     <type>notificationview</type>
diff --git a/modules/pdf.xml b/modules/pdf.xml
index 95877e070c..0df0193ad0 100755
--- a/modules/pdf.xml
+++ b/modules/pdf.xml
@@ -23,6 +23,7 @@
     <name>PDF</name>
     <author>Core</author>
     <description>Upload PDF files to assign to Layouts</description>
+    <icon>fa fa-file-pdf-o</icon>
     <class>\Xibo\Widget\PdfProvider</class>
     <type>pdf</type>
     <dataType></dataType>
diff --git a/modules/powerpoint.xml b/modules/powerpoint.xml
index 0bd55b98c2..5a030a7370 100644
--- a/modules/powerpoint.xml
+++ b/modules/powerpoint.xml
@@ -1,7 +1,7 @@
 <!--
-  ~ Copyright (C) 2022 Xibo Signage Ltd
+  ~ Copyright (C) 2023 Xibo Signage Ltd
   ~
-  ~ Xibo - Digital Signage - http://www.xibo.org.uk
+  ~ Xibo - Digital Signage - https://xibosignage.com
   ~
   ~ This file is part of Xibo.
   ~
@@ -23,6 +23,7 @@
     <name>PowerPoint</name>
     <author>Core</author>
     <description>Upload a PowerPoint file to assign to Layouts</description>
+    <icon>fa fa-file-powerpoint-o</icon>
     <class></class>
     <type>powerpoint</type>
     <dataType></dataType>
diff --git a/modules/rss-ticker.xml b/modules/rss-ticker.xml
index eec9af6ce0..93f4ceb51b 100644
--- a/modules/rss-ticker.xml
+++ b/modules/rss-ticker.xml
@@ -23,6 +23,7 @@
     <name>RSS Ticker</name>
     <author>Core</author>
     <description>Display articles from an RSS feed</description>
+    <icon>fa fa-rss</icon>
     <class>\Xibo\Widget\RssProvider</class>
     <compatibilityClass>\Xibo\Widget\Compatibility\RssWidgetCompatibility</compatibilityClass>
     <type>rss-ticker</type>
diff --git a/modules/shellcommand.xml b/modules/shellcommand.xml
index 4a38b3e752..b4e1283b4e 100755
--- a/modules/shellcommand.xml
+++ b/modules/shellcommand.xml
@@ -23,6 +23,7 @@
     <name>Shell Command</name>
     <author>Core</author>
     <description>Instruct a Display to execute a command using the operating system shell</description>
+    <icon>fa fa-terminal</icon>
     <class></class>
     <validatorClass>\Xibo\Widget\Validator\ShellCommandValidator</validatorClass>
     <type>shellcommand</type>
diff --git a/modules/spacer.xml b/modules/spacer.xml
index 0c4f33e89c..f2a54916fc 100644
--- a/modules/spacer.xml
+++ b/modules/spacer.xml
@@ -23,6 +23,7 @@
     <name>Spacer</name>
     <author>Core</author>
     <description>A module for making region empty for the duration</description>
+    <icon>fa fa-hourglass-o</icon>
     <class></class>
     <showIn>playlist</showIn>
     <type>spacer</type>
diff --git a/modules/ssp.xml b/modules/ssp.xml
index 472101f780..6f0a3de7e2 100644
--- a/modules/ssp.xml
+++ b/modules/ssp.xml
@@ -23,6 +23,7 @@
     <name>SSP</name>
     <author>Core</author>
     <description>Manually schedule SSP content from the SSP connector via select partners.</description>
+    <icon>fa fa-tv</icon>
     <type>ssp</type>
     <dataType></dataType>
     <schemaVersion>1</schemaVersion>
diff --git a/modules/stocks.xml b/modules/stocks.xml
index d8fc94d4cc..659857af18 100755
--- a/modules/stocks.xml
+++ b/modules/stocks.xml
@@ -23,6 +23,7 @@
     <name>Stocks</name>
     <author>Core</author>
     <description>A module for showing Stock quotes</description>
+    <icon>fa fa-bar-chart</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\StocksWidgetCompatibility</compatibilityClass>
     <type>stocks</type>
diff --git a/modules/subplaylist.xml b/modules/subplaylist.xml
index 5fe0282bc3..7621d6ddc6 100644
--- a/modules/subplaylist.xml
+++ b/modules/subplaylist.xml
@@ -23,6 +23,7 @@
     <name>Playlist</name>
     <author>Core</author>
     <description>Display widgets from one or more Playlists</description>
+    <icon>fa fa-list-ol</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\SubPlaylistWidgetCompatibility</compatibilityClass>
     <showIn>playlist</showIn>
@@ -104,7 +105,7 @@
     <preview>
         <twig><![CDATA[
 <div style="text-align:center;">
-    <i alt="{{ "Sub-Playlist"|trans }} thumbnail" class="module-preview-icon module-icon-subplaylist"></i>
+    <i alt="{{ "Sub-Playlist"|trans }} thumbnail" class="module-preview-icon fa fa-list-ol"></i>
     <br/>
     {% trans %}{{ countSubPlaylistWidgets }} Widgets / {{ calculatedDuration }} seconds{% endtrans %}
 </div>
diff --git a/modules/templates/article-elements.xml b/modules/templates/article-elements.xml
index e74ba64f0b..b2582544e8 100644
--- a/modules/templates/article-elements.xml
+++ b/modules/templates/article-elements.xml
@@ -25,13 +25,10 @@
         <title>Title</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-font</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-title</thumbnail>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="article-title" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/article/elements/article-title.png" />
-        </assets>
     </template>
     <template>
         <id>article_summary</id>
@@ -39,13 +36,10 @@
         <title>Summary</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-font</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-summary</thumbnail>
         <startWidth>500</startWidth>
         <startHeight>250</startHeight>
-        <assets>
-            <asset id="article-summary" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/article/elements/article-summary.png" />
-        </assets>
     </template>
     <template>
         <id>article_content</id>
@@ -53,13 +47,10 @@
         <title>Content</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-font</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-content</thumbnail>
         <startWidth>500</startWidth>
         <startHeight>500</startHeight>
-        <assets>
-            <asset id="article-content" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/article/elements/article-content.png" />
-        </assets>
     </template>
     <template>
         <id>article_author</id>
@@ -67,13 +58,10 @@
         <title>Author</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-user</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-author</thumbnail>
         <startWidth>400</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="article-author" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/article/elements/article-author.png" />
-        </assets>
     </template>
     <template>
         <id>article_date</id>
@@ -81,13 +69,10 @@
         <title>Date</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-calendar-week</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-date</thumbnail>
         <startWidth>400</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="article-date" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/date.png" />
-        </assets>
     </template>
     <template>
         <id>article_publishedDate</id>
@@ -95,13 +80,10 @@
         <title>Published Date</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-calendar-week</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-published-date</thumbnail>
         <startWidth>400</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="article-published-date" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/date.png" />
-        </assets>
     </template>
     <template>
         <id>article_image</id>
@@ -109,13 +91,10 @@
         <title>Image</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-image</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-image</thumbnail>
         <startWidth>200</startWidth>
         <startHeight>200</startHeight>
-        <assets>
-            <asset id="article-image" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/image.png" />
-        </assets>
     </template>
     <template>
         <id>article_link</id>
@@ -123,13 +102,10 @@
         <title>Link</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-link</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-link</thumbnail>
         <startWidth>480</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="article-link" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/article/elements/article-link.png" />
-        </assets>
     </template>
     <template>
         <id>article_permalink</id>
@@ -137,12 +113,9 @@
         <title>Permalink</title>
         <type>element</type>
         <dataType>article</dataType>
+        <icon>fas fa-link</icon>
         <canRotate>true</canRotate>
-        <thumbnail>article-permalink</thumbnail>
         <startWidth>480</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="article-permalink" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/article/elements/article-link.png" />
-        </assets>
     </template>
 </templates>
diff --git a/modules/templates/currency-elements.xml b/modules/templates/currency-elements.xml
index ac1aa1d145..81fb8d18a5 100644
--- a/modules/templates/currency-elements.xml
+++ b/modules/templates/currency-elements.xml
@@ -26,12 +26,9 @@
         <type>element</type>
         <dataType>currency</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>currency-name</thumbnail>
+        <icon>fa fa-font</icon>
         <startWidth>360</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="currency-name" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/currency/elements/currency-name.png" />
-        </assets>
     </template>
     <template>
         <id>currency_rawLastTradePriceOnly</id>
@@ -40,12 +37,9 @@
         <type>element</type>
         <dataType>currency</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>currency-last-trade-price</thumbnail>
+        <icon>fas fa-money-bill-alt</icon>
         <startWidth>250</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="currency-last-trade-price" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/currency/elements/currency-last-trade-price.png" />
-        </assets>
     </template>
     <template>
         <id>currency_changePercentage</id>
@@ -54,7 +48,7 @@
         <type>element</type>
         <dataType>currency</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>currency-change-percentage</thumbnail>
+        <icon>fas fa-percentage</icon>
         <startWidth>200</startWidth>
         <startHeight>100</startHeight>
         <onElementParseData><![CDATA[
@@ -86,9 +80,6 @@ if (elementData !== null && elementData.hasOwnProperty('ChangeStyle')) {
     }
 }
         ]]></onTemplateRender>
-        <assets>
-            <asset id="currency-change-percentage" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/currency/elements/currency-change-percentage.png" />
-        </assets>
     </template>
     <template>
         <id>currency_changeIcon</id>
@@ -96,7 +87,7 @@ if (elementData !== null && elementData.hasOwnProperty('ChangeStyle')) {
         <type>element</type>
         <dataType>currency</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>currency-change-icon</thumbnail>
+        <icon>fas fa-arrows-alt-v</icon>
         <startWidth>80</startWidth>
         <startHeight>60</startHeight>
         <properties>
@@ -141,7 +132,6 @@ if (elementData !== null && elementData.hasOwnProperty('ChangeStyle')) {
             ]]></style>
         </stencil>
         <assets>
-            <asset id="currency-change-icon" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/currency/elements/currency-change-icon.png" />
             <asset id="font-awesome" type="path" mimeType="text/css" path="/modules/assets/common/font-awesome.min.css" />
             <asset id="fontawesome-webfont.ttf" type="path" mimeType="application/x-font-ttf" path="/modules/assets/common/fontawesome-webfont.ttf"></asset>
             <asset id="fontawesome-webfont.woff" type="path" mimeType="application/font-woff" path="/modules/assets/common/fontawesome-webfont.woff"></asset>
@@ -155,7 +145,7 @@ if (elementData !== null && elementData.hasOwnProperty('ChangeStyle')) {
         <type>element</type>
         <dataType>currency</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>currency-logo</thumbnail>
+        <icon>fas fa-flag</icon>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
         <stencil>
@@ -205,7 +195,6 @@ if (width > height) {
 }
         ]]></onTemplateRender>
         <assets>
-            <asset id="currency-logo" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/currency/elements/currency-logo.png" />
             <asset id="flags" type="path" mimeType="image/webp" path="/modules/assets/currency/flags.webp" />
             <asset id="flagsCSS" type="path" mimeType="text/css" path="/modules/assets/currency/flags.css" />
         </assets>
diff --git a/modules/templates/dataset-elements.xml b/modules/templates/dataset-elements.xml
index 1454d6f2aa..045a78db9d 100644
--- a/modules/templates/dataset-elements.xml
+++ b/modules/templates/dataset-elements.xml
@@ -26,7 +26,7 @@
         <type>element</type>
         <dataType>dataset</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>dataset-data-string</thumbnail>
+        <icon>fa fa-font</icon>
         <startWidth>360</startWidth>
         <startHeight>100</startHeight>
         <properties>
@@ -62,9 +62,6 @@
                 </visibility>
             </property>
         </properties>
-        <assets>
-            <asset id="dataset-data-string" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/dataset/elements/dataset-string.png" />
-        </assets>
     </template>
     <template>
         <id>dataset_data_number</id>
@@ -73,7 +70,7 @@
         <type>element</type>
         <dataType>dataset</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>dataset-data-number</thumbnail>
+        <icon>fas fa-sort-numeric-up</icon>
         <startWidth>360</startWidth>
         <startHeight>100</startHeight>
         <properties>
@@ -108,9 +105,6 @@
                 </visibility>
             </property>
         </properties>
-        <assets>
-            <asset id="dataset-data-number" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/dataset/elements/dataset-number.png" />
-        </assets>
     </template>
     <template>
         <id>dataset_data_date</id>
@@ -119,7 +113,7 @@
         <type>element</type>
         <dataType>dataset</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>dataset-data-date</thumbnail>
+        <icon>fas fa-calendar-week</icon>
         <startWidth>360</startWidth>
         <startHeight>100</startHeight>
         <properties>
@@ -154,9 +148,6 @@
                 </visibility>
             </property>
         </properties>
-        <assets>
-            <asset id="dataset-data-date" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/date.png" />
-        </assets>
     </template>
     <template>
         <id>dataset_data_img</id>
@@ -165,7 +156,7 @@
         <type>element</type>
         <dataType>dataset</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>dataset-data-img</thumbnail>
+        <icon>fas fa-image</icon>
         <startWidth>150</startWidth>
         <startHeight>150</startHeight>
         <properties>
@@ -200,9 +191,6 @@
                 </visibility>
             </property>
         </properties>
-        <assets>
-            <asset id="dataset-data-img" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/image.png" />
-        </assets>
     </template>
     <template>
         <id>dataset_data_html</id>
@@ -211,7 +199,7 @@
         <type>element</type>
         <dataType>dataset</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>dataset-data-html</thumbnail>
+        <icon>fas fa-file-code</icon>
         <startWidth>360</startWidth>
         <startHeight>100</startHeight>
         <properties>
@@ -246,8 +234,5 @@
                 </visibility>
             </property>
         </properties>
-        <assets>
-            <asset id="dataset-data-html" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/dataset/elements/dataset-html.png" />
-        </assets>
     </template>
 </templates>
diff --git a/modules/templates/event-elements.xml b/modules/templates/event-elements.xml
index 89edb3ab06..2425b1289e 100644
--- a/modules/templates/event-elements.xml
+++ b/modules/templates/event-elements.xml
@@ -26,12 +26,9 @@
         <type>element</type>
         <dataType>event</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>event-summary</thumbnail>
+        <icon>fa fa-font</icon>
         <startWidth>300</startWidth>
         <startHeight>80</startHeight>
-        <assets>
-            <asset id="event-summary" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/event/elements/event-summary.png" />
-        </assets>
     </template>
     <template>
         <id>event_description</id>
@@ -40,12 +37,9 @@
         <type>element</type>
         <dataType>event</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>event-description</thumbnail>
+        <icon>fa fa-font</icon>
         <startWidth>650</startWidth>
         <startHeight>250</startHeight>
-        <assets>
-            <asset id="event-description" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/event/elements/event-description.png" />
-        </assets>
     </template>
     <template>
         <id>event_startDate</id>
@@ -54,12 +48,9 @@
         <type>element</type>
         <dataType>event</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>date-thumb</thumbnail>
+        <icon>fas fa-calendar-week</icon>
         <startWidth>450</startWidth>
         <startHeight>80</startHeight>
-        <assets>
-            <asset id="date-thumb" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/date.png" />
-        </assets>
     </template>
     <template>
         <id>event_endDate</id>
@@ -68,12 +59,9 @@
         <type>element</type>
         <dataType>event</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>date-thumb</thumbnail>
+        <icon>fas fa-calendar-week</icon>
         <startWidth>450</startWidth>
         <startHeight>80</startHeight>
-        <assets>
-            <asset id="date-thumb" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/date.png" />
-        </assets>
     </template>
     <template>
         <id>event_location</id>
@@ -82,12 +70,9 @@
         <type>element</type>
         <dataType>event</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>event-location</thumbnail>
+        <icon>fas fa-map-marker-alt</icon>
         <startWidth>650</startWidth>
         <startHeight>250</startHeight>
-        <assets>
-            <asset id="event-location" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/event/elements/event-location.png" />
-        </assets>
     </template>
     <template>
         <id>calendar_event_detailed</id>
diff --git a/modules/templates/forecast-elements.xml b/modules/templates/forecast-elements.xml
index 870f90904f..5647382c75 100644
--- a/modules/templates/forecast-elements.xml
+++ b/modules/templates/forecast-elements.xml
@@ -26,12 +26,9 @@
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-summary</thumbnail>
+        <icon>fa fa-font</icon>
         <startWidth>360</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="weather-summary" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-summary.png" />
-        </assets>
     </template>
     <template>
         <id>weather_temperature</id>
@@ -40,7 +37,7 @@
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-temperature</thumbnail>
+        <icon>fas fa-thermometer-half</icon>
         <startWidth>150</startWidth>
         <startHeight>150</startHeight>
         <onElementParseData><![CDATA[
@@ -55,9 +52,6 @@ if (String(value).includes('°C')) {
 
 return value + '<sup>°C</sup>';
         ]]></onElementParseData>
-        <assets>
-            <asset id="weather-temperature" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-temperature.png" />
-        </assets>
     </template>
     <template>
         <id>weather_min_temperature</id>
@@ -66,7 +60,7 @@ return value + '<sup>°C</sup>';
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-min-temperature</thumbnail>
+        <icon>fas fa-thermometer-empty</icon>
         <startWidth>150</startWidth>
         <startHeight>150</startHeight>
         <onElementParseData><![CDATA[
@@ -81,9 +75,6 @@ if (String(value).includes('°C')) {
 
 return value + '<sup>°C</sup>';
         ]]></onElementParseData>
-        <assets>
-            <asset id="weather-min-temperature" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-temperature.png" />
-        </assets>
     </template>
     <template>
         <id>weather_max_temperature</id>
@@ -92,7 +83,7 @@ return value + '<sup>°C</sup>';
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-max-temperature</thumbnail>
+        <icon>fas fa-thermometer-full</icon>
         <startWidth>150</startWidth>
         <startHeight>150</startHeight>
         <onElementParseData><![CDATA[
@@ -107,9 +98,6 @@ if (String(value).includes('°C')) {
 
 return value + '<sup>°C</sup>';
         ]]></onElementParseData>
-        <assets>
-            <asset id="weather-max-temperature" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-max-temperature.png" />
-        </assets>
     </template>
     <template>
         <id>weather_humidity_percent</id>
@@ -118,7 +106,7 @@ return value + '<sup>°C</sup>';
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-humidity-percent</thumbnail>
+        <icon>fas fa-percentage</icon>
         <startWidth>150</startWidth>
         <startHeight>150</startHeight>
         <onElementParseData><![CDATA[
@@ -143,7 +131,7 @@ return value + '%';
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-icon</thumbnail>
+        <icon>fas fa-sun</icon>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
         <properties>
@@ -170,7 +158,6 @@ return value + '%';
         ]]></hbs>
         </stencil>
         <assets>
-            <asset id="weather-icon" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-icon.png" />
             <asset id="weather-icons" type="path" mimeType="text/css" path="/modules/assets/forecastio/weather-icons.min.css"></asset>
             <asset id="weathericons-regular-webfont.eot" type="path" mimeType="application/vnd.ms-fontobject" path="/modules/assets/forecastio/weathericons-regular-webfont.eot"></asset>
             <asset id="weathericons-regular-webfont.svg" type="path" mimeType="image/svg+xml" path="/modules/assets/forecastio/weathericons-regular-webfont.svg"></asset>
@@ -197,12 +184,9 @@ return value + '%';
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-wind-direction</thumbnail>
+        <icon>fas fa-location-arrow</icon>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="weather-wind-direction" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-wind-direction.png" />
-        </assets>
     </template>
     <template>
         <id>weather_wind_speed</id>
@@ -211,12 +195,9 @@ return value + '%';
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-wind-speed</thumbnail>
+        <icon>fas fa-tachometer-alt</icon>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="weather-wind-speed" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-wind-speed.png" />
-        </assets>
     </template>
     <template>
         <id>weather_wind_speed_unit</id>
@@ -225,12 +206,9 @@ return value + '%';
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-wind-speed-unit</thumbnail>
+        <icon>fas fa-wind</icon>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="weather-wind-speed-unit" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-wind-speed-unit.png" />
-        </assets>
     </template>
     <template>
         <id>weather_attribution</id>
@@ -239,7 +217,7 @@ return value + '%';
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-attribution</thumbnail>
+        <icon>fa fa-font</icon>
         <startWidth>360</startWidth>
         <startHeight>100</startHeight>
         <onTemplateRender><![CDATA[
@@ -247,9 +225,6 @@ if (meta && meta.hasOwnProperty('Attribution')) {
     $(target).find('.global-elements-text > div:first-child').html(meta.Attribution);
 }
         ]]></onTemplateRender>
-        <assets>
-            <asset id="weather-attribution" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-attribution.png" />
-        </assets>
     </template>
     <template>
         <id>weather_condition_background_image</id>
@@ -257,7 +232,7 @@ if (meta && meta.hasOwnProperty('Attribution')) {
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-condition-bg-image</thumbnail>
+        <icon>fa fa-image</icon>
         <startWidth>480</startWidth>
         <startHeight>600</startHeight>
         <properties>
@@ -303,7 +278,6 @@ if (meta && meta.hasOwnProperty('Attribution')) {
             ]]></style>
         </stencil>
         <assets>
-            <asset id="weather-condition-bg-image" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-condition-bg-image.png" />
             <asset id="bg-cloudy" type="path" mimeType="image/jpeg" path="/modules/assets/forecastio/wi-cloudy.jpg"></asset>
             <asset id="bg-partly-cloudy-day" type="path" mimeType="image/jpeg" path="/modules/assets/forecastio/wi-day-cloudy.jpg"></asset>
             <asset id="bg-clear-day" type="path" mimeType="image/jpeg" path="/modules/assets/forecastio/wi-day-sunny.jpg"></asset>
@@ -323,7 +297,7 @@ if (meta && meta.hasOwnProperty('Attribution')) {
         <type>element</type>
         <dataType>forecast</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>weather-date</thumbnail>
+        <icon>fas fa-calendar-week</icon>
         <startWidth>420</startWidth>
         <startHeight>100</startHeight>
         <properties>
@@ -344,8 +318,5 @@ $(target).find('.date').each(function(_idx, dateEl){
     $(dateEl).html(formattedDate);
 });
         ]]></onTemplateRender>
-        <assets>
-            <asset id="weather-date" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-date.png" />
-        </assets>
     </template>
 </templates>
\ No newline at end of file
diff --git a/modules/templates/message-elements.xml b/modules/templates/message-elements.xml
index d104061b24..463b269c3b 100644
--- a/modules/templates/message-elements.xml
+++ b/modules/templates/message-elements.xml
@@ -26,6 +26,7 @@
         <title>Subject</title>
         <type>element</type>
         <dataType>message</dataType>
+        <icon>fas fa-font</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -36,6 +37,7 @@
         <title>Body</title>
         <type>element</type>
         <dataType>message</dataType>
+        <icon>fas fa-envelope</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -46,6 +48,7 @@
         <title>Date</title>
         <type>element</type>
         <dataType>message</dataType>
+        <icon>fas fa-calendar-week</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -56,6 +59,7 @@
         <title>Created Date</title>
         <type>element</type>
         <dataType>message</dataType>
+        <icon>fas fa-calendar-week</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
diff --git a/modules/templates/product-category-elements.xml b/modules/templates/product-category-elements.xml
index 2638a9faab..1dd242deb6 100644
--- a/modules/templates/product-category-elements.xml
+++ b/modules/templates/product-category-elements.xml
@@ -25,6 +25,7 @@
         <title>Name</title>
         <type>element</type>
         <dataType>product-category</dataType>
+        <icon>fas fa-font</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -35,6 +36,7 @@
         <title>Description</title>
         <type>element</type>
         <dataType>product-category</dataType>
+        <icon>fas fa-font</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -44,6 +46,7 @@
         <extends override="url" with="data.image">global-image</extends>
         <type>element</type>
         <dataType>product-category</dataType>
+        <icon>fas fa-image</icon>
         <title>Category Photo</title>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
diff --git a/modules/templates/product-elements.xml b/modules/templates/product-elements.xml
index f285c4f057..a2f6cc0de6 100644
--- a/modules/templates/product-elements.xml
+++ b/modules/templates/product-elements.xml
@@ -25,6 +25,7 @@
         <title>Name</title>
         <type>element</type>
         <dataType>product</dataType>
+        <icon>fas fa-font</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -55,6 +56,7 @@ if (properties.dimWhenUnavailable && properties.data && properties.data.availabi
         <title>Description</title>
         <type>element</type>
         <dataType>product</dataType>
+        <icon>fas fa-font</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -65,6 +67,7 @@ if (properties.dimWhenUnavailable && properties.data && properties.data.availabi
         <title>Price</title>
         <type>element</type>
         <dataType>product</dataType>
+        <icon>fas fa-money-bill-alt</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -115,6 +118,7 @@ return value;
         <title>Allergy info</title>
         <type>element</type>
         <dataType>product</dataType>
+        <icon>fas fa-allergies</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -124,6 +128,7 @@ return value;
         <extends override="url" with="data.image">global-image</extends>
         <type>element</type>
         <dataType>product</dataType>
+        <icon>fas fa-image</icon>
         <title>Photo</title>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
@@ -133,6 +138,7 @@ return value;
         <title>Options: Name</title>
         <type>element</type>
         <dataType>product</dataType>
+        <icon>fas fa-list</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -225,6 +231,7 @@ if (
         <title>Options: Value</title>
         <type>element</type>
         <dataType>product</dataType>
+        <icon>fas fa-money-bill-alt</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
@@ -318,6 +325,7 @@ if (
         <title>Calories</title>
         <type>element</type>
         <dataType>product</dataType>
+        <icon>fas fa-weight</icon>
         <canRotate>true</canRotate>
         <startWidth>500</startWidth>
         <startHeight>100</startHeight>
diff --git a/modules/templates/social-media-elements.xml b/modules/templates/social-media-elements.xml
index ef969f4d4b..61a7cf5f32 100644
--- a/modules/templates/social-media-elements.xml
+++ b/modules/templates/social-media-elements.xml
@@ -25,12 +25,9 @@
         <type>element</type>
         <dataType>social-media</dataType>
         <title>Profile Photo</title>
-        <thumbnail>social-media-profile-photo</thumbnail>
+        <icon>fas fa-user</icon>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="social-media-profile-photo" type="path" mimeType="image/png" cmsOnly="true" path="/modules/assets/template-thumbnails/social-media/elements/social-media-profile-photo.png" />
-        </assets>
     </template>
     <template>
         <id>social_media_description</id>
@@ -39,12 +36,9 @@
         <type>element</type>
         <dataType>social-media</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>social-media-description</thumbnail>
+        <icon>fas fa-font</icon>
         <startWidth>650</startWidth>
         <startHeight>250</startHeight>
-        <assets>
-            <asset id="social-media-description" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/social-media/elements/social-media-description.png" />
-        </assets>
     </template>
     <template>
         <id>social_media_screen_name</id>
@@ -53,12 +47,9 @@
         <type>element</type>
         <dataType>social-media</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>social-media-username</thumbnail>
+        <icon>fas fa-id-card</icon>
         <startWidth>650</startWidth>
         <startHeight>250</startHeight>
-        <assets>
-            <asset id="social-media-username" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/social-media/elements/social-media-username.png" />
-        </assets>
     </template>
     <template>
         <id>social_media_username</id>
@@ -67,12 +58,9 @@
         <type>element</type>
         <dataType>social-media</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>social-media-username</thumbnail>
+        <icon>fas fa-at</icon>
         <startWidth>650</startWidth>
         <startHeight>250</startHeight>
-        <assets>
-            <asset id="social-media-username" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/social-media/elements/social-media-username.png" />
-        </assets>
     </template>
     <template>
         <id>social_media_date</id>
@@ -81,12 +69,9 @@
         <type>element</type>
         <dataType>social-media</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>date-thumb</thumbnail>
+        <icon>fas fa-calendar-week</icon>
         <startWidth>450</startWidth>
         <startHeight>80</startHeight>
-        <assets>
-            <asset id="date-thumb" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/global/date.png" />
-        </assets>
     </template>
     <template>
         <id>post_photo</id>
@@ -94,12 +79,9 @@
         <type>element</type>
         <dataType>social-media</dataType>
         <title>Post Photo</title>
-        <thumbnail>social-media-post-photo</thumbnail>
+        <icon>fas fa-image</icon>
         <startWidth>100</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="social-media-post-photo" type="path" mimeType="image/png" cmsOnly="true" path="/modules/assets/template-thumbnails/social-media/elements/social-media-post-photo.png" />
-        </assets>
     </template>
     <template>
         <id>post_horizontal</id>
diff --git a/modules/templates/stock-elements.xml b/modules/templates/stock-elements.xml
index 31f833cf70..e203187378 100644
--- a/modules/templates/stock-elements.xml
+++ b/modules/templates/stock-elements.xml
@@ -26,12 +26,9 @@
         <type>element</type>
         <dataType>stock</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>stock-name</thumbnail>
+        <icon>fas fa-font</icon>
         <startWidth>420</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="stock-name" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/stocks/elements/stock-name.png" />
-        </assets>
     </template>
     <template>
         <id>stock_symbol</id>
@@ -40,12 +37,9 @@
         <type>element</type>
         <dataType>stock</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>stock-symbol</thumbnail>
+        <icon>fas fa-font</icon>
         <startWidth>420</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="stock-symbol" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/stocks/elements/stock-symbol.png" />
-        </assets>
     </template>
     <template>
         <id>stock_lastTradePrice</id>
@@ -53,13 +47,10 @@
         <title>Last Trade Price</title>
         <type>element</type>
         <dataType>stock</dataType>
-        <canRotate>true</canRotate>
-        <thumbnail>stock-last-trade-price</thumbnail>
+        <icon>fas fa-money-bill-alt</icon>
+        <canRotate>true</canRotate>date
         <startWidth>200</startWidth>
         <startHeight>100</startHeight>
-        <assets>
-            <asset id="stock-last-trade-price" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/stocks/elements/stock-last-trade-price.png" />
-        </assets>
     </template>
     <template>
         <id>stock_changePercentage</id>
@@ -68,7 +59,7 @@
         <type>element</type>
         <dataType>stock</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>stock-change-percentage</thumbnail>
+        <icon>fas fa-percentage</icon>
         <startWidth>200</startWidth>
         <startHeight>100</startHeight>
         <onElementParseData><![CDATA[
@@ -100,9 +91,6 @@ if (elementData !== null && elementData.hasOwnProperty('ChangeStyle')) {
     }
 }
         ]]></onTemplateRender>
-        <assets>
-            <asset id="stock-change-percentage" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/stocks/elements/stock-change-percentage.png" />
-        </assets>
     </template>
     <template>
         <id>stock_changeIcon</id>
@@ -110,7 +98,7 @@ if (elementData !== null && elementData.hasOwnProperty('ChangeStyle')) {
         <type>element</type>
         <dataType>stock</dataType>
         <canRotate>true</canRotate>
-        <thumbnail>stock-change-icon</thumbnail>
+        <icon>fas fa-arrows-alt-v</icon>
         <startWidth>80</startWidth>
         <startHeight>60</startHeight>
         <stencil>
@@ -143,7 +131,6 @@ if ($targetContainer.find('.sampleCSS').length == 0) {
 }
         ]]></onTemplateRender>
         <assets>
-            <asset id="stock-change-icon" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/stocks/elements/stock-change-icon.png" />
             <asset id="font-awesome" type="path" mimeType="text/css" path="/modules/assets/common/font-awesome.min.css" />
             <asset id="fontawesome-webfont.ttf" type="path" mimeType="application/x-font-ttf" path="/modules/assets/common/fontawesome-webfont.ttf"></asset>
             <asset id="fontawesome-webfont.woff" type="path" mimeType="application/font-woff" path="/modules/assets/common/fontawesome-webfont.woff"></asset>
diff --git a/modules/text.xml b/modules/text.xml
index d7cbc3e5b8..6f924731ec 100755
--- a/modules/text.xml
+++ b/modules/text.xml
@@ -23,6 +23,7 @@
     <name>Rich Text</name>
     <author>Core</author>
     <description>Add Text directly to a Layout</description>
+    <icon>fa fa-font</icon>
     <class></class>
     <showIn>playlist</showIn>
     <type>text</type>
diff --git a/modules/video.xml b/modules/video.xml
index c07750b244..1d2e619c4a 100644
--- a/modules/video.xml
+++ b/modules/video.xml
@@ -23,6 +23,7 @@
     <name>Video</name>
     <author>Core</author>
     <description>Upload Video files to assign to Layouts</description>
+    <icon>fa fa-file-video-o</icon>
     <class>\Xibo\Widget\VideoProvider</class>
     <validatorClass>\Xibo\Widget\Validator\ZeroDurationValidator</validatorClass>
     <type>video</type>
@@ -98,7 +99,7 @@
     {% set proportional = 1 %}
 {% endif %}
 <div class="img-container" style="display:table; width:100%; height: {{ height }}px">
-    <i class="module-preview-icon module-icon-video" style="position:absolute; color:#ececec;text-shadow: 0 0 2px black;z-index: 1;left:50%;top:50%;transform:translate(-50%,-50%);font-size: 3rem;"></i>
+    <i class="module-preview-icon fa fa-file-video-o" style="position:absolute; color:#ececec;text-shadow: 0 0 2px black;z-index: 1;left:50%;top:50%;transform:translate(-50%,-50%);font-size: 3rem;"></i>
     <div style="display: table-cell;vertical-align: middle;text-align: center;">
         <img src="{{ downloadUrl }}&width={{ width }}&height={{ height }}&proportional={{ proportional }}&fit=0"/>
     </div>
diff --git a/modules/videoin.xml b/modules/videoin.xml
index f98718f747..8403a965f7 100644
--- a/modules/videoin.xml
+++ b/modules/videoin.xml
@@ -1,7 +1,7 @@
 <!--
   ~ Copyright (C) 2023 Xibo Signage Ltd
   ~
-  ~ Xibo - Digital Signage - http://www.xibo.org.uk
+  ~ Xibo - Digital Signage - https://xibosignage.com
   ~
   ~ This file is part of Xibo.
   ~
@@ -23,6 +23,7 @@
     <name>Video In</name>
     <author>Core</author>
     <description>Display input from an external source</description>
+    <icon>fa fa-video-camera</icon>
     <class></class>
     <type>videoin</type>
     <dataType></dataType>
diff --git a/modules/webpage.xml b/modules/webpage.xml
index 47b4ab7c75..7a03ef0407 100644
--- a/modules/webpage.xml
+++ b/modules/webpage.xml
@@ -23,6 +23,7 @@
     <name>Webpage</name>
     <author>Core</author>
     <description>Embed a Webpage</description>
+    <icon>fa fa-sitemap</icon>
     <class></class>
     <type>webpage</type>
     <dataType></dataType>
diff --git a/modules/worldclock-analogue.xml b/modules/worldclock-analogue.xml
index 1265e4d540..3e011c6fa2 100644
--- a/modules/worldclock-analogue.xml
+++ b/modules/worldclock-analogue.xml
@@ -23,10 +23,11 @@
     <name>World Clock - Analogue</name>
     <author>Core</author>
     <description>Analogue World Clock</description>
+    <icon>fa fa-globe</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\WorldClockWidgetCompatibility</compatibilityClass>
     <type>worldclock-analogue</type>
-    <group id="worldclock" icon="world">World Clock</group>
+    <group id="worldclock" icon="fa fa-globe">World Clock</group>
     <legacyType condition="clockType==2">worldclock</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/worldclock-digital-custom.xml b/modules/worldclock-digital-custom.xml
index ae575fcf67..8b2596106a 100644
--- a/modules/worldclock-digital-custom.xml
+++ b/modules/worldclock-digital-custom.xml
@@ -23,11 +23,12 @@
     <name>World Clock - Custom</name>
     <author>Core</author>
     <description>Custom World Clock</description>
+    <icon>fa fa-globe</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\WorldClockWidgetCompatibility</compatibilityClass>
     <showIn>none</showIn>
     <type>worldclock-digital-custom</type>
-    <group id="worldclock" icon="world">World Clock</group>
+    <group id="worldclock" icon="fa fa-globe">World Clock</group>
     <legacyType>worldclock</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/worldclock-digital-date.xml b/modules/worldclock-digital-date.xml
index 3d7a57200f..3f7c321d9d 100644
--- a/modules/worldclock-digital-date.xml
+++ b/modules/worldclock-digital-date.xml
@@ -23,10 +23,11 @@
     <name>World Clock - Time and Date</name>
     <author>Core</author>
     <description>Time and Date World Clock</description>
+    <icon>fa fa-globe</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\WorldClockWidgetCompatibility</compatibilityClass>
     <type>worldclock-digital-date</type>
-    <group id="worldclock" icon="world">World Clock</group>
+    <group id="worldclock" icon="fa fa-globe">World Clock</group>
     <legacyType condition="templateId==='worldclock2'">worldclock</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/modules/worldclock-digital-text.xml b/modules/worldclock-digital-text.xml
index b438741806..b4a14b28fe 100644
--- a/modules/worldclock-digital-text.xml
+++ b/modules/worldclock-digital-text.xml
@@ -23,10 +23,11 @@
     <name>World Clock - Text</name>
     <author>Core</author>
     <description>Text World Clock</description>
+    <icon>fa fa-globe</icon>
     <class></class>
     <compatibilityClass>\Xibo\Widget\Compatibility\WorldClockWidgetCompatibility</compatibilityClass>
     <type>worldclock-digital-text</type>
-    <group id="worldclock" icon="world">World Clock</group>
+    <group id="worldclock" icon="fa fa-globe">World Clock</group>
     <legacyType condition="templateId==='worldclock1'">worldclock</legacyType>
     <dataType></dataType>
     <schemaVersion>2</schemaVersion>
diff --git a/ui/src/layout-editor/main.js b/ui/src/layout-editor/main.js
index 149ad1de19..4c5a216cb7 100644
--- a/ui/src/layout-editor/main.js
+++ b/ui/src/layout-editor/main.js
@@ -1984,13 +1984,6 @@ lD.addModuleToPlaylist = function(
       animateDialog: false,
       initialisedBy: 'layout-designer-upload',
       buttons: {
-        viewLibrary: {
-          label: uploadTrans.viewLibrary,
-          className: 'btn-white btn-bb-viewlibrary',
-          callback: function() {
-            lD.toolbar.openNewTabAndSearch(moduleType);
-          },
-        },
         main: {
           label: translations.done,
           className: 'btn-primary btn-bb-main',
diff --git a/ui/src/playlist-editor/playlist.js b/ui/src/playlist-editor/playlist.js
index c2dfb32ad7..42c3bbfc58 100644
--- a/ui/src/playlist-editor/playlist.js
+++ b/ui/src/playlist-editor/playlist.js
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2023 Xibo Signage Ltd
+ *
+ * Xibo - Digital Signage - https://xibosignage.com
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 // PLAYLIST Module
 const Widget = require('../editor-core/widget.js');
 
@@ -169,13 +190,6 @@ Playlist.prototype.addObject = function(
         initialisedBy: 'playlist-editor-upload',
         className: 'second-dialog',
         buttons: {
-          viewLibrary: {
-            label: uploadTrans.viewLibrary,
-            className: 'btn-white btn-bb-viewlibrary',
-            callback: function() {
-              pE.toolbar.openNewTabAndSearch(draggableSubType);
-            },
-          },
           main: {
             label: translations.done,
             className: 'btn-primary btn-bb-main',
diff --git a/ui/src/style/common.scss b/ui/src/style/common.scss
index edc133d283..1e50be12e6 100644
--- a/ui/src/style/common.scss
+++ b/ui/src/style/common.scss
@@ -246,162 +246,6 @@ $fa-font-path: "~font-awesome/fonts";
     }
 }
 
-/* Modules icons */
-// Font Awesome
-/* TODO: Module icons should be based on classes defined in the module XML */
-.module-icon-audio, .media-icon-audio {
-    @extend .fa, .fa-file-audio;
-}
-
-.module-icon-calendar {
-    @extend .fa, .fa-calendar-o;
-}
-
-.module-icon-ics-calendar {
-    @extend .fa, .fa-calendar-alt;
-}
-
-.module-icon-chart {
-    @extend .fa, .fa-pie-chart;
-}
-
-.module-icon-clock, .module-icon-clock-digital, .module-icon-clock-flip, .module-icon-clock-analogue {
-    @extend .fa, .fa-clock-o;
-}
-
-.module-icon-countdown, .module-icon-countdown-days, .module-icon-countdown-table, .module-icon-countdown-text, .module-icon-countdown-clock {
-    @extend .fa, .fa-hourglass-o;
-}
-
-.module-icon-currencies {
-    @extend .fa, .fa-line-chart;
-}
-
-.module-icon-dataset {
-    @extend .fa, .fa-table;
-}
-
-.module-icon-embedded {
-    @extend .fa, .fa-code;
-}
-
-.module-icon-flash, .media-icon-flash {
-    @extend .fa, .fa-flash;
-}
-
-.module-icon-forecastio {
-    @extend .fa, .fa-cloud;
-}
-
-.module-icon-googletraffic {
-    @extend .fa, .fa-car;
-}
-
-.module-icon-hls {
-    @extend .fa, .fa-video-camera;
-}
-
-.module-icon-htmlpackage, .media-icon-htmlpackage {
-    @extend .fa, .fa-file-code-o;
-}
-
-.module-icon-image, .media-icon-image {
-    @extend .fa, .fa-file-image-o;
-}
-
-.module-icon-localvideo {
-    @extend .fa, .fa-file-video-o;
-}
-
-.module-icon-notificationview {
-    @extend .fa, .fa-bell-o;
-}
-
-.module-icon-pdf, .media-icon-pdf {
-    @extend .fa, .fa-file-pdf-o;
-}
-
-.module-icon-playlist, .module-icon-subplaylist {
-    @extend .fa, .fa-list-ol;
-}
-
-.module-icon-powerpoint, .media-icon-powerpoint {
-    @extend .fa, .fa-file-powerpoint-o;
-}
-
-.module-icon-shellcommand {
-    @extend .fa, .fa-terminal;
-}
-
-.module-icon-spacer {
-    @extend .fa, .fa-hourglass-o;
-}
-
-.module-icon-mastodon {
-    @extend .fab, .fa-mastodon;
-}
-
-.module-icon-stocks {
-    @extend .fa, .fa-bar-chart;
-}
-
-.module-icon-text {
-    @extend .fa, .fa-font;
-}
-
-.module-icon-rss-ticker {
-    @extend .fa, .fa-rss;
-}
-
-.module-icon-twitter {
-    @extend .fa, .fa-twitter;
-}
-
-.module-icon-twittermetro {
-    @extend .fa, .fa-twitter-square;
-}
-
-.module-icon-video, .media-icon-video {
-    @extend .fa, .fa-file-video-o;
-}
-
-.module-icon-videoin {
-    @extend .fa, .fa-video-camera;
-}
-
-.module-icon-weather {
-    @extend .fa, .fa-cloud;
-}
-
-.module-icon-webpage {
-    @extend .fa, .fa-sitemap;
-}
-
-.module-icon-worldclock, .module-icon-worldclock-analogue, .module-icon-worldclock-digital, .module-icon-worldclock-flip {
-    @extend .fa, .fa-globe;
-}
-
-.module-icon-menuboard {
-    @extend .fa, .fa-th;
-}
-
-.module-icon-dashboard {
-    @extend .fa, .fa-file-image;
-}
-
-.module-icon-zone {
-    @extend .fas, .fa-border-none;
-}
-
-.module-icon-menuboard-product {
-    @extend .fas, .fa-hamburger;
-}
-
-.module-icon-menuboard-category {
-    @extend .fa, .fa-list-alt;
-}
-
-
 /* Tools icons */
 .tool-icon-region {
     @extend .fa, .fa-clone;
diff --git a/ui/src/templates/layer-manager.hbs b/ui/src/templates/layer-manager.hbs
index 2f985c1131..86667074a3 100644
--- a/ui/src/templates/layer-manager.hbs
+++ b/ui/src/templates/layer-manager.hbs
@@ -35,7 +35,7 @@
                             <i class="fa fa-list-ol"></i>
                         {{/eq}}
                         {{#eq type 'staticWidget'}}
-                            <i class="module-icon-{{subType}}"></i>
+                            <i class="{{icon}}"></i>
                         {{/eq}}
 
                         <span class="name" title="{{../../trans.name}}">{{name}}</span>
diff --git a/ui/src/templates/playlist-timeline-widget.hbs b/ui/src/templates/playlist-timeline-widget.hbs
index 551e48d796..bcf144c53a 100644
--- a/ui/src/templates/playlist-timeline-widget.hbs
+++ b/ui/src/templates/playlist-timeline-widget.hbs
@@ -2,7 +2,7 @@
     data-type="widget"
     data-widget-id="{{ widgetId }}"
     data-widget-type="{{ subType }}"
-    data-duration="{{ calculatedDuration }}""
+    data-duration="{{ calculatedDuration }}"
     class="playlist-widget tooltip-always-on selectable 
         {{#eq isValid 0}}invalid-widget{{/eq}} 
         {{#if selected}}selected{{/if}} 
@@ -14,7 +14,7 @@
     <div
         class="widgetLabel timelineMediaItemColouringDefault timelineMediaItemColouring_{{ subType }} {{ widgetColouring }}">
         <div class="widgetSubType">
-            <i class="module-icon-{{subType}} tooltip-always-on" data-toggle="tooltip"
+            <i class="{{icon}} tooltip-always-on" data-toggle="tooltip"
                 data-container="#playlist-timeline" data-title="{{moduleName}}"></i>
         </div>
         <div class="widgetDuration">
diff --git a/ui/src/templates/toolbar-card-item.hbs b/ui/src/templates/toolbar-card-item.hbs
index 1416ad7c13..e8d7f2c296 100644
--- a/ui/src/templates/toolbar-card-item.hbs
+++ b/ui/src/templates/toolbar-card-item.hbs
@@ -18,7 +18,10 @@
     <div class="toolbar-card-thumb">
         <img src="{{thumbnail}}" />
     </div>
+{{else}}
+    <i class="element-icon {{icon}} card-icon"></i>
 {{/if}}
+
     
     <div class="toolbar-content tooltip-always-on" data-toggle="tooltip" data-title="{{title}}">
         <span class="card-title">{{title}}</span>
diff --git a/ui/src/templates/toolbar-card-media.hbs b/ui/src/templates/toolbar-card-media.hbs
index aba2f41693..8e1699b76c 100644
--- a/ui/src/templates/toolbar-card-media.hbs
+++ b/ui/src/templates/toolbar-card-media.hbs
@@ -28,7 +28,7 @@
         </div>
 
         {{#eq thumbnail null}}
-            <i class="media-icon-{{type}} card-icon"></i>
+            <i class="{{icon}} card-icon"></i>
         {{/eq}}
 
         {{#if provider}}
diff --git a/ui/src/templates/toolbar-card.hbs b/ui/src/templates/toolbar-card.hbs
index e06c3f9d06..609f32aa48 100644
--- a/ui/src/templates/toolbar-card.hbs
+++ b/ui/src/templates/toolbar-card.hbs
@@ -35,7 +35,7 @@
             <img src="{{thumbnail}}" />
         </div>
     {{else}}
-        <i class="{{icon}}-icon-{{type}} card-icon"></i>
+        <i class="{{iconType}}-icon {{icon}} card-icon"></i>
     {{/if}}
     
     <div class="toolbar-content tooltip-always-on" data-toggle="tooltip" data-title="{{title}}">
diff --git a/ui/src/templates/toolbar-content-group.hbs b/ui/src/templates/toolbar-content-group.hbs
index 18c907a99d..4a152bdd98 100644
--- a/ui/src/templates/toolbar-content-group.hbs
+++ b/ui/src/templates/toolbar-content-group.hbs
@@ -3,7 +3,7 @@
         <i class="fa fa-arrow-left"></i>
     </div>
     <div class="content-title">
-        <i class="module-icon-{{data.subType}} card-icon"></i>
+        <i class="{{data.icon}} card-icon"></i>
         {{!-- <span class="material-icons">{{data.subType}}</span> --}}
         <span>{{data.title}}</span>
     </div>
diff --git a/ui/src/templates/toolbar-content-submenu.hbs b/ui/src/templates/toolbar-content-submenu.hbs
index 9a5be19341..29f0db7f10 100644
--- a/ui/src/templates/toolbar-content-submenu.hbs
+++ b/ui/src/templates/toolbar-content-submenu.hbs
@@ -3,7 +3,7 @@
         <i class="fa fa-arrow-left"></i>
     </div>
     <div class="content-title">
-        <i class="module-icon-{{data.subType}} card-icon"></i>
+        <i class="{{data.icon}} card-icon"></i>
         {{!-- <span class="material-icons">{{data.subType}}</span> --}}
         <span>{{data.title}}</span>
     </div>
diff --git a/ui/src/templates/toolbar-content.hbs b/ui/src/templates/toolbar-content.hbs
index 332f6b07be..fafbd4739f 100644
--- a/ui/src/templates/toolbar-content.hbs
+++ b/ui/src/templates/toolbar-content.hbs
@@ -22,7 +22,7 @@
                 {{#each content.favourites}}
                     {{#unless hideCard}}
                         {{!-- Load cards according to type searchItem/Widget --}}
-                        {{> toolbar-card contentType=../name trans=../trans icon=../iconType}}
+                        {{> toolbar-card contentType=../name trans=../trans iconType=../iconType}}
                     {{/unless}}
                 {{/each}}
 
@@ -32,7 +32,7 @@
                 {{#each content.cards}}
                     {{#unless hideCard}}
                         {{!-- Load cards according to type searchItem/Widget --}}
-                        {{> toolbar-card contentType=../name trans=../trans icon=../iconType}}
+                        {{> toolbar-card contentType=../name trans=../trans iconType=../iconType}}
                     {{/unless}}
                 {{/each}}
 
@@ -42,7 +42,7 @@
                 {{#each content.alternativeCards}}
                     {{#unless hideCard}}
                         {{!-- Load cards according to type searchItem/Widget --}}
-                        {{> toolbar-card contentType=../name trans=../trans icon=../iconType}}
+                        {{> toolbar-card contentType=../name trans=../trans iconType=../iconType}}
                     {{/unless}}
                 {{/each}}
 
diff --git a/ui/src/templates/viewer-playlist-controls.hbs b/ui/src/templates/viewer-playlist-controls.hbs
index 3a51a8030a..ecc06e4c40 100644
--- a/ui/src/templates/viewer-playlist-controls.hbs
+++ b/ui/src/templates/viewer-playlist-controls.hbs
@@ -5,7 +5,7 @@
 {{#if isEmpty}}
     <div class="playlist-preview-empty">
         <i alt="{{ "A playlist region" }}"
-           class="module-preview-icon module-icon-subplaylist"></i>
+           class="module-preview-icon fa fa-list-ol"></i>
         <p>{{ trans.empty }}</p>
     </div>
 {{else}}
diff --git a/views/applications-page.twig b/views/applications-page.twig
index e8bc93da7c..62e1fa381e 100644
--- a/views/applications-page.twig
+++ b/views/applications-page.twig
@@ -140,6 +140,9 @@
             dataType:"json",
             success: function(xhr, textStatus, error) {
               $.each(xhr.data, function(index, element) {
+                if (element.isHidden) {
+                  return;
+                }
                 element.configureUrl = '{{ url_for("connector.edit.form", {id: ":id"}) }}'.replace(':id', element.connectorId);
                 element.proxyUrl = '{{ url_for("connector.edit.form.proxy", {id: ":id", method: ":method"}) }}'.replace(':id', element.connectorId);
                 element.thumbnail = element.thumbnail || 'theme/default/img/thumbs/placeholder.png';
diff --git a/views/common.twig b/views/common.twig
index 53b3736065..fa89260bb7 100644
--- a/views/common.twig
+++ b/views/common.twig
@@ -437,7 +437,6 @@
                 startUpload: "{{ "Start upload" |trans }}",
                 cancelUpload: "{{ "Cancel upload" |trans }}",
                 processing: "{{ "Processing..." |trans }}",
-                viewLibrary: "{{ "View Library" |trans }}",
                 widgetFromDt: "{{ "Start time" |trans }}",
                 widgetToDt: "{{ "End time" |trans }}",
                 widgetExpiryDates: "{{ "Set Expiry Dates" |trans }}",
diff --git a/views/module-icon-preview.twig b/views/module-icon-preview.twig
index f56fb67667..ccd4dbad57 100644
--- a/views/module-icon-preview.twig
+++ b/views/module-icon-preview.twig
@@ -1,4 +1,4 @@
 <div style="text-align:center;">
     <i alt="{{ moduleName}} thumbnail" 
-       class="module-preview-icon module-icon-{{ moduleType }}"></i>
+       class="module-preview-icon fa fa-{{ moduleIcon }}"></i>
 </div>
\ No newline at end of file
diff --git a/views/playlist-dashboard-spots.twig b/views/playlist-dashboard-spots.twig
index ffc78f1054..eb16d17b24 100644
--- a/views/playlist-dashboard-spots.twig
+++ b/views/playlist-dashboard-spots.twig
@@ -57,7 +57,7 @@
                                         <img src='{{downloadUrl}}?preview=1&isThumb=1' style='max-height: 50px; max-width: 50px;'/>
                                     </a>
                                 {% else %}
-                                    <i title="{{ widget.getUnmatchedProperty("name") }}" class="fa-2x module-icon-{{ widget.type }}" style="height: 50px; max-width: 50px;"></i>
+                                    <i title="{{ widget.getUnmatchedProperty("name") }}" class="fa-2x {{ widget.getUnmatchedProperty("moduleIcon") }}" style="height: 50px; max-width: 50px;"></i>
                                 {% endif %}
                             {% endif %}
                         </div>
diff --git a/views/playlist-dashboard.twig b/views/playlist-dashboard.twig
index 716392a48b..905ed6370e 100644
--- a/views/playlist-dashboard.twig
+++ b/views/playlist-dashboard.twig
@@ -248,7 +248,7 @@
 
                         $imgDiv.append(thumbnail);
                     } else {
-                        $imgDiv.append($("<i class=\"fa-2x module-icon-" + $container.data("mediaType") + "\" style=\"height: 50px; max-width: 50px;\"></i>"));
+                        $imgDiv.append($("<i class=\"fa fa-2x fa-check\" style=\"height: 50px; max-width: 50px;\"></i>"));
                     }
 
                 } else {