Use views for icons

28 files changed, 84 insertions, 72 deletions

diff --git a/resources/views/admin/clean-data.php b/resources/views/admin/clean-data.php
index 9c9ad2e9fa..f046f6072b 100644
--- a/resources/views/admin/clean-data.php
+++ b/resources/views/admin/clean-data.php
@@ -5,7 +5,7 @@
 <h1><?= $title ?></h1>
 
 <p>
-	<?= I18N::translate('Files marked with %s are required for proper operation and cannot be removed.', '<i class="fas fa-ban text-danger"></i>') ?>
+	<?= I18N::translate('Files marked with %s are required for proper operation and cannot be removed.', view('icons/ban')) ?>
 </p>
 
 <form method="post">
@@ -15,9 +15,9 @@
 		<?php
 		foreach ($entries as $entry) {
 			if (in_array($entry, $protected)) {
-				echo '<li><span class="fa-li"><i class="fas fa-ban text-danger"></i></span>', e($entry), '</li>';
+				echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>';
 			} else {
-				echo '<li><span class="fa-li">' . view('icons/search') . '</span>';
+				echo '<li><span class="fa-li">' . view('icons/delete') . '</span>';
 				echo '<label>';
 				echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> ';
 				echo e($entry);
diff --git a/resources/views/admin/control-panel.php b/resources/views/admin/control-panel.php
index 8bfd2fa2b9..8add649c68 100644
--- a/resources/views/admin/control-panel.php
+++ b/resources/views/admin/control-panel.php
@@ -361,37 +361,37 @@
 			<div class="col-sm-6">
 				<ul class="fa-ul">
 					<li>
-						<span class="fa-li"><i class="fas fa-bars"></i></span>
+						<span class="fa-li"><?= view('icons/menu') ?></span>
 						<a href="<?= e(route('admin-menus')) ?>">
 							<?= I18N::translate('Menus') ?>
 						</a>
 					</li>
 					<li>
-						<span class="fa-li"><i class="far fa-folder"></i></span>
+						<span class="fa-li"><?= view('icons/tab') ?></span>
 						<a href="<?= e(route('admin-tabs')) ?>">
 							<?= I18N::translate('Tabs') ?>
 						</a>
 					</li>
 					<li>
-						<span class="fa-li"><i class="fas fa-th-list fa-flip-horizontal"></i></span>
+						<span class="fa-li"><?= view('icons/block') ?></span>
 						<a href="<?= e(route('admin-blocks')) ?>">
 							<?= I18N::translate('Blocks') ?>
 						</a>
 					</li>
 					<li>
-						<span class="fa-li"><i class="fas fa-pause"></i></span>
+						<span class="fa-li"><?= view('icons/sidebar') ?></span>
 						<a href="<?= e(route('admin-sidebars')) ?>">
 							<?= I18N::translate('Sidebars') ?>
 						</a>
 					</li>
 					<li>
-						<span class="fa-li"><i class="fas fa-sitemap"></i></span>
+						<span class="fa-li"><?= view('icons/chart') ?></span>
 						<a href="<?= e(route('admin-charts')) ?>">
 							<?= I18N::translate('Charts') ?>
 						</a>
 					</li>
 					<li>
-						<span class="fa-li"><i class="far fa-file"></i></span>
+						<span class="fa-li"><?= view('icons/report') ?></span>
 						<a href="<?= e(route('admin-reports')) ?>">
 							<?= I18N::translate('Reports') ?>
 						</a>
@@ -472,7 +472,7 @@
 			<div class="col-sm-6">
 				<ul class="fa-ul">
 					<li>
-						<span class="fa-li"><i class="fas fa-map-marker-alt"></i></span>
+						<span class="fa-li"><?= view('icons/location') ?></span>
 						<a href="<?= e(route('map-data')) ?>">
 							<?= I18N::translate('Geographic data') ?>
 						</a>
@@ -482,7 +482,7 @@
 			<div class="col-sm-6">
 				<ul class="fa-ul">
 					<li>
-						<span class="fa-li"><i class="far fa-map"></i></span>
+						<span class="fa-li"><?= view('icons/map') ?></span>
 						<a href="<?= e(route('map-provider')) ?>">
 							<?= I18N::translate('Map provider') ?>
 						</a>
diff --git a/resources/views/admin/map-import-form.php b/resources/views/admin/map-import-form.php
index da9aedcf5f..ed326f49ba 100644
--- a/resources/views/admin/map-import-form.php
+++ b/resources/views/admin/map-import-form.php
@@ -84,7 +84,7 @@
 	<div class="row form-group">
 		<div class="offset-sm-4 col-sm-8">
 			<button type="submit" class="btn btn-primary">
-				<i class="fas fa-check"></i>
+                <?= view('icons/save') ?>
 				<?= I18N::translate('continue') ?>
 			</button>
 		</div>
diff --git a/resources/views/admin/modules.php b/resources/views/admin/modules.php
index bf7d9a7cce..f2de2322a3 100644
--- a/resources/views/admin/modules.php
+++ b/resources/views/admin/modules.php
@@ -103,7 +103,7 @@
 						<?= $module->getDescription() ?>
 						<?php if (!in_array($module->getName(), $core_module_names)): ?>
 							<br>
-							<i class="fas fa-asterisk"></i>
+                            <?= view('icons/warning') ?>
 							<?= I18N::translate('Custom module') ?>
 							<?php if ($module::CUSTOM_VERSION): ?>
 								- <?= I18N::translate('Version') ?> <?= $module::CUSTOM_VERSION ?>
diff --git a/resources/views/admin/trees.php b/resources/views/admin/trees.php
index 98f88d47d4..00b86c65ec 100644
--- a/resources/views/admin/trees.php
+++ b/resources/views/admin/trees.php
@@ -20,7 +20,7 @@
 			<div class="card">
 				<div class="card-header" role="tab" id="card-tree-header-<?= $managed_tree->getTreeId() ?>">
 					<h2 class="mb-0">
-						<i class="fas fa-tree fa-fw"></i>
+                        <?= view('icons/tree') ?>
 						<a data-toggle="collapse" data-parent="#accordion" href="#card-tree-content-<?= $managed_tree->getTreeId() ?>" <?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? 'aria-expanded="true"' : '' ?> aria-controls="card-tree-content-<?= $managed_tree->getTreeId() ?>">
 							<?= e($managed_tree->getName()) ?> — <?= e($managed_tree->getTitle()) ?>
 						</a>
@@ -61,7 +61,7 @@
 									</li>
 									<!-- PRIVACY -->
 									<li>
-										<span class="fa-li"><i class="fas fa-lock"></i></span>
+										<span class="fa-li"><?= view('icons/lock') ?></span>
 										<a href="<?= e(route('tree-privacy', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Privacy') ?>
 											<span class="sr-only">
@@ -71,7 +71,7 @@
 									</li>
 									<!-- HOME PAGE BLOCKS-->
 									<li>
-										<span class="fa-li"><i class="fas fa-th-large"></i></span>
+										<span class="fa-li"><?= view('icons/block') ?></span>
 										<a href="<?= e(route('tree-page-edit', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Change the “Home page” blocks') ?>
 											<span class="sr-only">
@@ -99,7 +99,7 @@
 									<!-- SET AS DEFAULT -->
 									<?php if (count($all_trees) > 1): ?>
 										<li>
-											<span class="fa-li"><i class="far fa-star"></i></span>
+											<span class="fa-li"><?= view('icons/favorite') ?></span>
 											<?php if ($managed_tree->getName() === Site::getPreference('DEFAULT_GEDCOM')): ?>
 												<?= I18N::translate('Default family tree') ?>
 											<?php else: ?>
@@ -126,57 +126,57 @@
 								<ul class="fa-ul">
 									<!-- FIND DUPLICATES -->
 									<li>
-										<span class="fa-li"><i class="far fa-copy"></i></span>
+										<span class="fa-li"><?= view('icons/copy') ?></span>
 										<a href="<?= e(route('admin-trees-duplicates', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Find duplicates') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+										      <?= e($managed_tree->getTitle()) ?>
+								        	</span>
 										</a>
 									</li>
 									<!-- MERGE -->
 									<li>
-										<span class="fa-li"><i class="fas fa-code-branch"></i></span>
+										<span class="fa-li"><?= view('icons/merge') ?></span>
 										<a href="<?= e(route('merge-records', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Merge records') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                                <?= e($managed_tree->getTitle()) ?>
+                                          </span>
 										</a>
 									</li>
 									<!-- UPDATE PLACE NAMES -->
 									<li>
-										<span class="fa-li"><i class="fas fa-map-marker-alt"></i></span>
+										<span class="fa-li"><?= view('icons/location') ?></span>
 										<a href="<?= e(route('admin-trees-places', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Update place names') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+								        		<?= e($managed_tree->getTitle()) ?>
+								        	</span>
 										</a>
 									</li>
 									<!-- CHECK FOR ERRORS -->
 									<li>
-										<span class="fa-li"><?= view('icons/save') ?></span>
+										<span class="fa-li"><?= view('icons/warning') ?></span>
 										<a href="<?= e(route('admin-trees-check', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Check for errors') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 										</a>
 									</li>
 									<!-- UNCONNECTED INDIVIDUALS -->
 									<li>
-										<span class="fa-li"><i class="fas fa-unlink"></i></span>
+										<span class="fa-li"><?= view('icons/unlink') ?></span>
 										<a href="<?= e(route('admin-trees-unconnected', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Find unrelated individuals') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 										</a>
 									</li>
 									<!-- RENUMBER -->
 									<li>
-										<span class="fa-li"><i class="fas fa-sort-numeric-down"></i></span>
+										<span class="fa-li"><?= view('icons/sort') ?></span>
 										<a href="<?= e(route('admin-trees-renumber', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Renumber') ?>
 											<span class="sr-only">
@@ -186,12 +186,12 @@
 									</li>
 									<!-- CHANGES -->
 									<li>
-										<span class="fa-li"><i class="fas fa-th-list"></i></span>
+										<span class="fa-li"><?= view('icons/edit') ?></span>
 										<a href="<?= route('admin-changes-log', ['ged' => $managed_tree->getName()]) ?>">
 											<?= I18N::translate('Changes log') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 										</a>
 									</li>
 								</ul>
@@ -208,8 +208,8 @@
 										<a href="<?= e(route('add-unlinked-individual', ['ged' => $managed_tree->getName()])) ?>">
 											<?= I18N::translate('Individual') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 										</a>
 									</li>
 									<!-- UNLINKED SOURCE -->
@@ -218,8 +218,8 @@
 										<a href="#" data-href="<?= e(route('create-source', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal">
 											<?= I18N::translate('Source') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 										</a>
 									</li>
 									<!-- UNLINKED REPOSITORY -->
@@ -228,8 +228,8 @@
 										<a href="#" data-href="<?= e(route('create-repository', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal">
 											<?= I18N::translate('Repository') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 										</a>
 									</li>
 									<!-- UNLINKED MEDIA OBJECT -->
@@ -239,17 +239,17 @@
 
 											<?= I18N::translate('Media object') ?>
 											<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 										</a>
 									</li>
 									<!-- UNLINKED NOTE -->
 									<li>
 										<span class="fa-li"><?= view('icons/note') ?></span>
 										<a href="#" data-href="<?= e(route('create-note-object', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal">
-									<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                            <span class="sr-only">
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 											<?= I18N::translate('Shared note') ?>
 										</a>
 									</li>
@@ -257,9 +257,9 @@
 									<li>
 										<span class="fa-li"><?= view('icons/submitter') ?></span>
 										<a href="#" data-href="<?= e(route('create-submitter', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal">
-									<span class="sr-only">
-										<?= e($managed_tree->getTitle()) ?>
-									</span>
+                                            <span class="sr-only">
+                                                <?= e($managed_tree->getTitle()) ?>
+                                            </span>
 											<?= I18N::translate('Submitter') ?>
 										</a>
 									</li>
@@ -361,7 +361,7 @@
 		<div class="card">
 			<div class="card-header" id="card-pgv-wizard-header">
 				<h2 class="mb-0">
-					<i class="fas fa-magic fa-fw"></i>
+					<?= view('icons/wizard') ?>
 					<a data-toggle="collapse" data-parent="#accordion" href="#card-pgv-wizard-content" aria-controls="card-pgv-wizard-content">
 						<?= I18N::translate('PhpGedView to webtrees transfer wizard') ?>
 					</a>
@@ -404,7 +404,7 @@
 		<div class="card">
 			<div class="card-header" id="card-tree-create-header">
 				<h2 class="mb-0">
-					<i class="fas fa-sync-alt fa-fw"></i>
+					<?= view('icons/sync') ?>
 					<a data-toggle="collapse" data-parent="#accordion" href="#synchronize-gedcom-files">
 						<?= I18N::translate('Synchronize family trees with GEDCOM files') ?>
 					</a>
diff --git a/resources/views/edit/raw-gedcom-record.php b/resources/views/edit/raw-gedcom-record.php
index 470988a796..b3528a999f 100644
--- a/resources/views/edit/raw-gedcom-record.php
+++ b/resources/views/edit/raw-gedcom-record.php
@@ -30,7 +30,7 @@
 			<?php if (!$fact->isPendingDeletion()): ?>
 				<div class="card my-2">
 					<label class="card-header py-1 px-2 d-flex" for="fact-<?= e($fact->getFactId()) ?>">
-						<i class="fas fa-sort fa-fw drag-handle" style="cursor:move;"></i>
+                        <?= view('icons/drag-handle') ?>
 						<?= $fact->summary() ?>
 					</label>
 					<input type="hidden" name="fact_id[]" value="<?= e($fact->getFactId()) ?>">
diff --git a/resources/views/icons/ban.php b/resources/views/icons/ban.php
new file mode 100644
index 0000000000..2071a073b5
--- /dev/null
+++ b/resources/views/icons/ban.php
@@ -0,0 +1 @@
+<i class="fas fa-ban text-danger" aria-hidden="true"></i>
diff --git a/resources/views/icons/drag-handle.php b/resources/views/icons/drag-handle.php
index 78ab36f335..00839ac78b 100644
--- a/resources/views/icons/drag-handle.php
+++ b/resources/views/icons/drag-handle.php
@@ -1 +1 @@
-<i class="fas fa-bars" aria-hidden="true"></i>
+<i class="fas fa-grip-horizontal" style="cursor:move;"></i>
diff --git a/resources/views/icons/edit.php b/resources/views/icons/edit.php
index aa1f2908fe..96b9ccdfc4 100644
--- a/resources/views/icons/edit.php
+++ b/resources/views/icons/edit.php
@@ -1 +1 @@
-<i class="fas fa-pencil" aria-hidden="true"></i>
+<i class="fas fa-pencil-alt" aria-hidden="true"></i>
diff --git a/resources/views/icons/favorite.php b/resources/views/icons/favorite.php
new file mode 100644
index 0000000000..c651371ba2
--- /dev/null
+++ b/resources/views/icons/favorite.php
@@ -0,0 +1 @@
+<i class="far fa-star" aria-hidden="true"></i>
diff --git a/resources/views/icons/location.php b/resources/views/icons/location.php
new file mode 100644
index 0000000000..90866059ce
--- /dev/null
+++ b/resources/views/icons/location.php
@@ -0,0 +1 @@
+<i class="fas fa-map-marker-alt" aria-hidden="true"></i>
diff --git a/resources/views/icons/lock.php b/resources/views/icons/lock.php
new file mode 100644
index 0000000000..0d75948e50
--- /dev/null
+++ b/resources/views/icons/lock.php
@@ -0,0 +1 @@
+<i class="fas fa-lock" aria-hidden="true"></i>
diff --git a/resources/views/icons/map.php b/resources/views/icons/map.php
new file mode 100644
index 0000000000..ec17858f41
--- /dev/null
+++ b/resources/views/icons/map.php
@@ -0,0 +1 @@
+<i class="far fa-map" aria-hidden="true"></i>
diff --git a/resources/views/icons/menu.php b/resources/views/icons/menu.php
index 128d143d44..78ab36f335 100644
--- a/resources/views/icons/menu.php
+++ b/resources/views/icons/menu.php
@@ -1 +1 @@
-<i class="far fa-bar" aria-hidden="true"></i>
+<i class="fas fa-bars" aria-hidden="true"></i>
diff --git a/resources/views/icons/merge.php b/resources/views/icons/merge.php
new file mode 100644
index 0000000000..db34794cca
--- /dev/null
+++ b/resources/views/icons/merge.php
@@ -0,0 +1 @@
+<i class="fas fa-code-branch" aria-hidden="true"></i>
diff --git a/resources/views/icons/sidebar.php b/resources/views/icons/sidebar.php
index 77d5154c0d..b5ee9e165b 100644
--- a/resources/views/icons/sidebar.php
+++ b/resources/views/icons/sidebar.php
@@ -1 +1 @@
-<i class="far fa-pause" aria-hidden="true"></i>
+<i class="fas fa-pause" aria-hidden="true"></i>
diff --git a/resources/views/icons/sort.php b/resources/views/icons/sort.php
index e206971eeb..67c0c26c16 100644
--- a/resources/views/icons/sort.php
+++ b/resources/views/icons/sort.php
@@ -1 +1 @@
-<i class="fas fa-sort" aria-hidden="true"></i>
+<i class="fas fa-sort-amount-down" aria-hidden="true"></i>
diff --git a/resources/views/icons/sync.php b/resources/views/icons/sync.php
new file mode 100644
index 0000000000..a1dfbeb676
--- /dev/null
+++ b/resources/views/icons/sync.php
@@ -0,0 +1 @@
+<i class="fas fa-sync-alt" aria-hidden="true"></i>
diff --git a/resources/views/icons/tree.php b/resources/views/icons/tree.php
new file mode 100644
index 0000000000..d565370538
--- /dev/null
+++ b/resources/views/icons/tree.php
@@ -0,0 +1 @@
+<i class="fas fa-tree" aria-hidden="true"></i>
diff --git a/resources/views/icons/unlink.php b/resources/views/icons/unlink.php
new file mode 100644
index 0000000000..c2725802d8
--- /dev/null
+++ b/resources/views/icons/unlink.php
@@ -0,0 +1 @@
+<i class="fas fa-unlink" aria-hidden="true"></i>
diff --git a/resources/views/icons/warning.php b/resources/views/icons/warning.php
index 9e3b3885a2..be0055013a 100644
--- a/resources/views/icons/warning.php
+++ b/resources/views/icons/warning.php
@@ -1 +1 @@
-<i class="fas fa-exclamation-triange" aria-hidden="true"></i>
+<i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
diff --git a/resources/views/icons/wizard.php b/resources/views/icons/wizard.php
new file mode 100644
index 0000000000..48e8abb8b4
--- /dev/null
+++ b/resources/views/icons/wizard.php
@@ -0,0 +1 @@
+<i class="fas fa-magic" aria-hidden="true"></i>
diff --git a/resources/views/layouts/default.php b/resources/views/layouts/default.php
index a65881b16e..2a21c5f816 100644
--- a/resources/views/layouts/default.php
+++ b/resources/views/layouts/default.php
@@ -68,7 +68,7 @@
 									<input type="search" class="form-control wt-header-search-field" id="quick-search" name="query" size="15" placeholder="<?= I18N::translate('Search') ?>">
 									<span class="input-group-btn">
 										<button type="submit" class="btn btn-primary wt-header-search-button">
-											<i class="fas fa-search"></i>
+                                            <?= view('icons/search') ?>
 										</button>
 									</span>
 								</div>
diff --git a/resources/views/modules/faq/config.php b/resources/views/modules/faq/config.php
index b597348790..1ff5211e61 100644
--- a/resources/views/modules/faq/config.php
+++ b/resources/views/modules/faq/config.php
@@ -26,7 +26,7 @@
 
 <p>
 	<a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link">
-		<i class="fas fa-plus"></i>
+        <?= view('icons/add') ?>
 		<?= /* I18N: FAQ = “Frequently Asked Question” */
 		I18N::translate('Add an FAQ') ?>
 	</a>
@@ -65,7 +65,7 @@
 						<form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveUp', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post">
 							<?= csrf_field() ?>
 							<button type="submit" class="btn btn-secondary">
-								<i class="fas fa-arrow-up"></i>
+                                <?= view('icons/arrow-up') ?>
 								<?= I18N::translate('Move up') ?>
 							</button>
 						</form>
@@ -76,7 +76,7 @@
 						<form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveDown', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post">
 							<?= csrf_field() ?>
 							<button type="submit" class="btn btn-secondary">
-								<i class="fas fa-arrow-down"></i>
+                                <?= view('icons/arrow-down') ?>
 								<?= I18N::translate('Move down') ?>
 							</button>
 						</form>
@@ -84,7 +84,7 @@
 				</td>
 				<td>
 					<a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" class="btn btn-primary">
-						<i class="fas fa-pencil-alt"></i>
+                        <?= view('icons/edit') ?>
 						<?= I18N::translate('Edit') ?>
 					</a>
 				</td>
@@ -92,7 +92,7 @@
 					<form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminDelete', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post">
 						<?= csrf_field() ?>
 						<button type="submit" class="btn btn-danger" onclick="return confirm(this.dataset.confirm);" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($faq->header)) ?>">
-							<i class="fas fa-trash-alt"></i>
+                            <?= view('icons/delete') ?>
 							<?= I18N::translate('delete') ?>
 						</button>
 					</form>
diff --git a/resources/views/modules/faq/edit.php b/resources/views/modules/faq/edit.php
index 4982a2d64c..63cda98afd 100644
--- a/resources/views/modules/faq/edit.php
+++ b/resources/views/modules/faq/edit.php
@@ -69,7 +69,7 @@
 	<div class="row form-group">
 		<div class="offset-sm-3 col-sm-9">
 			<button type="submit" class="btn btn-primary">
-				<i class="fas fa-check"></i>
+                <?= view('icons/save') ?>
 				<?= I18N::translate('save') ?>
 			</button>
 		</div>
diff --git a/resources/views/modules/relationships_chart/config.php b/resources/views/modules/relationships_chart/config.php
index 70bd00ae62..862e115761 100644
--- a/resources/views/modules/relationships_chart/config.php
+++ b/resources/views/modules/relationships_chart/config.php
@@ -38,7 +38,7 @@
 	<div class="row form-group">
 		<div class="offset-sm-3 col-sm-9">
 			<button type="submit" class="btn btn-primary">
-				<i class="fas fa-check"></i>
+                <?= view('icons/save') ?>
 				<?= I18N::translate('save') ?>
 			</button>
 		</div>
diff --git a/resources/views/modules/stories/config.php b/resources/views/modules/stories/config.php
index cd62cf6edf..84878a8c6c 100644
--- a/resources/views/modules/stories/config.php
+++ b/resources/views/modules/stories/config.php
@@ -22,7 +22,7 @@
 
 <p>
 	<a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link">
-		<i class="fas fa-plus"></i>
+        <?= view('icons/add') ?>
 		<?= I18N::translate('Add a story') ?>
 	</a>
 </p>
@@ -53,14 +53,16 @@
 				</td>
 				<td>
 					<a class="btn btn-primary" href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>">
-						<i class="fas fa-pencil-alt"></i> <?= I18N::translate('Edit') ?>
+                        <?= view('icons/edit') ?>
+                        <?= I18N::translate('Edit') ?>
 					</a>
 				</td>
 				<td>
 					<form action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminDelete', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>" method="post">
 						<?= csrf_field() ?>
 						<button type="submit" class="btn btn-danger" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($story->title)) ?>" onclick="return confirm(this.dataset.confirm);">
-							<i class="fas fa-trash-alt"></i> <?= I18N::translate('Delete') ?>
+                            <?= view('icons/delete') ?>
+                            <?= I18N::translate('Delete') ?>
 						</button>
 					</form>
 				</td>
diff --git a/resources/views/modules/stories/edit.php b/resources/views/modules/stories/edit.php
index 3aafbc9ed7..f369cd4f7f 100644
--- a/resources/views/modules/stories/edit.php
+++ b/resources/views/modules/stories/edit.php
@@ -47,12 +47,12 @@
 	<div class="row form-group">
 		<div class="offset-sm-3 col-sm-9">
 			<button type="submit" class="btn btn-primary">
-				<i class="fas fa-check"></i>
+                <?= view('icons/save') ?>
 				<?= I18N::translate('save') ?>
 			</button>
 
 			<a href="<?= e(route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary">
-				<i class="fas fa-times"></i>
+                <?= view('icons/cancel') ?>
 				<?= I18N::translate('cancel') ?>
 			</a>
 		</div>