diff --git a/src/components/showcase/ShowcaseCard/index.js b/src/components/showcase/ShowcaseCard/index.js
index 0858a45975..6ccc6f2d8f 100644
--- a/src/components/showcase/ShowcaseCard/index.js
+++ b/src/components/showcase/ShowcaseCard/index.js
@@ -61,7 +61,7 @@ const ShowcaseCard = memo((card) => (
           <Link href={card.showcase.website}>{card.showcase.title}</Link>
         </h4>
         {card.showcase.tags.includes("favorite") && (
-          <Fav svgClass={styles.svgIconFavorite} size="small" />
+          <Fav className={styles.svgIconFavorite} size="small" />
         )}
         {card.showcase.getstarted && (
           <Link
diff --git a/src/pages/showcase/index.js b/src/pages/showcase/index.js
index 0dcd10dc07..a35b35a2ea 100644
--- a/src/pages/showcase/index.js
+++ b/src/pages/showcase/index.js
@@ -177,12 +177,11 @@ function ShowcaseFilters() {
         <ShowcaseFilterToggle />
       </div>
       <div className={styles.checkboxList}>
-        {TagList.map((tag) => {
+        {TagList.map((tag, i) => {
           const { label, description, color } = Tags[tag];
           const id = `showcase_checkbox_id_${tag}`;
           return (
-            <>
-              <div className={styles.checkboxListItem}>
+              <div key={i} className={styles.checkboxListItem}>
                 <ShowcaseTooltip
                   id={id}
                   text={description}
@@ -200,7 +199,7 @@ function ShowcaseFilters() {
                           }}
                         >
                           <Fav
-                            svgClass={styles.svgIconFavorite}
+                            className={styles.svgIconFavorite}
                             size="small"
                             style={{ display: "grid" }}
                           />
@@ -220,7 +219,6 @@ function ShowcaseFilters() {
                   />
                 </ShowcaseTooltip>
               </div>
-            </>
           );
         })}
       </div>
@@ -255,7 +253,7 @@ function ShowcaseCards() {
                 )}
               >
                 <h2 className={styles.ourFavorites}>Our favorites</h2>
-                <Fav svgClass={styles.svgIconFavorite} size="small" />
+                <Fav className={styles.svgIconFavorite} size="small" />
                 <SearchBar />
               </div>
               <ul className={clsx("container", styles.showcaseList)}>
diff --git a/src/pages/showcase/styles.module.css b/src/pages/showcase/styles.module.css
index 8c8b5b6f84..27a8cc5ce3 100644
--- a/src/pages/showcase/styles.module.css
+++ b/src/pages/showcase/styles.module.css
@@ -129,10 +129,6 @@
   font-size: 1rem;
 }
 
-.svgIconFavorite {
-  margin-left: 1rem;
-}
-
 .ourFavorites {
   margin-right: 0.7rem;
 }
\ No newline at end of file
diff --git a/src/pages/tools/index.js b/src/pages/tools/index.js
index aa7b0ee809..e1faac7585 100644
--- a/src/pages/tools/index.js
+++ b/src/pages/tools/index.js
@@ -194,12 +194,11 @@ function ShowcaseFilters() {
 
 function filterBy(tags) {
   return (<div className={styles.checkboxList}>
-    {tags.map((tag) => {
+    {tags.map((tag, i) => {
       const { label, description, color } = Tags[tag];
       const id = `showcase_checkbox_id_${tag}`;
       return (
-        <>
-          <div className={styles.checkboxListItem}>
+          <div key={i} className={styles.checkboxListItem}>
             <ShowcaseTooltip
               id={id}
               text={description}
@@ -221,7 +220,6 @@ function filterBy(tags) {
               />
             </ShowcaseTooltip>
           </div>
-        </>
       );
     })}
   </div>);
@@ -254,7 +252,7 @@ function ShowcaseCards() {
                 )}
               >
                 <h2 className={styles.ourFavorites}>Our favorites</h2>
-                <Fav svgClass={styles.svgIconFavorite} size="small" />
+                <Fav className={styles.svgIconFavorite} size="small" />
                 <SearchBar />
               </div>
               <ul className={clsx("container", styles.showcaseList)}>
diff --git a/src/pages/tools/styles.module.css b/src/pages/tools/styles.module.css
index 8c8b5b6f84..27a8cc5ce3 100644
--- a/src/pages/tools/styles.module.css
+++ b/src/pages/tools/styles.module.css
@@ -129,10 +129,6 @@
   font-size: 1rem;
 }
 
-.svgIconFavorite {
-  margin-left: 1rem;
-}
-
 .ourFavorites {
   margin-right: 0.7rem;
 }
\ No newline at end of file