diff --git a/main.go b/main.go
index 12403e2b7..0608fc22d 100644
--- a/main.go
+++ b/main.go
@@ -61,7 +61,7 @@ func main() {
 
 	c, err := conf.ParseFile(*configPath)
 	if err != nil {
-		glog.Println("Error parsing config at " + *configPath, err)
+		glog.Println("Error parsing config at "+*configPath, err)
 		os.Exit(1)
 	}
 
@@ -84,6 +84,9 @@ func startDashboardServer(c conf.Configuration, port int) {
 		dashboard.EndpointHandler(w, r, c, k)
 	})
 	http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("public/"))))
+	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, "public/favicon.ico")
+	})
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path != "/" {
 			http.NotFound(w, r)
diff --git a/pkg/dashboard/templates/dashboard.gohtml b/pkg/dashboard/templates/dashboard.gohtml
index 2d08ca1b8..6d59ebb68 100644
--- a/pkg/dashboard/templates/dashboard.gohtml
+++ b/pkg/dashboard/templates/dashboard.gohtml
@@ -8,6 +8,8 @@
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
+  <link rel="icon" type="image/png" href="/static/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="/static/favicon-16x16.png" sizes="16x16" />
   <link href="https://fonts.googleapis.com/css?family=Muli:300,400,700" rel="stylesheet">
   <link rel="stylesheet" href="/static/css/normalize.css">
   <link rel="stylesheet" href="/static/css/main.css">
diff --git a/public/css/main.css b/public/css/main.css
index 3e991ad42..8b35b49a3 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -67,7 +67,7 @@ body {
 }
 
 .namespace .cluster-overview {
-  height: 240px;
+  height: 220px;
 }
 
 .namespace .cluster-overview .cluster-score {
@@ -92,12 +92,13 @@ body {
 
 .namespace .cluster-overview .cluster-score .scores {
   font-size: 16px;
-  margin-top: 10px;}
+  margin-top: 10px;
+}
 
 #clusterScoreChart {
   width: 550px;
   position: relative;
-  top: -254px;
+  top: -247px;
   left: 120px;
 }
 
@@ -106,7 +107,7 @@ body {
   display: inline-block;
   position: relative;
   left: -100px;
-  top: -52px;
+  top: -47px;
 }
 
 .namespace .cluster-overview .result-messages ul {
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
new file mode 100644
index 000000000..5901074f4
Binary files /dev/null and b/public/favicon-16x16.png differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
new file mode 100644
index 000000000..149104e78
Binary files /dev/null and b/public/favicon-32x32.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 000000000..1ee1d8cb3
Binary files /dev/null and b/public/favicon.ico differ