diff --git a/gulpfile.js b/gulpfile.js
index df9c99302f..8da0809e2e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -54,7 +54,7 @@ function distFileName(browserName, ext) {
 function dist(browserName, manifest) {
     return gulp.src(paths.build + '**/*')
         .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.safari)))
-        .pipe(gulpif('popup/index.html', replace('__BROWSER__', browserName)))
+        .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'browser_' + browserName)))
         .pipe(gulpif('manifest.json', jeditor(manifest)))
         .pipe(zip(distFileName(browserName, 'zip')))
         .pipe(gulp.dest(paths.dist));
@@ -114,7 +114,7 @@ function edgeCopyBuild(source, dest) {
         gulp.src(source)
             .on('error', reject)
             .pipe(filter(['**'].concat(filters.fonts).concat(filters.safari)))
-            .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'edge')))
+            .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'browser_edge')))
             .pipe(gulpif('manifest.json', jeditor((manifest) => {
                 delete manifest.applications;
                 delete manifest.sidebar_action;
@@ -167,7 +167,7 @@ function safariCopyBuild(source, dest) {
         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(gulpif('popup/index.html', replace('__BROWSER__', 'browser_safari')))
             .pipe(gulp.dest(dest))
             .on('end', resolve);
     });
diff --git a/src/popup/scss/environment.scss b/src/popup/scss/environment.scss
index 946c04a9ee..312cd5541f 100644
--- a/src/popup/scss/environment.scss
+++ b/src/popup/scss/environment.scss
@@ -1,8 +1,10 @@
-@import "variables.scss";
+@import "variables.scss";
 
+/*
 html.browser_firefox, html.browser_edge {
     body {
         width: 320px !important;
         height: 568px !important;
     }
 }
+*/