diff --git a/Open in Yattee/Resources/images/icon-128.png b/Open in Yattee/Resources/images/icon-128.png
index c919eb00..50480b56 100644
Binary files a/Open in Yattee/Resources/images/icon-128.png and b/Open in Yattee/Resources/images/icon-128.png differ
diff --git a/Open in Yattee/Resources/images/icon-256.png b/Open in Yattee/Resources/images/icon-256.png
index 6bd3d206..3c5ef4e4 100644
Binary files a/Open in Yattee/Resources/images/icon-256.png and b/Open in Yattee/Resources/images/icon-256.png differ
diff --git a/Open in Yattee/Resources/images/icon-48.png b/Open in Yattee/Resources/images/icon-48.png
index 353e8fbd..356c6f3a 100644
Binary files a/Open in Yattee/Resources/images/icon-48.png and b/Open in Yattee/Resources/images/icon-48.png differ
diff --git a/Open in Yattee/Resources/images/icon-512.png b/Open in Yattee/Resources/images/icon-512.png
index 2200828b..4ccb11f3 100644
Binary files a/Open in Yattee/Resources/images/icon-512.png and b/Open in Yattee/Resources/images/icon-512.png differ
diff --git a/Open in Yattee/Resources/images/icon-64.png b/Open in Yattee/Resources/images/icon-64.png
index 995689f7..79903e67 100644
Binary files a/Open in Yattee/Resources/images/icon-64.png and b/Open in Yattee/Resources/images/icon-64.png differ
diff --git a/Open in Yattee/Resources/images/icon-96.png b/Open in Yattee/Resources/images/icon-96.png
index cb079d20..588244b6 100644
Binary files a/Open in Yattee/Resources/images/icon-96.png and b/Open in Yattee/Resources/images/icon-96.png differ
diff --git a/Open in Yattee/Resources/images/toolbar-icon-16.png b/Open in Yattee/Resources/images/toolbar-icon-16.png
index ad014f6e..75b9e6b2 100644
Binary files a/Open in Yattee/Resources/images/toolbar-icon-16.png and b/Open in Yattee/Resources/images/toolbar-icon-16.png differ
diff --git a/Open in Yattee/Resources/images/toolbar-icon-19.png b/Open in Yattee/Resources/images/toolbar-icon-19.png
index 33eb01e7..a7374a9d 100644
Binary files a/Open in Yattee/Resources/images/toolbar-icon-19.png and b/Open in Yattee/Resources/images/toolbar-icon-19.png differ
diff --git a/Open in Yattee/Resources/images/toolbar-icon-32.png b/Open in Yattee/Resources/images/toolbar-icon-32.png
index a71914b0..cc393cd7 100644
Binary files a/Open in Yattee/Resources/images/toolbar-icon-32.png and b/Open in Yattee/Resources/images/toolbar-icon-32.png differ
diff --git a/Open in Yattee/Resources/images/toolbar-icon-38.png b/Open in Yattee/Resources/images/toolbar-icon-38.png
index 990e7f41..59bdef61 100644
Binary files a/Open in Yattee/Resources/images/toolbar-icon-38.png and b/Open in Yattee/Resources/images/toolbar-icon-38.png differ
diff --git a/Open in Yattee/Resources/manifest.json b/Open in Yattee/Resources/manifest.json
index 0fc7a575..40a461ff 100644
--- a/Open in Yattee/Resources/manifest.json	
+++ b/Open in Yattee/Resources/manifest.json	
@@ -11,7 +11,12 @@
         "96": "images/icon-96.png",
         "128": "images/icon-128.png",
         "256": "images/icon-256.png",
-        "512": "images/icon-512.png"
+        "512": "images/icon-512.png",
+        
+        "16": "images/toolbar-icon-16.png",
+        "19": "images/toolbar-icon-19.png",
+        "32": "images/toolbar-icon-32.png",
+        "38": "images/toolbar-icon-38.png"
     },
     "content_scripts": [{
         "js": [ "content.js" ],
@@ -22,15 +27,5 @@
         ]
     }],
 
-    "browser_action": {
-        "default_popup": "popup.html",
-        "default_icon": {
-            "16": "images/toolbar-icon-16.png",
-            "19": "images/toolbar-icon-19.png",
-            "32": "images/toolbar-icon-32.png",
-            "38": "images/toolbar-icon-38.png"
-        }
-    },
-
     "permissions": [ ]
 }
