diff --git a/snikket_web/static/img/icons.svg b/snikket_web/static/img/icons.svg
index dfc3a01..f48579f 100644
--- a/snikket_web/static/img/icons.svg
+++ b/snikket_web/static/img/icons.svg
@@ -17,6 +17,11 @@ licensed under the terms of the Apache 2.0 License -->
 <path d="M0 0h24v24H0V0z" fill="none" />
 <path d="M9 16.2l-3.5-3.5c-.39-.39-1.01-.39-1.4 0-.39.39-.39 1.01 0 1.4l4.19 4.19c.39.39 1.02.39 1.41 0L20.3 7.7c.39-.39.39-1.01 0-1.4-.39-.39-1.01-.39-1.4 0L9 16.2z" />
 </symbol>
+<!-- from: action/delete/materialiconsround/24px.svg -->
+<symbol id="icon-delete" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0V0z" fill="none" />
+<path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V9c0-1.1-.9-2-2-2H8c-1.1 0-2 .9-2 2v10zM18 4h-2.5l-.71-.71c-.18-.18-.44-.29-.7-.29H9.91c-.26 0-.52.11-.7.29L8.5 4H6c-.55 0-1 .45-1 1s.45 1 1 1h12c.55 0 1-.45 1-1s-.45-1-1-1z" />
+</symbol>
 <!-- from: action/logout/materialicons/24px.svg -->
 <symbol id="icon-logout" viewBox="0 0 24 24">
 <path d="M0 0h24v24H0z" fill="none" />
@@ -102,6 +107,16 @@ licensed under the terms of the Apache 2.0 License -->
 <path d="M0 0h24v24H0V0z" fill="none" />
 <path d="M7 10H5V8c0-.55-.45-1-1-1s-1 .45-1 1v2H1c-.55 0-1 .45-1 1s.45 1 1 1h2v2c0 .55.45 1 1 1s1-.45 1-1v-2h2c.55 0 1-.45 1-1s-.45-1-1-1zm11 1c1.66 0 2.99-1.34 2.99-3S19.66 5 18 5c-.32 0-.63.05-.91.14.57.81.9 1.79.9 2.86s-.34 2.04-.9 2.86c.28.09.59.14.91.14zm-5 0c1.66 0 2.99-1.34 2.99-3S14.66 5 13 5s-3 1.34-3 3 1.34 3 3 3zm0 2c-2 0-6 1-6 3v1c0 .55.45 1 1 1h10c.55 0 1-.45 1-1v-1c0-2-4-3-6-3zm6.62.16c.83.73 1.38 1.66 1.38 2.84v1.5c0 .17-.02.34-.05.5h2.55c.28 0 .5-.22.5-.5V16c0-1.54-2.37-2.49-4.38-2.84z" />
 </symbol>
+<!-- from: social/person_add/materialiconsround/24px.svg -->
+<symbol id="icon-add_user" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0V0z" fill="none" />
+<path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V8c0-.55-.45-1-1-1s-1 .45-1 1v2H2c-.55 0-1 .45-1 1s.45 1 1 1h2v2c0 .55.45 1 1 1s1-.45 1-1v-2h2c.55 0 1-.45 1-1s-.45-1-1-1H6zm9 4c-2.67 0-8 1.34-8 4v1c0 .55.45 1 1 1h14c.55 0 1-.45 1-1v-1c0-2.66-5.33-4-8-4z" />
+</symbol>
+<!-- from: social/person_remove/materialiconsround/24px.svg -->
+<symbol id="icon-remove_user" viewBox="0 0 24 24">
+<g><rect fill="none" height="24" width="24" /><rect fill="none" height="24" width="24" /></g>
+<g><path d="M14,8c0-2.21-1.79-4-4-4S6,5.79,6,8s1.79,4,4,4S14,10.21,14,8z M2,18v1c0,0.55,0.45,1,1,1h14c0.55,0,1-0.45,1-1v-1 c0-2.66-5.33-4-8-4S2,15.34,2,18z M18,10h4c0.55,0,1,0.45,1,1v0c0,0.55-0.45,1-1,1h-4c-0.55,0-1-0.45-1-1v0 C17,10.45,17.45,10,18,10z" /></g>
+</symbol>
 <!-- from: navigation/close/materialiconsround/24px.svg -->
 <symbol id="icon-close" viewBox="0 0 24 24">
 <path d="M0 0h24v24H0V0z" fill="none" />
diff --git a/snikket_web/templates/admin_delete_user.html b/snikket_web/templates/admin_delete_user.html
index bf87580..941418c 100644
--- a/snikket_web/templates/admin_delete_user.html
+++ b/snikket_web/templates/admin_delete_user.html
@@ -17,7 +17,7 @@
 	{% endcall %}
 	<div class="f-bbox">
 		{%- call standard_button("back", url_for(".index"), class="secondary") %}{% trans %}Back{% endtrans %}{% endcall -%}
