diff --git a/cmd/fibr/templates/edit-modal.html b/cmd/fibr/templates/edit-modal.html
index ae12a46f..62790477 100644
--- a/cmd/fibr/templates/edit-modal.html
+++ b/cmd/fibr/templates/edit-modal.html
@@ -18,6 +18,13 @@ <h2 class="header">Rename</h2>
           <input id="name-{{ .ID }}" type="text" name="newName" value="{{ .Name }}" />
         </p>
 
+        {{ if not .IsDir }}
+          <p class="padding no-margin">
+            <label for="tags-{{ .ID }}" class="block">Tags, blank separated</label>
+            <input id="tags-{{ .ID }}" type="text" name="tags" value="{{ join .Tags " " }}" />
+          </p>
+        {{ end }}
+
         {{ if .HasThumbnail }}
           <p class="padding no-margin center">
             <input id="cover-{{ .ID }}" type="checkbox" name="cover" value="true" {{ if .IsCover }}checked{{ end }} />
diff --git a/cmd/fibr/templates/exif.html b/cmd/fibr/templates/exif.html
index e6d9b72a..3ce51583 100644
--- a/cmd/fibr/templates/exif.html
+++ b/cmd/fibr/templates/exif.html
@@ -1,7 +1,7 @@
 {{ define "exif-modal-btn" }}
   {{ if .Exif.HasData }}
-    <a href="#exif-modal" class="button button-icon exif-button" title="Show exif">
-      <img class="icon exif" src="{{ url "/svg/info" }}?fill=black" alt="Exif">
+    <a href="#exif-modal" class="button button-icon exif-button" title="Show exif metadatas">
+      <img class="icon exif" src="{{ url "/svg/info" }}?fill=black" alt="info">
     </a>
   {{ end }}
 {{ end }}
diff --git a/cmd/fibr/templates/file.html b/cmd/fibr/templates/file.html
index 787dbd17..1efb8d8f 100644
--- a/cmd/fibr/templates/file.html
+++ b/cmd/fibr/templates/file.html
@@ -57,7 +57,7 @@
       </video>
     {{ else }}
       {{ if .File.IsImage }}
-        <img src="{{ $url }}" alt="{{ .File.Name }}" />
+        <img src="{{ $url }}" alt="Image {{ .File.Name }}" />
       {{ else }}
         <object data="{{ $url }}" type="{{ .File.Mime }}"></object>
       {{ end }}
diff --git a/cmd/fibr/templates/files.html b/cmd/fibr/templates/files.html
index 949999d0..9008d781 100644
--- a/cmd/fibr/templates/files.html
+++ b/cmd/fibr/templates/files.html
@@ -9,7 +9,7 @@
 
   {{ if .Request.CanEdit }}
     <link rel="preload" as="image" href="{{ url "/svg/upload?fill=aliceblue" }}">
-    <link rel="preload" as="image" href="{{ url "/svg/folder-solid?fill=aliceblue" }}">
+    <link rel="preload" as="image" href="{{ url "/svg/folder?fill=aliceblue" }}">
     <link rel="preload" as="image" href="{{ url "/svg/times?fill=crimson" }}">
     <link rel="preload" as="image" href="{{ url "/svg/pencil-alt?fill=aliceblue" }}">
 
@@ -161,15 +161,15 @@
 
   <div class="content">
     <div id="menu" class="flex flex-center">
-      <a id="list-display" class="button button-icon" href="?d=list">
-        <img class="icon" src="{{ url "/svg/list?fill=aliceblue" }}" alt="List">
+      <a id="list-display" class="button button-icon" href="?d=list" title="List layout">
+        <img class="icon" src="{{ url "/svg/list?fill=aliceblue" }}" alt="list">
       </a>
-      <a id="grid-display" class="button button-icon" href="?d=grid">
-        <img class="icon" src="{{ url "/svg/grid?fill=aliceblue" }}" alt="Grid">
+      <a id="grid-display" class="button button-icon" href="?d=grid" title="Grid layout">
+        <img class="icon" src="{{ url "/svg/grid?fill=aliceblue" }}" alt="grid">
       </a>
       {{ if .HasStory }}
-        <a id="story-display" class="button button-icon" href="?d=story">
-          <img class="icon" src="{{ url "/svg/image?fill=aliceblue" }}" alt="Image story">
+        <a id="story-display" class="button button-icon" href="?d=story" title="Story layout">
+          <img class="icon" src="{{ url "/svg/image?fill=aliceblue" }}" alt="picture">
         </a>
       {{ end }}
 
@@ -177,35 +177,35 @@
       <span class="flex-grow"></span>
 
       {{ if .Request.CanEdit }}
-        <a id="upload-button-link" href="#upload-modal" class="button button-icon">
-          <img class="icon" src="{{ url "/svg/upload?fill=aliceblue" }}" alt="Upload">
+        <a id="upload-button-link" href="#upload-modal" class="button button-icon" title="Upload file">
+          <img class="icon" src="{{ url "/svg/upload?fill=aliceblue" }}" alt="upload">
         </a>
-        <a href="#folder-modal" class="button button-icon">
-          <img class="icon" src="{{ url "/svg/folder-plus?fill=aliceblue" }}" alt="Create folder">
+        <a href="#folder-modal" class="button button-icon" title="Create folder">
+          <img class="icon" src="{{ url "/svg/folder-plus?fill=aliceblue" }}" alt="folder with a plus">
         </a>
       {{ end }}
 
       {{ if .Request.CanShare }}
-        <a href="#share-list" class="button button-icon">
-          <img class="icon" src="{{ url "/svg/share?fill=aliceblue" }}" alt="Share">
+        <a href="#share-list" class="button button-icon" title="Share">
+          <img class="icon" src="{{ url "/svg/share?fill=aliceblue" }}" alt="share">
         </a>
       {{ end }}
 
       {{ if .Request.CanWebhook }}