diff --git a/Yattee.xcodeproj/project.pbxproj b/Yattee.xcodeproj/project.pbxproj
index 33b360ae..672caaab 100644
--- a/Yattee.xcodeproj/project.pbxproj
+++ b/Yattee.xcodeproj/project.pbxproj
@@ -241,17 +241,11 @@
 		37A3B15F27255E7F000FB5EE /* images in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B15E27255E7F000FB5EE /* images */; };
 		37A3B16127255E7F000FB5EE /* manifest.json in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16027255E7F000FB5EE /* manifest.json */; };
 		37A3B16527255E7F000FB5EE /* content.js in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16427255E7F000FB5EE /* content.js */; };
-		37A3B16727255E7F000FB5EE /* popup.html in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16627255E7F000FB5EE /* popup.html */; };
-		37A3B16927255E7F000FB5EE /* popup.css in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16827255E7F000FB5EE /* popup.css */; };
-		37A3B16B27255E7F000FB5EE /* popup.js in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16A27255E7F000FB5EE /* popup.js */; };
 		37A3B17027255E7F000FB5EE /* Open in Yattee (macOS).appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 37A3B15727255E7F000FB5EE /* Open in Yattee (macOS).appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		37A3B18F2725735F000FB5EE /* Open in Yattee (iOS).appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 37A3B1792725735F000FB5EE /* Open in Yattee (iOS).appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		37A3B194272574FB000FB5EE /* SafariWebExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A3B15927255E7F000FB5EE /* SafariWebExtensionHandler.swift */; };
 		37A3B19627257503000FB5EE /* content.js in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16427255E7F000FB5EE /* content.js */; };
-		37A3B1972725750B000FB5EE /* popup.js in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16A27255E7F000FB5EE /* popup.js */; };
 		37A3B1982725750B000FB5EE /* manifest.json in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16027255E7F000FB5EE /* manifest.json */; };
-		37A3B1992725750B000FB5EE /* popup.html in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16627255E7F000FB5EE /* popup.html */; };
-		37A3B19A2725750B000FB5EE /* popup.css in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B16827255E7F000FB5EE /* popup.css */; };
 		37A3B19B2725750F000FB5EE /* images in Resources */ = {isa = PBXBuildFile; fileRef = 37A3B15E27255E7F000FB5EE /* images */; };
 		37A9965A26D6F8CA006E3224 /* HorizontalCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A9965926D6F8CA006E3224 /* HorizontalCells.swift */; };
 		37A9965B26D6F8CA006E3224 /* HorizontalCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A9965926D6F8CA006E3224 /* HorizontalCells.swift */; };
@@ -596,9 +590,6 @@
 		37A3B15E27255E7F000FB5EE /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; path = images; sourceTree = "<group>"; };
 		37A3B16027255E7F000FB5EE /* manifest.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = manifest.json; sourceTree = "<group>"; };
 		37A3B16427255E7F000FB5EE /* content.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = content.js; sourceTree = "<group>"; };
-		37A3B16627255E7F000FB5EE /* popup.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = popup.html; sourceTree = "<group>"; };
-		37A3B16827255E7F000FB5EE /* popup.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = popup.css; sourceTree = "<group>"; };
-		37A3B16A27255E7F000FB5EE /* popup.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = popup.js; sourceTree = "<group>"; };
 		37A3B16C27255E7F000FB5EE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		37A3B16D27255E7F000FB5EE /* Open in Yattee.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Open in Yattee.entitlements"; sourceTree = "<group>"; };
 		37A3B1792725735F000FB5EE /* Open in Yattee (iOS).appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Open in Yattee (iOS).appex"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -996,9 +987,6 @@
 			children = (
 				37A3B15E27255E7F000FB5EE /* images */,
 				37A3B16027255E7F000FB5EE /* manifest.json */,
-				37A3B16627255E7F000FB5EE /* popup.html */,
-				37A3B16827255E7F000FB5EE /* popup.css */,
-				37A3B16A27255E7F000FB5EE /* popup.js */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -1469,12 +1457,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				37A3B16927255E7F000FB5EE /* popup.css in Resources */,
-				37A3B16727255E7F000FB5EE /* popup.html in Resources */,
 				37A3B15F27255E7F000FB5EE /* images in Resources */,
 				37A3B16127255E7F000FB5EE /* manifest.json in Resources */,
 				37A3B16527255E7F000FB5EE /* content.js in Resources */,
-				37A3B16B27255E7F000FB5EE /* popup.js in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1483,10 +1468,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				37A3B1982725750B000FB5EE /* manifest.json in Resources */,
-				37A3B1992725750B000FB5EE /* popup.html in Resources */,
-				37A3B19A2725750B000FB5EE /* popup.css in Resources */,
 				37A3B19627257503000FB5EE /* content.js in Resources */,
-				37A3B1972725750B000FB5EE /* popup.js in Resources */,
 				37A3B19B2725750F000FB5EE /* images in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;