diff --git a/frontend/src/components/Permissions.tsx b/frontend/src/components/Permissions.tsx
index 0587bd97..5f2663ac 100644
--- a/frontend/src/components/Permissions.tsx
+++ b/frontend/src/components/Permissions.tsx
@@ -12,8 +12,8 @@ import {
   NIP_47_PAY_INVOICE_METHOD,
   Scope,
   WalletCapabilities,
-  iconMap,
   scopeDescriptions,
+  scopeIconMap,
 } from "src/types";
 
 interface PermissionsProps {
@@ -122,7 +122,7 @@ const Permissions: React.FC<PermissionsProps> = ({
           <p className="text-sm font-medium mb-2">Scopes</p>
           <div className="flex flex-col mb-2">
             {[...permissions.scopes].map((rm) => {
-              const PermissionIcon = iconMap[rm];
+              const PermissionIcon = scopeIconMap[rm];
               return (
                 <div
                   key={rm}
diff --git a/frontend/src/components/Scopes.tsx b/frontend/src/components/Scopes.tsx
index 4307ea50..f0958785 100644
--- a/frontend/src/components/Scopes.tsx
+++ b/frontend/src/components/Scopes.tsx
@@ -14,7 +14,7 @@ import {
   SCOPE_GROUP_FULL_ACCESS,
   SCOPE_GROUP_READ_ONLY,
   Scope,
-  ScopeGroupType,
+  ScopeGroup,
   WalletCapabilities,
   scopeDescriptions,
   scopeGroupDescriptions,
@@ -55,7 +55,7 @@ const Scopes: React.FC<ScopesProps> = ({
     );
   }, [capabilities.scopes]);
 
-  const [scopeGroup, setScopeGroup] = React.useState<ScopeGroupType>(() => {
+  const [scopeGroup, setScopeGroup] = React.useState<ScopeGroup>(() => {
     if (!scopes.size || isSetEqual(scopes, fullAccessScopes)) {
       return SCOPE_GROUP_FULL_ACCESS;
     } else if (isSetEqual(scopes, readOnlyScopes)) {
@@ -73,7 +73,7 @@ const Scopes: React.FC<ScopesProps> = ({
     }
   }, [fullAccessScopes, onScopeChange, scopeGroup, scopes]);
 
-  const handleScopeGroupChange = (scopeGroup: ScopeGroupType) => {
+  const handleScopeGroupChange = (scopeGroup: ScopeGroup) => {
     setScopeGroup(scopeGroup);
     switch (scopeGroup) {
       case SCOPE_GROUP_FULL_ACCESS:
@@ -109,7 +109,7 @@ const Scopes: React.FC<ScopesProps> = ({
               SCOPE_GROUP_FULL_ACCESS,
               SCOPE_GROUP_READ_ONLY,
               SCOPE_GROUP_CUSTOM,
-            ] as ScopeGroupType[]
+            ] as ScopeGroup[]
           ).map((sg, index) => {
             const ScopeGroupIcon = scopeGroupIconMap[sg];
             return (
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index d030ade7..75af9e74 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -76,15 +76,19 @@ export type ReadOnlyScope =
   | "list_transactions"
   | "notifications";
 
-export type ScopeGroupType = "full_access" | "read_only" | "custom";
+export type ScopeGroup = "full_access" | "read_only" | "custom";
 
 export type Nip47NotificationType = "payment_received" | "payment_sent";
 
-export type IconMap = {
-  [key in string]: LucideIcon;
+export type ScopeIconMap = {
+  [key in Scope]: LucideIcon;
 };
 
-export const iconMap: IconMap = {
+export type ScopeGroupIconMap = {
+  [key in ScopeGroup]: LucideIcon;
+};
+
+export const scopeIconMap: ScopeIconMap = {
   [NIP_47_GET_BALANCE_METHOD]: WalletMinimal,
   [NIP_47_GET_INFO_METHOD]: Info,
   [NIP_47_LIST_TRANSACTIONS_METHOD]: NotebookTabs,
@@ -95,7 +99,7 @@ export const iconMap: IconMap = {
   [NIP_47_NOTIFICATIONS_PERMISSION]: Bell,
 };
 
-export const scopeGroupIconMap: IconMap = {
+export const scopeGroupIconMap: ScopeGroupIconMap = {
   [SCOPE_GROUP_FULL_ACCESS]: ArrowDownUp,
   [SCOPE_GROUP_READ_ONLY]: MoveDown,
   [SCOPE_GROUP_CUSTOM]: SquarePen,
@@ -126,13 +130,13 @@ export const scopeDescriptions: Record<Scope, string> = {
   [NIP_47_NOTIFICATIONS_PERMISSION]: "Receive wallet notifications",
 };
 
-export const scopeGroupTitle: Record<ScopeGroupType, string> = {
+export const scopeGroupTitle: Record<ScopeGroup, string> = {
   [SCOPE_GROUP_FULL_ACCESS]: "Full Access",
   [SCOPE_GROUP_READ_ONLY]: "Read Only",
   [SCOPE_GROUP_CUSTOM]: "Custom",
 };
 
-export const scopeGroupDescriptions: Record<ScopeGroupType, string> = {
+export const scopeGroupDescriptions: Record<ScopeGroup, string> = {
   [SCOPE_GROUP_FULL_ACCESS]: "Complete wallet control",
   [SCOPE_GROUP_READ_ONLY]: "Only view wallet info",
   [SCOPE_GROUP_CUSTOM]: "Define permissions",