diff --git a/main.go b/main.go
index 76b21a87c8dd7e415afb03507b3647c40f28575f..4f00e2c18173c7ba9c145dc21cb732589da090f8 100644
--- a/main.go
+++ b/main.go
@@ -314,7 +314,6 @@ func main() {
 	})
 
 	http.Handle("/assets/", http.StripPrefix("/assets/", assetServer))
-	http.Handle("/i/", http.StripPrefix("/i/", imageServer))
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		user := parseUser(r)
 
@@ -328,6 +327,7 @@ func main() {
 			panic(err)
 		}
 	})
+	http.Handle("/", imageServer)
 
 	err = http.ListenAndServe(":8080", nil)
 	if err != nil {
diff --git a/templates/me_images.html b/templates/me_images.html
index 3a4dff4ad97e0ae09a2e8981b41de1c59043056d..fdeda88fd59c4f4c9cf001d7c463c1aaae94901c 100644
--- a/templates/me_images.html
+++ b/templates/me_images.html
@@ -2,9 +2,9 @@
 {{define "content"}}
 <div class="images">
 {{range .Images}}
-    <a class="image" href="/i/{{.Id}}">
+    <a class="image" href="/{{.Id}}">
         <div class="image-container">
-            <img src="/i/{{.Id}}t" >
+            <img src="/{{.Id}}t" >
         </div>
         <div class="info">
             <p>{{.OriginalName}}</p>
diff --git a/templates/upload.html b/templates/upload.html
index 7f08def59f03e735a174c889a129781c43c5082a..99b5f81daa34d237cc2da54ad99fbdd4a6741ffa 100644
--- a/templates/upload.html
+++ b/templates/upload.html
@@ -3,7 +3,7 @@
 {{range .Results}}
 {{if .Success}}
 <div class="info success">
-    <h2>Upload of {{.Id}} finished. <a href="/i/{{.Id}}">View</a>.</h2>
+    <h2>Upload of {{.Id}} finished. <a href="/{{.Id}}">View</a>.</h2>
 </div>
 {{else}}
 <div class="info error">