-        <a href="#webhook-list" class="button button-icon">
-          <img class="icon" src="{{ url "/svg/webhook?fill=aliceblue" }}" alt="Webhook">
+        <a href="#webhook-list" class="button button-icon" title="Webhook">
+          <img class="icon" src="{{ url "/svg/webhook?fill=aliceblue" }}" alt="webhook">
         </a>
       {{ end }}
 
       {{ if gt (len .Files) 0 }}
-        <a class="padding" href="?download" download>
-          <img class="icon" src="{{ url "/svg/download?fill=aliceblue" }}" alt="Download">
+        <a class="padding" href="?download" title="Download files in an archive" download>
+          <img class="icon" src="{{ url "/svg/download?fill=aliceblue" }}" alt="download">
         </a>
       {{ end }}
 
       {{ if .HasMap }}
-        <a class="padding" href="#map" download>
-          <img class="icon" src="{{ url "/svg/map?fill=aliceblue" }}" alt="View on map">
+        <a class="padding" href="#map" title="View on map">
+          <img class="icon" src="{{ url "/svg/map?fill=aliceblue" }}" alt="map">
         </a>
       {{ end }}
     </div>
@@ -213,13 +213,13 @@
     <ul id="files" class="no-margin no-padding">
       {{ range .SavedSearches }}
         <li class="file relative padding-half">
-          <a class="filelink center ellipsis" href="?{{ raw .Query }}" title="{{ .Name }}">
-            <img class="icon {{ if eq $root.Request.Display "grid" }}icon-large{{ end }}" src="{{ url "/svg/folder-search?fill=aliceblue" }}" alt="Saved Search">
+          <a class="filelink center ellipsis" href="?{{ raw .Query }}" title="Saved search {{ .Name }}">
+            <img class="icon {{ if eq $root.Request.Display "grid" }}icon-large{{ end }}" src="{{ url "/svg/folder-search?fill=aliceblue" }}" alt="folder with magnifying glass">
             <span class="filename ellipsis {{ if eq $root.Request.Display "list" }}padding-left{{ end }}">{{ .Name }}</span>
 
             {{ if $root.Request.CanEdit }}
               <a href="#delete-saved-search-modal-{{ .ID }}" class="button button-icon file-delete" title="Delete">
-                <img class="icon icon-square" src="{{ url "/svg/times?fill=crimson" }}" alt="Delete">
+                <img class="icon icon-square" src="{{ url "/svg/times?fill=crimson" }}" alt="delete">
               </a>
             {{ end }}
           </a>
@@ -233,37 +233,47 @@
               {{ template "async-image-item" . }}
 
               {{ if .IsVideo }}
-                <img class="icon icon-overlay" src="{{ url "/svg/play?fill=rgba(192,192,192,0.8)" }}" alt="Play video">
+                <img class="icon icon-overlay" src="{{ url "/svg/play?fill=rgba(192,192,192,0.8)" }}" alt="play icon" title="Play video">
               {{ end }}
 
               {{ if .IsCover }}
-                <img class="icon icon-overlay-small" src="{{ url "/svg/rss?fill=rgba(192,192,192,0.8)" }}" alt="Is cover image" title="Is cover image">
+                <img class="icon icon-overlay-small" src="{{ url "/svg/rss?fill=rgba(192,192,192,0.8)" }}" alt="waves" title="Is cover image">
               {{ end }}
             {{ else }}
-              <img class="icon {{ if eq $root.Request.Display "grid" }}icon-large{{ end }}" src="{{ url "/svg/" }}{{ if .IsDir }}folder{{ else }}{{ iconFromExtension . }}{{ end }}?fill=aliceblue" alt="{{ if .IsDir }}Folder{{ else }}File{{ end }}">
+              <img class="icon {{ if eq $root.Request.Display "grid" }}icon-large{{ end }}" src="{{ url "/svg/" }}{{ if .IsDir }}folder{{ else }}{{ iconFromExtension . }}{{ end }}?fill=aliceblue" alt="{{ if .IsDir }}folder{{ else }}file{{ end }}">
               <span class="filename ellipsis {{ if eq $root.Request.Display "list" }}padding-left{{ end }}">{{ .Name }}</span>
             {{ end }}
 
-            <a href="{{ .URL }}?download" class="button button-icon file-download" title="Download" download="{{ .Name }}">
-              <img class="icon icon-square" src="{{ url "/svg/download?fill=aliceblue" }}" alt="Download">
+            <a href="{{ .URL }}?download" class="button button-icon file-download" title="Download {{ .Name }}" download="{{ .Name }}">
+              <img class="icon icon-square" src="{{ url "/svg/download?fill=aliceblue" }}" alt="download">
             </a>
 
             {{ if $root.Request.CanShare }}
-              <a href="#share-form-{{ .ID }}" class="button button-icon file-share" title="Share">
-                <img class="icon icon-square" src="{{ url "/svg/share?fill=aliceblue" }}" alt="Share {{ .Name }}">
+              <a href="#share-form-{{ .ID }}" class="button button-icon file-share" title="Share {{ .Name }}">
+                <img class="icon icon-square" src="{{ url "/svg/share?fill=aliceblue" }}" alt="share">
               </a>
             {{ end }}
 
             {{ if $root.Request.CanEdit }}
-              <a href="#edit-modal-{{ .ID }}" class="button button-icon file-edit" title="Edit">
-                <img class="icon icon-square" src="{{ url "/svg/pencil-alt?fill=aliceblue" }}" alt="Edit">
+              <a href="#edit-modal-{{ .ID }}" class="button button-icon file-edit" title="Edit {{ .Name }}">
+                <img class="icon icon-square" src="{{ url "/svg/pencil-alt?fill=aliceblue" }}" alt="edit">
               </a>