-		{%- call form_button("remove", form.action_delete, class="primary danger") %}{% endcall -%}
+		{%- call form_button("delete", form.action_delete, class="primary danger") %}{% endcall -%}
 	</div>
 </form></div>
 {% endblock %}
diff --git a/snikket_web/templates/admin_edit_circle.html b/snikket_web/templates/admin_edit_circle.html
index 3a0d0b2..793de6e 100644
--- a/snikket_web/templates/admin_edit_circle.html
+++ b/snikket_web/templates/admin_edit_circle.html
@@ -47,11 +47,11 @@
 	<h3 class="form-title">{% trans %}Delete circle{% endtrans %}</h3>
 	<p class="form-desc">{% trans %}Deleting a circle does not delete any users in the circle.{% endtrans %}</p>
 	<div class="f-bbox">
-		{%- call form_button("done", form.action_delete, class="secondary danger") %}{% endcall -%}
+		{%- call form_button("delete", form.action_delete, class="secondary danger") %}{% endcall -%}
 	</div>
 </div>
 {%- endif -%}
-<h2>{% trans %}Circle members{% endtrans %}</h2>
+<h2 id="members">{% trans %}Circle members{% endtrans %}</h2>
 {%- if circle_members -%}
 <div class="el-2 elevated"><table>
 	<thead>
@@ -65,7 +65,7 @@
 			<td>{{ member.localpart }}</td>
 			<td class="collapsible">{% call value_or_hint(member.display_name) %}{% endcall %}</td>
 			<td class="nowrap">
-				{%- call custom_form_button("remove", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%}
+				{%- call custom_form_button("remove_user", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%}
 					{% trans username=member.localpart %}Remove user {{ username }} from circle{% endtrans %}
 				{%- endcall -%}
 			</td>
@@ -85,7 +85,7 @@
 		<div class="select-wrap">{{ form.user_to_add }}</div>
 	</div>
 	<div class="f-bbox">
-		{%- call form_button("add", form.action_add_user, class="primary") %}{% endcall -%}
+		{%- call form_button("add_user", form.action_add_user, class="primary") %}{% endcall -%}
 	</div>
 </div>
 {%- else -%}
diff --git a/snikket_web/templates/admin_users.html b/snikket_web/templates/admin_users.html
index ba4730c..7d147e1 100644
--- a/snikket_web/templates/admin_users.html
+++ b/snikket_web/templates/admin_users.html
@@ -18,13 +18,13 @@
 			<td>{{ user.localpart }}</td>
 			<td>{% call value_or_hint(user.display_name) %}{% endcall %}</td>
 			<td class="nowrap">
-				{%- call action_button("remove", url_for(".delete_user", localpart=user.localpart), class="secondary") -%}
+				{%- call action_button("delete", url_for(".delete_user", localpart=user.localpart), class="secondary") -%}
 					{% trans user_name=user.localpart %}Delete user {{ user_name }}{% endtrans %}
 				{%- endcall -%}
 				{%- call action_button("bug_report", url_for(".debug_user", localpart=user.localpart), class="secondary") -%}
 					{% trans user_name=user.localpart %}Show debug information for {{ user_name }}{% endtrans %}
 				{%- endcall -%}
-				{%- call custom_form_button("create_link", reset_form.action_create.name, user.localpart, class="secondary", slim=True) -%}
+				{%- call custom_form_button("passwd", reset_form.action_create.name, user.localpart, class="secondary", slim=True) -%}
 					{% trans user_name=user.localpart %}Create password reset link for {{ user_name }}{% endtrans %}
 				{%- endcall -%}
 				</form>
diff --git a/snikket_web/templates/user_passwd.html b/snikket_web/templates/user_passwd.html
index 1972535..c10e2b5 100644
--- a/snikket_web/templates/user_passwd.html
+++ b/snikket_web/templates/user_passwd.html
@@ -28,7 +28,7 @@
 	</div>
 	<div class="f-bbox">
 		{%- call standard_button("back", url_for('.index'), class="secondary") %}{% trans %}Back{% endtrans %}{% endcall -%}
-		{%- call custom_form_button("done", "", "", class="primary") -%}
+		{%- call custom_form_button("passwd", "", "", class="primary") -%}
 			{% trans %}Change password{% endtrans %}
 		{%- endcall -%}
 	</div>
diff --git a/tools/icons.list b/tools/icons.list
index 36dc346..90a0aca 100644
--- a/tools/icons.list
+++ b/tools/icons.list
@@ -1,6 +1,7 @@
 action/account_circle:profile
 action/bug_report:bug_report
 action/done:done
+action/delete:delete
 action/logout:logout
 action/login:login
 action/exit_to_app:exit_to_app
@@ -18,5 +19,7 @@ navigation/more_vert:more
 social/groups:groups
 social/people:people
 social/group_add:create_group
+social/person_add:add_user
+social/person_remove:remove_user
 navigation/close:close
 image/edit:edit