diff --git a/src/main/java/com/commafeed/frontend/pages/BasePage.html b/src/main/java/com/commafeed/frontend/pages/BasePage.html
index 9c827ab3..5f423635 100644
--- a/src/main/java/com/commafeed/frontend/pages/BasePage.html
+++ b/src/main/java/com/commafeed/frontend/pages/BasePage.html
@@ -5,10 +5,19 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-	<link rel="apple-touch-icon" href="apple-touch-icon-iphone.png" /> 
-	<link rel="apple-touch-icon" sizes="72x72" href="apple-touch-icon-ipad.png" /> 
-	<link rel="apple-touch-icon" sizes="114x114" href="apple-touch-icon-iphone4.png" />
-	<link rel="apple-touch-icon" sizes="144x144" href="apple-touch-icon-ipad3.png" />
+	<link rel="apple-touch-icon" href="app-icon-57.png" /> 
+	<link rel="apple-touch-icon" sizes="72x72" href="app-icon-72.png" /> 
+	<link rel="apple-touch-icon" sizes="114x114" href="app-icon-114.png" />
+	<link rel="apple-touch-icon" sizes="144x144" href="app-icon-144.png" />
+	<link rel="icon" sizes="32x32" href="app-icon-32.png" />
+	<link rel="icon" sizes="64x64" href="app-icon-64.png" />
+	<link rel="icon" sizes="128x128" href="app-icon-128.png" />
+	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
+	<meta name="application-name" content="CommaFeed" />
+	<meta name="msapplication-TileColor" content="#D36D00" />
+	<meta name="msapplication-TileImage" content="app-icon-144.png" />
+	<link rel="fluid-icon" href="app-icon-512.png" title="CommaFeed" />
+	<link rel="logo" type="image/svg" href="app-icon.svg" />
 </head>
 <body>
 	<wicket:child />
diff --git a/src/main/webapp/app-icon-114.png b/src/main/webapp/app-icon-114.png
new file mode 100644
index 00000000..14798b12
Binary files /dev/null and b/src/main/webapp/app-icon-114.png differ
diff --git a/src/main/webapp/app-icon-128.png b/src/main/webapp/app-icon-128.png
new file mode 100644
index 00000000..41474930
Binary files /dev/null and b/src/main/webapp/app-icon-128.png differ
diff --git a/src/main/webapp/app-icon-144.png b/src/main/webapp/app-icon-144.png
new file mode 100644
index 00000000..5bd86a27
Binary files /dev/null and b/src/main/webapp/app-icon-144.png differ
diff --git a/src/main/webapp/app-icon-16.png b/src/main/webapp/app-icon-16.png
new file mode 100644
index 00000000..9c1b5fe7
Binary files /dev/null and b/src/main/webapp/app-icon-16.png differ
diff --git a/src/main/webapp/app-icon-195.png b/src/main/webapp/app-icon-195.png
new file mode 100644
index 00000000..4be31595
Binary files /dev/null and b/src/main/webapp/app-icon-195.png differ
diff --git a/src/main/webapp/app-icon-256.png b/src/main/webapp/app-icon-256.png
new file mode 100644
index 00000000..66bd1745
Binary files /dev/null and b/src/main/webapp/app-icon-256.png differ
diff --git a/src/main/webapp/app-icon-32.png b/src/main/webapp/app-icon-32.png
new file mode 100644
index 00000000..a9da4ab4
Binary files /dev/null and b/src/main/webapp/app-icon-32.png differ
diff --git a/src/main/webapp/app-icon-512.png b/src/main/webapp/app-icon-512.png
new file mode 100644
index 00000000..337efe8c
Binary files /dev/null and b/src/main/webapp/app-icon-512.png differ
diff --git a/src/main/webapp/app-icon-57.png b/src/main/webapp/app-icon-57.png
new file mode 100644
index 00000000..6dd53d04
Binary files /dev/null and b/src/main/webapp/app-icon-57.png differ
diff --git a/src/main/webapp/app-icon-64.png b/src/main/webapp/app-icon-64.png
new file mode 100644
index 00000000..b5ee56fc
Binary files /dev/null and b/src/main/webapp/app-icon-64.png differ
diff --git a/src/main/webapp/app-icon-72.png b/src/main/webapp/app-icon-72.png
new file mode 100644
index 00000000..ead8afb5
Binary files /dev/null and b/src/main/webapp/app-icon-72.png differ
diff --git a/src/main/webapp/app-icon.svg b/src/main/webapp/app-icon.svg
new file mode 100644
index 00000000..7ba789df
--- /dev/null
+++ b/src/main/webapp/app-icon.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="512" viewBox="0 0 10.711864 10.711864">
+  <rect width="10.711864" height="10.711864" rx="1.5091927" ry="1.2708992" x="0" y="0" style="fill:#ffa500" />
+  <path d="m 2.7542368,4.7330509 c 1.5707966,0 2.8750003,1.3042037 2.8750003,2.875 0.070247,1.0493555 1.3031335,1.024681 1.3125,0 0,-2.0943951 -2.0931049,-4.1875001 -4.1875003,-4.1875001 -0.86206,0.016123 -0.747372,1.2499509 0,1.3125001 z" style="fill:#ffffff" />
+  <path d="m 2.7542368,2.7330508 c 2.6179942,0 4.8750003,2.2570062 4.8750003,4.8750001 -0.00565,0.9321539 1.2503531,0.8922423 1.3125,0 0,-3.1415927 -3.0459073,-6.1875 -6.1875003,-6.1875 -0.8681,0.012451 -0.781452,1.2948721 0,1.3124999 z" style="fill:#ffffff" />
+  <g transform="matrix(1.2074516,0,0,1.2074516,15.495275,2.2871299)">
+    <circle cx="2" cy="6" r="1" transform="translate(-11.966102,-2.1355932)" style="fill:#ffffff" />
+    <path d="m -287.23531,128.17716 c 0,0 -3.17578,27.4663 -39.58757,46.68826 -13.03431,6.88087 -1.20385,3.39557 5.06016,-20.42474 6.26401,-23.82031 34.52741,-26.26352 34.52741,-26.26352 z" transform="scale(0.03125,0.03125)" style="fill:#ffffff" />
+  </g>
+</svg>
diff --git a/src/main/webapp/apple-touch-icon-ipad.png b/src/main/webapp/apple-touch-icon-ipad.png
deleted file mode 100644
index b938a2e4..00000000
Binary files a/src/main/webapp/apple-touch-icon-ipad.png and /dev/null differ
diff --git a/src/main/webapp/apple-touch-icon-ipad3.png b/src/main/webapp/apple-touch-icon-ipad3.png
deleted file mode 100644
index 83afc2ef..00000000
Binary files a/src/main/webapp/apple-touch-icon-ipad3.png and /dev/null differ
diff --git a/src/main/webapp/apple-touch-icon-iphone.png b/src/main/webapp/apple-touch-icon-iphone.png
deleted file mode 100644
index e2e22ecc..00000000
Binary files a/src/main/webapp/apple-touch-icon-iphone.png and /dev/null differ
diff --git a/src/main/webapp/apple-touch-icon-iphone4.png b/src/main/webapp/apple-touch-icon-iphone4.png
deleted file mode 100644
index b33b32ad..00000000
Binary files a/src/main/webapp/apple-touch-icon-iphone4.png and /dev/null differ
diff --git a/src/main/webapp/favicon.ico b/src/main/webapp/favicon.ico
index 069ac502..cee7e39e 100644
Binary files a/src/main/webapp/favicon.ico and b/src/main/webapp/favicon.ico differ
