diff --git a/app/app.go b/app/app.go
index 541fb24..c999430 100644
--- a/app/app.go
+++ b/app/app.go
@@ -308,6 +308,12 @@ func loadTemplates() (templates map[string]*Template) {
 			}
 			return baseUrl + url.String(), nil
 		},
+		"absoluteUrlForPath": func(path string) string {
+			if appengine.IsDevAppServer() {
+				return "http://localhost:8080" + path
+			}
+			return "https://www.retrogit.com" + path
+		},
 		"style": func(names ...string) (result template.CSS) {
 			for _, name := range names {
 				result += styles[name]
diff --git a/app/app.yaml b/app/app.yaml
index 7849eb2..f0d5032 100644
--- a/app/app.yaml
+++ b/app/app.yaml
@@ -6,6 +6,9 @@ api_version: go1
 handlers:
 - url: /static
   static_dir: static
+- url: /favicon.ico
+  static_files: static/favicon.ico
+  upload: static/favicon.ico
 - url: /digest/cron
   script: _go_app
   login: admin
diff --git a/app/static/favicon.ico b/app/static/favicon.ico
new file mode 100644
index 0000000..ef24010
Binary files /dev/null and b/app/static/favicon.ico differ
diff --git a/app/templates/base/page.html b/app/templates/base/page.html
index 9386590..3860824 100644
--- a/app/templates/base/page.html
+++ b/app/templates/base/page.html
@@ -4,6 +4,7 @@
   <meta charset="utf-8">
   <title>RetroGit {{template "title" .}}</title>
   <meta name="viewport" content="initial-scale=1 maximum-scale=1 user-scalable=no">
+  <link rel="shortcut icon" sizes="16x16 32x32" href="{{absoluteUrlForPath "/favicon.ico"}}">
   <link rel="stylesheet" href="/static/main.css">
   <link rel="stylesheet" href="/static/octicons/octicons.css">
 </head>
diff --git a/assets/favicon16.psd b/assets/favicon16.psd
new file mode 100644
index 0000000..b6bbe0d
Binary files /dev/null and b/assets/favicon16.psd differ
diff --git a/assets/favicon32.psd b/assets/favicon32.psd
new file mode 100644
index 0000000..c58ce74
Binary files /dev/null and b/assets/favicon32.psd differ