diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html
index 9adbf6b..4668a8b 100644
--- a/brutaldon/templates/main/toot_partial.html
+++ b/brutaldon/templates/main/toot_partial.html
@@ -39,12 +39,17 @@
                         <div class="level-left">
                             {% for media in toot.media_attachments %}
                                 <a class="level-item" href="{{ media.url }}">
-                                    <img src="{{ media.preview_url }}" alt="
-                                              {% if media.text_url  %}
+                                    <img src="{{ media.preview_url }}"
+                                         alt="{% if media.description  %}
+                                              {{ media.description }}
+                                              {% elif media.text_url %}
                                               {{ media.text_url }}
                                               {% else %}
                                               {{ media.url  }}
-                                              {% endif %}"
+                                         {% endif %}"
+                                         {% if media.description %}
+                                             title="{{ media.description }}"
+                                         {% endif %}
                                          class="image is-128x128">
                                 </a>
                             {% endfor %}