diff --git a/map/templates/map/navbar.html b/map/templates/map/navbar.html
index 366c4f3..060cb54 100644
--- a/map/templates/map/navbar.html
+++ b/map/templates/map/navbar.html
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container">
-        <a class="navbar-brand" href="{% url 'map' %}">{{ app.site.name }}</a>
+        <a class="navbar-brand" href="{% url 'map' %}"><i class="fas fa-map-marked-alt"></i> {{ app.site.name }}</a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
                 aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
@@ -8,26 +8,26 @@
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav ml-auto">
-                <li class="nav-item"><a class="nav-link" href="{{ app.site.repository.bugtracker }}">Feedback</a></li>
+                <li class="nav-item"><a class="nav-link" href="{{ app.site.repository.bugtracker }}"><i class="fas fa-comments"></i> Feedback</a></li>
                 <li class="nav-item dropdown">
                     {% if user.is_authenticated %}
                         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                            data-toggle="dropdown"
                            aria-haspopup="true" aria-expanded="false">
-                            {% firstof user.get_full_name user.username %}
+                            <i class="fas fa-user"></i> {% firstof user.get_full_name user.username %}
                         </a>
                         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
                             {% if user.is_staff %}
-                                <a class="dropdown-item" href="{% url 'admin:index' %}">Admin</a>
+                                <a class="dropdown-item" href="{% url 'admin:index' %}"><i class="fas fa-tools"></i> Admin</a>
                                 <div role="separator" class="dropdown-divider"></div>
                             {% endif %}
-                            <a class="dropdown-item" href="{% url 'change-profile' %}">Edit profile</a>
-                            <a class="dropdown-item" href="{% url 'password_change' %}">Change password</a>
+                            <a class="dropdown-item" href="{% url 'change-profile' %}"><i class="fas fa-user-edit"></i> Edit profile</a>
+                            <a class="dropdown-item" href="{% url 'password_change' %}"><i class="fas fa-key"></i> Change password</a>
                             <div role="separator" class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="{% url 'logout' %}">Logout</a>
+                            <a class="dropdown-item" href="{% url 'logout' %}"><i class="fas fa-sign-out-alt"></i> Logout</a>
                         </div>
                     {% else %}
-                        <a class="nav-link" href="{% url 'login' %}">Login</a>
+                        <a class="nav-link" href="{% url 'login' %}"><i class="fas fa-sign-in-alt"></i> Login</a>
                     {% endif %}
                 </li>
             </ul>
diff --git a/map/views.py b/map/views.py
index 990955b..90c3ed3 100644
--- a/map/views.py
+++ b/map/views.py
@@ -24,7 +24,7 @@ class MapView(LoginRequiredMixin, QuickActionsMixin, generic.DetailView):
                 'url': reverse_lazy('change-location'),
                 'category': 'primary',
                 'display': f'Change your location',
-                'icon': 'fas fa-map-marked-alt',
+                'icon': 'fas fa-map-marker-alt',
             }, {
                 'url': reverse_lazy('delete-location'),
                 'category': 'warning',
@@ -36,7 +36,7 @@ class MapView(LoginRequiredMixin, QuickActionsMixin, generic.DetailView):
                 'url': reverse_lazy('add-location'),
                 'category': 'primary',
                 'display': f'Add your location',
-                'icon': 'fas fa-map-marked-alt',
+                'icon': 'fas fa-map-marker-alt',
             }]
 
         actions.append({