diff --git a/src/templates/base.html b/src/templates/base.html
index 5e96e8e1b..1f80a1a52 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -146,7 +146,7 @@
                                     Notifications
                                 </a>
                                 <a class="item" href="{% url 'accounts:password_reset' %}">
-                                    <i class="icon sign out"></i>
+                                    <i class="lock icon"></i>
                                     Change Password
                                 </a>
                                 <a class="item" href="{% url 'accounts:logout' %}">
diff --git a/src/templates/registration/password_reset_complete.html b/src/templates/registration/password_reset_complete.html
index e69a6e197..0041b9694 100644
--- a/src/templates/registration/password_reset_complete.html
+++ b/src/templates/registration/password_reset_complete.html
@@ -1,10 +1,14 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<div class="six wide centered column">
-    <h2 class="ui blue header">
+<div class="sixteen wide mobile six wide computer centered column">
+    <h2 class="ui blue centered header">
         Password Reset Complete
     </h2>
-    <p>Your password has been successfully reset.</p>
+    <div class="ui stacked segment">
+        <div class="ui green message">
+            <p>Your password has been successfully reset.</p>
+        </div>
+    </div>
 </div>
 {% endblock %}
diff --git a/src/templates/registration/password_reset_confirm.html b/src/templates/registration/password_reset_confirm.html
index 873f819bb..04b250985 100644
--- a/src/templates/registration/password_reset_confirm.html
+++ b/src/templates/registration/password_reset_confirm.html
@@ -1,14 +1,42 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<div class="six wide centered column">
-    <h2 class="ui blue header">
+<div class="sixteen wide mobile six wide computer centered column">
+    <h2 class="ui blue centered header">
         Change Password
     </h2>
-    <form method="post">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <button type="submit">Reset Password</button>
-    </form>
+    <div class="ui stacked segment">
+        <p>Reset your password by entering a new one.</p>
+        <div class="ui divider"></div>
+        <form class="ui form" method="POST">
+            {% csrf_token %}
+            <div class="field">
+                <div class="ui left icon input">
+                    <i class="lock icon"></i>
+                    <input type="password"
+                           name="new_password1"
+                           placeholder="new password"
+                           id="id_new_password1"
+                           value=""
+                           maxlength=""
+                           required>
+                </div>
+            </div>
+            <div class="field">
+                <div class="ui left icon input">
+                    <i class="lock icon"></i>
+                    <input type="password"
+                           name="new_password2"
+                           placeholder="repeat new password"
+                           id="id_new_password2"
+                           value=""
+                           maxlength=""
+                           required>
+                </div>
+            </div>
+            
+            <button class="ui fluid blue submit button" type="submit">Reset password</button>
+        </form>
+    </div>
 </div>
 {% endblock %}
diff --git a/src/templates/registration/password_reset_done.html b/src/templates/registration/password_reset_done.html
index c36f7c225..8ad764b95 100644
--- a/src/templates/registration/password_reset_done.html
+++ b/src/templates/registration/password_reset_done.html
@@ -3,14 +3,19 @@
 {% block title %}Password reset{% endblock %}
 
 {% block content %}
-<div class="six wide centered column">
-    <h2 class="ui blue header">
+<div class="sixteen wide mobile six wide computer centered column">
+    <h2 class="ui blue centered header">
         Password Reset Complete
     </h2>
-    <p>
-        We have sent you an email with a link to reset your password. Please check
-        your email and click the link to continue.
-    </p>
+    <div class="ui stacked segment">
+        <div class="ui blue message">
+            <p>
+                We have sent you an email with a link to reset your password. Please check
+                your email and click the link to continue.
+            </p>
+        </div>
+        
+    </div>
 </div>
 {% endblock %}
 
diff --git a/src/templates/registration/password_reset_form.html b/src/templates/registration/password_reset_form.html
index 5d225765d..4c1ca903a 100644
--- a/src/templates/registration/password_reset_form.html
+++ b/src/templates/registration/password_reset_form.html
@@ -4,19 +4,37 @@
 {% block title %}Reset password{% endblock %}
 
 {% block content %}
-<div class="six wide centered column">
-    <h2 class="ui blue header">
+<div class="sixteen wide mobile six wide computer centered column">
+    <h2 class="ui blue centered header">
         Reset password
     </h2>
-    {% if user.is_authenticated %}
-        <p><strong>Note:</strong> you are already logged in as {{ user.username }}.</p>
-    {% endif %}
-    <p>Forgot your password? Enter your email in the form below and we'll send you instructions for creating a new one.</p>
-    <form method="post" action="">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <input type="submit" value="Reset password" />
-    </form>
+    <div class="ui stacked segment">
+        {% if user.is_authenticated %}
+            <div class="ui blue message">
+                <p><strong>Note:</strong> you are already logged in as {{ user.username }}.</p>
+            </div>
+        {% endif %}
+        <h5>Forgot your password?</h5>
+        <p>Enter your email in the form below and we'll send you instructions for creating a new one.</p>
+        <div class="ui divider"></div>
+        <form class="ui form" method="POST">
+            {% csrf_token %}
+            <div class="field">
+                <div class="ui left icon input">
+                    <i class="user icon"></i>
+                    <input type="email"
+                           name="email"
+                           placeholder="email"
+                           id="id_email"
+                           value=""
+                           maxlength=""
+                           required>
+                </div>
+            </div>
+            <button class="ui fluid blue submit button" type="submit">Reset password</button>
+            <div class="ui error message"></div>
+        </form>
+    </div>
 </div>
 {% endblock %}