diff --git a/app.js b/app.js
index 1b16fd42300f0e14d4239341c87f3dc53d11bdd1..f82bed30346339cbf033032b2f15a1d158cf98df 100644
--- a/app.js
+++ b/app.js
@@ -51,8 +51,7 @@ app.set('port', config.httpPort || 3000);
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-// uncomment after placing your favicon in /public
-//app.use(favicon(__dirname + '/public/favicon.ico'));
+app.use(favicon(__dirname + '/public/favicon.ico'));
 //app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..27ad97a9a11cbfba77a0106e08528865c3796d44
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 0000000000000000000000000000000000000000..25703209bcc0302a998d702429363b76b3b4787f
Binary files /dev/null and b/public/favicon-32x32.png differ
diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f28df95707b92f6f13c9d18b8d67cda47c6854a
Binary files /dev/null and b/public/favicon-96x96.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..eb10a4d4c0d0d47f9230a0cd3d0e4864d7a4ba38
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/views/index.jade b/views/index.jade
index bc02e22b4ca1fb25aff81543b001a5a59df47d9d..503a9a1e6e0810f958f65eed2c340b7613bea2c5 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -1,6 +1,4 @@
 extends layout
 
 block content
-  //h1= title
-  //p Welcome to #{title}
   img(id='latest' src='images/no_photo.png')
\ No newline at end of file
diff --git a/views/layout.jade b/views/layout.jade
index 60091bbd3bc1ef02191022eeba03e655d434c2cf..2e5e5f96c5b3da17ef3a2ce2890f78f26bef62c1 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -6,5 +6,8 @@ html
     script(src='/javascripts/jquery-1.11.1.min.js')
     script(src='/javascripts/wipho.js')
     link(rel='stylesheet', href='/stylesheets/wipho.css')
+    link(rel='icon', type='image/png' sizes='16x16' href='/favicon-16x16.png')
+    link(rel='icon', type='image/png' sizes='32x32' href='/favicon-32x32.png')
+    link(rel='icon', type='image/png' sizes='96x96' href='/favicon-96x96.png')
   body
     block content