diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
index 66f45338cf38657736d39e503da7ee4fb53de7f3..ab18684a4f3ed7f252de9177246d2072b90bd98f 100644
--- a/libvaladoc/html/basicdoclet.vala
+++ b/libvaladoc/html/basicdoclet.vala
@@ -1031,21 +1031,32 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 		if (element is Class || element is Interface || element is Struct) {
 			unowned string format = (settings.use_svg_images ? "svg" : "png");
 			var chart = new Charts.Hierarchy (image_factory, element);
-			chart.save (this.get_img_path (element, format), format);
+			if (!settings.use_svg_images) {
+				chart.save (this.get_img_path (element, format), format);
+			}
 
 			writer.start_tag ("h2", {"class", css_title})
 				.text ("Object Hierarchy:")
 				.end_tag ("h2");
 
-			writer.simple_tag ("img", {"class",
-									   css_diagram,
-									   "usemap",
-									   "#"+element.get_full_name (),
-									   "alt",
-									   "Object hierarchy for %s".printf (element.name),
-									   "src",
-									   this.get_img_path_html (element, format)});
-			writer.add_usemap (chart);
+			if (settings.use_svg_images) {
+				writer.start_tag ("div", {"class",
+					css_diagram,
+					"alt",
+					"Object hierarchy for %s".printf (element.name)})
+					.text ((string) chart.write_buffer (format))
+					.end_tag ("div");
+			} else {
+				writer.simple_tag ("img", {"class",
+					css_diagram,
+					"usemap",
+					"#%s".printf (element.get_full_name ()),
+					"alt",
+					"Object hierarchy for %s".printf (element.name),
+					"src",
+					this.get_img_path_html (element, format)});
+				writer.add_usemap (chart);
+			}
 		}
 	}
 
diff --git a/valadoc/icons/devhelpstyle.css b/valadoc/icons/devhelpstyle.css
index c28cdb095fbc9a8f089ab8729f4e27a9f8505178..3fd025e8b99797eb235fbd1ceaecfd640b84929f 100644
--- a/valadoc/icons/devhelpstyle.css
+++ b/valadoc/icons/devhelpstyle.css
@@ -14,8 +14,16 @@ ul.external_link {
 	border-style: none;
 	display: block;
 	margin: 0px auto;
+	text-align: center;
+}
+
+.graph .node text {
+	font-size: 14px;
 }
 
+.graph .node a polygon {
+	fill: transparent;
+}
 
 .main_notification {
 	padding-right: 10px;
diff --git a/valadoc/icons/style.css b/valadoc/icons/style.css
index 61d584c9e29082d72248cb48259f3a4c9459629b..5a16f6def0f10d3df5aaf73d63e8d607238ec97a 100644
--- a/valadoc/icons/style.css
+++ b/valadoc/icons/style.css
@@ -27,6 +27,15 @@ ul.external_link {
 	border-style: none;
 	display: block;
 	margin: 0px auto;
+	text-align: center;
+}
+
+.graph .node text {
+	font-size: 14px;
+}
+
+.graph .node a polygon {
+	fill: transparent;
 }
 
 .site_navi {
diff --git a/valadoc/icons/wikistyle.css b/valadoc/icons/wikistyle.css
index 9b66ff8b1eca8ab3b3f6dfea2b8d5aa4a16f4676..01ce609e7031ed354387f4dda07ab943da9446e1 100644
--- a/valadoc/icons/wikistyle.css
+++ b/valadoc/icons/wikistyle.css
@@ -10,6 +10,15 @@ ul.external_link {
 	display: block;
 	margin: 0px auto;
 	width: 100px;
+	text-align: center;
+}
+
+.graph .node text {
+	font-size: 14px;
+}
+
+.graph .node a polygon {
+	fill: transparent;
 }
 
 .site_navi {