-              <a href="#delete-modal-{{ .ID }}" class="button button-icon file-delete" title="Delete">
-                <img class="icon icon-square" src="{{ url "/svg/times?fill=crimson" }}" alt="Delete">
+              <a href="#delete-modal-{{ .ID }}" class="button button-icon file-delete" title="Delete {{ .Name }}">
+                <img class="icon icon-square" src="{{ url "/svg/times?fill=crimson" }}" alt="delete">
               </a>
             {{ end }}
           </a>
 
+          {{ if .Tags }}
+            {{- if eq $root.Request.Display "grid" -}}
+              <img class="icon tags" src="{{ url "/svg/tag" }}?fill=aliceblue" alt="tag" title="#{{ join .Tags " #" }}">
+            {{ else }}
+              <em class="tags ellipsis padding-left">
+                #{{ join .Tags " #" }}
+              </em>
+            {{ end}}
+          {{ end }}
+
           {{ if .IsDir }}
             {{ if or .Aggregate.Location (not .Aggregate.Start.IsZero) }}
               {{- $startDate := .Aggregate.Start.Format "Jan 2006" -}}
@@ -273,7 +283,7 @@
                 <img
                   class="icon exif"
                   src="{{ url "/svg/info" }}?fill=aliceblue"
-                  alt="Exif"
+                  alt="exif"
                   title="
                     {{- if .Aggregate.Location }}
                       {{- .Aggregate.Location }}
diff --git a/cmd/fibr/templates/items.html b/cmd/fibr/templates/items.html
index 23d89622..7c1572ab 100644
--- a/cmd/fibr/templates/items.html
+++ b/cmd/fibr/templates/items.html
@@ -49,6 +49,13 @@
         font-size: 1rem;
         text-align: right;
       }
+
+      .tags {
+        display: inline-block;
+        flex: 0.5 0.5;
+        font-size: 1rem;
+        text-align: right;
+      }
     {{ end }}
 
     {{ if eq .Request.Display "grid" }}
@@ -97,6 +104,12 @@
         bottom: 0.5rem;
         right:  0.5rem;
       }
+
+      .tags {
+        bottom: 0.5rem;
+        left:  0.5rem;
+        position: absolute;
+      }
     {{ end }}
   </style>
 {{ end }}
diff --git a/cmd/fibr/templates/layout.html b/cmd/fibr/templates/layout.html
index fb2dea35..224af6a3 100644
--- a/cmd/fibr/templates/layout.html
+++ b/cmd/fibr/templates/layout.html
@@ -33,37 +33,40 @@ <h2 class="small bg-grey no-margin full ellipsis">
         {{ end }}
       </span>
 
-      {{ if not (and .Previous.IsZero .Next.IsZero) }}
-        <nav class="flex">
-          {{ if not .Previous.IsZero }}
-            <a class="button button-icon" href="{{ url (.Request.AbsoluteURL .Previous.URL) }}?browser">
-              <img class="icon" src="{{ url "/svg/arrow-left?fill=aliceblue" }}" alt="Previous file">
-            </a>
-          {{ end }}
+      <nav class="flex">
+        {{ if not .Previous.IsZero }}
+          <a class="button button-icon" href="{{ url (.Request.AbsoluteURL .Previous.URL) }}?browser" title="Previous file">
+            <img class="icon" src="{{ url "/svg/arrow-left?fill=aliceblue" }}" alt="left arrow">
+          </a>
+        {{ end }}
 
-          {{ if not .Next.IsZero }}
-            <a class="button button-icon" href="{{ url (.Request.AbsoluteURL .Next.URL) }}?browser">
-              <img class="icon" src="{{ url "/svg/arrow-right?fill=aliceblue" }}" alt="Next file">
-            </a>
-          {{ end }}
-        </nav>
-      {{ end }}
+        {{ if not .Next.IsZero }}
+          <a class="button button-icon" href="{{ url (.Request.AbsoluteURL .Next.URL) }}?browser" title="Next file">
+            <img class="icon" src="{{ url "/svg/arrow-right?fill=aliceblue" }}" alt="right arrow">
+          </a>
+        {{ end }}
+
+        {{- $url := .Request.AbsoluteURL "/" }}
+        <a class="button button-icon" href="{{ url $url }}?d={{ .Request.LayoutPath $url }}" title="Back to folder">
+          <img class="icon" src="{{ url "/svg/folder-back?fill=aliceblue" }}" alt="folder back">
+        </a>
+      </nav>
     {{ else }}
       </span>
       {{ if .Request.Share.Story }}
         {{ if .HasMap }}
-          <a class="padding" href="#map" download>
-            <img class="icon" src="{{ url "/svg/map?fill=aliceblue" }}" alt="View on map">
+          <a class="padding" href="#map" title="View on map">
+            <img class="icon" src="{{ url "/svg/map?fill=aliceblue" }}" alt="map">
           </a>
         {{ end }}
       {{ else }}
         {{ if and .Request.CanEdit .Search }}
-          <a class="padding" href="#create-saved-search">
-            <img class="icon" src="{{ url "/svg/folder-search?fill=" }}aliceblue" alt="Created saved search folder">
+          <a class="padding" href="#create-saved-search" title="Created saved search folder">
+            <img class="icon" src="{{ url "/svg/folder-search?fill=" }}aliceblue" alt="folder with magnifying glass">
           </a>
         {{ end }}
