summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Functions/FunctionsEdit.php12
-rw-r--r--app/Http/Controllers/AdminUsersController.php6
-rw-r--r--app/Theme/AbstractTheme.php2
-rw-r--r--modules_v3/address_report/module.php6
-rw-r--r--resources/views/icons/add.php2
-rw-r--r--resources/views/icons/arrow-down.php2
-rw-r--r--resources/views/icons/arrow-end.php2
-rw-r--r--resources/views/icons/arrow-start.php2
-rw-r--r--resources/views/icons/arrow-up.php2
-rw-r--r--resources/views/icons/ban.php2
-rw-r--r--resources/views/icons/bing-maps.php2
-rw-r--r--resources/views/icons/block-tree.php2
-rw-r--r--resources/views/icons/block-user.php2
-rw-r--r--resources/views/icons/block.php2
-rw-r--r--resources/views/icons/calendar.php2
-rw-r--r--resources/views/icons/cancel.php2
-rw-r--r--resources/views/icons/chart.php2
-rw-r--r--resources/views/icons/coordinates.php2
-rw-r--r--resources/views/icons/copy.php2
-rw-r--r--resources/views/icons/delete.php2
-rw-r--r--resources/views/icons/download.php2
-rw-r--r--resources/views/icons/edit.php2
-rw-r--r--resources/views/icons/email.php2
-rw-r--r--resources/views/icons/family.php2
-rw-r--r--resources/views/icons/favorite.php2
-rw-r--r--resources/views/icons/google-maps.php2
-rw-r--r--resources/views/icons/help.php2
-rw-r--r--resources/views/icons/individual.php2
-rw-r--r--resources/views/icons/keyboard.php2
-rw-r--r--resources/views/icons/location.php2
-rw-r--r--resources/views/icons/lock.php2
-rw-r--r--resources/views/icons/map.php2
-rw-r--r--resources/views/icons/media-next.php2
-rw-r--r--resources/views/icons/media-play.php2
-rw-r--r--resources/views/icons/media-stop.php2
-rw-r--r--resources/views/icons/media.php2
-rw-r--r--resources/views/icons/menu.php2
-rw-r--r--resources/views/icons/merge.php2
-rw-r--r--resources/views/icons/note.php2
-rw-r--r--resources/views/icons/openstreetmap.php2
-rw-r--r--resources/views/icons/pin.php2
-rw-r--r--resources/views/icons/preferences.php2
-rw-r--r--resources/views/icons/report.php2
-rw-r--r--resources/views/icons/repository.php2
-rw-r--r--resources/views/icons/save.php2
-rw-r--r--resources/views/icons/search.php2
-rw-r--r--resources/views/icons/sidebar.php2
-rw-r--r--resources/views/icons/sort.php2
-rw-r--r--resources/views/icons/source.php2
-rw-r--r--resources/views/icons/submitter.php2
-rw-r--r--resources/views/icons/sync.php2
-rw-r--r--resources/views/icons/tab.php2
-rw-r--r--resources/views/icons/theme.php2
-rw-r--r--resources/views/icons/tree.php2
-rw-r--r--resources/views/icons/unlink.php2
-rw-r--r--resources/views/icons/upload.php2
-rw-r--r--resources/views/icons/user.php1
-rw-r--r--resources/views/icons/warning.php2
-rw-r--r--resources/views/icons/wizard.php2
59 files changed, 65 insertions, 70 deletions
diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php
index 67be467e53..bb5a60d4bf 100644
--- a/app/Functions/FunctionsEdit.php
+++ b/app/Functions/FunctionsEdit.php
@@ -671,7 +671,7 @@ class FunctionsEdit
} elseif ($fact === 'FAMC') {
$html .=
'<div class="input-group">' .
- '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-family" data-element-id="' . $id . '" title="' . I18N::translate('Create a family') . '"><i class="fas fa-plus"></i></button></span>' .
+ '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-family" data-element-id="' . $id . '" title="' . I18N::translate('Create a family') . '">' . view('icons/add') . '</button></span>' .
self::formControlFamily($tree, Family::getInstance($value, $tree), [
'id' => $id,
'name' => $name,
@@ -686,7 +686,7 @@ class FunctionsEdit
'<div class="input-group">' .
'<span class="input-group-btn">' .
'<button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#wt-ajax-modal" data-href="' . e(route('create-note-object', ['ged' => $tree->getName()])) . '" data-select-id="' . $id . '" title="' . I18N::translate('Create a shared note') . '">' .
- '<i class="fas fa-plus"></i><' .
+ '' . view('icons/add') . '<' .
'/button>' .
'</span>' .
self::formControlNote($tree, Note::getInstance($value, $tree), [
@@ -697,7 +697,7 @@ class FunctionsEdit
} elseif ($fact === 'OBJE') {
$html .=
'<div class="input-group">' .
- '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-media-object', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a media object') . '"><i class="fas fa-plus"></i></button></span>' .
+ '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-media-object', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a media object') . '">' . view('icons/add') . '</button></span>' .
self::formControlMediaObject($tree, Media::getInstance($value, $tree), [
'id' => $id,
'name' => $name,
@@ -742,7 +742,7 @@ class FunctionsEdit
} elseif ($fact === 'REPO') {
$html .=
'<div class="input-group">' .
- '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-repository', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a repository') . '"><i class="fas fa-plus"></i></button></span>' .
+ '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-repository', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a repository') . '">' . view('icons/add') . '</button></span>' .
self::formControlRepository($tree, Repository::getInstance($value, $tree), [
'id' => $id,
'name' => $name,
@@ -769,7 +769,7 @@ class FunctionsEdit
} elseif ($fact === 'SOUR') {
$html .=
'<div class="input-group">' .
- '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-source', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a source') . '"><i class="fas fa-plus"></i></button></span>' .
+ '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-source', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a source') . '">' . view('icons/add') . '</button></span>' .
self::formControlSource($tree, Source::getInstance($value, $tree), [
'id' => $id,
'name' => $name,
@@ -780,7 +780,7 @@ class FunctionsEdit
} elseif ($fact === 'SUBM') {
$html .=
'<div class="input-group">' .
- '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-submitter', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a submitter') . '"><i class="fas fa-plus"></i></button></span>' .
+ '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-submitter', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a submitter') . '">' . view('icons/add') . '</button></span>' .
self::formControlSubmitter($tree, GedcomRecord::getInstance($value, $tree), [
'id' => $id,
'name' => $name,
diff --git a/app/Http/Controllers/AdminUsersController.php b/app/Http/Controllers/AdminUsersController.php
index 5b2937e82d..9a474ea273 100644
--- a/app/Http/Controllers/AdminUsersController.php
+++ b/app/Http/Controllers/AdminUsersController.php
@@ -218,14 +218,14 @@ class AdminUsersController extends AbstractBaseController
$user_name = $datum[2];
if ($user_id != $user->getUserId()) {
- $admin_options = '<div class="dropdown-item"><a href="#" onclick="return masquerade(' . $user_id . ')"><i class="far fa-user fa-fw"></i> ' . /* I18N: Pretend to be another user, by logging in as them */
- I18N::translate('Masquerade as this user') . '</a></div>' . '<div class="dropdown-item"><a href="#" data-confirm="' . I18N::translate('Are you sure you want to delete “%s”?', e($user_name)) . '" onclick="delete_user(this.dataset.confirm, ' . $user_id . ');"><i class="fas fa-trash-alt fa-fw" aria-hidden="true"></i> ' . I18N::translate('Delete') . '</a></div>';
+ $admin_options = '<div class="dropdown-item"><a href="#" onclick="return masquerade(' . $user_id . ')">' . view('icons/user') . ' ' . /* I18N: Pretend to be another user, by logging in as them */
+ I18N::translate('Masquerade as this user') . '</a></div>' . '<div class="dropdown-item"><a href="#" data-confirm="' . I18N::translate('Are you sure you want to delete “%s”?', e($user_name)) . '" onclick="delete_user(this.dataset.confirm, ' . $user_id . ');">' . view('icons/delete') . ' ' . I18N::translate('Delete') . '</a></div>';
} else {
// Do not delete ourself!
$admin_options = '';
}
- $datum[0] = '<div class="dropdown"><button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" id="edit-user-button-' . $user_id . '" aria-haspopup="true" aria-expanded="false"><i class="fas fa-pencil-alt"></i> <span class="caret"></span></button><div class="dropdown-menu" aria-labelledby="edit-user-button-' . $user_id . '"><div class="dropdown-item"><a href="' . e(route('admin-users-edit', ['user_id' => $user_id])) . '"><i class="fas fa-pencil-alt fa-fw"></i> ' . I18N::translate('Edit') . '</a></div><div class="divider"></div><div class="dropdown-item"><a href="' . e(route('user-page-user-edit', ['user_id' => $user_id])) . '"><i class="fas fa-th-large fa-fw" aria-hidden="true"></i> ' . I18N::translate('Change the blocks on this user’s “My page”') . '</a></div>' . $admin_options . '</div></div>';
+ $datum[0] = '<div class="dropdown"><button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" id="edit-user-button-' . $user_id . '" aria-haspopup="true" aria-expanded="false">' . view('icons/edit') . ' <span class="caret"></span></button><div class="dropdown-menu" aria-labelledby="edit-user-button-' . $user_id . '"><div class="dropdown-item"><a href="' . e(route('admin-users-edit', ['user_id' => $user_id])) . '">' . view('icons/edit') . ' ' . I18N::translate('Edit') . '</a></div><div class="divider"></div><div class="dropdown-item"><a href="' . e(route('user-page-user-edit', ['user_id' => $user_id])) . '">' . view('icons/block') . ' ' . I18N::translate('Change the blocks on this user’s “My page”') . '</a></div>' . $admin_options . '</div></div>';
// The real name
$datum[3] = '<span dir="auto">' . e($datum[3]) . '</span>';
// $datum[4] is the email address
diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php
index 0cacce9888..c96131d3c1 100644
--- a/app/Theme/AbstractTheme.php
+++ b/app/Theme/AbstractTheme.php
@@ -525,7 +525,7 @@ abstract class AbstractTheme
'<label class="sr-only" for="quick-search">' . I18N::translate('Search') . '</label>' .
'<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></button>' .
+ '<button type="submit" class="btn btn-primary wt-header-search-button">' . view('icons/search') . '</button>' .
'</span>' .
'</div>';
}
diff --git a/modules_v3/address_report/module.php b/modules_v3/address_report/module.php
deleted file mode 100644
index 777fb97600..0000000000
--- a/modules_v3/address_report/module.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-// This module has been deleted.
-
-return null;
-
diff --git a/resources/views/icons/add.php b/resources/views/icons/add.php
index d908eff60e..51b2853604 100644
--- a/resources/views/icons/add.php
+++ b/resources/views/icons/add.php
@@ -1 +1 @@
-<i class="fas fa-plus" aria-hidden="true"></i>
+<i class="fas fa-plus fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/arrow-down.php b/resources/views/icons/arrow-down.php
index bfc750a693..ea23115235 100644
--- a/resources/views/icons/arrow-down.php
+++ b/resources/views/icons/arrow-down.php
@@ -1 +1 @@
-<i class="fas fa-arrow-down" aria-hidden="true"></i>
+<i class="fas fa-arrow-down fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/arrow-end.php b/resources/views/icons/arrow-end.php
index e50045e140..508855281b 100644
--- a/resources/views/icons/arrow-end.php
+++ b/resources/views/icons/arrow-end.php
@@ -1 +1 @@
-<i class="fas fa-arrow-end" aria-hidden="true"></i>
+<i class="fas fa-arrow-end fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/arrow-start.php b/resources/views/icons/arrow-start.php
index 4800de5377..e024cb6d50 100644
--- a/resources/views/icons/arrow-start.php
+++ b/resources/views/icons/arrow-start.php
@@ -1 +1 @@
-<i class="fas fa-arrow-start" aria-hidden="true"></i>
+<i class="fas fa-arrow-start fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/arrow-up.php b/resources/views/icons/arrow-up.php
index 648fb5bf43..8b4d3d0ff2 100644
--- a/resources/views/icons/arrow-up.php
+++ b/resources/views/icons/arrow-up.php
@@ -1 +1 @@
-<i class="fas fa-arrow-up" aria-hidden="true"></i>
+<i class="fas fa-arrow-up fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/ban.php b/resources/views/icons/ban.php
index 2071a073b5..cfbcd052d5 100644
--- a/resources/views/icons/ban.php
+++ b/resources/views/icons/ban.php
@@ -1 +1 @@
-<i class="fas fa-ban text-danger" aria-hidden="true"></i>
+<i class="fas fa-ban text-danger fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/bing-maps.php b/resources/views/icons/bing-maps.php
index 195ef4984b..382456dd0d 100644
--- a/resources/views/icons/bing-maps.php
+++ b/resources/views/icons/bing-maps.php
@@ -1 +1 @@
-<i class="fas fa-map" aria-hidden="true"></i>
+<i class="fas fa-map fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/block-tree.php b/resources/views/icons/block-tree.php
index d565370538..cf7ab58de8 100644
--- a/resources/views/icons/block-tree.php
+++ b/resources/views/icons/block-tree.php
@@ -1 +1 @@
-<i class="fas fa-tree" aria-hidden="true"></i>
+<i class="fas fa-tree fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/block-user.php b/resources/views/icons/block-user.php
index 4e8bc723e4..f853259b3f 100644
--- a/resources/views/icons/block-user.php
+++ b/resources/views/icons/block-user.php
@@ -1 +1 @@
-<i class="far fa-user" aria-hidden="true"></i>
+<i class="far fa-user fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/block.php b/resources/views/icons/block.php
index d09b2cf9e8..e53eb7c151 100644
--- a/resources/views/icons/block.php
+++ b/resources/views/icons/block.php
@@ -1 +1 @@
-<i class="fas fa-th-list fa-flip-horizontal" aria-hidden="true"></i>
+<i class="fas fa-th-list fa-flip-horizontal fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/calendar.php b/resources/views/icons/calendar.php
index 6f52c0c89f..556d41e967 100644
--- a/resources/views/icons/calendar.php
+++ b/resources/views/icons/calendar.php
@@ -1 +1 @@
-<i class="fas fa-calendar" aria-hidden="true"></i>
+<i class="fas fa-calendar fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/cancel.php b/resources/views/icons/cancel.php
index b73ae91734..8469a131d1 100644
--- a/resources/views/icons/cancel.php
+++ b/resources/views/icons/cancel.php
@@ -1 +1 @@
-<i class="fas fa-times" aria-hidden="true"></i>
+<i class="fas fa-times fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/chart.php b/resources/views/icons/chart.php
index b77c4f9ac5..60d6a3f154 100644
--- a/resources/views/icons/chart.php
+++ b/resources/views/icons/chart.php
@@ -1 +1 @@
-<i class="fas fa-sitemap" aria-hidden="true"></i>
+<i class="fas fa-sitemap fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/coordinates.php b/resources/views/icons/coordinates.php
index 74a3b07834..75695cfa18 100644
--- a/resources/views/icons/coordinates.php
+++ b/resources/views/icons/coordinates.php
@@ -1 +1 @@
-<i class="fas fa-map-marker" aria-hidden="true"></i>
+<i class="fas fa-map-marker fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/copy.php b/resources/views/icons/copy.php
index c1042187ee..149595fe96 100644
--- a/resources/views/icons/copy.php
+++ b/resources/views/icons/copy.php
@@ -1 +1 @@
-<i class="far fa-copy" aria-hidden="true"></i>
+<i class="far fa-copy fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/delete.php b/resources/views/icons/delete.php
index 391f487b63..d36b0a9cde 100644
--- a/resources/views/icons/delete.php
+++ b/resources/views/icons/delete.php
@@ -1 +1 @@
-<i class="far fa-trash-alt" aria-hidden="true"></i>
+<i class="far fa-trash-alt fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/download.php b/resources/views/icons/download.php
index e0af439b5d..7ccffc0cb0 100644
--- a/resources/views/icons/download.php
+++ b/resources/views/icons/download.php
@@ -1 +1 @@
-<i class="fas fa-download" aria-hidden="true"></i>
+<i class="fas fa-download fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/edit.php b/resources/views/icons/edit.php
index 96b9ccdfc4..8d3f23609a 100644
--- a/resources/views/icons/edit.php
+++ b/resources/views/icons/edit.php
@@ -1 +1 @@
-<i class="fas fa-pencil-alt" aria-hidden="true"></i>
+<i class="fas fa-pencil-alt fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/email.php b/resources/views/icons/email.php
index 0f12457c57..42e6f54e8e 100644
--- a/resources/views/icons/email.php
+++ b/resources/views/icons/email.php
@@ -1 +1 @@
-<i class="far fa-envelope" aria-hidden="true"></i>
+<i class="far fa-envelope fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/family.php b/resources/views/icons/family.php
index adba8e996c..35b1aa0a26 100644
--- a/resources/views/icons/family.php
+++ b/resources/views/icons/family.php
@@ -1 +1 @@
-<i class="fas fa-users" aria-hidden="true"></i>
+<i class="fas fa-users fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/favorite.php b/resources/views/icons/favorite.php
index c651371ba2..14f073f854 100644
--- a/resources/views/icons/favorite.php
+++ b/resources/views/icons/favorite.php
@@ -1 +1 @@
-<i class="far fa-star" aria-hidden="true"></i>
+<i class="far fa-star fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/google-maps.php b/resources/views/icons/google-maps.php
index 195ef4984b..382456dd0d 100644
--- a/resources/views/icons/google-maps.php
+++ b/resources/views/icons/google-maps.php
@@ -1 +1 @@
-<i class="fas fa-map" aria-hidden="true"></i>
+<i class="fas fa-map fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/help.php b/resources/views/icons/help.php
index 421b683a61..83a4cab2c8 100644
--- a/resources/views/icons/help.php
+++ b/resources/views/icons/help.php
@@ -1 +1 @@
-<i class="fas fa-info-circle" aria-hidden="true"></i>
+<i class="fas fa-info-circle fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/individual.php b/resources/views/icons/individual.php
index 4e8bc723e4..f853259b3f 100644
--- a/resources/views/icons/individual.php
+++ b/resources/views/icons/individual.php
@@ -1 +1 @@
-<i class="far fa-user" aria-hidden="true"></i>
+<i class="far fa-user fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/keyboard.php b/resources/views/icons/keyboard.php
index 36621b3c2f..f941960891 100644
--- a/resources/views/icons/keyboard.php
+++ b/resources/views/icons/keyboard.php
@@ -1 +1 @@
-<i class="far fa-keyboard" aria-hidden="true"></i>
+<i class="far fa-keyboard fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/location.php b/resources/views/icons/location.php
index 90866059ce..e4e73843e0 100644
--- a/resources/views/icons/location.php
+++ b/resources/views/icons/location.php
@@ -1 +1 @@
-<i class="fas fa-map-marker-alt" aria-hidden="true"></i>
+<i class="fas fa-map-marker-alt fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/lock.php b/resources/views/icons/lock.php
index 0d75948e50..3bcb48f363 100644
--- a/resources/views/icons/lock.php
+++ b/resources/views/icons/lock.php
@@ -1 +1 @@
-<i class="fas fa-lock" aria-hidden="true"></i>
+<i class="fas fa-lock fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/map.php b/resources/views/icons/map.php
index ec17858f41..479a2f5c2a 100644
--- a/resources/views/icons/map.php
+++ b/resources/views/icons/map.php
@@ -1 +1 @@
-<i class="far fa-map" aria-hidden="true"></i>
+<i class="far fa-map fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/media-next.php b/resources/views/icons/media-next.php
index 088ed92430..3893f0d2c6 100644
--- a/resources/views/icons/media-next.php
+++ b/resources/views/icons/media-next.php
@@ -1 +1 @@
-<i class="fas fa-step-forward" aria-hidden="true"></i>
+<i class="fas fa-step-forward fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/media-play.php b/resources/views/icons/media-play.php
index d1771d4d3f..20d052b6bc 100644
--- a/resources/views/icons/media-play.php
+++ b/resources/views/icons/media-play.php
@@ -1 +1 @@
-<i class="fas fa-play" aria-hidden="true"></i>
+<i class="fas fa-play fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/media-stop.php b/resources/views/icons/media-stop.php
index 64411b330c..a7ed33b6ca 100644
--- a/resources/views/icons/media-stop.php
+++ b/resources/views/icons/media-stop.php
@@ -1 +1 @@
-<i class="fas fa-stop" aria-hidden="true"></i>
+<i class="fas fa-stop fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/media.php b/resources/views/icons/media.php
index 4a04a66116..35ce37671a 100644
--- a/resources/views/icons/media.php
+++ b/resources/views/icons/media.php
@@ -1 +1 @@
-<i class="far fa-file-image" aria-hidden="true"></i>
+<i class="far fa-file-image fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/menu.php b/resources/views/icons/menu.php
index 78ab36f335..760fc75d71 100644
--- a/resources/views/icons/menu.php
+++ b/resources/views/icons/menu.php
@@ -1 +1 @@
-<i class="fas fa-bars" aria-hidden="true"></i>
+<i class="fas fa-bars fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/merge.php b/resources/views/icons/merge.php
index db34794cca..a6a853ec14 100644
--- a/resources/views/icons/merge.php
+++ b/resources/views/icons/merge.php
@@ -1 +1 @@
-<i class="fas fa-code-branch" aria-hidden="true"></i>
+<i class="fas fa-code-branch fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/note.php b/resources/views/icons/note.php
index b2b8d1d0c7..152c37d3d0 100644
--- a/resources/views/icons/note.php
+++ b/resources/views/icons/note.php
@@ -1 +1 @@
-<i class="far fa-sticky-note" aria-hidden="true"></i>
+<i class="far fa-sticky-note fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/openstreetmap.php b/resources/views/icons/openstreetmap.php
index 195ef4984b..382456dd0d 100644
--- a/resources/views/icons/openstreetmap.php
+++ b/resources/views/icons/openstreetmap.php
@@ -1 +1 @@
-<i class="fas fa-map" aria-hidden="true"></i>
+<i class="fas fa-map fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/pin.php b/resources/views/icons/pin.php
index fcde32c7fb..2f976b10c6 100644
--- a/resources/views/icons/pin.php
+++ b/resources/views/icons/pin.php
@@ -1 +1 @@
-<i class="fas fa-thumbtack" aria-hidden="true"></i>
+<i class="fas fa-thumbtack fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/preferences.php b/resources/views/icons/preferences.php
index f63d82c9d9..57aa6a153c 100644
--- a/resources/views/icons/preferences.php
+++ b/resources/views/icons/preferences.php
@@ -1 +1 @@
-<i class="fas fa-wrench" aria-hidden="true"></i>
+<i class="fas fa-wrench fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/report.php b/resources/views/icons/report.php
index dfccf8c17b..6f4a247584 100644
--- a/resources/views/icons/report.php
+++ b/resources/views/icons/report.php
@@ -1 +1 @@
-<i class="far fa-file" aria-hidden="true"></i>
+<i class="far fa-file fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/repository.php b/resources/views/icons/repository.php
index 9e53f92196..e69ee84cb2 100644
--- a/resources/views/icons/repository.php
+++ b/resources/views/icons/repository.php
@@ -1 +1 @@
-<i class="fas fa-university" aria-hidden="true"></i>
+<i class="fas fa-university fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/save.php b/resources/views/icons/save.php
index 29781f525b..e9dbf9b6c0 100644
--- a/resources/views/icons/save.php
+++ b/resources/views/icons/save.php
@@ -1 +1 @@
-<i class="fas fa-check" aria-hidden="true"></i>
+<i class="fas fa-check fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/search.php b/resources/views/icons/search.php
index eeb29f0af6..04c015a05d 100644
--- a/resources/views/icons/search.php
+++ b/resources/views/icons/search.php
@@ -1 +1 @@
-<i class="fas fa-search" aria-hidden="true"></i>
+<i class="fas fa-search fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/sidebar.php b/resources/views/icons/sidebar.php
index b5ee9e165b..20938f3751 100644
--- a/resources/views/icons/sidebar.php
+++ b/resources/views/icons/sidebar.php
@@ -1 +1 @@
-<i class="fas fa-pause" aria-hidden="true"></i>
+<i class="fas fa-pause fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/sort.php b/resources/views/icons/sort.php
index 67c0c26c16..3bbdf41c80 100644
--- a/resources/views/icons/sort.php
+++ b/resources/views/icons/sort.php
@@ -1 +1 @@
-<i class="fas fa-sort-amount-down" aria-hidden="true"></i>
+<i class="fas fa-sort-amount-down fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/source.php b/resources/views/icons/source.php
index dbbccdaf1e..29d7431efc 100644
--- a/resources/views/icons/source.php
+++ b/resources/views/icons/source.php
@@ -1 +1 @@
-<i class="far fa-file-alt" aria-hidden="true"></i>
+<i class="far fa-file-alt fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/submitter.php b/resources/views/icons/submitter.php
index 4e8bc723e4..f853259b3f 100644
--- a/resources/views/icons/submitter.php
+++ b/resources/views/icons/submitter.php
@@ -1 +1 @@
-<i class="far fa-user" aria-hidden="true"></i>
+<i class="far fa-user fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/sync.php b/resources/views/icons/sync.php
index a1dfbeb676..7fc878bbf5 100644
--- a/resources/views/icons/sync.php
+++ b/resources/views/icons/sync.php
@@ -1 +1 @@
-<i class="fas fa-sync-alt" aria-hidden="true"></i>
+<i class="fas fa-sync-alt fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/tab.php b/resources/views/icons/tab.php
index 7d14ad5531..122c02d473 100644
--- a/resources/views/icons/tab.php
+++ b/resources/views/icons/tab.php
@@ -1 +1 @@
-<i class="far fa-folder" aria-hidden="true"></i>
+<i class="far fa-folder fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/theme.php b/resources/views/icons/theme.php
index 401dc9694f..fc444fd4b1 100644
--- a/resources/views/icons/theme.php
+++ b/resources/views/icons/theme.php
@@ -1 +1 @@
-<i class="fas fa-paint-brush" aria-hidden="true"></i>
+<i class="fas fa-paint-brush fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/tree.php b/resources/views/icons/tree.php
index d565370538..cf7ab58de8 100644
--- a/resources/views/icons/tree.php
+++ b/resources/views/icons/tree.php
@@ -1 +1 @@
-<i class="fas fa-tree" aria-hidden="true"></i>
+<i class="fas fa-tree fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/unlink.php b/resources/views/icons/unlink.php
index c2725802d8..a20b990a5e 100644
--- a/resources/views/icons/unlink.php
+++ b/resources/views/icons/unlink.php
@@ -1 +1 @@
-<i class="fas fa-unlink" aria-hidden="true"></i>
+<i class="fas fa-unlink fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/upload.php b/resources/views/icons/upload.php
index 30e7f5524d..0865b10e25 100644
--- a/resources/views/icons/upload.php
+++ b/resources/views/icons/upload.php
@@ -1 +1 @@
-<i class="fas fa-upload" aria-hidden="true"></i>
+<i class="fas fa-upload fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/user.php b/resources/views/icons/user.php
new file mode 100644
index 0000000000..dd13701f12
--- /dev/null
+++ b/resources/views/icons/user.php
@@ -0,0 +1 @@
+<i class="fas fa-user fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/warning.php b/resources/views/icons/warning.php
index be0055013a..8873359bb7 100644
--- a/resources/views/icons/warning.php
+++ b/resources/views/icons/warning.php
@@ -1 +1 @@
-<i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+<i class="fas fa-exclamation-triangle fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/icons/wizard.php b/resources/views/icons/wizard.php
index 48e8abb8b4..5e4e13a21f 100644
--- a/resources/views/icons/wizard.php
+++ b/resources/views/icons/wizard.php
@@ -1 +1 @@
-<i class="fas fa-magic" aria-hidden="true"></i>
+<i class="fas fa-magic fa-fw" aria-hidden="true"></i>