diff --git a/bookwyrm/templates/components/tooltip.html b/bookwyrm/templates/components/tooltip.html
index 153ce35c5..35225b6f9 100644
--- a/bookwyrm/templates/components/tooltip.html
+++ b/bookwyrm/templates/components/tooltip.html
@@ -1,8 +1,11 @@
 {% load i18n %}
 
-<aside class="notification is-hidden transition-y" data-hide="hide_tooltip_{{ controls_text }}">
-    <button class="delete set-display" type="button" data-id="hide_tooltip_{{ controls_text }}">
-        {% trans "Close" %}
-    </button>
+{% trans "Help" as button_text %}
+{% include 'snippets/toggle/open_button.html' with text=button_text class="ml-2 is-rounded is-small" icon="heart" controls_text=controls_text controls_uid=controls_uid %}
+
+<aside class="notification is-hidden transition-y is-pulled-left mb-2" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
+    {% trans "Close" as button_text %}
+    {% include 'snippets/toggle/close_button.html' with label=button_text class="delete" nonbutton=True controls_text=controls_text controls_uid=controls_uid %}
+
     {% block tooltip_content %}{% endblock %}
 </aside>
diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index cf911f55c..cc296b75b 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -12,9 +12,14 @@
 
         <div class="columns">
         <div class="column is-half">
-            <label class="label" for="source">
-                {% trans "Data source:" %}
-            </label>
+
+            <div class="field">
+                <label class="label is-pulled-left" for="source">
+                    {% trans "Data source:" %}
+                </label>
+                {% include 'import/tooltip.html' with controls_text="goodreads-tooltip" %}
+            </div>
+
             <div class="select block">
                 <select name="source" id="source">
                     <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
@@ -28,7 +33,6 @@
                     </option>
                 </select>
             </div>
-            {% include 'import/tooltip.html' with controls_text="goodreads-tooltip" %}
             <div class="field">
                 <label class="label" for="id_csv_file">{% trans "Data file:" %}</label>
                 {{ import_form.csv_file }}