-        <a class="padding" href="#search" download>
-          <img class="icon" src="{{ url "/svg/search?fill=" }}{{ if .Search }}limegreen{{ else }}aliceblue{{ end }}" alt="Search files">
+        <a class="padding" href="#search" title="Search files">
+          <img class="icon" src="{{ url "/svg/search?fill=" }}{{ if .Search }}limegreen{{ else }}aliceblue{{ end }}" alt="magnifying glass">
         </a>
       {{ end }}
     {{ end }}
diff --git a/cmd/fibr/templates/search.html b/cmd/fibr/templates/search.html
index a3465f00..0bf99c8b 100644
--- a/cmd/fibr/templates/search.html
+++ b/cmd/fibr/templates/search.html
@@ -70,11 +70,11 @@
 
   <div class="content">
     <div id="menu" class="flex flex-center">
-      <a id="list-display" class="button button-icon" href="?d=list&{{ raw .Search.Encode }}">
-        <img class="icon" src="{{ url "/svg/list?fill=aliceblue" }}" alt="List">
+      <a id="list-display" class="button button-icon" href="?d=list&{{ raw .Search.Encode }}" title="List layout">
+        <img class="icon" src="{{ url "/svg/list?fill=aliceblue" }}" alt="list">
       </a>
-      <a id="grid-display" class="button button-icon" href="?d=grid&{{ raw .Search.Encode }}">
-        <img class="icon" src="{{ url "/svg/grid?fill=aliceblue" }}" alt="Grid">
+      <a id="grid-display" class="button button-icon" href="?d=grid&{{ raw .Search.Encode }}" title="Grid layout">
+        <img class="icon" src="{{ url "/svg/grid?fill=aliceblue" }}" alt="grid">
       </a>
 
       <span class="padding-left">
@@ -84,14 +84,14 @@
       <span class="flex-grow"></span>
 
       {{ if gt (len .Files) 0 }}
-        <a class="padding" href="?download&{{ raw .Search.Encode }}" download>
-          <img class="icon" src="{{ url "/svg/download?fill=aliceblue" }}" alt="Download">
+        <a class="padding" href="?download&{{ raw .Search.Encode }}" title="Download results in an archive" download>
+          <img class="icon" src="{{ url "/svg/download?fill=aliceblue" }}" alt="download">
         </a>
       {{ end }}
 
       {{ if .HasMap }}
-        <a class="padding" href="#map" download>
-          <img class="icon" src="{{ url "/svg/map?fill=aliceblue" }}" alt="View on map">
+        <a class="padding" href="#map" title="View on map">
+          <img class="icon" src="{{ url "/svg/map?fill=aliceblue" }}" alt="map">
         </a>
       {{ end }}
     </div>
@@ -110,15 +110,15 @@
               {{ template "async-image-item" . }}
 
               {{ if .IsVideo }}
-                <img class="icon icon-overlay" src="{{ url "/svg/play?fill=rgba(192,192,192,0.8)" }}" alt="Play video">
+                <img class="icon icon-overlay" src="{{ url "/svg/play?fill=rgba(192,192,192,0.8)" }}" alt="play icon" title="Play video">
               {{ end }}
             {{ else }}
-              <img class="icon {{ if eq $root.Request.Display "grid" }}icon-large{{ end }}" src="{{ url "/svg/" }}{{ if .IsDir }}folder{{ else }}{{ iconFromExtension . }}{{ end }}?fill=aliceblue" alt="{{ if .IsDir }}Folder{{ else }}File{{ end }}">
+              <img class="icon {{ if eq $root.Request.Display "grid" }}icon-large{{ end }}" src="{{ url "/svg/" }}{{ if .IsDir }}folder{{ else }}{{ iconFromExtension . }}{{ end }}?fill=aliceblue" alt="{{ if .IsDir }}folder{{ else }}file{{ end }}">
               <span class="filename ellipsis {{ if eq $root.Request.Display "list" }}padding-left{{ end }}">{{ .URL }}</span>
             {{ end }}
 
-            <a href="{{ .URL }}?download" class="button button-icon file-download" title="Download" download="{{ .Name }}">
-              <img class="icon" src="{{ url "/svg/download?fill=aliceblue" }}" alt="Download">
+            <a href="{{ .URL }}?download" class="button button-icon file-download" title="Download {{ .Name }}" download="{{ .Name }}">
+              <img class="icon" src="{{ url "/svg/download?fill=aliceblue" }}" alt="download">
             </a>
           </a>
         </li>
diff --git a/cmd/fibr/templates/share-list.html b/cmd/fibr/templates/share-list.html
index 21899518..cce6b66c 100644
--- a/cmd/fibr/templates/share-list.html
+++ b/cmd/fibr/templates/share-list.html
@@ -35,16 +35,16 @@ <h2 class="flex flex-center header no-margin">
                 </th>
                 <td class="center">
                   {{ if .Edit }}
-                    <img class="icon" src="{{ url "/svg/edit?fill=aliceblue" }}" alt="Editable">
+                    <img class="icon" src="{{ url "/svg/edit?fill=aliceblue" }}" alt="pencil" title="Editable">
                   {{ end }}
                   {{ if .Story }}
-                    <img class="icon" src="{{ url "/svg/image?fill=aliceblue" }}" alt="Story mode">
+                    <img class="icon" src="{{ url "/svg/image?fill=aliceblue" }}" alt="image" title="Story mode">
                   {{ end }}
                   {{ if .Password }}
-                    <img class="icon" src="{{ url "/svg/lock?fill=aliceblue" }}" alt="Password protected">
+                    <img class="icon" src="{{ url "/svg/lock?fill=aliceblue" }}" alt="lock" title="Password protected">
                   {{ end }}
                   {{ if .Duration }}
-                    <img class="icon" src="{{ url "/svg/hourglass?fill=aliceblue" }}" alt="Duration">
+                    <img class="icon" src="{{ url "/svg/hourglass?fill=aliceblue" }}" alt="hourglass" title="Duration">
                     {{ .Duration.Hours }}h
                   {{ end }}
                 </td>
