diff --git a/src/lib/components/back.svelte b/src/lib/components/back.svelte
index 3ac888f73..18980a511 100644
--- a/src/lib/components/back.svelte
+++ b/src/lib/components/back.svelte
@@ -3,6 +3,6 @@
 </script>
 
 <a {href}>
-    <i class="icon-cheveron-left" />
+    <span class="icon-cheveron-left" aria-hidden="true" />
     <slot />
 </a>
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index a200c2dec..fb72021cd 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -84,7 +84,10 @@
                 </h1>
                 {#if $copyData?.value}
                     <Copy value={$copyData.value}>
-                        <Pill button><i class="icon-duplicate" />{$copyData.text}</Pill>
+                        <Pill button
+                            ><span
+                                class="icon-duplicate"
+                                aria-hidden="true" />{$copyData.text}</Pill>
                     </Copy>
                 {/if}
             </svelte:fragment>
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte
index 9cb322f28..04cb02f3b 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte
@@ -73,7 +73,7 @@
                 <div class="u-flex u-flex-vertical u-cross-center">
                     <div class="common-section">
                         <Button secondary round on:click={() => console.log('showCreate = true')}>
-                            <i class="icon-plus" />
+                            <span class="icon-plus" aria-hidden="true" />
                         </Button>
                     </div>
                     <div class="common-section">
diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte
index d3232e255..88c5e5514 100644
--- a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte
+++ b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte
@@ -110,7 +110,7 @@
                 <div class="u-flex u-flex-vertical u-cross-center">
                     <div class="common-section">
                         <Button secondary round on:click={() => (showCreate = true)}>
-                            <i class="icon-plus" />
+                            <span class="icon-plus" aria-hidden="true" />
                         </Button>
                     </div>
                     <div class="common-section">
diff --git a/src/routes/console/[project]/storage/index.svelte b/src/routes/console/[project]/storage/index.svelte
index ea408fe96..3b52c7ba9 100644
--- a/src/routes/console/[project]/storage/index.svelte
+++ b/src/routes/console/[project]/storage/index.svelte
@@ -51,7 +51,8 @@
                         <h3 class="tiles-title">{bucket.name}</h3>
                         <div class="u-flex u-main-space-between">
                             <Copy value={bucket.$id}>
-                                <Pill button><i class="icon-duplicate" />Bucket ID</Pill>
+                                <Pill button
+                                    ><span class="icon-duplicate" aria-hidden="true" />Bucket ID</Pill>
                             </Copy>
                             <div class="">
                                 <Tooltip icon="lock-closed" aria="encryption">
@@ -97,7 +98,7 @@
                 <div class="u-flex u-flex-vertical u-cross-center">
                     <div class="common-section">
                         <Button secondary round on:click={() => (showCreate = true)}>
-                            <i class="icon-plus" />
+                            <span class="icon-plus" aria-hidden="true" />
                         </Button>
                     </div>
                     <div class="common-section">
diff --git a/src/routes/console/[project]/users/_createTeam.svelte b/src/routes/console/[project]/users/_createTeam.svelte
index 58d9ebddb..a0b7b1d91 100644
--- a/src/routes/console/[project]/users/_createTeam.svelte
+++ b/src/routes/console/[project]/users/_createTeam.svelte
@@ -49,7 +49,8 @@
             {#if !showDropdown}
                 <div>
                     <Pill button on:click={() => (showDropdown = !showDropdown)}
-                        ><span class="icon-pencil" /> <span class="text"> Team ID </span>
+                        ><span class="icon-pencil" aria-hidden="true" />
+                        <span class="text"> Team ID </span>
                     </Pill>
                 </div>
             {:else}
diff --git a/src/routes/console/[project]/users/_createUser.svelte b/src/routes/console/[project]/users/_createUser.svelte
index 9834d3d67..2ea77473c 100644
--- a/src/routes/console/[project]/users/_createUser.svelte
+++ b/src/routes/console/[project]/users/_createUser.svelte
@@ -69,7 +69,9 @@
             {#if !showDropdown}
                 <div>
                     <Pill button on:click={() => (showDropdown = !showDropdown)}
-                        ><span class="icon-pencil" /><span class="text"> User ID </span></Pill>
+                        ><span class="icon-pencil" aria-hidden="true" /><span class="text">
+                            User ID
+                        </span></Pill>
                 </div>
             {:else}
                 <InnerModal bind:show={showDropdown}>
diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/[project]/users/index.svelte
index f06fe64ed..303c357e9 100644
--- a/src/routes/console/[project]/users/index.svelte
+++ b/src/routes/console/[project]/users/index.svelte
@@ -96,7 +96,9 @@
                         </TableCellText>
                         <TableCellText showOverflow title="ID">
                             <Copy value={user.$id}>
-                                <Pill button><i class="icon-duplicate" />User ID</Pill>
+                                <Pill button
+                                    ><span class="icon-duplicate" aria-hidden="true" />
+                                    <span class="text">User ID</span></Pill>
                             </Copy>
                         </TableCellText>
                         <TableCellText title="Joined">
@@ -139,7 +141,7 @@
                         }
                     }}>
                     <Button secondary round on:click={() => (showCreate = true)}>
-                        <i class="icon-plus" />
+                        <span class="icon-plus" aria-hidden="true" />
                     </Button>
                 </div>
                 <div class="common-section">
diff --git a/src/routes/console/[project]/users/teams.svelte b/src/routes/console/[project]/users/teams.svelte
index 78f1b5062..2a8dc62fd 100644
--- a/src/routes/console/[project]/users/teams.svelte
+++ b/src/routes/console/[project]/users/teams.svelte
@@ -117,7 +117,7 @@
                     }
                 }}>
                 <Button secondary round on:click={() => (showCreate = true)}>
-                    <i class="icon-plus" />
+                    <span class="icon-plus" aria-hidden="true" />
                 </Button>
             </div>
             <div class="common-section">
diff --git a/src/routes/console/[project]/users/teams/[team]/members.svelte b/src/routes/console/[project]/users/teams/[team]/members.svelte
index 1c8426f94..27ebd0e23 100644
--- a/src/routes/console/[project]/users/teams/[team]/members.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/members.svelte
@@ -45,7 +45,7 @@
 <Container>
     <Search bind:search placeholder="Search by ID">
         <Button on:click={() => (showCreate = true)}>
-            <span class="icon-plus" aria-hidden="true" /> <span class="text">Add Member</span>
+            <span class="icon-plus" aria-hidden="true" /> <span class="text">Create Member</span>
         </Button>
     </Search>
     {#if $memberships?.total}
@@ -117,7 +117,7 @@
             <div class="u-flex u-flex-vertical u-cross-center">
                 <div class="common-section">
                     <Button secondary round on:click={() => (showCreate = true)}>
-                        <i class="icon-plus" />
+                        <span class="icon-plus" aria-hidden="true" />
                     </Button>
                 </div>
                 <div class="common-section">