diff --git a/templates/user/storage.html b/templates/user/storage.html
index c430b8a..d8872ec 100644
--- a/templates/user/storage.html
+++ b/templates/user/storage.html
@@ -3,36 +3,68 @@
 {% block content %}
 
 <div>
-  <h2>File Upload</h2>
-  <p><em>
-      Warning: This will overwrite any files stored on the server with the same name.
-  </em></p>
-  <form action="/storage/multi-upload" method="POST" enctype="multipart/form-data">
-      <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-      <input required type="file" name="STORAGE-FILES" multiple>
-      <input type="submit" value="Upload Files"/>
-  </form>
+    <h1>Storage Index</h1>
+    <div class="be-storage-section-upload">
+	<form action="/storage/multi-upload" method="POST" enctype="multipart/form-data">
+	    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
+	    <input required type="file" name="STORAGE-FILES" multiple>
+	    <!-- <input type="submit" value="Upload Files"/> -->
+	    <button class="be-gui-button-no-text"
+		    title="Click to upload files to storage"
+		    type="submit">
+		<img alt="Upload to Storage"
+		     src="/images/icons/up-arrow.png">
+	    </button>
+	</form>
+    </div>
 </div>
 
-<h1>Storage Files</h1>
-{% for item in files %}
-<div>
-    <p>
-	<a href="/storage/view/media/{{item.slug}}">
-	    <img src="{{ item | build-thumbnail-path }}" alt="{{item.name}}">
+<div class="be-storage-section">
+    {% for item in files %}
+    <div class="be-storage-entry">
+	<img class="file-thumbnail" src="{{ item | build-thumbnail-path }}" alt="{{item.name}}">
+	<a class="be-gui-link-no-text"
+	   title="Click to view '{{item.name}}'"
+	   href="/storage/view/media/{{item.slug}}">
+	    <img alt="{{entry.title}}"
+		 src="/images/icons/view-entry.png">
 	</a>
 	{% if roles.administrator %}
-	<form action="/storage/rename/{{item.slug}}" method="POST">
-	    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-	    <input required type="text" name="NEW-FILE-NAME" value="{{item.name}}">
-	    <input type="submit" value="Rename"/>
+	<form class="be-storage-rename"
+	      action="/storage/rename/{{item.slug}}"
+	      method="POST">
+	    <input required
+		   type="hidden"
+		   name="AUTHENTICITY-TOKEN"
+		   value="{{token}}">
+	    <input required
+		   type="text"
+		   name="NEW-FILE-NAME"
+		   value="{{item.name}}">
+	    <!-- <input type="submit" value="Rename"/> -->
+	    <button class="be-gui-button-no-text"
+		    title="Click to rename '{{item.name}}'"
+		    type="submit">
+		<img alt="Rename {{item.name}}"
+		     src="/images/icons/edit-entry.png">
+	    </button>
 	</form>
-	<form action="/storage/delete/{{item.slug}}" method="POST">
-	    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-	    <input type="submit" value="Delete"/>
+	<form class="be-storage-delete"
+	      action="/storage/delete/{{item.slug}}"
+	      method="POST">
+	    <input required
+		   type="hidden"
+		   name="AUTHENTICITY-TOKEN"
+		   value="{{token}}">
+	    <button class="be-gui-button-no-text"
+		    title="Click to delete '{{item.name}}'"
+		    type="submit">
+		<img alt="Delete {{item.name}}"
+		     src="/images/icons/delete-entry.png">
+	    </button>
 	</form>
 	{% endif %}
-    </p>
+    </div>
+    {% endfor %}
 </div>
-{% endfor %}
 {% endblock %}