diff --git a/api.go b/api.go
index befe1c9..805151f 100644
--- a/api.go
+++ b/api.go
@@ -20,6 +20,10 @@ func assetContentType(name string) string {
 		return "application/javascript"
 	}
 
+	if strings.Contains(name, ".icon") {
+		return "image/x-icon"
+	}
+
 	return "text/plain"
 }
 
diff --git a/static/img/icon.ico b/static/img/icon.ico
new file mode 100644
index 0000000..35079e8
Binary files /dev/null and b/static/img/icon.ico differ
diff --git a/static/index.html b/static/index.html
index a9decbd..41deffc 100644
--- a/static/index.html
+++ b/static/index.html
@@ -7,6 +7,7 @@
   <meta http-equiv="Content-Language" content="en">
   <link rel="stylesheet" href="/static/css/bootstrap.css"></link>
   <link rel="stylesheet" href="/static/css/app.css"></link>
+  <link rel="icon" type="image/x-icon" href="/static/img/icon.ico" />
   <script type="text/javascript" src="/static/js/jquery.js"></script>
   <script type="text/javascript" src="/static/js/ace.js"></script>
   <script type="text/javascript" src="/static/js/ace-pgsql.js"></script>
@@ -65,7 +66,7 @@
       </div>
     </div>
   </div>
-  
+
   <div id="connection_window">
     <div class="connection-settings">
       <h1>pgweb</h1>