diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index ab53c3a..51c0dc4 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -2,7 +2,6 @@
   <nav class="navbar navbar-light fixed-top">
     <div class="navbar-text ml-auto d-flex">
       <button class="btn btn-sm btn-outline-success" @click="$parent.$emit('toggle')">
-        <i class="fas fa-dollar-sign"></i>
         <font-awesome-icon icon="dollar-sign"></font-awesome-icon>
       </button>
       <div class="dropdown ml-2" v-if="cart.length>0">
@@ -14,7 +13,7 @@
           aria-expanded="false"
         >
           <span class="badge badge-pill badge-light">{{cartQty}}</span>
-          <i class="fas fa-shopping-cart mx-2"></i>
+          <font-awesome-icon icon="shopping-cart" class="mx-2"></font-awesome-icon>
           <price :value="Number(cartTotal)"></price>
         </button>
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="cartDropdown">
diff --git a/src/components/ProductList.vue b/src/components/ProductList.vue
index 1a133f4..cfc21ba 100644
--- a/src/components/ProductList.vue
+++ b/src/components/ProductList.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/no-use-v-if-with-v-for,vue/no-confusing-v-for-v-if -->
 <template>
   <transition-group name="fade" tag="div" @beforeEnter="beforeEnter" @enter="enter" @leave="leave">
     <div