diff --git a/src/utils/changeExtensionIcon.ts b/src/utils/changeExtensionIcon.ts
index d1e8d1a..650634b 100644
--- a/src/utils/changeExtensionIcon.ts
+++ b/src/utils/changeExtensionIcon.ts
@@ -7,22 +7,23 @@ type ColorIconTypes = 'gray' | 'red' | 'white' | '';
  * It changes the extension icon color.
  */
 export default async function changeExtensionIcon(color?: ColorIconTypes): Promise<void> {
+  let path;
   if (color) {
-    const path = `./graphics/wakatime-logo-38-${color}.png`;
-
-    await browser.action.setIcon({
-      path: path,
-    });
+    path = `./graphics/wakatime-logo-38-${color}.png`;
   } else {
     const { theme } = await browser.storage.sync.get({
       theme: config.theme,
     });
-    const path =
+    path =
       theme === config.theme
         ? './graphics/wakatime-logo-38.png'
         : './graphics/wakatime-logo-38-white.png';
-    await browser.action.setIcon({
-      path: path,
-    });
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  if (browser.browserAction) {
+    await browser.browserAction.setIcon({ path: path }); // Support for FF with manifest V2
+  } else {
+    await browser.action.setIcon({ path: path }); // Support for Chrome with manifest V3
   }
 }
diff --git a/src/utils/changeExtensionTooltip.ts b/src/utils/changeExtensionTooltip.ts
index 9c9e647..d6cc4ae 100644
--- a/src/utils/changeExtensionTooltip.ts
+++ b/src/utils/changeExtensionTooltip.ts
@@ -12,5 +12,10 @@ export default async function changeExtensionTooltip(text: string): Promise<void
     text = `${config.name} - ${text}`;
   }
 
-  await browser.action.setTitle({ title: text });
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  if (browser.browserAction) {
+    await browser.browserAction.setTitle({ title: text }); // Support for FF with manifest V2
+  } else {
+    await browser.action.setTitle({ title: text }); // Support for Chrome with manifest V3
+  }
 }