diff --git a/templates/domains/overview.html b/templates/domains/overview.html
index d97a9f4..dddca80 100644
--- a/templates/domains/overview.html
+++ b/templates/domains/overview.html
@@ -37,9 +37,9 @@
 					</td>
 					<td>{{ domain.mnt_by.all|linkObjects }}</td>
 					<td>
-						<a href="{% url "domains:domain-check" domain.name %}">DNS-check</a>
-						<a href="{% url "domains:domain-edit" domain.name %}">Edit</a>
-						<a href="{% url "domains:domain-delete" domain.name %}">Delete</a>
+						<a href="{% url "domains:domain-check" domain.name %}"><span title="Check DNS" class="glyphicon glyphicon-check"></span></a>
+						<a href="{% url "domains:domain-edit" domain.name %}"><span title="Edit" class="glyphicon glyphicon-pencil"></span></a>
+						<a href="{% url "domains:domain-delete" domain.name %}"><span title="Delete" class="glyphicon glyphicon-trash"></span></a>
 					</td>
 				</tr>
 			{% endfor %}
@@ -60,7 +60,7 @@
 					<td>{{ nameserver.glueIPv4|default:"-" }}</td>
 					<td>{{ nameserver.glueIPv6|default:"-" }}</td>
 					<td>{{ nameserver.mnt_by.all|linkObjects }}</td>
-					<td><a href="{% url "domains:nameserver-edit" nameserver.getPK %}">Edit</a> <a href="{% url "domains:nameserver-delete" nameserver.getPK %}">Delete</a></td>
+					<td><a href="{% url "domains:nameserver-edit" nameserver.getPK %}"><span title="Edit" class="glyphicon glyphicon-pencil"></span></a> <a href="{% url "domains:nameserver-delete" nameserver.getPK %}"><span title="Delete" class="glyphicon glyphicon-trash"></span></a></td>
 				</tr>
 			{% endfor %}
 			</table>
@@ -85,9 +85,9 @@
 						</ul>
 					</td>
 					<td>
-						<a href="{% url "domains:reversezone-check" reversezone.pk %}">DNS-check</a>
-						<a href="{% url "domains:reversezone-edit" reversezone.pk %}">Edit</a>
-						<a href="{% url "domains:reversezone-delete" reversezone.pk %}">Delete</a></td>
+						<a href="{% url "domains:reversezone-check" reversezone.pk %}"><span title="Check DNS" class="glyphicon glyphicon-check"></span></a>
+						<a href="{% url "domains:reversezone-edit" reversezone.pk %}"><span title="Edit" class="glyphicon glyphicon-pencil"></span></a>
+						<a href="{% url "domains:reversezone-delete" reversezone.pk %}"><span title="Delete" class="glyphicon glyphicon-trash"></span></a></td>
 				</tr>
 			{% endfor %}
 			</table>
diff --git a/templates/whoisdb/handle_table.html b/templates/whoisdb/handle_table.html
index 2101ad7..3203596 100644
--- a/templates/whoisdb/handle_table.html
+++ b/templates/whoisdb/handle_table.html
@@ -12,8 +12,14 @@
 		{% with object.getAppName|add:":"|add:object.getClassName|lower|add:"-edit" as editView %}
 		{% with object.getAppName|add:":"|add:object.getClassName|lower|add:"-delete" as deleteView %}
 		<td>
-			<a href="{% url editView object.getPK %}"><span class="glyphicon glyphicon-pencil"></span></a>
-			<a href="{% url deleteView object.getPK %}"><span class="glyphicon glyphicon-trash"></span></a>
+			{% if object.getClassName == "Domain" %}
+				<a href="{% url "domains:domain-check" object.getZone %}"><span title="Check DNS" class="glyphicon glyphicon-check"></span></a>
+			{% elif object.getClassName == "ReverseZone" %}
+				<a href="{% url "domains:reversezone-check" object.getPK %}"><span title="Check DNS" class="glyphicon glyphicon-check"></span></a>
+
+			{% endif %}
+			<a href="{% url editView object.getPK %}"><span title="Edit" class="glyphicon glyphicon-pencil"></span></a>
+			<a href="{% url deleteView object.getPK %}"><span title="Delete" class="glyphicon glyphicon-trash"></span></a>
 		</td>
 		{% endwith %}
 		{% endwith %}
diff --git a/templates/whoisdb/handle_table_row.html b/templates/whoisdb/handle_table_row.html
index 5446dab..f838cbc 100644
--- a/templates/whoisdb/handle_table_row.html
+++ b/templates/whoisdb/handle_table_row.html
@@ -10,7 +10,7 @@
 			<td>{{ obj.getResource|default:"-" }}</td>
 			<td>{{ obj.mnt_by.all|linkObjects|default:"-" }}{% if obj.mnt_lower.all %} / lower: {{ obj.mnt_lower.all|linkObjects }}{% endif %}</td>
 			<td>{{ obj.admin_c.all|linkObjects }}</td>
-			<td><a href="{% url editView obj.handle %}">Edit</a> <a href="{% url deleteView obj.handle %}">Delete</a></td>
+			<td><a href="{% url editView obj.handle %}"><span title="Edit" class="glyphicon glyphicon-pencil"></span></a> <a href="{% url deleteView obj.handle %}"><span title="Delete" class="glyphicon glyphicon-trash"></span></a></td>
 		</tr>
 		{% endwith %}
 	{% endwith %}