diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index 8842e347c..fe7a20bb3 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -59,7 +59,7 @@
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
                    aria-haspopup="true" aria-expanded="false">
-                    {% trans 'Tags' %}
+                    <i class="fas fa-tags"></i> {% trans 'Tags' %}
                 </a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
                     <a class="dropdown-item" href="{% url 'list_keyword' %}"><i
@@ -70,8 +70,7 @@
             </li>
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
-                   aria-haspopup="true" aria-expanded="false">
-                    {% trans 'Storage Data' %}
+                   aria-haspopup="true" aria-expanded="false"><i class="fas fa-database"></i> {% trans 'Storage Data' %}
                 </a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
                     <a class="dropdown-item" href="{% url 'list_storage' %}"><i
@@ -90,7 +89,7 @@
 
         <ul class="navbar-nav ml-auto">
             <li class="nav-item">
-                <a class="nav-link" href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>
+                <a class="nav-link" href="{% url 'admin:index' %}"><i class="fas fa-user-shield"></i> {% trans 'Admin' %}</a>
             </li>
             <li class="nav-item">
                 {% if user.is_authenticated %}
diff --git a/cookbook/templates/generic/list_template.html b/cookbook/templates/generic/list_template.html
index 18be28c61..1a7cb0714 100644
--- a/cookbook/templates/generic/list_template.html
+++ b/cookbook/templates/generic/list_template.html
@@ -11,7 +11,7 @@
     <div class="table-container">
         <h3>{{ title }} {% trans 'List' %}
             {% if create_url %}
-                <a href="{% url create_url %}"> <i class="fal fa-plus-circle"></i>
+                <a href="{% url create_url %}"> <i class="fas fa-plus-circle"></i>
                 </a>
             {% endif %}
         </h3>
diff --git a/cookbook/templates/index.html b/cookbook/templates/index.html
index 326ee6404..5cb3479c2 100644
--- a/cookbook/templates/index.html
+++ b/cookbook/templates/index.html
@@ -21,10 +21,10 @@
                     <div class="card-body">
                         <form action="" method="get" id="search_form">
                             {{ filter.form|crispy }}
-                            <input class="btn btn-primary" type="submit" value="{% trans 'Search' %}"/>
+                            <button class="btn btn-primary" value="1"><i class="fas fa-search"></i> {% trans 'Search' %}</button>
                             <a href="#" onclick="window.location = window.location.pathname;"
-                               class="btn btn-warning">{% trans 'Reset' %}</a>
-                            <a href="{% url 'new_recipe' %}" class="btn btn-success">{% trans 'New' %}</a>
+                               class="btn btn-warning"><i class="fas fa-backspace"></i> {% trans 'Reset' %}</a>
+                            <a href="{% url 'new_recipe' %}" class="btn btn-success"><i class="fas fa-plus-circle"></i> {% trans 'New' %}</a>
                         </form>
 
                     </div>