@@ -53,7 +53,7 @@ <h2 class="flex flex-center header no-margin">
                     <input type="hidden" name="type" value="share" />
                     <input type="hidden" name="method" value="DELETE" />
                     <input type="hidden" name="id" value="{{ .ID }}" />
-                    <button id="share-delete-{{ .ID }}" type="submit" class="button button-icon" title="Delete" data-confirm="share for {{ .Path }}">
+                    <button id="share-delete-{{ .ID }}" type="submit" class="button button-icon" title="Delete {{ .Path }}" data-confirm="share for {{ .Path }}">
                       <img class="icon" src="{{ url "/svg/times?fill=crimson" }}" alt="Delete">
                     </button>
                   </form>
diff --git a/cmd/fibr/templates/story.html b/cmd/fibr/templates/story.html
index 0cf2a459..762304e6 100644
--- a/cmd/fibr/templates/story.html
+++ b/cmd/fibr/templates/story.html
@@ -140,21 +140,21 @@
   <div class="content">
     {{ if not .Request.Share.Story }}
       <div id="menu" class="flex flex-center">
-        <a id="list-display" class="button button-icon" href="?d=list">
-          <img class="icon" src="{{ url "/svg/list?fill=aliceblue" }}" alt="List">
+        <a id="list-display" class="button button-icon" href="?d=list" title="List layout">
+          <img class="icon" src="{{ url "/svg/list?fill=aliceblue" }}" alt="list">
         </a>
-        <a id="grid-display" class="button button-icon" href="?d=grid">
-          <img class="icon" src="{{ url "/svg/grid?fill=aliceblue" }}" alt="Grid">
+        <a id="grid-display" class="button button-icon" href="?d=grid" title="Grid layout">
+          <img class="icon" src="{{ url "/svg/grid?fill=aliceblue" }}" alt="grid">
         </a>
-        <a id="story-display" class="button button-icon" href="?d=story">
-          <img class="icon" src="{{ url "/svg/image?fill=aliceblue" }}" alt="Image story">
+        <a id="story-display" class="button button-icon" href="?d=story" title="Story layout">
+          <img class="icon" src="{{ url "/svg/image?fill=aliceblue" }}" alt="picture">
         </a>
 
         <span class="flex-grow"></span>
 
         {{ if .HasMap }}
-          <a class="padding" href="#map" download>
-            <img class="icon" src="{{ url "/svg/map?fill=aliceblue" }}" alt="View on map">
+          <a class="padding" href="#map" title="View on map">
+            <img class="icon" src="{{ url "/svg/map?fill=aliceblue" }}" alt="map">
           </a>
         {{ end }}
       </div>
@@ -167,7 +167,7 @@
             {{ template "async-image-item-large" .RenderItem }}
 
             {{ if .IsVideo }}
-              <img class="icon icon-overlay" src="{{ url "/svg/play?fill=rgba(192,192,192,0.8)" }}" alt="Play video">
+              <img class="icon icon-overlay" src="{{ url "/svg/play?fill=rgba(192,192,192,0.8)" }}" alt="play icon" title="Play video">
             {{ end }}
           </a>
 
@@ -175,7 +175,7 @@
             {{ if or (.Exif.Geocode.HasAddress) (not .Exif.Date.IsZero) }}
               <p class="context">
                 {{ if .Exif.Geocode.HasAddress }}
-                  <img class="icon margin-right-half" src="{{ url "/svg/location?fill=%23272727" }}" alt="Location">
+                  <img class="icon margin-right-half" src="{{ url "/svg/location?fill=%23272727" }}" alt="location">
                   <span class="location">
                     {{ if index .Exif.Geocode.Address "city_district" }}
                       {{ index .Exif.Geocode.Address "city_district" }},
@@ -192,7 +192,7 @@
                 </span>
 
                 {{ if not .Exif.Date.IsZero }}
-                  <img class="icon margin-right-half{{ if .Exif.Geocode.HasAddress }} margin-left-half{{ end }}" src="{{ url "/svg/calendar?fill=%23272727" }}" alt="Location">
+                  <img class="icon margin-right-half{{ if .Exif.Geocode.HasAddress }} margin-left-half{{ end }}" src="{{ url "/svg/calendar?fill=%23272727" }}" alt="calendar">
                   <span class="date">{{ .Exif.Date.Format "2006-01-02T15:04:05Z07:00" }}</span>
                 {{ end }}
               </p>
@@ -200,7 +200,7 @@
 
             {{ if index .Exif.Data "Model" }}
               <p class="context">
-                <img class="icon margin-right-half" src="{{ url "/svg/camera?fill=%23272727" }}" alt="Camera model">
+                <img class="icon margin-right-half" src="{{ url "/svg/camera?fill=%23272727" }}" alt="camera">
                 {{ index .Exif.Data "Model" }}
               </p>
             {{ end }}
@@ -216,11 +216,11 @@
 
             {{ if $root.Request.CanEdit }}
               <a href="#desc-modal-{{ .ID }}" class="button button-icon desc-edit" title="Edit description">
-                <img class="icon" src="{{ url "/svg/pencil-alt?fill=%23272727" }}" alt="Edit description">
+                <img class="icon" src="{{ url "/svg/pencil-alt?fill=%23272727" }}" alt="edit description">
               </a>
             {{ end }}
             <a href="#{{ .ID }}" class="button button-icon permalink" title="Link to image">
-              <img class="icon" src="{{ url "/svg/link?fill=%23272727" }}" alt="Link">
+              <img class="icon" src="{{ url "/svg/link?fill=%23272727" }}" alt="link">
             </a>
           </div>
         </li>
