Refactor icons. Use SVG and foreground images. De-duplicate. Remove unused.

84 files changed, 102 insertions, 82 deletions

diff --git a/resources/views/icons/add.phtml b/resources/views/icons/add.phtml
index 95bca0ac56..922fedd6c3 100644
--- a/resources/views/icons/add.phtml
+++ b/resources/views/icons/add.phtml
@@ -1 +1 @@
-<i class="fas fa-plus fa-fw wt-icon-add" aria-hidden="true"></i>
+<span class="wt-icon-add"><i class="fas fa-plus fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/analytics.phtml b/resources/views/icons/analytics.phtml
index 62102aabe0..407f841616 100644
--- a/resources/views/icons/analytics.phtml
+++ b/resources/views/icons/analytics.phtml
@@ -1 +1 @@
-<i class="fas fa-magic fa-fw wt-icon-analytics" aria-hidden="true"></i>
+<span class="wt-icon-analytics"><i class="fas fa-magic fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/anniversary.phtml b/resources/views/icons/anniversary.phtml
index 89c7ba49dc..c43ad15798 100644
--- a/resources/views/icons/anniversary.phtml
+++ b/resources/views/icons/anniversary.phtml
@@ -1 +1 @@
-<i class="far fa-bell fa-fw wt-icon-anniversary" aria-hidden="true"></i>
+<span class="wt-icon-anniversary"><i class="far fa-bell fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/arrow-down.phtml b/resources/views/icons/arrow-down.phtml
index d208bcaca5..afaa789f70 100644
--- a/resources/views/icons/arrow-down.phtml
+++ b/resources/views/icons/arrow-down.phtml
@@ -1 +1 @@
-<i class="fas fa-arrow-down fa-fw wt-icon-arrow-down" aria-hidden="true"></i>
+<span class="wt-icon-arrow-down"><i class="fas fa-arrow-down fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/arrow-left.phtml b/resources/views/icons/arrow-left.phtml
index ae1251680c..0255954d39 100644
--- a/resources/views/icons/arrow-left.phtml
+++ b/resources/views/icons/arrow-left.phtml
@@ -1 +1 @@
-<i class="fas fa-arrow-left fa-fw wt-icon-arrow-left wt-icon-flip-rtl" aria-hidden="true"></i>
+<span class="wt-icon-arrow-left wt-icon-flip-rtl"><i class="fas fa-arrow-left fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/arrow-right.phtml b/resources/views/icons/arrow-right.phtml
index 3b61945ba1..5a965d6808 100644
--- a/resources/views/icons/arrow-right.phtml
+++ b/resources/views/icons/arrow-right.phtml
@@ -1 +1 @@
-<i class="fas fa-arrow-right fa-fw wt-icon-arrow-right wt-icon-flip-rtl" aria-hidden="true"></i>
+<span class="wt-icon-arrow-right wt-icon-flip-rtl"><i class="fas fa-arrow-right fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/arrow-up.phtml b/resources/views/icons/arrow-up.phtml
index f96e83425a..386a1345d0 100644
--- a/resources/views/icons/arrow-up.phtml
+++ b/resources/views/icons/arrow-up.phtml
@@ -1 +1 @@
-<i class="fas fa-arrow-up fa-fw wt-icon-arrow-up" aria-hidden="true"></i>
+<span class="wt-icon-arrow-up"><i class="fas fa-arrow-up fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/ban.phtml b/resources/views/icons/ban.phtml
index c3e2bfebd0..2de1c7b961 100644
--- a/resources/views/icons/ban.phtml
+++ b/resources/views/icons/ban.phtml
@@ -1 +1 @@
-<i class="fas fa-ban fa-fw text-danger wt-icon-ban" aria-hidden="true"></i>
+<span class="wt-icon-ban"><i class="fas fa-ban fa-fw text-danger" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/bing-maps.phtml b/resources/views/icons/bing-maps.phtml
index b18caffa07..eea9fa98d6 100644
--- a/resources/views/icons/bing-maps.phtml
+++ b/resources/views/icons/bing-maps.phtml
@@ -1 +1 @@
-<i class="fas fa-map fa-fw wt-icon-bing-maps" aria-hidden="true"></i>
+<span class="wt-icon-bing-maps"><i class="fas fa-map fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/block-tree.phtml b/resources/views/icons/block-tree.phtml
index 2a175855f3..a6a9574c19 100644
--- a/resources/views/icons/block-tree.phtml
+++ b/resources/views/icons/block-tree.phtml
@@ -1 +1 @@
-<i class="fas fa-tree fa-fw wt-icon-block-tree" aria-hidden="true"></i>
+<span class="wt-icon-block-tree"><i class="fas fa-tree fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/block-user.phtml b/resources/views/icons/block-user.phtml
index de7d0dcecf..a0c2b3c477 100644
--- a/resources/views/icons/block-user.phtml
+++ b/resources/views/icons/block-user.phtml
@@ -1 +1 @@
-<i class="far fa-user fa-fw wt-icon-block-user" aria-hidden="true"></i>
+<span class="wt-icon-block-user"><i class="far fa-user fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/block.phtml b/resources/views/icons/block.phtml
index 9e59618915..63bf57c1a2 100644
--- a/resources/views/icons/block.phtml
+++ b/resources/views/icons/block.phtml
@@ -1 +1 @@
-<i class="fas fa-th-list fa-flip-horizontal fa-fw wt-icon-block" aria-hidden="true"></i>
+<span class="wt-icon-block"><i class="fas fa-th-list fa-flip-horizontal fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/calendar.phtml b/resources/views/icons/calendar.phtml
index 5726650a0f..b536284bd1 100644
--- a/resources/views/icons/calendar.phtml
+++ b/resources/views/icons/calendar.phtml
@@ -1 +1 @@
-<i class="fas fa-calendar fa-fw wt-icon-calendar" aria-hidden="true"></i>
+<span class="wt-icon-calendar"><i class="fas fa-calendar fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/cancel.phtml b/resources/views/icons/cancel.phtml
index 06ac0c072a..0a4a6d35ae 100644
--- a/resources/views/icons/cancel.phtml
+++ b/resources/views/icons/cancel.phtml
@@ -1 +1 @@
-<i class="fas fa-times fa-fw wt-icon-cancel" aria-hidden="true"></i>
+<span class="wt-icon-cancel"><i class="fas fa-times fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/chart.phtml b/resources/views/icons/chart.phtml
index 6cd0db4ed6..5314eb064c 100644
--- a/resources/views/icons/chart.phtml
+++ b/resources/views/icons/chart.phtml
@@ -1 +1 @@
-<i class="fas fa-sitemap fa-fw wt-icon-chart" aria-hidden="true"></i>
+<span class="wt-icon-chart"><i class="fas fa-sitemap fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/collapse.phtml b/resources/views/icons/collapse.phtml
index 39ca9e11ba..0e233c9fde 100644
--- a/resources/views/icons/collapse.phtml
+++ b/resources/views/icons/collapse.phtml
@@ -1 +1 @@
-<i class="far fa-minus-square fa-fw wt-icon-collapse" aria-hidden="true"></i>
+<span class="wt-icon-collapse"><i class="far fa-minus-square fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/coordinates.phtml b/resources/views/icons/coordinates.phtml
index 805be69196..39769389d9 100644
--- a/resources/views/icons/coordinates.phtml
+++ b/resources/views/icons/coordinates.phtml
@@ -1 +1 @@
-<i class="fas fa-map-marker-alt fa-fw wt-icon-coordinates" aria-hidden="true"></i>
+<span class="wt-icon-coordinates"><i class="fas fa-map-marker-alt fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/copy.phtml b/resources/views/icons/copy.phtml
index c692368291..4551854261 100644
--- a/resources/views/icons/copy.phtml
+++ b/resources/views/icons/copy.phtml
@@ -1 +1 @@
-<i class="far fa-copy fa-fw wt-icon-copy" aria-hidden="true"></i>
+<span class="wt-icon-copy"><i class="far fa-copy fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/delete.phtml b/resources/views/icons/delete.phtml
index 2695828e51..7141138d57 100644
--- a/resources/views/icons/delete.phtml
+++ b/resources/views/icons/delete.phtml
@@ -1 +1 @@
-<i class="far fa-trash-alt fa-fw wt-icon-delete" aria-hidden="true"></i>
+<span class="wt-icon-delete"><i class="far fa-trash-alt fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/download.phtml b/resources/views/icons/download.phtml
index 5194ab2a1f..b383dfe9fb 100644
--- a/resources/views/icons/download.phtml
+++ b/resources/views/icons/download.phtml
@@ -1 +1 @@
-<i class="fas fa-download fa-fw wt-icon-upload" aria-hidden="true"></i>
+<span class="wt-icon-upload"><i class="fas fa-download fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/drag-handle.phtml b/resources/views/icons/drag-handle.phtml
index 067416a846..2e4876fe47 100644
--- a/resources/views/icons/drag-handle.phtml
+++ b/resources/views/icons/drag-handle.phtml
@@ -1 +1 @@
-<i class="fas fa-grip-horizontal fa-fw wt-icon-drag-handle" style="cursor:move;"></i>
+<span class="wt-icon-drag-handle"><i class="fas fa-grip-horizontal fa-fw" style="cursor:move;"></i></span>
diff --git a/resources/views/icons/edit.phtml b/resources/views/icons/edit.phtml
index 7523216601..88bfe5adca 100644
--- a/resources/views/icons/edit.phtml
+++ b/resources/views/icons/edit.phtml
@@ -1 +1 @@
-<i class="fas fa-pencil-alt fa-fw wt-icon-edit" aria-hidden="true"></i>
+<span class="wt-icon-edit"><i class="fas fa-pencil-alt fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/email.phtml b/resources/views/icons/email.phtml
index c956ada15e..3cb9431e60 100644
--- a/resources/views/icons/email.phtml
+++ b/resources/views/icons/email.phtml
@@ -1 +1 @@
-<i class="far fa-envelope fa-fw wt-icon-email" aria-hidden="true"></i>
+<span class="wt-icon-email"><i class="far fa-envelope fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/expand.phtml b/resources/views/icons/expand.phtml
index ab72399b55..2a09d86af5 100644
--- a/resources/views/icons/expand.phtml
+++ b/resources/views/icons/expand.phtml
@@ -1 +1 @@
-<i class="far fa-plus-square fa-fw wt-icon-expand" aria-hidden="true"></i>
+<span class="wt-icon-expand"><i class="far fa-plus-square fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/family.phtml b/resources/views/icons/family.phtml
index 00a4effa80..5d5a939bdd 100644
--- a/resources/views/icons/family.phtml
+++ b/resources/views/icons/family.phtml
@@ -1 +1 @@
-<i class="fas fa-users fa-fw wt-icon-family" aria-hidden="true"></i>
+<span class="wt-icon-family"><i class="fas fa-users fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/favorite.phtml b/resources/views/icons/favorite.phtml
index 1554cb95a3..a379947b9c 100644
--- a/resources/views/icons/favorite.phtml
+++ b/resources/views/icons/favorite.phtml
@@ -1 +1 @@
-<i class="far fa-star fa-fw wt-icon-favorite" aria-hidden="true"></i>
+<span class="wt-icon-favorite"><i class="far fa-star fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/file.phtml b/resources/views/icons/file.phtml
index c30185ba62..a8d0b38c6e 100644
--- a/resources/views/icons/file.phtml
+++ b/resources/views/icons/file.phtml
@@ -1 +1 @@
-<i class="far fa-file fa-fw wt-icon-file" aria-hidden="true"></i>
+<span class="wt-icon-file"><i class="far fa-file fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/folder.phtml b/resources/views/icons/folder.phtml
index 423a030c84..512961bd16 100644
--- a/resources/views/icons/folder.phtml
+++ b/resources/views/icons/folder.phtml
@@ -1 +1 @@
-<i class="far fa-folder fa-fw wt-icon-folder" aria-hidden="true"></i>
+<span class="wt-icon-folder"><i class="far fa-folder fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/footer.phtml b/resources/views/icons/footer.phtml
index a43d75faa5..af5deb3eb3 100644
--- a/resources/views/icons/footer.phtml
+++ b/resources/views/icons/footer.phtml
@@ -1 +1 @@
-<i class="fas fa-grip-lines fa-fw wt-icon-footer" aria-hidden="true"></i>
+<span class="wt-icon-footer"><i class="fas fa-grip-lines fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/google-maps.phtml b/resources/views/icons/google-maps.phtml
index e3d7c35a02..5f4573b457 100644
--- a/resources/views/icons/google-maps.phtml
+++ b/resources/views/icons/google-maps.phtml
@@ -1 +1 @@
-<i class="fas fa-map fa-fw wt-icon-google-maps" aria-hidden="true"></i>
+<span class="wt-icon-google-maps"><i class="fas fa-map fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/help.phtml b/resources/views/icons/help.phtml
index cab0e99de6..69c597b3f2 100644
--- a/resources/views/icons/help.phtml
+++ b/resources/views/icons/help.phtml
@@ -1 +1 @@
-<i class="fas fa-question-circle fa-fw wt-icon-help" aria-hidden="true"></i>
+<span class="wt-icon-help"><i class="fas fa-question-circle fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/history.phtml b/resources/views/icons/history.phtml
index 05a90ac852..a2b9c7f430 100644
--- a/resources/views/icons/history.phtml
+++ b/resources/views/icons/history.phtml
@@ -1 +1 @@
-<i class="fas fa-history fa-fw wt-icon-history" aria-hidden="true"></i>
+<span class="wt-icon-history"><i class="fas fa-history fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/individual.phtml b/resources/views/icons/individual.phtml
index ade451cb74..d17bd4f93f 100644
--- a/resources/views/icons/individual.phtml
+++ b/resources/views/icons/individual.phtml
@@ -1 +1 @@
-<i class="far fa-user fa-fw wt-icon-individual" aria-hidden="true"></i>
+<span class="wt-icon-individual"><i class="far fa-user fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/information.phtml b/resources/views/icons/information.phtml
index 9152155dc8..84c25eb841 100644
--- a/resources/views/icons/information.phtml
+++ b/resources/views/icons/information.phtml
@@ -1 +1 @@
-<i class="fas fa-info-circle fa-fw wt-icon-information" aria-hidden="true"></i>
+<span class="wt-icon-information"><i class="fas fa-info-circle fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/keyboard.phtml b/resources/views/icons/keyboard.phtml
index 8bf8438155..bbcdaffdf9 100644
--- a/resources/views/icons/keyboard.phtml
+++ b/resources/views/icons/keyboard.phtml
@@ -1 +1 @@
-<i class="far fa-keyboard wt-icon-keyboard" aria-hidden="true"></i>
+<span class="wt-icon-keyboard"><i class="far fa-keyboard" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/language.phtml b/resources/views/icons/language.phtml
index 8dec9dc22e..75339cd27c 100644
--- a/resources/views/icons/language.phtml
+++ b/resources/views/icons/language.phtml
@@ -1 +1 @@
-<i class="fas fa-language fa-fw wt-icon-language" aria-hidden="true"></i>
+<span class="wt-icon-language"><i class="fas fa-language fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/link.phtml b/resources/views/icons/link.phtml
index 178cee9413..9f93752679 100644
--- a/resources/views/icons/link.phtml
+++ b/resources/views/icons/link.phtml
@@ -1 +1 @@
-<i class="fas fa-link fa-fw wt-icon-link" aria-hidden="true"></i>
+<span class="wt-icon-link"><i class="fas fa-link fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/list.phtml b/resources/views/icons/list.phtml
index 2d0344f114..ba53308392 100644
--- a/resources/views/icons/list.phtml
+++ b/resources/views/icons/list.phtml
@@ -1 +1 @@
-<i class="fas fa-list fa-fw wt-icon-list" aria-hidden="true"></i>
+<span class="wt-icon-list"><i class="fas fa-list fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/location.phtml b/resources/views/icons/location.phtml
index f0d9d14736..3f1f5f5719 100644
--- a/resources/views/icons/location.phtml
+++ b/resources/views/icons/location.phtml
@@ -1 +1 @@
-<i class="fas fa-map-marker-alt fa-fw wt-icon-location" aria-hidden="true"></i>
+<span class="wt-icon-location"><i class="fas fa-map-marker-alt fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/lock.phtml b/resources/views/icons/lock.phtml
index 6eb5c72412..1d5dacd50f 100644
--- a/resources/views/icons/lock.phtml
+++ b/resources/views/icons/lock.phtml
@@ -1 +1 @@
-<i class="fas fa-lock fa-fw wt-icon-lock" aria-hidden="true"></i>
+<span class="wt-icon-lock"><i class="fas fa-lock fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/map.phtml b/resources/views/icons/map.phtml
index 7acecedbf2..db34198c11 100644
--- a/resources/views/icons/map.phtml
+++ b/resources/views/icons/map.phtml
@@ -1 +1 @@
-<i class="far fa-map fa-fw wt-icon-map" aria-hidden="true"></i>
+<span class="wt-icon-map"><i class="fas fa-map fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/media-next.phtml b/resources/views/icons/media-next.phtml
index db6cccd363..e024420069 100644
--- a/resources/views/icons/media-next.phtml
+++ b/resources/views/icons/media-next.phtml
@@ -1 +1 @@
-<i class="fas fa-step-forward fa-fw wt-icon-media-next wt-icon-flip-rtl" aria-hidden="true"></i>
+<span class="wt-icon-media-next wt-icon-flip-rtl"><i class="fas fa-step-forward fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/media-play.phtml b/resources/views/icons/media-play.phtml
index d1ce1a5ffd..3c120eff2f 100644
--- a/resources/views/icons/media-play.phtml
+++ b/resources/views/icons/media-play.phtml
@@ -1 +1 @@
-<i class="fas fa-play fa-fw wt-icon-media-play wt-icon-flip-rtl" aria-hidden="true"></i>
+<span class="wt-icon-media-play wt-icon-flip-rtl"><i class="fas fa-play fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/media-stop.phtml b/resources/views/icons/media-stop.phtml
index 7bf074c0ca..e27c7a304f 100644
--- a/resources/views/icons/media-stop.phtml
+++ b/resources/views/icons/media-stop.phtml
@@ -1 +1 @@
-<i class="fas fa-stop fa-fw wt-icon-media-stop" aria-hidden="true"></i>
+<span class="wt-icon-media-stop"><i class="fas fa-stop fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/media.phtml b/resources/views/icons/media.phtml
index 4cbbf394bf..6aae6dade9 100644
--- a/resources/views/icons/media.phtml
+++ b/resources/views/icons/media.phtml
@@ -1 +1 @@
-<i class="far fa-file-image fa-fw wt-icon-media" aria-hidden="true"></i>
+<span class="wt-icon-media"><i class="far fa-file-image fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/menu.phtml b/resources/views/icons/menu.phtml
index a68c11b67a..572aacfec8 100644
--- a/resources/views/icons/menu.phtml
+++ b/resources/views/icons/menu.phtml
@@ -1 +1 @@
-<i class="fas fa-bars fa-fw wt-icon-menu" aria-hidden="true"></i>
+<span class="wt-icon-menu"><i class="fas fa-bars fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/merge.phtml b/resources/views/icons/merge.phtml
index de2ba173c9..7f82efb8e6 100644
--- a/resources/views/icons/merge.phtml
+++ b/resources/views/icons/merge.phtml
@@ -1 +1 @@
-<i class="fas fa-code-branch fa-fw wt-icon-merge" aria-hidden="true"></i>
+<span class="wt-icon-merge"><i class="fas fa-code-branch fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/mime.phtml b/resources/views/icons/mime.phtml
index 79ab88c26c..78f20390c3 100644
--- a/resources/views/icons/mime.phtml
+++ b/resources/views/icons/mime.phtml
@@ -1 +1 @@
-<i class="wt-mime wt-mime-<?= e(explode('/', $type)[0]) ?> wt-mime-<?= strtr($type, '/', '-') ?>" aria-hidden="true"></i>
+<span class="wt-mime wt-mime-<?= e(explode('/', $type)[0]) ?> wt-mime-<?= strtr($type, '/', '-') ?>" aria-hidden="true"></span>
diff --git a/resources/views/icons/module.phtml b/resources/views/icons/module.phtml
index 3b03a90f17..d44dd8e3e7 100644
--- a/resources/views/icons/module.phtml
+++ b/resources/views/icons/module.phtml
@@ -1 +1 @@
-<i class="fas fa-puzzle-piece fa-fw wt-icon-module" aria-hidden="true"></i>
+<span class="wt-icon-module"><i class="fas fa-puzzle-piece fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/note.phtml b/resources/views/icons/note.phtml
index 9c8f2b0470..60a4ac3b55 100644
--- a/resources/views/icons/note.phtml
+++ b/resources/views/icons/note.phtml
@@ -1 +1 @@
-<i class="far fa-sticky-note fa-fw wt-icon-note" aria-hidden="true"></i>
+<span class="wt-icon-note"><i class="far fa-sticky-note fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/openstreetmap.phtml b/resources/views/icons/openstreetmap.phtml
index 803350c3ef..08b590aefc 100644
--- a/resources/views/icons/openstreetmap.phtml
+++ b/resources/views/icons/openstreetmap.phtml
@@ -1 +1 @@
-<i class="fas fa-map fa-fw wt-icon-openstreetmap" aria-hidden="true"></i>
+<span class="wt-icon-openstreetmap"><i class="fas fa-map fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/pedigree-down.phtml b/resources/views/icons/pedigree-down.phtml
index 07cd5fc2d3..a2203c81dc 100644
--- a/resources/views/icons/pedigree-down.phtml
+++ b/resources/views/icons/pedigree-down.phtml
@@ -1 +1 @@
-<i class="fas fa-sitemap fa-fw wt-icon-pedigree-down" aria-hidden="true"></i>
+<span class="wt-icon-pedigree-down"><i class="fas fa-sitemap fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/pedigree-left.phtml b/resources/views/icons/pedigree-left.phtml
index 09ab6cd271..e4d7b17672 100644
--- a/resources/views/icons/pedigree-left.phtml
+++ b/resources/views/icons/pedigree-left.phtml
@@ -1 +1 @@
-<i class="fas fa-sitemap fa-fw fa-rotate-90 wt-icon-pedigree-bottom" aria-hidden="true"></i>
+<span class="wt-icon-pedigree-left wt-icon-flip-rtl"><i class="fas fa-sitemap fa-fw fa-rotate-90" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/pedigree-right.phtml b/resources/views/icons/pedigree-right.phtml
index 831938108f..7471918181 100644
--- a/resources/views/icons/pedigree-right.phtml
+++ b/resources/views/icons/pedigree-right.phtml
@@ -1 +1 @@
-<i class="fas fa-sitemap fa-fw fa-rotate-270 wt-icon-pedigree-bottom" aria-hidden="true"></i>
+<span class="wt-icon-pedigree-right wt-icon-flip-rtl"><i class="fas fa-sitemap fa-fw fa-rotate-270" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/pedigree-up.phtml b/resources/views/icons/pedigree-up.phtml
index a0d7ac667f..b424e27efb 100644
--- a/resources/views/icons/pedigree-up.phtml
+++ b/resources/views/icons/pedigree-up.phtml
@@ -1 +1 @@
-<i class="fas fa-sitemap fa-fw fa-rotate-180 wt-icon-pedigree-up" aria-hidden="true"></i>
+<span class="wt-icon-pedigree-up"><i class="fas fa-sitemap fa-fw fa-rotate-180 " aria-hidden="true"></i></span>
diff --git a/resources/views/icons/pin.phtml b/resources/views/icons/pin.phtml
index 842fb20716..8ba57519e0 100644
--- a/resources/views/icons/pin.phtml
+++ b/resources/views/icons/pin.phtml
@@ -1 +1 @@
-<i class="fas fa-thumbtack fa-fw wt-icon-pin" aria-hidden="true"></i>
+<span class="wt-icon-pin"><i class="fas fa-thumbtack fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/preferences.phtml b/resources/views/icons/preferences.phtml
index 29d434b2ba..0b939ec025 100644
--- a/resources/views/icons/preferences.phtml
+++ b/resources/views/icons/preferences.phtml
@@ -1 +1 @@
-<i class="fas fa-wrench fa-fw wt-icon-preferences" aria-hidden="true"></i>
+<span class="wt-icon-preferences"><i class="fas fa-wrench fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/record.phtml b/resources/views/icons/record.phtml
new file mode 100644
index 0000000000..01e6e04540
--- /dev/null
+++ b/resources/views/icons/record.phtml
@@ -0,0 +1,15 @@
+<?php if ($record::RECORD_TYPE === 'INDI') : ?>
+    <?= view('icons/individual') ?>
+<?php elseif ($record::RECORD_TYPE === 'FAM') : ?>
+    <?= view('icons/family') ?>
+<?php elseif ($record::RECORD_TYPE === 'SOUR') : ?>
+    <?= view('icons/source') ?>
+<?php elseif ($record::RECORD_TYPE === 'REPO') : ?>
+    <?= view('icons/repository') ?>
+<?php elseif ($record::RECORD_TYPE === 'NOTE') : ?>
+    <?= view('icons/note') ?>
+<?php elseif ($record::RECORD_TYPE === 'OBJE') : ?>
+    <?= view('icons/media') ?>
+<?php elseif ($record::RECORD_TYPE === 'SUBM') : ?>
+    <?= view('icons/submitter') ?>
+<?php endif ?>
diff --git a/resources/views/icons/reorder.phtml b/resources/views/icons/reorder.phtml
index 3fb17b77ad..406fbb32cb 100644
--- a/resources/views/icons/reorder.phtml
+++ b/resources/views/icons/reorder.phtml
@@ -1 +1 @@
-<i class="fas fa-arrows-alt-v fa-fw wt-icon-reorder" aria-hidden="true"></i>
+<span class="wt-icon-reorder"><i class="fas fa-arrows-alt-v fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/report.phtml b/resources/views/icons/report.phtml
index 6bad3f54cf..f2ccc97f1f 100644
--- a/resources/views/icons/report.phtml
+++ b/resources/views/icons/report.phtml
@@ -1 +1 @@
-<i class="far fa-file fa-fw wt-icon-report" aria-hidden="true"></i>
+<span class="wt-icon-report"><i class="far fa-file fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/repository.phtml b/resources/views/icons/repository.phtml
index 76badf3061..71403aedcc 100644
--- a/resources/views/icons/repository.phtml
+++ b/resources/views/icons/repository.phtml
@@ -1 +1 @@
-<i class="fas fa-university fa-fw wt-icon-repository" aria-hidden="true"></i>
+<span class="wt-icon-repository"><i class="fas fa-university fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/save.phtml b/resources/views/icons/save.phtml
index 3c70099951..311a7d6c74 100644
--- a/resources/views/icons/save.phtml
+++ b/resources/views/icons/save.phtml
@@ -1 +1 @@
-<i class="fas fa-check fa-fw wt-icon-save" aria-hidden="true"></i>
+<span class="wt-icon-save"><i class="fas fa-check fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/search.phtml b/resources/views/icons/search.phtml
index 63af4e36ad..2758b838a2 100644
--- a/resources/views/icons/search.phtml
+++ b/resources/views/icons/search.phtml
@@ -1 +1 @@
-<i class="fas fa-search fa-fw wt-icon-search" aria-hidden="true"></i>
+<span class="wt-icon-search"><i class="fas fa-search fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/sex-F.phtml b/resources/views/icons/sex-F.phtml
deleted file mode 100644
index 02b7ef53c6..0000000000
--- a/resources/views/icons/sex-F.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<i class="fas fa-venus fa-fw wt-icon-sex-f" aria-hidden="true"></i>
diff --git a/resources/views/icons/sex-M.phtml b/resources/views/icons/sex-M.phtml
deleted file mode 100644
index 0d4e169219..0000000000
--- a/resources/views/icons/sex-M.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<i class="fas fa-mars fa-fw wt-icon-sex-m" aria-hidden="true"></i>
diff --git a/resources/views/icons/sex-U.phtml b/resources/views/icons/sex-U.phtml
deleted file mode 100644
index 27d324fe7a..0000000000
--- a/resources/views/icons/sex-U.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<i class="fas fa-genderless fa-fw wt-icon-sex-u" aria-hidden="true"></i>
diff --git a/resources/views/icons/sex-X.phtml b/resources/views/icons/sex-X.phtml
deleted file mode 100644
index df0cf16621..0000000000
--- a/resources/views/icons/sex-X.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<i class="fas fa-transgender fa-fw wt-icon-sex-x" aria-hidden="true"></i>
diff --git a/resources/views/icons/sex.phtml b/resources/views/icons/sex.phtml
new file mode 100644
index 0000000000..e977c9f8f9
--- /dev/null
+++ b/resources/views/icons/sex.phtml
@@ -0,0 +1,9 @@
+<?php if ($sex === 'F') : ?>
+<span class="wt-icon-sex wt-icon-sex-f"><i class="fas fa-venus fa-fw" aria-hidden="true"></i></span>
+<?php elseif ($sex === 'M') : ?>
+    <span class="wt-icon-sex wt-icon-sex-m"><i class="fas fa-mars fa-fw" aria-hidden="true"></i></span>
+<?php elseif ($sex === 'X') : ?>
+    <span class="wt-icon-sex wt-icon-sex-x"><i class="fas fa-transgender fa-fw" aria-hidden="true"></i></span>
+<?php elseif ($sex === 'U') : ?>
+    <span class="wt-icon-sex wt-icon-sex-u"><i class="fas fa-genderless fa-fw" aria-hidden="true"></i></span>
+<?php endif ?>
diff --git a/resources/views/icons/sidebar.phtml b/resources/views/icons/sidebar.phtml
index 6a49f5f2d4..e496d93ea3 100644
--- a/resources/views/icons/sidebar.phtml
+++ b/resources/views/icons/sidebar.phtml
@@ -1 +1 @@
-<i class="fas fa-pause fa-fw wt-icon-sidebar" aria-hidden="true"></i>
+<span class="wt-icon-sidebar"><i class="fas fa-pause fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/sort.phtml b/resources/views/icons/sort.phtml
index 6ece5275fe..7514f81b29 100644
--- a/resources/views/icons/sort.phtml
+++ b/resources/views/icons/sort.phtml
@@ -1 +1 @@
-<i class="fas fa-sort-amount-down fa-fw wt-icon-sort" aria-hidden="true"></i>
+<span class="wt-icon-sort"><i class="fas fa-sort-amount-down fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/source.phtml b/resources/views/icons/source.phtml
index 5b52f848c1..6f8a0523d5 100644
--- a/resources/views/icons/source.phtml
+++ b/resources/views/icons/source.phtml
@@ -1 +1 @@
-<i class="far fa-file-alt fa-fw wt-icon-source" aria-hidden="true"></i>
+<span class="wt-icon-source"><i class="far fa-file-alt fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/spacer.phtml b/resources/views/icons/spacer.phtml
index 2a4dde6560..bf23b06c90 100644
--- a/resources/views/icons/spacer.phtml
+++ b/resources/views/icons/spacer.phtml
@@ -1 +1 @@
-<i class="fas fa-fw" aria-hidden="true"></i>
+<span class=""><i class="fas fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/submitter.phtml b/resources/views/icons/submitter.phtml
index 4a0644c83c..3b4139d085 100644
--- a/resources/views/icons/submitter.phtml
+++ b/resources/views/icons/submitter.phtml
@@ -1 +1 @@
-<i class="far fa-user fa-fw wt-icon-submitter" aria-hidden="true"></i>
+<span class="wt-icon-submitter"><i class="far fa-user fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/sync.phtml b/resources/views/icons/sync.phtml
index c929862996..ff5141b275 100644
--- a/resources/views/icons/sync.phtml
+++ b/resources/views/icons/sync.phtml
@@ -1 +1 @@
-<i class="fas fa-sync-alt fa-fw wt-icon-sync" aria-hidden="true"></i>
+<span class="wt-icon-sync"><i class="fas fa-sync-alt fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/tab.phtml b/resources/views/icons/tab.phtml
index a6d73edb96..a56964beca 100644
--- a/resources/views/icons/tab.phtml
+++ b/resources/views/icons/tab.phtml
@@ -1 +1 @@
-<i class="far fa-folder fa-fw wt-icon-theme" aria-hidden="true"></i>
+<span class="wt-icon-theme"><i class="far fa-folder fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/theme.phtml b/resources/views/icons/theme.phtml
index ff1302a46e..4759fa7a1d 100644
--- a/resources/views/icons/theme.phtml
+++ b/resources/views/icons/theme.phtml
@@ -1 +1 @@
-<i class="fas fa-paint-brush fa-fw wt-icon-theme" aria-hidden="true"></i>
+<span class="wt-icon-theme"><i class="fas fa-paint-brush fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/tree.phtml b/resources/views/icons/tree.phtml
index 6ecae766d9..40e6f9f6aa 100644
--- a/resources/views/icons/tree.phtml
+++ b/resources/views/icons/tree.phtml
@@ -1 +1 @@
-<i class="fas fa-tree fa-fw wt-icon-tree" aria-hidden="true"></i>
+<span class="wt-icon-tree"><i class="fas fa-tree fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/unlink.phtml b/resources/views/icons/unlink.phtml
index 1a5741a1eb..e0372f1e0c 100644
--- a/resources/views/icons/unlink.phtml
+++ b/resources/views/icons/unlink.phtml
@@ -1 +1 @@
-<i class="fas fa-unlink fa-fw wt-icon-unlink" aria-hidden="true"></i>
+<span class="wt-icon-unlink"><i class="fas fa-unlink fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/upload.phtml b/resources/views/icons/upload.phtml
index f5c42956c4..6c2d741080 100644
--- a/resources/views/icons/upload.phtml
+++ b/resources/views/icons/upload.phtml
@@ -1 +1 @@
-<i class="fas fa-upload fa-fw wt-icon-upload" aria-hidden="true"></i>
+<span class="wt-icon-upload"><i class="fas fa-upload fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/user.phtml b/resources/views/icons/user.phtml
index 3476257dbe..38fb5988fa 100644
--- a/resources/views/icons/user.phtml
+++ b/resources/views/icons/user.phtml
@@ -1 +1 @@
-<i class="fas fa-user fa-fw wt-icon-user" aria-hidden="true"></i>
+<span class="wt-icon-user"><i class="far fa-user fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/warning.phtml b/resources/views/icons/warning.phtml
index 9cba892488..07f778f2eb 100644
--- a/resources/views/icons/warning.phtml
+++ b/resources/views/icons/warning.phtml
@@ -1 +1 @@
-<i class="fas fa-exclamation-triangle fa-fw text-warning wt-icon-warning" aria-hidden="true"></i>
+<span class="wt-icon-warning"><i class="fas fa-exclamation-triangle fa-fw text-warning" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/wizard.phtml b/resources/views/icons/wizard.phtml
index a9e91287fe..8d5a1f4fa9 100644
--- a/resources/views/icons/wizard.phtml
+++ b/resources/views/icons/wizard.phtml
@@ -1 +1 @@
-<i class="fas fa-magic fa-fw wt-icon-wizard" aria-hidden="true"></i>
+<span class="wt-icon-wizard"><i class="fas fa-magic fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/zoom-in.phtml b/resources/views/icons/zoom-in.phtml
index 27bf9269b0..5540699b33 100644
--- a/resources/views/icons/zoom-in.phtml
+++ b/resources/views/icons/zoom-in.phtml
@@ -1 +1 @@
-<i class="fas fa-search-plus fa-fw wt-icon-zoom-in" aria-hidden="true"></i>
+<span class="wt-icon-zoom-in"><i class="fas fa-search-plus fa-fw" aria-hidden="true"></i></span>
diff --git a/resources/views/icons/zoom-out.phtml b/resources/views/icons/zoom-out.phtml
index 1684fed6ca..3b73b26a4d 100644
--- a/resources/views/icons/zoom-out.phtml
+++ b/resources/views/icons/zoom-out.phtml
@@ -1 +1 @@
-<i class="fas fa-search-minus fa-fw wt-icon-zoom-out" aria-hidden="true"></i>
+<span class="wt-icon-zoom-out"><i class="fas fa-search-minus fa-fw" aria-hidden="true"></i></span>