diff --git a/src/main/java/com/commafeed/frontend/pages/HomePage.html b/src/main/java/com/commafeed/frontend/pages/HomePage.html
index f995293e..90b1cdaf 100644
--- a/src/main/java/com/commafeed/frontend/pages/HomePage.html
+++ b/src/main/java/com/commafeed/frontend/pages/HomePage.html
@@ -3,6 +3,7 @@
 <head>
 	<title>CommaFeed</title>
 	<meta charset="utf-8">
+	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
 </head>
 <body>
 	<div ng-app="commafeed" id="main" class="main">
diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
index ce04d4ee..3d180549 100644
--- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
+++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <head>
-<meta charset="utf-8">
-<title>CommaFeed</title>
+	<meta charset="utf-8">
+	<title>CommaFeed</title>
+	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
 </head>
 <body>
 	<div class="container">
diff --git a/src/main/webapp/favicon.ico b/src/main/webapp/favicon.ico
new file mode 100644
index 00000000..ff2103a6
Binary files /dev/null and b/src/main/webapp/favicon.ico differ