diff --git a/cmd/fibr/templates/svg.html b/cmd/fibr/templates/svg.html
index 4e87de47..5ef9909d 100644
--- a/cmd/fibr/templates/svg.html
+++ b/cmd/fibr/templates/svg.html
@@ -157,3 +157,11 @@
 {{ define "svg-folder-search" }}
   <svg xmlns="http://www.w3.org/2000/svg" fill="none" stroke="{{ . }}" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24"><path d="M4 20h16a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.93a2 2 0 0 1-1.66-.9l-.82-1.2A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13c0 1.1.9 2 2 2Z"/><circle cx="11.5" cy="12.5" r="2.5"/><path d="M13.27 14.27 15 16"/></svg>
 {{ end }}
+
+{{ define "svg-folder-back" }}
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" stroke="{{ . }}" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24"><path d="M2 7.5V5c0-1.1.9-2 2-2h3.93a2 2 0 0 1 1.66.9l.82 1.2a2 2 0 0 0 1.66.9H20a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H2M2 13h10"/><path d="m5 10-3 3 3 3"/></svg>
+{{ end }}
+
+{{ define "svg-tag" }}
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" stroke="{{ . }}" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24"><path d="M12 2H2v10l9.29 9.29c.94.94 2.48.94 3.42 0l6.58-6.58c.94-.94.94-2.48 0-3.42L12 2ZM7 7h.01"/></svg>
+{{ end }}
diff --git a/cmd/fibr/templates/webhook-list.html b/cmd/fibr/templates/webhook-list.html
index 68946163..4957c3b8 100644
--- a/cmd/fibr/templates/webhook-list.html
+++ b/cmd/fibr/templates/webhook-list.html
@@ -67,7 +67,7 @@ <h2 class="flex flex-center header no-margin">
                     <input type="hidden" name="method" value="DELETE" />
                     <input type="hidden" name="id" value="{{ .ID }}" />
                     <button id="webhook-delete-{{ .ID }}" type="submit" class="button button-icon" title="Delete" data-confirm="webhook for {{ .Pathname }}">
-                      <img class="icon" src="{{ url "/svg/times?fill=crimson" }}" alt="Delete">
+                      <img class="icon" src="{{ url "/svg/times?fill=crimson" }}" alt="delete">
                     </button>
                   </form>
                 </td>
diff --git a/pkg/crud/browse.go b/pkg/crud/browse.go
index f1fdf785..82d203fe 100644
--- a/pkg/crud/browse.go
+++ b/pkg/crud/browse.go
@@ -23,7 +23,7 @@ func (a App) browse(ctx context.Context, request provider.Request, item absto.It
 		previous provider.RenderItem
 		next     provider.RenderItem
 		files    []absto.Item
-		exif     provider.Metadata
+		metadata provider.Metadata
 	)
 
 	wg := concurrent.NewSimple()
