diff --git a/storefront/components/base/header/search.vue b/storefront/components/base/header/search.vue
index 0204019c..361eb500 100644
--- a/storefront/components/base/header/search.vue
+++ b/storefront/components/base/header/search.vue
@@ -69,6 +69,7 @@ import { useSearchUI } from "@/composables/search";
 
 const {t} = useI18n();
 const router = useRouter();
+const appStore = useAppStore();
 
 const {
   query,
@@ -93,10 +94,17 @@ function submitSearch() {
   }
 }
 
+watch(
+  () => isSearchActive.value,
+  (state) => {
+    appStore.setOverflowHidden(state);
+  },
+  { immediate: true }
+);
+
 function goTo(category: string, item: any) {
   let path = "/";
-  console.log('c', category)
-  console.log(item)
+
   switch (category) {
     case "products":
       path = `/product/${item.slug}`;
diff --git a/storefront/components/profile/navigation.vue b/storefront/components/profile/navigation.vue
index 308f7a03..7f6ce452 100644
--- a/storefront/components/profile/navigation.vue
+++ b/storefront/components/profile/navigation.vue
@@ -98,6 +98,8 @@ const { logout } = useLogout();
 
     @include hover {
       color: $accentDark;
+      background-color: #f5f5f5;
+      border-color: #f5f5f5;
     }
 
     &.active {
diff --git a/storefront/components/ui/loader.vue b/storefront/components/ui/loader.vue
index d7571037..e6e08dbe 100644
--- a/storefront/components/ui/loader.vue
+++ b/storefront/components/ui/loader.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="loader">
-    <li class="loader__dots" id="dot-1"></li>
-    <li class="loader__dots" id="dot-2"></li>
-    <li class="loader__dots" id="dot-3"></li>
+    <span class="loader__dots" id="dot-1"></span>
+    <span class="loader__dots" id="dot-2"></span>
+    <span class="loader__dots" id="dot-3"></span>
   </div>
 </template>
 
@@ -17,8 +17,8 @@
   list-style: none;
 
   &__dots {
-    width: 12px;
-    height: 12px;
+    width: 10px;
+    height: 10px;
     border-radius: 50%;
     background-color: $white;
   }
diff --git a/storefront/composables/search/useSearchUi.ts b/storefront/composables/search/useSearchUi.ts
index 61586564..83b9d826 100644
--- a/storefront/composables/search/useSearchUi.ts
+++ b/storefront/composables/search/useSearchUi.ts
@@ -4,7 +4,7 @@ import { useDebounceFn } from '@vueuse/core';
 
 export function useSearchUI() {
   const query = ref('');
-  const isSearchActive = ref(false);
+  const isSearchActive = ref<boolean>(false);
   const { search, loading, searchResults } = useSearch();
 
   const filteredSearchResults = computed(() => {
diff --git a/storefront/pages/product/[slug].vue b/storefront/pages/product/[slug].vue
index 1af3ec71..fe4d427d 100644
--- a/storefront/pages/product/[slug].vue
+++ b/storefront/pages/product/[slug].vue
@@ -97,7 +97,7 @@
         </div>
       </div>
       <client-only>
-        <div class="characteristics" id="characteristics">
+        <div class="characteristics" id="characteristics" v-if="attributes.length">
           <div class="characteristics__wrapper">
             <h6 class="characteristics__title">{{ t('product.characteristics') }}</h6>
             <div class="characteristics__list">
@@ -330,7 +330,7 @@ watch(
     gap: 25px;
 
     &-description {
-      color: $accent;
+      color: $black;
       font-size: 16px;
       font-weight: 600;
     }
diff --git a/storefront/pages/profile/cart.vue b/storefront/pages/profile/cart.vue
index fd78d5b4..1104af5a 100644
--- a/storefront/pages/profile/cart.vue
+++ b/storefront/pages/profile/cart.vue
@@ -17,7 +17,7 @@
             :isToolsVisible="true"
         />
       </div>
-      <p class="cart__empty">{{ t('profile.cart.empty') }}</p>
+      <p class="cart__empty" v-else>{{ t('profile.cart.empty') }}</p>
     </div>
   </div>
 </template>
diff --git a/storefront/pages/profile/orders.vue b/storefront/pages/profile/orders.vue
index 105e9086..eee107d9 100644
--- a/storefront/pages/profile/orders.vue
+++ b/storefront/pages/profile/orders.vue
@@ -63,8 +63,7 @@
 <script setup lang="ts">
 import {usePageTitle} from "~/composables/utils";
 import {useOrders} from "~/composables/orders";
-import {CURRENCY, orderStatuses} from "~/config/constants";
-import {useDate} from "~/composables/date";
+import {orderStatuses} from "~/config/constants";
 import {useRouteQuery} from "@vueuse/router";
 
 const {t} = useI18n();
diff --git a/storefront/pages/profile/promocodes.vue b/storefront/pages/profile/promocodes.vue
index e7ecd77c..e11c1dae 100644
--- a/storefront/pages/profile/promocodes.vue
+++ b/storefront/pages/profile/promocodes.vue
@@ -18,11 +18,23 @@
         </div>
         <div class="promocodes__item-right">
           <p class="promocodes__item-text">{{ promocode.node.discount }} {{ promocode.node.discountType === 'percent' ? '%' : CURRENCY }}</p>
-          <div class="promocodes__item-expire">{{ t('profile.promocodes.until') }} {{ useDate(promocode.node.endTime, locale) }}</div>
+          <div class="promocodes__item-expire">
+            {{ t('profile.promocodes.until') }}
+            {{
+              useDate(promocode.node.endTime, locale, {
+                  year: 'numeric',
+                  month: 'long',
+                  day: '2-digit',
+                  hour: '2-digit',
+                  minute: '2-digit',
+                  second: '2-digit'
+              })
+            }}
+          </div>
         </div>
       </div>
     </div>
-    <p class="promocodes__empty">{{ t('profile.promocodes.empty') }}</p>
+    <p class="promocodes__empty" v-else>{{ t('profile.promocodes.empty') }}</p>
   </div>
 </template>
 
@@ -49,7 +61,7 @@ const copyCode = (code: string) => {
     console.error(err);
   });
 };
-// TODO: display time for expire date
+
 const { setPageTitle } = usePageTitle();
 
 setPageTitle(t('breadcrumbs.promocodes'));
@@ -73,7 +85,7 @@ setPageTitle(t('breadcrumbs.promocodes'));
 
   &__item {
     border-radius: $default_border_radius;
-    border: 1px solid $accent;
+    border: 2px solid $accent;
     display: flex;
     align-items: stretch;
     justify-content: space-between;
@@ -82,7 +94,7 @@ setPageTitle(t('breadcrumbs.promocodes'));
       display: flex;
       align-items: center;
       gap: 20px;
-      padding: 7px 25px;
+      padding: 7px 15px;
 
       & p {
         font-weight: 600;
diff --git a/storefront/pages/profile/settings.vue b/storefront/pages/profile/settings.vue
index 4bed6d5a..1d88fb3d 100644
--- a/storefront/pages/profile/settings.vue
+++ b/storefront/pages/profile/settings.vue
@@ -5,7 +5,14 @@
         <div class="settings__avatar">
           <input type="file" id="avatar" @change="uploadAvatar" />
           <label for="avatar">
-            <img class="settings__avatar-image" v-if="user?.avatar" :src="user?.avatar" alt="">
+            <nuxt-img
+                class="settings__avatar-image"
+                v-if="user?.avatar"
+                :src="user?.avatar"
+                alt="avatar"
+                format="webp"
+                densities="x1"
+            />
             <icon name="material-symbols-light:person-outline-rounded" size="100" v-else />
             <span class="settings__avatar-inner">
               <icon name="material-symbols:upload" size="40" />
diff --git a/storefront/pages/profile/wishlist.vue b/storefront/pages/profile/wishlist.vue
index 1f55d0dd..09aad0d7 100644
--- a/storefront/pages/profile/wishlist.vue
+++ b/storefront/pages/profile/wishlist.vue
@@ -43,7 +43,7 @@
           />
         </div>
       </div>
-      <p class="wishlist__empty">{{ t('profile.wishlist.empty') }}</p>
+      <p class="wishlist__empty" v-else>{{ t('profile.wishlist.empty') }}</p>
     </div>
   </div>
 </template>
diff --git a/storefront/plugins/apollo.ts b/storefront/plugins/apollo.ts
index 26d888e0..300b61a5 100644
--- a/storefront/plugins/apollo.ts
+++ b/storefront/plugins/apollo.ts
@@ -9,7 +9,7 @@ export default defineNuxtPlugin((nuxtApp) => {
   const runtime = useRuntimeConfig();
   const localeCookie = useCookie(useAppConfig().COOKIES_LOCALE_KEY);
   const token = useCookie(useAppConfig().COOKIES_ACCESS_TOKEN_KEY).value || '';
-  const { $apollo } = nuxtApp;
+  const { $apollo } = nuxtApp as any;
 
   const errorLink = onError((err) => {
     nuxtApp.callHook('apollo:error', err);