diff --git a/lib/icons/app-icon/app-icon.ico b/lib/icons/app-icon/app-icon.ico
index e396132bb..2ef768776 100644
Binary files a/lib/icons/app-icon/app-icon.ico and b/lib/icons/app-icon/app-icon.ico differ
diff --git a/lib/icons/app-icon/icon_128x128.png b/lib/icons/app-icon/icon_128x128.png
index da940e4a5..58ea38762 100644
Binary files a/lib/icons/app-icon/icon_128x128.png and b/lib/icons/app-icon/icon_128x128.png differ
diff --git a/lib/icons/app-icon/icon_128x128@2x.png b/lib/icons/app-icon/icon_128x128@2x.png
index 15ab612f9..95c66c214 100644
Binary files a/lib/icons/app-icon/icon_128x128@2x.png and b/lib/icons/app-icon/icon_128x128@2x.png differ
diff --git a/lib/icons/app-icon/icon_16x16.png b/lib/icons/app-icon/icon_16x16.png
index e97affe48..ff2c07e47 100644
Binary files a/lib/icons/app-icon/icon_16x16.png and b/lib/icons/app-icon/icon_16x16.png differ
diff --git a/lib/icons/app-icon/icon_16x16@2x.png b/lib/icons/app-icon/icon_16x16@2x.png
index 0905e8c34..c09b79115 100644
Binary files a/lib/icons/app-icon/icon_16x16@2x.png and b/lib/icons/app-icon/icon_16x16@2x.png differ
diff --git a/lib/icons/app-icon/icon_256x256.png b/lib/icons/app-icon/icon_256x256.png
index 15ab612f9..7b3b7bde0 100644
Binary files a/lib/icons/app-icon/icon_256x256.png and b/lib/icons/app-icon/icon_256x256.png differ
diff --git a/lib/icons/app-icon/icon_256x256@2x.png b/lib/icons/app-icon/icon_256x256@2x.png
index fb7273dd2..111655335 100644
Binary files a/lib/icons/app-icon/icon_256x256@2x.png and b/lib/icons/app-icon/icon_256x256@2x.png differ
diff --git a/lib/icons/app-icon/icon_32x32.png b/lib/icons/app-icon/icon_32x32.png
index 0905e8c34..b142a0cea 100644
Binary files a/lib/icons/app-icon/icon_32x32.png and b/lib/icons/app-icon/icon_32x32.png differ
diff --git a/lib/icons/app-icon/icon_32x32@2x.png b/lib/icons/app-icon/icon_32x32@2x.png
index e547490f5..bf510cfc7 100644
Binary files a/lib/icons/app-icon/icon_32x32@2x.png and b/lib/icons/app-icon/icon_32x32@2x.png differ
diff --git a/lib/icons/app-icon/icon_512x512.png b/lib/icons/app-icon/icon_512x512.png
index fb7273dd2..9c0b86db0 100644
Binary files a/lib/icons/app-icon/icon_512x512.png and b/lib/icons/app-icon/icon_512x512.png differ
diff --git a/lib/icons/app-icon/icon_512x512@2x.png b/lib/icons/app-icon/icon_512x512@2x.png
index fa291ca8d..4df8ab8ed 100644
Binary files a/lib/icons/app-icon/icon_512x512@2x.png and b/lib/icons/app-icon/icon_512x512@2x.png differ
diff --git a/public_html/favicon-sync-16.gif b/public_html/favicon-sync-16.gif
deleted file mode 100644
index 4aa91fd41..000000000
Binary files a/public_html/favicon-sync-16.gif and /dev/null differ
diff --git a/public_html/favicon-sync-32.gif b/public_html/favicon-sync-32.gif
deleted file mode 100644
index 3cddf1b3f..000000000
Binary files a/public_html/favicon-sync-32.gif and /dev/null differ
diff --git a/public_html/favicon-sync-64.gif b/public_html/favicon-sync-64.gif
deleted file mode 100644
index 132347bce..000000000
Binary files a/public_html/favicon-sync-64.gif and /dev/null differ
diff --git a/public_html/favicon.ico b/public_html/favicon.ico
deleted file mode 100644
index 974abffdf..000000000
Binary files a/public_html/favicon.ico and /dev/null differ
diff --git a/resources/appx/Square150x150Logo.png b/resources/appx/Square150x150Logo.png
index 17cefa1f5..f42feb4d0 100644
Binary files a/resources/appx/Square150x150Logo.png and b/resources/appx/Square150x150Logo.png differ
diff --git a/resources/appx/Square150x150Logo.targetsize-150_altform-unplated.png b/resources/appx/Square150x150Logo.targetsize-150_altform-unplated.png
index 17cefa1f5..f42feb4d0 100644
Binary files a/resources/appx/Square150x150Logo.targetsize-150_altform-unplated.png and b/resources/appx/Square150x150Logo.targetsize-150_altform-unplated.png differ
diff --git a/resources/appx/Square44x44Logo.png b/resources/appx/Square44x44Logo.png
index 1e8ba44b2..0064ea08c 100644
Binary files a/resources/appx/Square44x44Logo.png and b/resources/appx/Square44x44Logo.png differ
diff --git a/resources/appx/Square44x44Logo.targetsize-44_altform-unplated.png b/resources/appx/Square44x44Logo.targetsize-44_altform-unplated.png
index 1e8ba44b2..0064ea08c 100644
Binary files a/resources/appx/Square44x44Logo.targetsize-44_altform-unplated.png and b/resources/appx/Square44x44Logo.targetsize-44_altform-unplated.png differ
diff --git a/resources/appx/StoreLogo.png b/resources/appx/StoreLogo.png
index 3d33081bd..b0fa685ec 100644
Binary files a/resources/appx/StoreLogo.png and b/resources/appx/StoreLogo.png differ
diff --git a/resources/appx/Wide310x150Logo.png b/resources/appx/Wide310x150Logo.png
index 774affa14..998181588 100644
Binary files a/resources/appx/Wide310x150Logo.png and b/resources/appx/Wide310x150Logo.png differ
diff --git a/resources/images/app-icon.icns b/resources/images/app-icon.icns
index e5bebd549..f18aaa4ad 100644
Binary files a/resources/images/app-icon.icns and b/resources/images/app-icon.icns differ
diff --git a/resources/images/dmg-icon.icns b/resources/images/dmg-icon.icns
index 36ac71a48..13292ad97 100644
Binary files a/resources/images/dmg-icon.icns and b/resources/images/dmg-icon.icns differ
diff --git a/resources/images/favicon.ico b/resources/images/favicon.ico
new file mode 100644
index 000000000..46f163212
Binary files /dev/null and b/resources/images/favicon.ico differ
diff --git a/resources/images/icon_128x128.png b/resources/images/icon_128x128.png
index da940e4a5..f8483438f 100644
Binary files a/resources/images/icon_128x128.png and b/resources/images/icon_128x128.png differ
diff --git a/resources/images/icon_16x16.png b/resources/images/icon_16x16.png
index e97affe48..82b069b0a 100644
Binary files a/resources/images/icon_16x16.png and b/resources/images/icon_16x16.png differ
diff --git a/resources/images/icon_256x256.png b/resources/images/icon_256x256.png
index 15ab612f9..26b090554 100644
Binary files a/resources/images/icon_256x256.png and b/resources/images/icon_256x256.png differ
diff --git a/resources/images/icon_32x32.png b/resources/images/icon_32x32.png
index 0905e8c34..0b05038d4 100644
Binary files a/resources/images/icon_32x32.png and b/resources/images/icon_32x32.png differ
diff --git a/resources/images/icon_512x512.png b/resources/images/icon_512x512.png
index fb7273dd2..9c0b86db0 100644
Binary files a/resources/images/icon_512x512.png and b/resources/images/icon_512x512.png differ
diff --git a/resources/images/simplenote.ico b/resources/images/simplenote.ico
index 3eb849349..2ef768776 100644
Binary files a/resources/images/simplenote.ico and b/resources/images/simplenote.ico differ
diff --git a/webpack.config.js b/webpack.config.js
index 23615380e..9f9c59fb0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -75,7 +75,7 @@ module.exports = () => {
         'build-reference': spawnSync('git', ['describe', '--always', '--dirty'])
           .stdout.toString('utf8')
           .replace('\n', ''),
-        favicon: process.cwd() + '/public_html/favicon.ico',
+        favicon: process.cwd() + '/resources/images/favicon.ico',
         'node-version': process.version,
         template: 'index.ejs',
         title: 'Simplenote',