@@ -38,9 +38,9 @@ func (a App) browse(ctx context.Context, request provider.Request, item absto.It
 
 	wg.Go(func() {
 		var err error
-		exif, err = a.exifApp.GetMetadataFor(ctx, item)
+		metadata, err = a.metadataApp.GetMetadataFor(ctx, item)
 		if err != nil && !absto.IsNotExist(err) {
-			logger.WithField("item", item.Pathname).Error("load exif: %s", err)
+			logger.WithField("item", item.Pathname).Error("load metadata: %s", err)
 		}
 	})
 
@@ -54,7 +54,7 @@ func (a App) browse(ctx context.Context, request provider.Request, item absto.It
 	return renderer.NewPage("file", http.StatusOK, map[string]any{
 		"Paths":     getPathParts(request),
 		"File":      renderItem,
-		"Exif":      exif,
+		"Exif":      metadata,
 		"Cover":     a.getCover(ctx, request, files),
 		"HasStream": renderItem.IsVideo() && a.thumbnailApp.HasStream(ctx, item),
 
diff --git a/pkg/crud/crud.go b/pkg/crud/crud.go
index 41e16e7a..1e8c58a8 100644
--- a/pkg/crud/crud.go
+++ b/pkg/crud/crud.go
@@ -34,7 +34,7 @@ type App struct {
 	storageApp      absto.Storage
 	shareApp        provider.ShareManager
 	webhookApp      provider.WebhookManager
-	exifApp         provider.MetadataManager
+	metadataApp     provider.MetadataManager
 	searchApp       search.App
 	pushEvent       provider.EventProducer
 	exclusiveApp    exclusive.App
@@ -77,7 +77,7 @@ func New(config Config, storageApp absto.Storage, filteredStorage absto.Storage,
 		storageApp:    filteredStorage,
 		rendererApp:   rendererApp,
 		thumbnailApp:  thumbnailApp,
-		exifApp:       exifApp,
+		metadataApp:   exifApp,
 		shareApp:      shareApp,
 		webhookApp:    webhookApp,
 		searchApp:     searchApp,
diff --git a/pkg/crud/get.go b/pkg/crud/get.go
index 717215e1..7aab1653 100644
--- a/pkg/crud/get.go
+++ b/pkg/crud/get.go
@@ -198,7 +198,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
 	var hash string
 	if query.GetBool(r, "search") {
 		hash = a.exifHash(ctx, items)
-	} else if exifs, err := a.exifApp.ListDir(ctx, item); err != nil {
+	} else if exifs, err := a.metadataApp.ListDir(ctx, item); err != nil {
 		logger.WithField("item", item.Pathname).Error("list exifs: %s", err)
 	} else {
 		hash = sha.New(exifs)
@@ -209,7 +209,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
 		return
 	}
 
-	exifs, err := a.exifApp.GetAllMetadataFor(ctx, items...)
+	exifs, err := a.metadataApp.GetAllMetadataFor(ctx, items...)
 	if err != nil {
 		a.error(w, r, request, err)
 	}
diff --git a/pkg/crud/get_test.go b/pkg/crud/get_test.go
index c81ec709..c5a746fd 100644
--- a/pkg/crud/get_test.go
+++ b/pkg/crud/get_test.go
@@ -76,7 +76,7 @@ func BenchmarkServeGeoJSON(b *testing.B) {
 	mockExif.EXPECT().ListDir(gomock.Any(), gomock.Any()).Return(items, nil).AnyTimes()
 
 	instance := App{
-		exifApp: mockExif,
+		metadataApp: mockExif,
 	}
 
 	r := httptest.NewRequest(http.MethodGet, "/", nil)
diff --git a/pkg/crud/list.go b/pkg/crud/list.go
index 3c21d1fa..3ca37456 100644
--- a/pkg/crud/list.go
+++ b/pkg/crud/list.go
@@ -35,7 +35,7 @@ func (a App) list(ctx context.Context, request provider.Request, message rendere
 	wg.Go(func() {
 		var err error
 
-		directoryAggregate, err = a.exifApp.GetAggregateFor(ctx, item)
+		directoryAggregate, err = a.metadataApp.GetAggregateFor(ctx, item)
 		if err != nil && !absto.IsNotExist(err) {
 			listLogger(item.Pathname).Error("get aggregate: %s", err)
 		}
@@ -45,9 +45,19 @@ func (a App) list(ctx context.Context, request provider.Request, message rendere
 	wg.Go(func() {
 		var err error
 
-		aggregates, err = a.exifApp.GetAllAggregateFor(ctx, files...)
+		aggregates, err = a.metadataApp.GetAllAggregateFor(ctx, files...)
 		if err != nil {
-			listLogger(item.Pathname).Error("list exifs: %s", err)
+			listLogger(item.Pathname).Error("list aggregates: %s", err)
+		}
+	})
+
+	var metadatas map[string]provider.Metadata
+	wg.Go(func() {
+		var err error
+
+		metadatas, err = a.metadataApp.GetAllMetadataFor(ctx, files...)
+		if err != nil {
+			listLogger(item.Pathname).Error("list metadatas: %s", err)
 		}
 	})
 
@@ -85,8 +95,13 @@ func (a App) list(ctx context.Context, request provider.Request, message rendere
 
 	for index, item := range files {
 		renderItem := provider.StorageToRender(item, request)
-		renderItem.Aggregate = aggregates[item.ID]
-		renderItem.IsCover = item.Name == directoryAggregate.Cover
+		renderItem.Tags = metadatas[item.ID].Tags
+
+		if item.IsDir {
+			renderItem.Aggregate = aggregates[item.ID]
+		} else {
+			renderItem.IsCover = item.Name == directoryAggregate.Cover
+		}
 
 		items[index] = renderItem
 	}
diff --git a/pkg/crud/post.go b/pkg/crud/post.go
index eaa403d1..414f6364 100644
--- a/pkg/crud/post.go
+++ b/pkg/crud/post.go
@@ -170,7 +170,7 @@ func (a App) handlePostDescription(w http.ResponseWriter, r *http.Request, reque
 
 	description := r.FormValue("description")
 
-	if _, err = a.exifApp.Update(ctx, item, provider.ReplaceDescription(description)); err != nil {
+	if _, err = a.metadataApp.Update(ctx, item, provider.ReplaceDescription(description)); err != nil {
 		a.error(w, r, request, err)
 		return
 	}
diff --git a/pkg/crud/rename.go b/pkg/crud/rename.go
index c18a118b..8a60e623 100644
--- a/pkg/crud/rename.go
+++ b/pkg/crud/rename.go
@@ -70,7 +70,7 @@ func (a App) Rename(w http.ResponseWriter, r *http.Request, request provider.Req
 	var oldItem absto.Item
 	var newItem absto.Item
 
-	if oldPath != newPath {
+	if !strings.EqualFold(oldPath, newPath) {
 		if _, err := a.checkFile(ctx, newPath, false); err != nil {
 			a.error(w, r, request, err)
 			return
@@ -93,15 +93,22 @@ func (a App) Rename(w http.ResponseWriter, r *http.Request, request provider.Req
 			provider.SetPrefsCookie(w, request)
 		}
 	} else {
-		newItem, err = a.checkFile(ctx, newPath, true)
+		newItem, err = a.checkFile(ctx, oldPath, true)
 		if err != nil {
 			a.error(w, r, request, err)
 			return
 		}
 	}
 
-	if !newItem.IsDir && cover {
-		if err := a.updateCover(ctx, newItem); err != nil {
+	if !newItem.IsDir {
+		if cover {
+			if err := a.updateCover(ctx, newItem); err != nil {
+				a.error(w, r, request, model.WrapInternal(err))
+				return
+			}
+		}
+
+		if _, err = a.metadataApp.Update(ctx, newItem, provider.ReplaceTags(strings.Split(r.Form.Get("tags"), " "))); err != nil {
 			a.error(w, r, request, model.WrapInternal(err))
 			return
 		}
@@ -164,14 +171,14 @@ func (a App) updateCover(ctx context.Context, item absto.Item) error {
 		return fmt.Errorf("get directory: %w", err)
 	}
 
-	aggregate, err := a.exifApp.GetAggregateFor(ctx, directory)
+	aggregate, err := a.metadataApp.GetAggregateFor(ctx, directory)
 	if err != nil && !absto.IsNotExist(err) {
 		return fmt.Errorf("get aggregate: %w", err)
 	}
 
 	aggregate.Cover = item.Name
 
-	if err := a.exifApp.SaveAggregateFor(ctx, directory, aggregate); err != nil {
+	if err := a.metadataApp.SaveAggregateFor(ctx, directory, aggregate); err != nil {
 		return fmt.Errorf("save aggregate: %w", err)
 	}
 
diff --git a/pkg/crud/story.go b/pkg/crud/story.go
index ca6d3581..0d428d54 100644
--- a/pkg/crud/story.go
+++ b/pkg/crud/story.go
@@ -28,7 +28,7 @@ func (a App) story(r *http.Request, request provider.Request, item absto.Item, f
 	wg.Go(func() {
 		var err error
 
-		directoryAggregate, err = a.exifApp.GetAggregateFor(ctx, item)
+		directoryAggregate, err = a.metadataApp.GetAggregateFor(ctx, item)
 		if err != nil && !absto.IsNotExist(err) {
 			logger.WithField("fn", "crud.story").WithField("item", request.Path).Error("get aggregate: %s", err)
 		}
@@ -38,7 +38,7 @@ func (a App) story(r *http.Request, request provider.Request, item absto.Item, f
 	wg.Go(func() {
 		var err error
 
-		exifs, err = a.exifApp.GetAllMetadataFor(ctx, files...)
+		exifs, err = a.metadataApp.GetAllMetadataFor(ctx, files...)
 		if err != nil {
 			logger.WithField("fn", "crud.story").WithField("item", request.Path).Error("list exifs: %s", err)
 		}
diff --git a/pkg/fibr/renderer.go b/pkg/fibr/renderer.go
index a1aa3827..ec1f14a1 100644
--- a/pkg/fibr/renderer.go
+++ b/pkg/fibr/renderer.go
@@ -18,6 +18,9 @@ var FuncMap = template.FuncMap{
 	"rebuildPaths": func(parts []string, index int) string {
 		return fmt.Sprintf("/%s/", strings.Join(parts[:index+1], "/"))
 	},
+	"join": func(arr []string, separator string) string {
+		return strings.Join(arr, separator)
+	},
 	"raw": func(content string) template.URL {
 		return template.URL(content)
 	},
diff --git a/pkg/metadata/metadata.go b/pkg/metadata/metadata.go
index 936ef271..774efc27 100644
--- a/pkg/metadata/metadata.go
+++ b/pkg/metadata/metadata.go
@@ -18,7 +18,7 @@ func (a App) Update(ctx context.Context, item absto.Item, opts ...provider.Metad
 
 		metadata, err := a.GetMetadataFor(ctx, item)
 		if err != nil && !absto.IsNotExist(err) {
-			logger.WithField("item", item.Pathname).Error("load exif: %s", err)
+			logger.WithField("item", item.Pathname).Error("load metadata: %s", err)
 		}
 
 		for _, opt := range opts {
@@ -26,7 +26,7 @@ func (a App) Update(ctx context.Context, item absto.Item, opts ...provider.Metad
 		}
 
 		if err = a.exifCacheApp.EvictOnSuccess(ctx, item, a.saveMetadata(ctx, item, metadata)); err != nil {
-			return fmt.Errorf("save exif: %w", err)
+			return fmt.Errorf("save metadata: %w", err)
 		}
 
 		return nil
diff --git a/pkg/provider/metadata.go b/pkg/provider/metadata.go
index a9e0b8af..f007cc99 100644
--- a/pkg/provider/metadata.go
+++ b/pkg/provider/metadata.go
@@ -46,19 +46,9 @@ func ReplaceDescription(description string) MetadataAction {
 	}
 }
 
-func AddTag(tag string) MetadataAction {
+func ReplaceTags(tags []string) MetadataAction {
 	return func(instance Metadata) Metadata {
-		instance.Tags = append(instance.Tags, tag)
-
-		return instance
-	}
-}
-
-func RemoveTag(tag string) MetadataAction {
-	return func(instance Metadata) Metadata {
-		if index := findIndex(instance.Tags, tag); index != -1 {
-			instance.Tags = append(instance.Tags[:index], instance.Tags[index+1:]...)
-		}
+		instance.Tags = tags
 
 		return instance
 	}
diff --git a/pkg/provider/storage.go b/pkg/provider/storage.go
index b449be5a..6c84f340 100644
--- a/pkg/provider/storage.go
+++ b/pkg/provider/storage.go
@@ -56,9 +56,11 @@ func (a ByID) Less(i, j int) bool {
 }
 
 type RenderItem struct {
-	Aggregate
-	URL  string
-	Path string
+	Aggregate Aggregate
+	Tags      []string
+	URL       string
+	Path      string
+
 	absto.Item
 	HasThumbnail bool
 	IsCover      bool
diff --git a/pkg/provider/util.go b/pkg/provider/util.go
index 49e2b125..1ac850ba 100644
--- a/pkg/provider/util.go
+++ b/pkg/provider/util.go
@@ -265,13 +265,3 @@ func EtagMatch(w http.ResponseWriter, r *http.Request, hash string) (etag string
 
 	return
 }
-
-func findIndex(arr []string, value string) int {
-	for index, item := range arr {
-		if item == value {
-			return index
-		}
-	}
-
-	return -1
-}
diff --git a/pkg/thumbnail/thumbnail.go b/pkg/thumbnail/thumbnail.go
index e0f9f78a..8daa9f72 100644
--- a/pkg/thumbnail/thumbnail.go
+++ b/pkg/thumbnail/thumbnail.go
@@ -270,7 +270,7 @@ func (a App) thumbnailHash(ctx context.Context, items []absto.Item) string {
 	}
 
 	thumbnails, err := a.cacheApp.List(ctx, onCacheError, ids...)
-	if err != nil {
+	if err != nil && !absto.IsNotExist(err) {
 		logger.Error("list thumbnails from cache: %s", err)
 	}