diff --git a/friends_map/settings.py b/friends_map/settings.py
index c5f66eb..85756bd 100644
--- a/friends_map/settings.py
+++ b/friends_map/settings.py
@@ -45,13 +45,13 @@ if DEBUG:
 # Application definition
 
 INSTALLED_APPS = [
+    'map',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'map',
     'crispy_forms',
 ]
 
diff --git a/map/templates/registration/login.html b/map/templates/registration/login.html
index 8948718..704afee 100644
--- a/map/templates/registration/login.html
+++ b/map/templates/registration/login.html
@@ -8,7 +8,7 @@
     <form method="post">
         {% csrf_token %}
         {{ form|crispy }}
-        <button type="submit" class="btn btn-primary">Login</button>
-        <a href="{% url 'signup' %}" class="btn btn-secondary">I don't have an account</a>
+        <button type="submit" class="btn btn-primary"><i class="fas fa-sign-in-alt"></i> Login</button>
+        <a href="{% url 'signup' %}" class="btn btn-secondary"><i class="fas fa-user-plus"></i> I don't have an account</a>
     </form>
 {% endblock %}
diff --git a/map/templates/registration/password_change_done.html b/map/templates/registration/password_change_done.html
new file mode 100644
index 0000000..2b06024
--- /dev/null
+++ b/map/templates/registration/password_change_done.html
@@ -0,0 +1,12 @@
+{% extends 'map/base.html' %}
+{% load crispy_forms_filters %}
+
+{% block title %}Password change successful{% endblock %}
+{% block h1 %}Password change successful{% endblock %}
+
+{% block content %}
+    <div class="alert alert-info">
+        Your password was changed.
+    </div>
+    <a href="{% url 'map' %}" class="btn btn-primary"><i class="fas fa-map-marked-alt"></i> Go to map</a>
+{% endblock %}
diff --git a/map/templates/registration/password_change_form.html b/map/templates/registration/password_change_form.html
new file mode 100644
index 0000000..89f1279
--- /dev/null
+++ b/map/templates/registration/password_change_form.html
@@ -0,0 +1,9 @@
+{% extends 'map/base_change.html' %}
+{% load crispy_forms_filters %}
+
+{% block title %}Change your password{% endblock %}
+{% block h1 %}Change your password{% endblock %}
+
+{% block form-buttons %}
+    <button type="submit" class="btn btn-primary"><i class="fas fa-key"></i> Save</button>
+{% endblock %}
diff --git a/map/templates/registration/signup.html b/map/templates/registration/signup.html
index a37efed..73ef4be 100644
--- a/map/templates/registration/signup.html
+++ b/map/templates/registration/signup.html
@@ -41,7 +41,7 @@
             {% csrf_token %}
             {{ form|crispy }}
             {% block form-buttons %}
-                <button type="submit" class="btn btn-primary">Save</button>
+                <button type="submit" class="btn btn-primary"><i class="fas fa-user-plus"></i> Save</button>
             {% endblock %}
         </form>
     {% endif %}