diff --git a/gulpfile.js b/gulpfile.js
index f93804438c..3cc52c47ac 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -27,7 +27,7 @@ const filters = {
         'build/popup/fonts/fontawesome*.woff'
     ],
     safari: [
-        '!build/Info.plist',
+        '!build/safari/**/*',
         '!build/downloader/**/*'
     ],
     webExt: [
@@ -162,9 +162,12 @@ gulp.task('ci:coverage', (cb) => {
 
 gulp.task('safari:build', (cb) => {
     const buildPath = './build.safariextension/';
+    const safariAssetsBuildPath = buildPath + 'safari/';
 
     return del([buildPath + '**/*'])
-        .then(() => safariMoveBuild(paths.build + '**/*', buildPath))
+        .then(() => safariCopyBuild(paths.build + '**/*', buildPath))
+        .then(() => copy(safariAssetsBuildPath + '**/*', buildPath))
+        .then(() => del([safariAssetsBuildPath]))
         .then(() => {
             return cb;
         }, () => {
@@ -172,11 +175,21 @@ gulp.task('safari:build', (cb) => {
         });
 });
 
-function safariMoveBuild(source, dest) {
+function safariCopyBuild(source, dest) {
     return new Promise((resolve, reject) => {
         gulp.src(source)
             .on('error', reject)
             .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.webExt)))
+            .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'safari')))
+            .pipe(gulp.dest(dest))
+            .on('end', resolve);
+    });
+}
+
+function copy(source, dest) {
+    return new Promise((resolve, reject) => {
+        gulp.src(source)
+            .on('error', reject)
             .pipe(gulp.dest(dest))
             .on('end', resolve);
     });
diff --git a/src/images/icon64_gray.png b/src/images/icon64_gray.png
deleted file mode 100644
index f94d33c3b3..0000000000
Binary files a/src/images/icon64_gray.png and /dev/null differ
diff --git a/src/safari/Icon-128.png b/src/safari/Icon-128.png
new file mode 100644
index 0000000000..7e819bcb88
Binary files /dev/null and b/src/safari/Icon-128.png differ
diff --git a/src/safari/Icon-32.png b/src/safari/Icon-32.png
new file mode 100644
index 0000000000..28923a676d
Binary files /dev/null and b/src/safari/Icon-32.png differ
diff --git a/src/safari/Icon-48.png b/src/safari/Icon-48.png
new file mode 100644
index 0000000000..93e7bc82e8
Binary files /dev/null and b/src/safari/Icon-48.png differ
diff --git a/src/images/icon64.png b/src/safari/Icon-64.png
similarity index 100%
rename from src/images/icon64.png
rename to src/safari/Icon-64.png
diff --git a/src/safari/Icon-96.png b/src/safari/Icon-96.png
new file mode 100644
index 0000000000..be9917680d
Binary files /dev/null and b/src/safari/Icon-96.png differ
diff --git a/src/Info.plist b/src/safari/Info.plist
similarity index 100%
rename from src/Info.plist
rename to src/safari/Info.plist
diff --git a/webpack.common.js b/webpack.common.js
index 4841981e6c..bcc6b4699f 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -102,9 +102,9 @@ module.exports = {
         }),
         new CopyWebpackPlugin([
             './src/manifest.json',
-            './src/Info.plist',
             { from: './src/_locales', to: '_locales' },
             { from: './src/edge', to: 'edge' },
+            { from: './src/safari', to: 'safari' },
             { from: './src/images', to: 'images' },
             { from: './src/content/autofill.css', to: 'content' }
         ])