diff --git a/assets/js/page_image_detail.js b/assets/js/page_image_detail.js
index 5e71833d4ccd385273d62d1cfa563181104475b3..0bca43c9dd84a479b28b0721f1847aa9c91fce4b 100644
--- a/assets/js/page_image_detail.js
+++ b/assets/js/page_image_detail.js
@@ -44,7 +44,12 @@ const scheduleSave = () => {
 
 const fakeTitleListener = (event) => {
     requestAnimationFrame(() => {
-        document.title = event.target.innerText + " | i.k8r";
+        const title = event.target.innerText;
+        if (title.trim() !== "") {
+            document.title = title + " | ik8r";
+        } else {
+            document.title = "Image Detail | ik8r";
+        }
         actualTitle.value = fakeTitle.innerText;
     });
     hasChanged = true;
diff --git a/templates/_navigation.html b/templates/_navigation.html
index 537f53687b0aabe5f34ca3a91348991e9bedd9a1..ca8b030e04cf0490d4e9c27dd1f86ca899a330e2 100644
--- a/templates/_navigation.html
+++ b/templates/_navigation.html
@@ -1,7 +1,7 @@
 {{define "navigation"}}
 <nav>
     <ul>
-        <li class="title"><a href="/">i.k8r</a></li>
+        <li class="title"><a href="/">ik8r</a></li>
     {{if .HasRole "imghost:user" }}
         <li><a href="/upload">Upload</a></li>
     {{end}}
diff --git a/templates/image_detail.html b/templates/image_detail.html
index 73078b0a17b0eb6fc48654d9cd9d624fc21280af..261205b9f7754d6ddbfba4baf2bf27e77b9011f0 100644
--- a/templates/image_detail.html
+++ b/templates/image_detail.html
@@ -1,4 +1,4 @@
-{{define "title"}}{{.Image.Title}} | i.k8r{{end}}
+{{define "title"}}{{.Image.Title}} | ik8r{{end}}
 {{define "content"}}
 <div class="page image detail">
     <div class="detail">
diff --git a/templates/image_list.html b/templates/image_list.html
index e9f6fd44fb39f3adb6a99cb44bcc242e97c89194..2df6ccf758318764c25bc6a0499150aae63fbe7c 100644
--- a/templates/image_list.html
+++ b/templates/image_list.html
@@ -1,4 +1,4 @@
-{{define "title"}}My Images | i.k8r{{end}}
+{{define "title"}}My Images | ik8r{{end}}
 {{define "content"}}
 <div class="page image list">
 {{range .Images}}
diff --git a/templates/index.html b/templates/index.html
index 02909987838522587c9e26e546943baae52ccebf..359073073fac13ebfe2205b92d13e20c91903ae4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,2 +1,2 @@
-{{define "title"}}i.k8r{{end}}
+{{define "title"}}ik8r{{end}}
 {{define "content"}}{{end}}
\ No newline at end of file
diff --git a/templates/upload.html b/templates/upload.html
index b8489a7247e5d48ba6e8a0e1d229e1e864114b97..6508d46af09afb2a90a8fe3d9c87974901a968c9 100644
--- a/templates/upload.html
+++ b/templates/upload.html
@@ -1,4 +1,4 @@
-{{define "title"}}Upload | i.k8r{{end}}
+{{define "title"}}Upload | ik8r{{end}}
 {{define "content"}}
 <div class="page upload">
     <div class="container centered">