diff --git a/templates/status.tmpl b/templates/status.tmpl
index e842a96..a46129f 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -91,7 +91,9 @@
 
 				{{if eq .Type "image"}}
 				{{if $.Ctx.HideAttachments}}
-				<a href="{{.URL}}" target="_blank" title="{{.Description}}"> [image] </a>
+				<a href="{{.URL}}" target="_blank">
+					{{if .Description}}[{{.Description}}]{{else}}[image]{{end}}
+				</a>
 				{{else}}
 				<a class="img-link" href="{{.URL}}" target="_blank" title="{{.Description}}">
 					<img class="status-image" src="{{.URL}}" alt="status-image" height="240" />
@@ -103,7 +105,9 @@
 
 				{{else if eq .Type "audio"}}
 				{{if $.Ctx.HideAttachments}}
-				<a href="{{.URL}}" target="_blank" title="{{.Description}}"> [audio] </a>
+				<a href="{{.URL}}" target="_blank">
+					{{if .Description}}[{{.Description}}]{{else}}[audio]{{end}}
+				</a>
 				{{else}}
 				<audio class="status-audio" controls title="{{.Description}}">
 					<source src="{{.URL}}">
@@ -113,7 +117,9 @@
 
 				{{else if eq .Type "video"}}
 				{{if $.Ctx.HideAttachments}}
-				<a href="{{.URL}}" target="_blank" title="{{.Description}}"> [video] </a>
+				<a href="{{.URL}}" target="_blank">
+					{{if .Description}}[{{.Description}}]{{else}}[video]{{end}}
+				</a>
 				{{else}}
 				<div class="status-video-container" title="{{.Description}}">
 					<video class="status-video" controls height="240">
@@ -127,7 +133,9 @@
 				{{end}}
 
 				{{else}}
-				<a href="{{.URL}}" target="_blank" title="{{.Description}}"> [attachment] </a>
+				<a href="{{.URL}}" target="_blank"> 
+					{{if .Description}}[{{.Description}}]{{else}}[attachment]{{end}}
+				</a>
 				{{end}}
 				{{end}}
 			</div>