diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index 4235b266..a875ad78 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -9,7 +9,7 @@
         {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
         <div class="column is-narrow">
             <a href="{{ author.local_path }}/edit">
-                <span class="icon icon-pencil">
+                <span class="icon icon-pencil" title="Edit Author">
                     <span class="is-sr-only">Edit Author</span>
                 </span>
             </a>
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 240bef17..c54255fe 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -23,7 +23,7 @@
         {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
         <div class="column is-narrow">
             <a href="{{ book.id }}/edit">
-                <span class="icon icon-pencil">
+                <span class="icon icon-pencil" title="Edit Book">
                     <span class="is-sr-only">Edit Book</span>
                 </span>
             </a>
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index b08aa983..26953af0 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -1,25 +1,16 @@
 {% extends 'layout.html' %}
 {% load humanize %}
 {% block content %}
-<div class="block">
-    <div class="level">
-        <h1 class="title level-left">
-            Edit "{{ author.name }}"
-        </h1>
-        <div class="level-right">
-            <a href="/author/{{ author.id }}">
-                <span class="edit-link icon icon-close">
-                    <span class="is-sr-only">Close</span>
-                </span>
-            </a>
-        </div>
-    </div>
+<header class="block">
+    <h1 class="title level-left">
+        Edit "{{ author.name }}"
+    </h1>
     <div>
         <p>Added: {{ author.created_date | naturaltime }}</p>
         <p>Updated: {{ author.updated_date | naturaltime }}</p>
         <p>Last edited by: <a href="{{ author.last_edited_by.remote_id }}">{{ author.last_edited_by.display_name }}</a></p>
     </div>
-</div>
+</header>
 
 {% if form.non_field_errors %}
 <div class="block">
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index b0e262dd..7bc6e112 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -1,25 +1,16 @@
 {% extends 'layout.html' %}
 {% load humanize %}
 {% block content %}
-<div class="block">
-    <div class="level">
-        <h1 class="title level-left">
-            Edit "{{ book.title }}"
-        </h1>
-        <div class="level-right">
-            <a href="/book/{{ book.id }}">
-                <span class="edit-link icon icon-close">
-                    <span class="is-sr-only">Close</span>
-                </span>
-            </a>
-        </div>
-    </div>
+<header class="block">
+    <h1 class="title level-left">
+        Edit "{{ book.title }}"
+    </h1>
     <div>
         <p>Added: {{ book.created_date | naturaltime }}</p>
         <p>Updated: {{ book.updated_date | naturaltime }}</p>
         <p>Last edited by: <a href="{{ book.last_edited_by.remote_id }}">{{ book.last_edited_by.display_name }}</a></p>
     </div>
-</div>
+</header>
 
 {% if form.non_field_errors %}
 <div class="block">
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index f2db8521..e625343b 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -33,7 +33,7 @@
                 </div>
                 <div class="control">
                     <button class="button" type="submit">
-                        <span class="icon icon-search">
+                        <span class="icon icon-search" title="Search">
                             <span class="is-sr-only">search</span>
                         </span>
                     </button>
@@ -43,7 +43,7 @@
 
         <label for="main-nav" role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="mainNav" onclick="toggleMenu(this)" tabindex="0">
             <div class="navbar-item mt-3">
-                <div class="icon icon-dots-three-vertical">
+                <div class="icon icon-dots-three-vertical" title="Main navigation menu">
                     <span class="is-sr-only">Main navigation menu</span>
                 </div>
             </div>
@@ -110,7 +110,7 @@
                 <a href="/notifications">
                     <div class="tags has-addons">
                         <span class="tag is-medium">
-                            <span class="icon icon-bell">
+                            <span class="icon icon-bell" title="Notifications">
                                 <span class="is-sr-only">Notifications</span>
                             </span>
                         </span>
diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index 02b55794..e6688124 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -4,7 +4,7 @@
 <form name="boost" action="/boost/{{ status.id }}" method="post" onsubmit="return interact(event)" class="boost-{{ status.id }}-{{ uuid }} {% if request.user|boosted:status  %}hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small" type="submit" {% if not status.boostable %}disabled{% endif %}>
-        <span class="icon icon-boost">
+        <span class="icon icon-boost" title="Boost status">
             <span class="is-sr-only">Boost status</span>
         </span>
     </button>
@@ -12,7 +12,7 @@
 <form name="unboost" action="/unboost/{{ status.id }}" method="post" onsubmit="return interact(event)" class="boost-{{ status.id }}-{{ uuid }} active {% if not request.user|boosted:status %}hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small is-success" type="submit">
-        <span class="icon icon-boost">
+        <span class="icon icon-boost" title="Un-boost status">
             <span class="is-sr-only">Un-boost status</span>
         </span>
     </button>
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index 11e03cdb..abd453fd 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -3,7 +3,7 @@
 <form name="favorite" action="/favorite/{{ status.id }}" method="POST" onsubmit="return interact(event)" class="fav-{{ status.id }}-{{ uuid }} {% if request.user|liked:status %}hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small" type="submit">
-        <span class="icon icon-heart">
+        <span class="icon icon-heart" title="Like status">
             <span class="is-sr-only">Like status</span>
         </span>
     </button>
@@ -11,7 +11,7 @@
 <form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" onsubmit="return interact(event)" class="fav-{{ status.id }}-{{ uuid }} active {% if not request.user|liked:status %}hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-success is-small" type="submit">
-        <span class="icon icon-heart">
+        <span class="icon icon-heart" title="Un-like status">
             <span class="is-sr-only">Un-like status</span>
         </span>
     </button>
diff --git a/bookwyrm/templates/snippets/privacy-icons.html b/bookwyrm/templates/snippets/privacy-icons.html
index b911f128..793fbc8b 100644
--- a/bookwyrm/templates/snippets/privacy-icons.html
+++ b/bookwyrm/templates/snippets/privacy-icons.html
@@ -1,17 +1,17 @@
 {% if item.privacy == 'public' %}
-<span class="icon icon-globe">
+<span class="icon icon-globe" title="Public post">
     <span class="is-sr-only">Public post</span>
 </span>
 {% elif item.privacy == 'unlisted' %}
-<span class="icon icon-unlock">
+<span class="icon icon-unlock" title="Unlisted post">
     <span class="is-sr-only">Unlisted post</span>
 </span>
 {% elif item.privacy == 'followers' %}
-<span class="icon icon-lock">
+<span class="icon icon-lock" title="Followers-only post">
     <span class="is-sr-only">Followers-only post</span>
 </span>
 {% else %}
-<span class="icon icon-envelope">
+<span class="icon icon-envelope" title="Private post">
     <span class="is-sr-only">Private post</span>
 </span>
 {% endif %}
diff --git a/bookwyrm/templates/snippets/status_body.html b/bookwyrm/templates/snippets/status_body.html
index 0f196464..d37fa098 100644
--- a/bookwyrm/templates/snippets/status_body.html
+++ b/bookwyrm/templates/snippets/status_body.html
@@ -27,15 +27,15 @@
 
                 {% else %}
                 <a href="/login">
-                    <span class="icon icon-comment">
+                    <span class="icon icon-comment" title="Reply">
                         <span class="is-sr-only">Reply</span>
                     </span>
 
-                    <span class="icon icon-boost">
+                    <span class="icon icon-boost" title="Boost status">
                         <span class="is-sr-only">Boost status</span>
                     </span>
 
-                    <span class="icon icon-heart">
+                    <span class="icon icon-heart" title="Like status">
                         <span class="is-sr-only">Like status</span>
                     </span>
                 </a>
diff --git a/bookwyrm/templates/snippets/toggle/toggle_button.html b/bookwyrm/templates/snippets/toggle/toggle_button.html
index aae21f5c..e891e07a 100644
--- a/bookwyrm/templates/snippets/toggle/toggle_button.html
+++ b/bookwyrm/templates/snippets/toggle/toggle_button.html
@@ -1,6 +1,6 @@
 <label class="{% if class %}{{ class }}{% else %}button{% endif %}{% if small %} is-small{% endif %}" for="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}" tabindex="0" role="button">
     {% if icon %}
-    <span class="icon icon-{{ icon }}">
+    <span class="icon icon-{{ icon }}" title="{{ text }}">
         <span class="is-sr-only">{{ text }}</span>
     </span>
     {% else %}
diff --git a/bookwyrm/templates/user.html b/bookwyrm/templates/user.html
index 8ad5ee08..5bfa048d 100644
--- a/bookwyrm/templates/user.html
+++ b/bookwyrm/templates/user.html
@@ -8,7 +8,7 @@
     {% if is_self %}
     <div class="column is-narrow">
         <a href="/user-edit/">
-            <span class="icon icon-pencil">
+            <span class="icon icon-pencil" title="Edit profile">
                 <span class="is-sr-only">Edit profile</span>
             </span>
         </a>