Merge branch 'develop' into feature/tracking

2024-10-30 14:12:24 +01:00
parent ee25198ae7 795eae89bc
commit 26ce0d10ec
261 changed files with 3397 additions and 2854 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -42,5 +42,8 @@ certificates
 #vscode
 .vscode/

+#cursor
+.cursorrules
+
 # localfile with all the CSS variables exported from design system
 variables.css
--- a/actions/editProfile.ts
+++ b/actions/editProfile.ts
@@ -148,7 +148,7 @@ export const editProfile = protectedServerActionProcedure
      )
    }

-    const apiResponse = await api.patch(api.endpoints.v1.profile, {
+    const apiResponse = await api.patch(api.endpoints.v1.Profile.profile, {
      body,
      cache: "no-store",
      headers: {
--- a/actions/registerUser.ts
+++ b/actions/registerUser.ts
@@ -55,7 +55,7 @@ export const registerUser = serviceServerActionProcedure

    let apiResponse
    try {
-      apiResponse = await api.post(api.endpoints.v1.profile, {
+      apiResponse = await api.post(api.endpoints.v1.Profile.profile, {
        body: parsedPayload.data,
        headers: {
          Authorization: `Bearer ${ctx.serviceToken}`,
--- a/actions/registerUserBookingFlow.ts
+++ b/actions/registerUserBookingFlow.ts
@@ -33,7 +33,7 @@ export const registerUserBookingFlow = serviceServerActionProcedure
    // TODO: Consume the API to register the user as soon as passwordless signup is enabled.
    // let apiResponse
    // try {
-    //   apiResponse = await api.post(api.endpoints.v1.profile, {
+    //   apiResponse = await api.post(api.endpoints.v1.Profile.profile, {
    //     body: payload,
    //     headers: {
    //       Authorization: `Bearer ${ctx.serviceToken}`,
--- a/app/[lang]/(live)/(protected)/my-pages/profile/layout.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/layout.tsx
@@ -1,5 +1,3 @@
-import { env } from "@/env/server"
-
 import Divider from "@/components/TempDesignSystem/Divider"

 import type { ProfileLayoutProps } from "@/types/components/myPages/myProfile/layout"
@@ -17,7 +15,7 @@ export default function ProfileLayout({
        {profile}
        <Divider color="burgundy" opacity={8} />
        {creditCards}
-        {env.HIDE_FOR_NEXT_RELEASE ? null : communication}
+        {communication}
      </section>
    </main>
  )
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/[...paths]/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/[...paths]/page.tsx
@@ -0,0 +1 @@
+export { default } from "../page"
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/loading.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function LoadingHotelHeader() {
+  return <LoadingSpinner />
+}
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/page.tsx
@@ -0,0 +1,22 @@
+import { redirect } from "next/navigation"
+
+import { getHotelData } from "@/lib/trpc/memoizedRequests"
+
+import HotelSelectionHeader from "@/components/HotelReservation/HotelSelectionHeader"
+
+import type { LangParams, PageArgs } from "@/types/params"
+
+export default async function HotelHeader({
+  params,
+  searchParams,
+}: PageArgs<LangParams, { hotel: string }>) {
+  const home = `/${params.lang}`
+  if (!searchParams.hotel) {
+    redirect(home)
+  }
+  const hotel = await getHotelData(searchParams.hotel, params.lang)
+  if (!hotel?.data) {
+    redirect(home)
+  }
+  return <HotelSelectionHeader hotel={hotel.data.attributes} />
+}
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/[...paths]/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/[...paths]/page.tsx
@@ -0,0 +1 @@
+export { default } from "../page"
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/loading.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function LoadingHotelSidePeek() {
+  return <LoadingSpinner />
+}
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/page.tsx
@@ -0,0 +1,21 @@
+import { redirect } from "next/navigation"
+
+import { getHotelData } from "@/lib/trpc/memoizedRequests"
+
+import SidePeek from "@/components/HotelReservation/EnterDetails/SidePeek"
+
+import type { LangParams, PageArgs } from "@/types/params"
+
+export default async function HotelSidePeek({
+  params,
+  searchParams,
+}: PageArgs<LangParams, { hotel: string }>) {
+  if (!searchParams.hotel) {
+    redirect(`/${params.lang}`)
+  }
+  const hotel = await getHotelData(searchParams.hotel, params.lang)
+  if (!hotel?.data) {
+    redirect(`/${params.lang}`)
+  }
+  return <SidePeek hotel={hotel.data.attributes} />
+}
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/layout.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/layout.tsx
@@ -1,46 +1,32 @@
-import { redirect } from "next/navigation"
-
-import {
-  getCreditCardsSafely,
-  getHotelData,
-  getProfileSafely,
-} from "@/lib/trpc/memoizedRequests"
-
 import EnterDetailsProvider from "@/components/HotelReservation/EnterDetails/Provider"
 import SelectedRoom from "@/components/HotelReservation/EnterDetails/SelectedRoom"
-import SidePeek from "@/components/HotelReservation/EnterDetails/SidePeek"
 import Summary from "@/components/HotelReservation/EnterDetails/Summary"
-import HotelSelectionHeader from "@/components/HotelReservation/HotelSelectionHeader"
 import { setLang } from "@/i18n/serverContext"

+import { preload } from "./page"
+
 import styles from "./layout.module.css"

 import { StepEnum } from "@/types/components/enterDetails/step"
 import type { LangParams, LayoutArgs } from "@/types/params"

-function preload(id: string, lang: string) {
-  void getHotelData(id, lang)
-  void getProfileSafely()
-  void getCreditCardsSafely()
-}
-
 export default async function StepLayout({
  children,
+  hotelHeader,
  params,
-}: React.PropsWithChildren<LayoutArgs<LangParams & { step: StepEnum }>>) {
-  setLang(params.lang)
-  preload("811", params.lang)
-
-  const hotel = await getHotelData("811", params.lang)
-
-  if (!hotel?.data) {
-    redirect(`/${params.lang}`)
+  sidePeek,
+}: React.PropsWithChildren<
+  LayoutArgs<LangParams & { step: StepEnum }> & {
+    hotelHeader: React.ReactNode
+    sidePeek: React.ReactNode
  }
-
+>) {
+  setLang(params.lang)
+  preload()
  return (
    <EnterDetailsProvider step={params.step}>
      <main className={styles.layout}>
-        <HotelSelectionHeader hotel={hotel.data.attributes} />
+        {hotelHeader}
        <div className={styles.content}>
          <SelectedRoom />
          {children}
@@ -48,7 +34,7 @@ export default async function StepLayout({
            <Summary />
          </aside>
        </div>
-        <SidePeek hotel={hotel.data.attributes} />
+        {sidePeek}
      </main>
    </EnterDetailsProvider>
  )
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/page.tsx
@@ -1,9 +1,11 @@
-import { notFound } from "next/navigation"
+import { notFound, redirect } from "next/navigation"

 import {
+  getBreakfastPackages,
  getCreditCardsSafely,
  getHotelData,
  getProfileSafely,
+  getRoomAvailability,
 } from "@/lib/trpc/memoizedRequests"

 import BedType from "@/components/HotelReservation/EnterDetails/BedType"
@@ -17,61 +19,101 @@ import { getIntl } from "@/i18n"
 import { StepEnum } from "@/types/components/enterDetails/step"
 import type { LangParams, PageArgs } from "@/types/params"

+export function preload() {
+  void getProfileSafely()
+  void getCreditCardsSafely()
+}
+
 function isValidStep(step: string): step is StepEnum {
  return Object.values(StepEnum).includes(step as StepEnum)
 }

 export default async function StepPage({
  params,
-}: PageArgs<LangParams & { step: StepEnum }>) {
-  const { step, lang } = params
+  searchParams,
+}: PageArgs<LangParams & { step: StepEnum }, { hotel: string }>) {
+  if (!searchParams.hotel) {
+    redirect(`/${params.lang}`)
+  }
+  void getBreakfastPackages(searchParams.hotel)
+  void getRoomAvailability({
+    hotelId: searchParams.hotel,
+    adults: Number(searchParams.adults),
+    roomStayStartDate: searchParams.checkIn,
+    roomStayEndDate: searchParams.checkOut,
+  })

  const intl = await getIntl()

-  const hotel = await getHotelData("811", lang)
+  const hotel = await getHotelData(searchParams.hotel, params.lang)
  const user = await getProfileSafely()
  const savedCreditCards = await getCreditCardsSafely()
+  const breakfastPackages = await getBreakfastPackages(searchParams.hotel)

-  if (!isValidStep(step) || !hotel) {
+  const roomAvailability = await getRoomAvailability({
+    hotelId: searchParams.hotel,
+    adults: Number(searchParams.adults),
+    roomStayStartDate: searchParams.checkIn,
+    roomStayEndDate: searchParams.checkOut,
+    rateCode: searchParams.rateCode,
+  })
+
+  if (!isValidStep(params.step) || !hotel || !roomAvailability) {
    return notFound()
  }

+  const mustBeGuaranteed = roomAvailability?.mustBeGuaranteed ?? false
+
+  const paymentGuarantee = intl.formatMessage({
+    id: "Payment Guarantee",
+  })
+  const payment = intl.formatMessage({
+    id: "Payment",
+  })
+  const guaranteeWithCard = intl.formatMessage({
+    id: "Guarantee booking with credit card",
+  })
+  const selectPaymentMethod = intl.formatMessage({
+    id: "Select payment method",
+  })
+
  return (
    <section>
      <HistoryStateManager />
      <SectionAccordion
-        header="Select bed"
+        header={intl.formatMessage({ id: "Select bed" })}
        step={StepEnum.selectBed}
        label={intl.formatMessage({ id: "Request bedtype" })}
      >
        <BedType />
      </SectionAccordion>
      <SectionAccordion
-        header="Food options"
+        header={intl.formatMessage({ id: "Food options" })}
        step={StepEnum.breakfast}
        label={intl.formatMessage({ id: "Select breakfast options" })}
      >
-        <Breakfast />
+        <Breakfast packages={breakfastPackages} />
      </SectionAccordion>
      <SectionAccordion
-        header="Details"
+        header={intl.formatMessage({ id: "Details" })}
        step={StepEnum.details}
        label={intl.formatMessage({ id: "Enter your details" })}
      >
        <Details user={user} />
      </SectionAccordion>
      <SectionAccordion
-        header="Payment"
+        header={mustBeGuaranteed ? paymentGuarantee : payment}
        step={StepEnum.payment}
-        label={intl.formatMessage({ id: "Select payment method" })}
+        label={mustBeGuaranteed ? guaranteeWithCard : selectPaymentMethod}
      >
        <Payment
-          hotelId={hotel.data.attributes.operaId}
+          hotelId={searchParams.hotel}
          otherPaymentOptions={
            hotel.data.attributes.merchantInformationData
              .alternatePaymentOptions
          }
          savedCreditCards={savedCreditCards}
+          mustBeGuaranteed={mustBeGuaranteed}
        />
      </SectionAccordion>
    </section>
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
@@ -7,6 +7,7 @@ import { getLocations } from "@/lib/trpc/memoizedRequests"

 import {
  fetchAvailableHotels,
+  generateChildrenString,
  getFiltersFromHotels,
 } from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils"
 import HotelCardListing from "@/components/HotelReservation/HotelCardListing"
@@ -50,7 +51,8 @@ export default async function SelectHotelPage({
  const selectHotelParamsObject =
    getHotelReservationQueryParams(selectHotelParams)
  const adults = selectHotelParamsObject.room[0].adults // TODO: Handle multiple rooms
-  const children = selectHotelParamsObject.room[0].child?.length // TODO: Handle multiple rooms
+  const child = selectHotelParamsObject.room[0].child
+  const children = child ? generateChildrenString(child) : undefined // TODO: Handle multiple rooms

  const hotels = await fetchAvailableHotels({
    cityId: city.id,
@@ -80,7 +82,7 @@ export default async function SelectHotelPage({
    arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
    departureDate: format(departureDate, "yyyy-MM-dd"),
    noOfAdults: adults,
-    noOfChildren: children,
+    noOfChildren: child?.length,
    noOfRooms: 1, // // TODO: Handle multiple rooms
    duration: differenceInCalendarDays(departureDate, arrivalDate),
    leadTime: differenceInCalendarDays(arrivalDate, new Date()),
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts
@@ -2,9 +2,11 @@ import { serverClient } from "@/lib/trpc/server"

 import { getLang } from "@/i18n/serverContext"

+import { BedTypeEnum } from "@/types/components/bookingWidget/enums"
 import { AvailabilityInput } from "@/types/components/hotelReservation/selectHotel/availabilityInput"
 import { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
 import { Filter } from "@/types/components/hotelReservation/selectHotel/hotelFilters"
+import { Child } from "@/types/components/hotelReservation/selectRate/selectRate"

 export async function fetchAvailableHotels(
  input: AvailabilityInput
@@ -41,3 +43,19 @@ export function getFiltersFromHotels(hotels: HotelData[]) {

  return filterList
 }
+
+const bedTypeMap: Record<number, string> = {
+  [BedTypeEnum.IN_ADULTS_BED]: "ParentsBed",
+  [BedTypeEnum.IN_CRIB]: "Crib",
+  [BedTypeEnum.IN_EXTRA_BED]: "ExtraBed",
+}
+
+export function generateChildrenString(children: Child[]): string {
+  return `[${children
+    ?.map((child) => {
+      const age = child.age
+      const bedType = bedTypeMap[+child.bed]
+      return `${age}:${bedType}`
+    })
+    .join(",")}]`
+}
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.module.css
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.module.css
@@ -1,24 +0,0 @@
-.page {
-  min-height: 100dvh;
-  padding-top: var(--Spacing-x6);
-  padding-left: var(--Spacing-x2);
-  padding-right: var(--Spacing-x2);
-  background-color: var(--Scandic-Brand-Warm-White);
-}
-
-.content {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  display: flex;
-  flex-direction: column;
-  gap: var(--Spacing-x7);
-  padding: var(--Spacing-x2);
-}
-
-.main {
-  flex-grow: 1;
-}
-
-.summary {
-  max-width: 340px;
-}
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
@@ -1,14 +1,17 @@
+import { notFound } from "next/navigation"
+
 import { getProfileSafely } from "@/lib/trpc/memoizedRequests"
 import { serverClient } from "@/lib/trpc/server"

 import HotelInfoCard from "@/components/HotelReservation/SelectRate/HotelInfoCard"
-import RoomSelection from "@/components/HotelReservation/SelectRate/RoomSelection"
+import Rooms from "@/components/HotelReservation/SelectRate/Rooms"
 import getHotelReservationQueryParams from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
 import { setLang } from "@/i18n/serverContext"

-import styles from "./page.module.css"
+import { generateChildrenString } from "../select-hotel/utils"

-import { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
+import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
+import type { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
 import { LangParams, PageArgs } from "@/types/params"

 export default async function SelectRatePage({
@@ -20,10 +23,18 @@ export default async function SelectRatePage({
  const selectRoomParams = new URLSearchParams(searchParams)
  const selectRoomParamsObject =
    getHotelReservationQueryParams(selectRoomParams)
-  const adults = selectRoomParamsObject.room[0].adults // TODO: Handle multiple rooms
-  const children = selectRoomParamsObject.room[0].child?.length // TODO: Handle multiple rooms

-  const [hotelData, roomConfigurations, user] = await Promise.all([
+  if (!selectRoomParamsObject.room) {
+    return notFound()
+  }
+
+  const adults = selectRoomParamsObject.room[0].adults // TODO: Handle multiple rooms
+  const childrenCount = selectRoomParamsObject.room[0].child?.length
+  const children = selectRoomParamsObject.room[0].child
+    ? generateChildrenString(selectRoomParamsObject.room[0].child)
+    : undefined // TODO: Handle multiple rooms
+
+  const [hotelData, roomsAvailability, packages, user] = await Promise.all([
    serverClient().hotel.hotelData.get({
      hotelId: searchParams.hotel,
      language: params.lang,
@@ -36,10 +47,22 @@ export default async function SelectRatePage({
      adults,
      children,
    }),
+    serverClient().hotel.packages.get({
+      hotelId: searchParams.hotel,
+      startDate: searchParams.fromDate,
+      endDate: searchParams.toDate,
+      adults,
+      children: childrenCount,
+      packageCodes: [
+        RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
+        RoomPackageCodeEnum.PET_ROOM,
+        RoomPackageCodeEnum.ALLERGY_ROOM,
+      ],
+    }),
    getProfileSafely(),
  ])

-  if (!roomConfigurations) {
+  if (!roomsAvailability) {
    return "No rooms found" // TODO: Add a proper error message
  }

@@ -50,17 +73,14 @@ export default async function SelectRatePage({
  const roomCategories = hotelData?.included

  return (
-    <div>
+    <>
      <HotelInfoCard hotelData={hotelData} />
-      <div className={styles.content}>
-        <div className={styles.main}>
-          <RoomSelection
-            roomConfigurations={roomConfigurations}
-            roomCategories={roomCategories ?? []}
-            user={user}
-          />
-        </div>
-      </div>
-    </div>
+      <Rooms
+        roomsAvailability={roomsAvailability}
+        roomCategories={roomCategories ?? []}
+        user={user}
+        packages={packages ?? []}
+      />
+    </>
  )
 }
--- a/app/[lang]/(live)/@bookingwidget/page.tsx
+++ b/app/[lang]/(live)/@bookingwidget/page.tsx
@@ -3,13 +3,11 @@ import { serverClient } from "@/lib/trpc/server"

 import BookingWidget, { preload } from "@/components/BookingWidget"

-import { BookingWidgetSearchParams } from "@/types/components/bookingWidget"
-import { LangParams, PageArgs } from "@/types/params"
+import { PageArgs } from "@/types/params"

 export default async function BookingWidgetPage({
-  params,
  searchParams,
-}: PageArgs<LangParams, BookingWidgetSearchParams>) {
+}: PageArgs<{}, URLSearchParams>) {
  if (env.HIDE_FOR_NEXT_RELEASE) {
    return null
  }
--- a/components/BookingWidget/Client.tsx
+++ b/components/BookingWidget/Client.tsx
@@ -9,6 +9,7 @@ import Form from "@/components/Forms/BookingWidget"
 import { bookingWidgetSchema } from "@/components/Forms/BookingWidget/schema"
 import { CloseLargeIcon } from "@/components/Icons"
 import { debounce } from "@/utils/debounce"
+import { getFormattedUrlQueryParams } from "@/utils/url"

 import getHotelReservationQueryParams from "../HotelReservation/SelectRate/RoomSelection/utils"
 import MobileToggleButton from "./MobileToggleButton"
@@ -18,6 +19,7 @@ import styles from "./bookingWidget.module.css"
 import type {
  BookingWidgetClientProps,
  BookingWidgetSchema,
+  BookingWidgetSearchParams,
 } from "@/types/components/bookingWidget"
 import type { Location } from "@/types/trpc/routers/hotel/locations"

@@ -36,12 +38,14 @@ export default function BookingWidgetClient({
    ? JSON.parse(sessionStorageSearchData)
    : undefined

-  const bookingWidgetSearchParams = searchParams
-    ? new URLSearchParams(searchParams)
-    : undefined
-  const bookingWidgetSearchData = bookingWidgetSearchParams
-    ? getHotelReservationQueryParams(bookingWidgetSearchParams)
-    : undefined
+  const bookingWidgetSearchData: BookingWidgetSearchParams | undefined =
+    searchParams
+      ? (getFormattedUrlQueryParams(new URLSearchParams(searchParams), {
+          adults: "number",
+          age: "number",
+          bed: "number",
+        }) as BookingWidgetSearchParams)
+      : undefined

  const getLocationObj = (destination: string): Location | undefined => {
    if (destination) {
@@ -83,7 +87,7 @@ export default function BookingWidgetClient({
        // UTC is required to handle requests from far away timezones https://scandichotels.atlassian.net/browse/SWAP-6375 & PET-507
        // This is specifically to handle timezones falling in different dates.
        fromDate: isDateParamValid
-          ? bookingWidgetSearchData?.fromDate.toString()
+          ? bookingWidgetSearchData?.fromDate?.toString()
          : dt().utc().format("YYYY-MM-DD"),
        toDate: isDateParamValid
          ? bookingWidgetSearchData?.toDate?.toString()
@@ -92,10 +96,10 @@ export default function BookingWidgetClient({
      bookingCode: "",
      redemption: false,
      voucher: false,
-      rooms: [
+      rooms: bookingWidgetSearchData?.room ?? [
        {
          adults: 1,
-          children: [],
+          child: [],
        },
      ],
    },
--- a/components/BookingWidget/MobileToggleButton/index.tsx
+++ b/components/BookingWidget/MobileToggleButton/index.tsx
@@ -54,6 +54,12 @@ export default function MobileToggleButton({
      }
      return acc
    }, 0)
+    const totalChildren = rooms.reduce((acc, room) => {
+      if (room.child) {
+        acc = acc + room.child.length
+      }
+      return acc
+    }, 0)
    return (
      <div className={styles.complete} onClick={openMobileSearch} role="button">
        <div>
@@ -62,7 +68,14 @@ export default function MobileToggleButton({
            {`${selectedFromDate} - ${selectedToDate} (${intl.formatMessage(
              { id: "booking.nights" },
              { totalNights: nights }
-            )}) ${intl.formatMessage({ id: "booking.adults" }, { totalAdults })}, ${intl.formatMessage({ id: "booking.rooms" }, { totalRooms })}`}
+            )}) ${intl.formatMessage({ id: "booking.adults" }, { totalAdults })}, ${
+              totalChildren > 0
+                ? intl.formatMessage(
+                    { id: "booking.children" },
+                    { totalChildren }
+                  ) + ", "
+                : ""
+            }${intl.formatMessage({ id: "booking.rooms" }, { totalRooms })}`}
          </Caption>
        </div>
        <div className={styles.icon}>
--- a/components/ContentType/ContentPage/HotelListingItem/hotelListingItem.module.css
+++ b/components/ContentType/ContentPage/HotelListingItem/hotelListingItem.module.css
@@ -0,0 +1,49 @@
+.container {
+  background-color: var(--Base-Surface-Primary-light-Normal);
+  border: 1px solid var(--Base-Border-Subtle);
+  border-radius: var(--Corner-radius-Medium);
+  overflow: hidden;
+}
+
+.image {
+  width: 100%;
+  max-height: 200px;
+  object-fit: cover;
+}
+
+.content {
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x2);
+  padding: var(--Spacing-x2) var(--Spacing-x3);
+}
+
+.intro {
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x-half);
+}
+
+.dividerContainer {
+  padding: 0 var(--Spacing-x1);
+}
+
+.captions {
+  display: flex;
+}
+
+@media screen and (min-width: 768px) {
+  .container {
+    display: grid;
+    grid-template-columns: minmax(250px, 350px) auto;
+  }
+
+  .image {
+    max-height: none;
+    height: 100%;
+  }
+
+  .button {
+    width: min(100%, 200px);
+  }
+}
--- a/components/ContentType/ContentPage/HotelListingItem/index.tsx
+++ b/components/ContentType/ContentPage/HotelListingItem/index.tsx
@@ -0,0 +1,70 @@
+import { ScandicLogoIcon } from "@/components/Icons"
+import Image from "@/components/Image"
+import Button from "@/components/TempDesignSystem/Button"
+import Divider from "@/components/TempDesignSystem/Divider"
+import Link from "@/components/TempDesignSystem/Link"
+import Body from "@/components/TempDesignSystem/Text/Body"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
+import Title from "@/components/TempDesignSystem/Text/Title"
+import { getIntl } from "@/i18n"
+
+import styles from "./hotelListingItem.module.css"
+
+import type { HotelListingItemProps } from "@/types/components/contentPage/hotelListingItem"
+
+export default async function HotelListingItem({
+  imageUrl,
+  altText,
+  name,
+  address,
+  distanceToCentre,
+  description,
+  link,
+}: HotelListingItemProps) {
+  const intl = await getIntl()
+
+  return (
+    <article className={styles.container}>
+      <Image
+        src={imageUrl}
+        alt={altText}
+        width={300}
+        height={200}
+        className={styles.image}
+      />
+      <section className={styles.content}>
+        <div className={styles.intro}>
+          <ScandicLogoIcon color="red" />
+          <Subtitle asChild>
+            <Title as="h3">{name}</Title>
+          </Subtitle>
+          <div className={styles.captions}>
+            <Caption color="uiTextPlaceholder">{address}</Caption>
+            <div className={styles.dividerContainer}>
+              <Divider variant="vertical" color="beige" />
+            </div>
+            <Caption color="uiTextPlaceholder">
+              {intl.formatMessage(
+                { id: "Distance to city centre" },
+                { number: distanceToCentre }
+              )}
+            </Caption>
+          </div>
+        </div>
+        <Body>{description}</Body>
+        <Button
+          intent="primary"
+          theme="base"
+          size="small"
+          className={styles.button}
+          asChild
+        >
+          <Link href={link} color="white">
+            {intl.formatMessage({ id: "See hotel details" })}
+          </Link>
+        </Button>
+      </section>
+    </article>
+  )
+}
--- a/components/ContentType/HotelPage/PreviewImages/index.tsx
+++ b/components/ContentType/HotelPage/PreviewImages/index.tsx
@@ -21,9 +21,9 @@ export default async function PreviewImages({
        {images.slice(0, 3).map((image, index) => (
          <Image
            key={index}
-            src={image.url}
-            alt={image.alt}
-            title={image.title}
+            src={image.imageSizes.medium}
+            alt={image.metaData.altText}
+            title={image.metaData.title}
            width={index === 0 ? 752 : 292}
            height={index === 0 ? 540 : 266}
            className={styles.image}
--- a/components/ContentType/HotelPage/index.tsx
+++ b/components/ContentType/HotelPage/index.tsx
@@ -63,12 +63,14 @@ export default async function HotelPage() {
  return (
    <div className={styles.pageContainer}>
      <div className={styles.hotelImages}>
-        <PreviewImages images={hotelImages} hotelName={hotelName} />
+        {hotelImages?.length && (
+          <PreviewImages images={hotelImages} hotelName={hotelName} />
+        )}
      </div>
      <TabNavigation
        restaurantTitle={getRestaurantHeading(hotelDetailedFacilities)}
        hasActivities={!!activitiesCard}
-        hasFAQ={!!faq}
+        hasFAQ={!!faq.accordions.length}
      />
      <main className={styles.mainSection}>
        <div id={HotelHashValues.overview} className={styles.overview}>
@@ -98,7 +100,7 @@ export default async function HotelPage() {
        </div>
        <Rooms rooms={roomCategories} />
        <Facilities facilities={facilities} activitiesCard={activitiesCard} />
-        {faq && (
+        {faq.accordions.length > 0 && (
          <AccordionSection accordion={faq.accordions} title={faq.title} />
        )}
      </main>
--- a/components/DatePicker/Screen/Desktop.tsx
+++ b/components/DatePicker/Screen/Desktop.tsx
@@ -69,7 +69,13 @@ export default function DatePickerDesktop({
      weekStartsOn={1}
      components={{
        Chevron(props) {
-          return <ChevronLeftIcon {...props} height={20} width={20} />
+          return (
+            <ChevronLeftIcon
+              className={props.className}
+              height={20}
+              width={20}
+            />
+          )
        },
        Footer(props) {
          return (
@@ -82,8 +88,8 @@ export default function DatePickerDesktop({
                  size="small"
                  theme="base"
                >
-                  <Caption color="white" type="bold">
-                    {intl.formatMessage({ id: "Select dates" })}
+                  <Caption color="white" type="bold" asChild>
+                    <span>{intl.formatMessage({ id: "Select dates" })}</span>
                  </Caption>
                </Button>
              </footer>
--- a/components/DatePicker/Screen/Mobile.tsx
+++ b/components/DatePicker/Screen/Mobile.tsx
@@ -94,8 +94,8 @@ export default function DatePickerMobile({
                size="large"
                theme="base"
              >
-                <Body color="white" textTransform="bold">
-                  {intl.formatMessage({ id: "Select dates" })}
+                <Body color="white" textTransform="bold" asChild>
+                  <span>{intl.formatMessage({ id: "Select dates" })}</span>
                </Body>
              </Button>
              <div className={styles.backdrop} />
--- a/components/DatePicker/index.tsx
+++ b/components/DatePicker/index.tsx
@@ -89,8 +89,10 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
  return (
    <div className={styles.container} data-isopen={isOpen} ref={ref}>
      <button className={styles.btn} onClick={handleOnClick} type="button">
-        <Body className={styles.body}>
-          {selectedFromDate} - {selectedToDate}
+        <Body className={styles.body} asChild>
+          <span>
+            {selectedFromDate} - {selectedToDate}
+          </span>
        </Body>
      </button>
      <input {...register("date.fromDate")} type="hidden" />
--- a/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/index.tsx
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/index.tsx
@@ -33,8 +33,8 @@ export default function ClearSearchButton({
      type="button"
    >
      <DeleteIcon color="burgundy" height={20} width={20} />
-      <Caption color="burgundy" type="bold">
-        {intl.formatMessage({ id: "Clear searches" })}
+      <Caption color="burgundy" type="bold" asChild>
+        <span>{intl.formatMessage({ id: "Clear searches" })}</span>
      </Caption>
    </button>
  )
--- a/components/Forms/BookingWidget/FormContent/index.tsx
+++ b/components/Forms/BookingWidget/FormContent/index.tsx
@@ -7,6 +7,7 @@ import { dt } from "@/lib/dt"

 import DatePicker from "@/components/DatePicker"
 import GuestsRoomsPickerForm from "@/components/GuestsRoomsPicker"
+import GuestsRoomsProvider from "@/components/GuestsRoomsPicker/Provider/GuestsRoomsProvider"
 import { SearchIcon } from "@/components/Icons"
 import Button from "@/components/TempDesignSystem/Button"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
@@ -29,6 +30,8 @@ export default function FormContent({

  const nights = dt(selectedDate.toDate).diff(dt(selectedDate.fromDate), "days")

+  const selectedGuests = useWatch({ name: "rooms" })
+
  return (
    <>
      <div className={styles.input}>
@@ -51,7 +54,9 @@ export default function FormContent({
                {rooms}
              </Caption>
            </label>
-            <GuestsRoomsPickerForm />
+            <GuestsRoomsProvider selectedGuests={selectedGuests}>
+              <GuestsRoomsPickerForm name="rooms" />
+            </GuestsRoomsProvider>
          </div>
        </div>
        <div className={styles.voucherContainer}>
@@ -65,12 +70,17 @@ export default function FormContent({
            theme="base"
            type="submit"
          >
-            <Caption color="white" type="bold" className={styles.buttonText}>
-              {intl.formatMessage({ id: "Search" })}
+            <Caption
+              color="white"
+              type="bold"
+              className={styles.buttonText}
+              asChild
+            >
+              <span>{intl.formatMessage({ id: "Search" })}</span>
            </Caption>
-            <div className={styles.icon}>
+            <span className={styles.icon}>
              <SearchIcon color="white" width={28} height={28} />
-            </div>
+            </span>
          </Button>
        </div>
      </div>
--- a/components/Forms/BookingWidget/index.tsx
+++ b/components/Forms/BookingWidget/index.tsx
@@ -42,7 +42,7 @@ export default function Form({ locations, type }: BookingWidgetFormProps) {
    data.rooms.forEach((room, index) => {
      bookingWidgetParams.set(`room[${index}].adults`, room.adults.toString())

-      room.children.forEach((child, childIndex) => {
+      room.child.forEach((child, childIndex) => {
        bookingWidgetParams.set(
          `room[${index}].child[${childIndex}].age`,
          child.age.toString()
--- a/components/Forms/BookingWidget/schema.ts
+++ b/components/Forms/BookingWidget/schema.ts
@@ -4,7 +4,7 @@ import type { Location } from "@/types/trpc/routers/hotel/locations"

 export const guestRoomSchema = z.object({
  adults: z.number().default(1),
-  children: z.array(
+  child: z.array(
    z.object({
      age: z.number().nonnegative(),
      bed: z.number(),
--- a/components/GuestsRoomsPicker/AdultSelector/index.tsx
+++ b/components/GuestsRoomsPicker/AdultSelector/index.tsx
@@ -21,7 +21,7 @@ export default function AdultSelector({ roomIndex = 0 }: AdultSelectorProps) {
  const intl = useIntl()
  const adultsLabel = intl.formatMessage({ id: "Adults" })
  const { setValue } = useFormContext()
-  const { adults, children, childrenInAdultsBed } = useGuestsRoomsStore(
+  const { adults, child, childrenInAdultsBed } = useGuestsRoomsStore(
    (state) => state.rooms[roomIndex]
  )
  const increaseAdults = useGuestsRoomsStore((state) => state.increaseAdults)
@@ -39,13 +39,13 @@ export default function AdultSelector({ roomIndex = 0 }: AdultSelectorProps) {
      decreaseAdults(roomIndex)
      setValue(`rooms.${roomIndex}.adults`, adults - 1)
      if (childrenInAdultsBed > adults) {
-        const toUpdateIndex = children.findIndex(
+        const toUpdateIndex = child.findIndex(
          (child: Child) => child.bed == BedTypeEnum.IN_ADULTS_BED
        )
        if (toUpdateIndex != -1) {
          setValue(
            `rooms.${roomIndex}.children.${toUpdateIndex}.bed`,
-            children[toUpdateIndex].age < 3
+            child[toUpdateIndex].age < 3
              ? BedTypeEnum.IN_CRIB
              : BedTypeEnum.IN_EXTRA_BED
          )
--- a/components/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx
+++ b/components/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx
@@ -26,7 +26,7 @@ export default function ChildInfoSelector({
  const ageLabel = intl.formatMessage({ id: "Age" })
  const ageReqdErrMsg = intl.formatMessage({ id: "Child age is required" })
  const bedLabel = intl.formatMessage({ id: "Bed" })
-  const { setValue, trigger } = useFormContext()
+  const { setValue } = useFormContext()
  const { adults, childrenInAdultsBed } = useGuestsRoomsStore(
    (state) => state.rooms[roomIndex]
  )
@@ -51,10 +51,11 @@ export default function ChildInfoSelector({

  function updateSelectedAge(age: number) {
    updateChildAge(age, roomIndex, index)
-    setValue(`rooms.${roomIndex}.children.${index}.age`, age)
+    setValue(`rooms.${roomIndex}.child.${index}.age`, age, {
+      shouldValidate: true,
+    })
    const availableBedTypes = getAvailableBeds(age)
    updateSelectedBed(availableBedTypes[0].value)
-    trigger("rooms")
  }

  function updateSelectedBed(bed: number) {
@@ -64,7 +65,7 @@ export default function ChildInfoSelector({
      decreaseChildInAdultsBed(roomIndex)
    }
    updateChildBed(bed, roomIndex, index)
-    setValue(`rooms.${roomIndex}.children.${index}.bed`, bed)
+    setValue(`rooms.${roomIndex}.child.${index}.bed`, bed)
  }

  const allBedTypes: ChildBed[] = [
@@ -109,8 +110,9 @@ export default function ChildInfoSelector({
            onSelect={(key) => {
              updateSelectedAge(key as number)
            }}
-            name={`rooms.${roomIndex}.children.${index}.age`}
+            name={`rooms.${roomIndex}.child.${index}.age`}
            placeholder={ageLabel}
+            maxHeight={150}
          />
        </div>
        <div>
@@ -123,7 +125,7 @@ export default function ChildInfoSelector({
              onSelect={(key) => {
                updateSelectedBed(key as number)
              }}
-              name={`rooms.${roomIndex}.children.${index}.age`}
+              name={`rooms.${roomIndex}.child.${index}.age`}
              placeholder={bedLabel}
            />
          ) : null}
--- a/components/GuestsRoomsPicker/ChildSelector/index.tsx
+++ b/components/GuestsRoomsPicker/ChildSelector/index.tsx
@@ -19,9 +19,7 @@ export default function ChildSelector({ roomIndex = 0 }: ChildSelectorProps) {
  const intl = useIntl()
  const childrenLabel = intl.formatMessage({ id: "Children" })
  const { setValue, trigger } = useFormContext<BookingWidgetSchema>()
-  const children = useGuestsRoomsStore(
-    (state) => state.rooms[roomIndex].children
-  )
+  const children = useGuestsRoomsStore((state) => state.rooms[roomIndex].child)
  const increaseChildren = useGuestsRoomsStore(
    (state) => state.increaseChildren
  )
@@ -32,18 +30,22 @@ export default function ChildSelector({ roomIndex = 0 }: ChildSelectorProps) {
  function increaseChildrenCount(roomIndex: number) {
    if (children.length < 5) {
      increaseChildren(roomIndex)
-      setValue(`rooms.${roomIndex}.children.${children.length}`, {
-        age: -1,
-        bed: -1,
-      })
-      trigger("rooms")
+      setValue(
+        `rooms.${roomIndex}.child.${children.length}`,
+        {
+          age: -1,
+          bed: -1,
+        },
+        { shouldValidate: true }
+      )
    }
  }
  function decreaseChildrenCount(roomIndex: number) {
    if (children.length > 0) {
      const newChildrenList = decreaseChildren(roomIndex)
-      setValue(`rooms.${roomIndex}.children`, newChildrenList)
-      trigger("rooms")
+      setValue(`rooms.${roomIndex}.child`, newChildrenList, {
+        shouldValidate: true,
+      })
    }
  }

--- a/components/GuestsRoomsPicker/Provider/GuestsRoomsProvider.tsx
+++ b/components/GuestsRoomsPicker/Provider/GuestsRoomsProvider.tsx
@@ -0,0 +1,26 @@
+"use client"
+import { PropsWithChildren, useRef } from "react"
+
+import {
+  GuestsRoomsContext,
+  type GuestsRoomsStore,
+  initGuestsRoomsState,
+} from "@/stores/guests-rooms"
+
+import { GuestsRoom } from "@/types/components/bookingWidget/guestsRoomsPicker"
+
+export default function GuestsRoomsProvider({
+  selectedGuests,
+  children,
+}: PropsWithChildren<{ selectedGuests?: GuestsRoom[] }>) {
+  const initialStore = useRef<GuestsRoomsStore>()
+  if (!initialStore.current) {
+    initialStore.current = initGuestsRoomsState(selectedGuests)
+  }
+
+  return (
+    <GuestsRoomsContext.Provider value={initialStore.current}>
+      {children}
+    </GuestsRoomsContext.Provider>
+  )
+}
--- a/components/GuestsRoomsPicker/index.tsx
+++ b/components/GuestsRoomsPicker/index.tsx
@@ -1,6 +1,7 @@
 "use client"

 import { useCallback, useEffect, useRef, useState } from "react"
+import { useFormContext } from "react-hook-form"
 import { useIntl } from "react-intl"

 import { useGuestsRoomsStore } from "@/stores/guests-rooms"
@@ -12,9 +13,14 @@ import GuestsRoomsPicker from "./GuestsRoomsPicker"

 import styles from "./guests-rooms-picker.module.css"

-export default function GuestsRoomsPickerForm() {
+export default function GuestsRoomsPickerForm({
+  name = "rooms",
+}: {
+  name: string
+}) {
  const intl = useIntl()
  const [isOpen, setIsOpen] = useState(false)
+  const { setValue } = useFormContext()
  const { rooms, adultCount, childCount, setIsValidated } = useGuestsRoomsStore(
    (state) => ({
      rooms: state.rooms,
@@ -32,10 +38,11 @@ export default function GuestsRoomsPickerForm() {
    if (guestRoomsValidData.success) {
      setIsOpen(false)
      setIsValidated(false)
+      setValue(name, guestRoomsValidData.data, { shouldValidate: true })
    } else {
      setIsValidated(true)
    }
-  }, [rooms, setIsValidated, setIsOpen])
+  }, [rooms, name, setValue, setIsValidated, setIsOpen])

  useEffect(() => {
    function handleClickOutside(evt: Event) {
@@ -53,23 +60,25 @@ export default function GuestsRoomsPickerForm() {
  return (
    <div className={styles.container} data-isopen={isOpen} ref={ref}>
      <button className={styles.btn} onClick={handleOnClick} type="button">
-        <Body className={styles.body}>
-          {intl.formatMessage(
-            { id: "booking.rooms" },
-            { totalRooms: rooms.length }
-          )}
-          {", "}
-          {intl.formatMessage(
-            { id: "booking.adults" },
-            { totalAdults: adultCount }
-          )}
-          {childCount > 0
-            ? ", " +
-              intl.formatMessage(
-                { id: "booking.children" },
-                { totalChildren: childCount }
-              )
-            : null}
+        <Body className={styles.body} asChild>
+          <span>
+            {intl.formatMessage(
+              { id: "booking.rooms" },
+              { totalRooms: rooms.length }
+            )}
+            {", "}
+            {intl.formatMessage(
+              { id: "booking.adults" },
+              { totalAdults: adultCount }
+            )}
+            {childCount > 0
+              ? ", " +
+                intl.formatMessage(
+                  { id: "booking.children" },
+                  { totalChildren: childCount }
+                )
+              : null}
+          </span>
        </Body>
      </button>
      <div aria-modal className={styles.hideWrapper} role="dialog">
--- a/components/Header/MainMenu/MobileMenu/index.tsx
+++ b/components/Header/MainMenu/MobileMenu/index.tsx
@@ -68,7 +68,7 @@ export default function MobileMenu({
        })}
        onClick={() => toggleDropdown(DropdownTypeEnum.HamburgerMenu)}
      >
-        <span className={styles.bar}></span>
+        <span className={styles.bar} />
      </button>
      <Modal className={styles.modal} isOpen={isHamburgerMenuOpen}>
        <Dialog
--- a/components/Header/MainMenu/MyPagesMenu/index.tsx
+++ b/components/Header/MainMenu/MyPagesMenu/index.tsx
@@ -47,8 +47,10 @@ export default function MyPagesMenu({
        onClick={() => toggleDropdown(DropdownTypeEnum.MyPagesMenu)}
      >
        <Avatar initials={getInitials(user.firstName, user.lastName)} />
-        <Subtitle type="two">
-          {intl.formatMessage({ id: "Hi" })} {user.firstName}!
+        <Subtitle type="two" asChild>
+          <span>
+            {intl.formatMessage({ id: "Hi" })} {user.firstName}!
+          </span>
        </Subtitle>
        <ChevronDownIcon
          className={`${styles.chevron} ${isMyPagesMenuOpen ? styles.isExpanded : ""}`}
--- a/components/Header/MainMenu/NavigationMenu/MegaMenu/index.tsx
+++ b/components/Header/MainMenu/NavigationMenu/MegaMenu/index.tsx
@@ -42,8 +42,8 @@ export default function MegaMenu({
            onClick={() => toggleMegaMenu(false)}
          >
            <ChevronLeftIcon color="red" />
-            <Subtitle type="one" color="burgundy">
-              {title}
+            <Subtitle type="one" color="burgundy" asChild>
+              <span>{title}</span>
            </Subtitle>
          </button>
        </div>
--- a/components/HotelReservation/EnterDetails/BedType/index.tsx
+++ b/components/HotelReservation/EnterDetails/BedType/index.tsx
@@ -15,7 +15,7 @@ import { bedTypeSchema } from "./schema"
 import styles from "./bedOptions.module.css"

 import type { BedTypeSchema } from "@/types/components/enterDetails/bedType"
-import { bedTypeEnum } from "@/types/enums/bedType"
+import { BedTypeEnum } from "@/types/enums/bedType"

 export default function BedType() {
  const intl = useIntl()
@@ -61,7 +61,7 @@ export default function BedType() {
        <RadioCard
          Icon={KingBedIcon}
          iconWidth={46}
-          id={bedTypeEnum.KING}
+          id={BedTypeEnum.KING}
          name="bedType"
          subtitle={intl.formatMessage(
            { id: "{width} cm × {length} cm" },
@@ -72,12 +72,12 @@ export default function BedType() {
          )}
          text={text}
          title={intl.formatMessage({ id: "King bed" })}
-          value={bedTypeEnum.KING}
+          value={BedTypeEnum.KING}
        />
        <RadioCard
          Icon={KingBedIcon}
          iconWidth={46}
-          id={bedTypeEnum.QUEEN}
+          id={BedTypeEnum.QUEEN}
          name="bedType"
          subtitle={intl.formatMessage(
            { id: "{width} cm × {length} cm" },
@@ -88,7 +88,7 @@ export default function BedType() {
          )}
          text={text}
          title={intl.formatMessage({ id: "Queen bed" })}
-          value={bedTypeEnum.QUEEN}
+          value={BedTypeEnum.QUEEN}
        />
      </form>
    </FormProvider>
--- a/components/HotelReservation/EnterDetails/BedType/schema.ts
+++ b/components/HotelReservation/EnterDetails/BedType/schema.ts
@@ -1,7 +1,7 @@
 import { z } from "zod"

-import { bedTypeEnum } from "@/types/enums/bedType"
+import { BedTypeEnum } from "@/types/enums/bedType"

 export const bedTypeSchema = z.object({
-  bedType: z.nativeEnum(bedTypeEnum),
+  bedType: z.nativeEnum(BedTypeEnum),
 })
--- a/components/HotelReservation/EnterDetails/Breakfast/index.tsx
+++ b/components/HotelReservation/EnterDetails/Breakfast/index.tsx
@@ -7,36 +7,50 @@ import { useIntl } from "react-intl"

 import { useEnterDetailsStore } from "@/stores/enter-details"

-import { BreakfastIcon, NoBreakfastIcon } from "@/components/Icons"
+import { Highlight } from "@/components/TempDesignSystem/Form/ChoiceCard/_Card"
 import RadioCard from "@/components/TempDesignSystem/Form/ChoiceCard/Radio"

-import { breakfastSchema } from "./schema"
+import { breakfastFormSchema } from "./schema"

 import styles from "./breakfast.module.css"

-import type { BreakfastSchema } from "@/types/components/enterDetails/breakfast"
-import { breakfastEnum } from "@/types/enums/breakfast"
+import type {
+  BreakfastFormSchema,
+  BreakfastProps,
+} from "@/types/components/enterDetails/breakfast"
+import { BreakfastPackageEnum } from "@/types/enums/breakfast"

-export default function Breakfast() {
+export default function Breakfast({ packages }: BreakfastProps) {
  const intl = useIntl()

  const breakfast = useEnterDetailsStore((state) => state.data.breakfast)

-  const methods = useForm<BreakfastSchema>({
-    defaultValues: breakfast ? { breakfast } : undefined,
+  let defaultValues = undefined
+  if (breakfast === BreakfastPackageEnum.NO_BREAKFAST) {
+    defaultValues = { breakfast: BreakfastPackageEnum.NO_BREAKFAST }
+  } else if (breakfast?.code) {
+    defaultValues = { breakfast: breakfast.code }
+  }
+  const methods = useForm<BreakfastFormSchema>({
+    defaultValues,
    criteriaMode: "all",
    mode: "all",
-    resolver: zodResolver(breakfastSchema),
+    resolver: zodResolver(breakfastFormSchema),
    reValidateMode: "onChange",
  })

  const completeStep = useEnterDetailsStore((state) => state.completeStep)

  const onSubmit = useCallback(
-    (values: BreakfastSchema) => {
-      completeStep(values)
+    (values: BreakfastFormSchema) => {
+      const pkg = packages?.find((p) => p.code === values.breakfast)
+      if (pkg) {
+        completeStep({ breakfast: pkg })
+      } else {
+        completeStep({ breakfast: BreakfastPackageEnum.NO_BREAKFAST })
+      }
    },
-    [completeStep]
+    [completeStep, packages]
  )

  useEffect(() => {
@@ -47,30 +61,46 @@ export default function Breakfast() {
    return () => subscription.unsubscribe()
  }, [methods, onSubmit])

+  if (!packages) {
+    return null
+  }
+
  return (
    <FormProvider {...methods}>
      <form className={styles.form} onSubmit={methods.handleSubmit(onSubmit)}>
-        <RadioCard
-          Icon={BreakfastIcon}
-          id={breakfastEnum.BREAKFAST}
-          name="breakfast"
-          subtitle={intl.formatMessage<React.ReactNode>(
-            { id: "<b>{amount} {currency}</b>/night per adult" },
-            {
-              amount: "150",
-              b: (str) => <b>{str}</b>,
-              currency: "SEK",
+        {packages.map((pkg) => (
+          <RadioCard
+            key={pkg.code}
+            id={pkg.code}
+            name="breakfast"
+            subtitle={
+              pkg.code === BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
+                ? intl.formatMessage<React.ReactNode>(
+                    { id: "breakfast.price.free" },
+                    {
+                      amount: pkg.originalPrice,
+                      currency: pkg.currency,
+                      free: (str) => <Highlight>{str}</Highlight>,
+                      strikethrough: (str) => <s>{str}</s>,
+                    }
+                  )
+                : intl.formatMessage(
+                    { id: "breakfast.price" },
+                    {
+                      amount: pkg.packagePrice,
+                      currency: pkg.currency,
+                    }
+                  )
            }
-          )}
-          text={intl.formatMessage({
-            id: "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.",
-          })}
-          title={intl.formatMessage({ id: "Breakfast buffet" })}
-          value={breakfastEnum.BREAKFAST}
-        />
+            text={intl.formatMessage({
+              id: "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.",
+            })}
+            title={intl.formatMessage({ id: "Breakfast buffet" })}
+            value={pkg.code}
+          />
+        ))}
        <RadioCard
-          Icon={NoBreakfastIcon}
-          id={breakfastEnum.NO_BREAKFAST}
+          id={BreakfastPackageEnum.NO_BREAKFAST}
          name="breakfast"
          subtitle={intl.formatMessage(
            { id: "{amount} {currency}" },
@@ -83,7 +113,7 @@ export default function Breakfast() {
            id: "You can always change your mind later and add breakfast at the hotel.",
          })}
          title={intl.formatMessage({ id: "No breakfast" })}
-          value={breakfastEnum.NO_BREAKFAST}
+          value={BreakfastPackageEnum.NO_BREAKFAST}
        />
      </form>
    </FormProvider>
--- a/components/HotelReservation/EnterDetails/Breakfast/schema.ts
+++ b/components/HotelReservation/EnterDetails/Breakfast/schema.ts
@@ -1,7 +1,15 @@
 import { z } from "zod"

-import { breakfastEnum } from "@/types/enums/breakfast"
+import { breakfastPackageSchema } from "@/server/routers/hotels/output"

-export const breakfastSchema = z.object({
-  breakfast: z.nativeEnum(breakfastEnum),
+import { BreakfastPackageEnum } from "@/types/enums/breakfast"
+
+export const breakfastStoreSchema = z.object({
+  breakfast: breakfastPackageSchema.or(
+    z.literal(BreakfastPackageEnum.NO_BREAKFAST)
+  ),
+})
+
+export const breakfastFormSchema = z.object({
+  breakfast: z.string().or(z.literal(BreakfastPackageEnum.NO_BREAKFAST)),
 })
--- a/components/HotelReservation/EnterDetails/Payment/GuaranteeDetails/guaranteeDetails.module.css
+++ b/components/HotelReservation/EnterDetails/Payment/GuaranteeDetails/guaranteeDetails.module.css
@@ -0,0 +1,22 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x1);
+  padding-top: var(--Spacing-x2);
+}
+
+.content ol {
+  margin: 0;
+}
+
+.summary {
+  list-style: none;
+  display: flex;
+  align-items: center;
+  gap: var(--Spacing-x-half);
+}
+
+.summary::-webkit-details-marker,
+.summary::marker {
+  display: none;
+}
--- a/components/HotelReservation/EnterDetails/Payment/GuaranteeDetails/index.tsx
+++ b/components/HotelReservation/EnterDetails/Payment/GuaranteeDetails/index.tsx
@@ -0,0 +1,50 @@
+import { useIntl } from "react-intl"
+
+import ChevronDown from "@/components/Icons/ChevronDown"
+import Body from "@/components/TempDesignSystem/Text/Body"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+
+import styles from "./guaranteeDetails.module.css"
+
+export default function GuaranteeDetails() {
+  const intl = useIntl()
+  return (
+    <details>
+      <Caption color="burgundy" type="bold" asChild>
+        <summary className={styles.summary}>
+          {intl.formatMessage({ id: "How it works" })}
+          <ChevronDown color="burgundy" height={16} />
+        </summary>
+      </Caption>
+      <section className={styles.content}>
+        <Body>
+          {intl.formatMessage({
+            id: "When guaranteeing your booking, we will hold the booking until 07:00 until the day after check-in. This will provide you as a guest with added flexibility for check-in times.",
+          })}
+        </Body>
+        <Body>
+          {intl.formatMessage({
+            id: "What you have to do to guarantee booking:",
+          })}
+        </Body>
+        <ol>
+          <Body asChild>
+            <li>{intl.formatMessage({ id: "Complete the booking" })}</li>
+          </Body>
+          <Body asChild>
+            <li>
+              {intl.formatMessage({
+                id: "Provide a payment card in the next step",
+              })}
+            </li>
+          </Body>
+        </ol>
+        <Body>
+          {intl.formatMessage({
+            id: "Please note that this is mandatory, and that your card will only be charged in the event of a no-show.",
+          })}
+        </Body>
+      </section>
+    </details>
+  )
+}
--- a/components/HotelReservation/EnterDetails/Payment/index.tsx
+++ b/components/HotelReservation/EnterDetails/Payment/index.tsx
@@ -22,7 +22,7 @@ import { useEnterDetailsStore } from "@/stores/enter-details"

 import LoadingSpinner from "@/components/LoadingSpinner"
 import Button from "@/components/TempDesignSystem/Button"
-import Checkbox from "@/components/TempDesignSystem/Checkbox"
+import Checkbox from "@/components/TempDesignSystem/Form/Checkbox"
 import Link from "@/components/TempDesignSystem/Link"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
@@ -30,6 +30,7 @@ import { toast } from "@/components/TempDesignSystem/Toasts"
 import { useHandleBookingStatus } from "@/hooks/booking/useHandleBookingStatus"
 import useLang from "@/hooks/useLang"

+import GuaranteeDetails from "./GuaranteeDetails"
 import PaymentOption from "./PaymentOption"
 import { PaymentFormData, paymentSchema } from "./schema"

@@ -48,6 +49,7 @@ export default function Payment({
  hotelId,
  otherPaymentOptions,
  savedCreditCards,
+  mustBeGuaranteed,
 }: PaymentProps) {
  const router = useRouter()
  const lang = useLang()
@@ -169,12 +171,26 @@ export default function Payment({
    return <LoadingSpinner />
  }

+  const guaranteeing = intl.formatMessage({ id: "guaranteeing" })
+  const paying = intl.formatMessage({ id: "paying" })
+  const paymentVerb = mustBeGuaranteed ? guaranteeing : paying
+
  return (
    <FormProvider {...methods}>
      <form
        className={styles.paymentContainer}
        onSubmit={methods.handleSubmit(handleSubmit)}
      >
+        {mustBeGuaranteed ? (
+          <section className={styles.section}>
+            <Body>
+              {intl.formatMessage({
+                id: "To secure your reservation, we kindly ask you to provide your payment card details. Rest assured, no charges will be made at this time.",
+              })}
+            </Body>
+            <GuaranteeDetails />
+          </section>
+        ) : null}
        {savedCreditCards?.length ? (
          <section className={styles.section}>
            <Body color="uiTextHighContrast" textTransform="bold">
@@ -238,6 +254,7 @@ export default function Payment({
                  id: "booking.terms",
                },
                {
+                  paymentVerb,
                  termsLink: (str) => (
                    <Link
                      className={styles.link}
--- a/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx
+++ b/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx
@@ -3,7 +3,6 @@ import { useIntl } from "react-intl"

 import { mapFacilityToIcon } from "@/components/ContentType/HotelPage/data"
 import TripAdvisorIcon from "@/components/Icons/TripAdvisor"
-import Image from "@/components/Image"
 import Divider from "@/components/TempDesignSystem/Divider"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
@@ -29,14 +28,6 @@ export default function HotelInfoCard({ hotelData }: HotelInfoCardProps) {
      {hotelAttributes && (
        <section className={styles.wrapper}>
          <div className={styles.imageWrapper}>
-            {hotelAttributes.ratings?.tripAdvisor && (
-              <div className={styles.tripAdvisor}>
-                <TripAdvisorIcon color="burgundy" />
-                <Caption color="burgundy">
-                  {hotelAttributes.ratings.tripAdvisor.rating}
-                </Caption>
-              </div>
-            )}
            {hotelAttributes.gallery && (
              <ImageGallery
                title={hotelAttributes.name}
@@ -46,6 +37,14 @@ export default function HotelInfoCard({ hotelData }: HotelInfoCardProps) {
                ]}
              />
            )}
+            {hotelAttributes.ratings?.tripAdvisor && (
+              <div className={styles.tripAdvisor}>
+                <TripAdvisorIcon color="burgundy" />
+                <Caption color="burgundy">
+                  {hotelAttributes.ratings.tripAdvisor.rating}
+                </Caption>
+              </div>
+            )}
          </div>
          <div className={styles.hotelContent}>
            <div className={styles.hotelInformation}>
--- a/components/HotelReservation/SelectRate/ImageGallery/index.tsx
+++ b/components/HotelReservation/SelectRate/ImageGallery/index.tsx
@@ -9,14 +9,7 @@ import type { ImageGalleryProps } from "@/types/components/hotelReservation/sele

 export default function ImageGallery({ images, title }: ImageGalleryProps) {
  return (
-    <Lightbox
-      images={images.map((image) => ({
-        url: image.imageSizes.small,
-        alt: image.metaData.altText,
-        title: image.metaData.title,
-      }))}
-      dialogTitle={title}
-    >
+    <Lightbox images={images} dialogTitle={title}>
      <div className={styles.triggerArea} id="lightboxTrigger">
        <Image
          src={images[0].imageSizes.medium}
--- a/components/HotelReservation/SelectRate/RoomFilter/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomFilter/index.tsx
@@ -0,0 +1,124 @@
+"use client"
+
+import { zodResolver } from "@hookform/resolvers/zod"
+import { useCallback, useEffect, useMemo } from "react"
+import { FormProvider, useForm } from "react-hook-form"
+import { useIntl } from "react-intl"
+import { z } from "zod"
+
+import { InfoCircleIcon } from "@/components/Icons"
+import CheckboxChip from "@/components/TempDesignSystem/Form/FilterChip/Checkbox"
+import Body from "@/components/TempDesignSystem/Text/Body"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+import { Tooltip } from "@/components/TempDesignSystem/Tooltip"
+
+import { getIconForFeatureCode } from "../utils"
+
+import styles from "./roomFilter.module.css"
+
+import {
+  type RoomFilterProps,
+  RoomPackageCodeEnum,
+} from "@/types/components/hotelReservation/selectRate/roomFilter"
+
+export default function RoomFilter({
+  numberOfRooms,
+  onFilter,
+  filterOptions,
+}: RoomFilterProps) {
+  const initialFilterValues = useMemo(
+    () =>
+      filterOptions.reduce(
+        (acc, option) => {
+          acc[option.code] = false
+          return acc
+        },
+        {} as Record<string, boolean | undefined>
+      ),
+    [filterOptions]
+  )
+
+  const intl = useIntl()
+  const methods = useForm<Record<string, boolean | undefined>>({
+    defaultValues: initialFilterValues,
+    mode: "all",
+    reValidateMode: "onChange",
+    resolver: zodResolver(z.object({})),
+  })
+
+  const { watch, getValues, handleSubmit } = methods
+  const petFriendly = watch(RoomPackageCodeEnum.PET_ROOM)
+  const allergyFriendly = watch(RoomPackageCodeEnum.ALLERGY_ROOM)
+
+  const selectedFilters = getValues()
+
+  const tooltipText = intl.formatMessage({
+    id: "Pet-friendly rooms have an additional fee of 20 EUR per stay",
+  })
+
+  const submitFilter = useCallback(() => {
+    const data = getValues()
+    onFilter(data)
+  }, [onFilter, getValues])
+
+  useEffect(() => {
+    const subscription = watch(() => handleSubmit(submitFilter)())
+    return () => subscription.unsubscribe()
+  }, [handleSubmit, watch, submitFilter])
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.infoDesktop}>
+        <Body color="uiTextHighContrast">
+          {intl.formatMessage(
+            { id: "Room types available" },
+            { numberOfRooms }
+          )}
+        </Body>
+      </div>
+      <div className={styles.infoMobile}>
+        <div className={styles.filterInfo}>
+          <Caption type="label" color="burgundy" textTransform="uppercase">
+            {intl.formatMessage({ id: "Filter" })}
+          </Caption>
+          <Caption type="label" color="burgundy">
+            {Object.entries(selectedFilters)
+              .filter(([_, value]) => value)
+              .map(([key]) => intl.formatMessage({ id: key }))
+              .join(", ")}
+          </Caption>
+        </div>
+        <Caption color="uiTextHighContrast">
+          {intl.formatMessage(
+            { id: "Room types available" },
+            { numberOfRooms }
+          )}
+        </Caption>
+      </div>
+      <FormProvider {...methods}>
+        <form onSubmit={handleSubmit(submitFilter)}>
+          <div className={styles.roomsFilter}>
+            {filterOptions.map((option) => (
+              <CheckboxChip
+                name={option.code}
+                key={option.code}
+                label={intl.formatMessage({ id: option.description })}
+                disabled={
+                  (option.code === RoomPackageCodeEnum.ALLERGY_ROOM &&
+                    petFriendly) ||
+                  (option.code === RoomPackageCodeEnum.PET_ROOM &&
+                    allergyFriendly)
+                }
+                selected={getValues(option.code)}
+                Icon={getIconForFeatureCode(option.code)}
+              />
+            ))}
+            <Tooltip text={tooltipText} position="bottom" arrow="right">
+              <InfoCircleIcon className={styles.infoIcon} />
+            </Tooltip>
+          </div>
+        </form>
+      </FormProvider>
+    </div>
+  )
+}
--- a/components/HotelReservation/SelectRate/RoomFilter/roomFilter.module.css
+++ b/components/HotelReservation/SelectRate/RoomFilter/roomFilter.module.css
@@ -0,0 +1,43 @@
+.container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.roomsFilter {
+  display: flex;
+  flex-direction: row;
+  gap: var(--Spacing-x1);
+  align-items: center;
+}
+
+.roomsFilter .infoIcon,
+.roomsFilter .infoIcon path {
+  stroke: var(--UI-Text-Medium-contrast);
+  fill: transparent;
+}
+.filterInfo {
+  display: flex;
+  flex-direction: row;
+  gap: var(--Spacing-x-half);
+  align-items: flex-end;
+}
+
+.infoDesktop {
+  display: none;
+}
+
+.infoMobile {
+  display: block;
+}
+
+@media (min-width: 768px) {
+  .infoDesktop {
+    display: block;
+  }
+
+  .infoMobile {
+    display: none;
+  }
+}
--- a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/index.tsx
@@ -40,6 +40,9 @@ export default function PriceList({
              </Subtitle>
              <Body color="uiTextHighContrast" textTransform="bold">
                {publicLocalPrice.currency}
+                <span className={styles.perNight}>
+                  /{intl.formatMessage({ id: "night" })}
+                </span>
              </Body>
            </div>
          ) : (
@@ -64,6 +67,9 @@ export default function PriceList({
              </Subtitle>
              <Body color="red" textTransform="bold">
                {memberLocalPrice.currency}
+                <span className={styles.perNight}>
+                  /{intl.formatMessage({ id: "night" })}
+                </span>
              </Body>
            </div>
          ) : (
--- a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/priceList.module.css
+++ b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/priceList.module.css
@@ -12,3 +12,8 @@
  display: flex;
  gap: var(--Spacing-x-half);
 }
+
+.perNight {
+  font-weight: 400;
+  font-size: var(--typography-Caption-Regular-fontSize);
+}
--- a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx
@@ -19,6 +19,7 @@ export default function FlexibilityOption({
  priceInformation,
  roomType,
  roomTypeCode,
+  features,
  handleSelectRate,
 }: FlexibilityOptionProps) {
  const [rootDiv, setRootDiv] = useState<Element | undefined>(undefined)
@@ -52,6 +53,7 @@ export default function FlexibilityOption({
      priceName: name,
      public: publicPrice,
      member: memberPrice,
+      features,
    }
    handleSelectRate(rate)
  }
--- a/components/HotelReservation/SelectRate/RoomSelection/RateSummary/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomSelection/RateSummary/index.tsx
@@ -1,29 +1,56 @@
+import { differenceInCalendarDays } from "date-fns"
 import { useIntl } from "react-intl"

 import Button from "@/components/TempDesignSystem/Button"
 import Body from "@/components/TempDesignSystem/Text/Body"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+import Footnote from "@/components/TempDesignSystem/Text/Footnote"
 import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"

 import styles from "./rateSummary.module.css"

-import { RateSummaryProps } from "@/types/components/hotelReservation/selectRate/rateSummary"
+import type { RateSummaryProps } from "@/types/components/hotelReservation/selectRate/rateSummary"
+import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"

 export default function RateSummary({
  rateSummary,
  isUserLoggedIn,
+  packages,
+  roomsAvailability,
 }: RateSummaryProps) {
  const intl = useIntl()
+  const {
+    member,
+    public: publicRate,
+    features,
+    roomType,
+    priceName,
+  } = rateSummary
+  const priceToShow = isUserLoggedIn ? member : publicRate

-  const priceToShow = isUserLoggedIn ? rateSummary.member : rateSummary.public
+  const isPetRoomSelected = features.some(
+    (feature) => feature.code === RoomPackageCodeEnum.PET_ROOM
+  )
+
+  const petRoomPackage = packages.find(
+    (pkg) => pkg.code === RoomPackageCodeEnum.PET_ROOM
+  )
+
+  const petRoomPrice = petRoomPackage?.calculatedPrice ?? null
+  const petRoomCurrency = petRoomPackage?.currency ?? null
+
+  const checkInDate = new Date(roomsAvailability.checkInDate)
+  const checkOutDate = new Date(roomsAvailability.checkOutDate)
+  const nights = differenceInCalendarDays(checkOutDate, checkInDate)

  return (
    <div className={styles.summary}>
      <div className={styles.summaryText}>
-        <Subtitle color="uiTextHighContrast">{rateSummary.roomType}</Subtitle>
-        <Body color="uiTextMediumContrast">{rateSummary.priceName}</Body>
+        <Subtitle color="uiTextHighContrast">{roomType}</Subtitle>
+        <Body color="uiTextMediumContrast">{priceName}</Body>
      </div>
      <div className={styles.summaryPrice}>
-        <div className={styles.summaryPriceText}>
+        <div className={styles.summaryPriceTextDesktop}>
          <Subtitle color={isUserLoggedIn ? "red" : "uiTextHighContrast"}>
            {priceToShow?.localPrice.pricePerStay}{" "}
            {priceToShow?.localPrice.currency}
@@ -34,7 +61,49 @@ export default function RateSummary({
            {priceToShow?.requestedPrice?.currency}
          </Body>
        </div>
-        <Button type="submit" theme="base">
+        <div className={styles.summaryPriceTextMobile}>
+          <Caption color="uiTextHighContrast">
+            {intl.formatMessage({ id: "Total price" })}
+          </Caption>
+          <Subtitle color={isUserLoggedIn ? "red" : "uiTextHighContrast"}>
+            {priceToShow?.localPrice.pricePerStay}{" "}
+            {priceToShow?.localPrice.currency}
+          </Subtitle>
+          <Footnote
+            color="uiTextMediumContrast"
+            className={styles.summaryPriceTextMobile}
+          >
+            {intl.formatMessage(
+              { id: "booking.nights" },
+              { totalNights: nights }
+            )}
+            ,{" "}
+            {intl.formatMessage(
+              { id: "booking.adults" },
+              { totalAdults: roomsAvailability.occupancy?.adults }
+            )}
+            {roomsAvailability.occupancy?.children?.length && (
+              <>
+                ,{" "}
+                {intl.formatMessage(
+                  { id: "booking.children" },
+                  { totalChildren: roomsAvailability.occupancy.children.length }
+                )}
+              </>
+            )}
+          </Footnote>
+        </div>
+        {isPetRoomSelected && (
+          <div className={styles.petInfo}>
+            <Body color="uiTextHighContrast" textTransform="bold">
+              + {petRoomPrice} {petRoomCurrency}
+            </Body>
+            <Body color="uiTextMediumContrast">
+              {intl.formatMessage({ id: "Pet charge" })}
+            </Body>
+          </div>
+        )}
+        <Button type="submit" theme="base" className={styles.continueButton}>
          {intl.formatMessage({ id: "Continue" })}
        </Button>
      </div>
--- a/components/HotelReservation/SelectRate/RoomSelection/RateSummary/rateSummary.module.css
+++ b/components/HotelReservation/SelectRate/RoomSelection/RateSummary/rateSummary.module.css
@@ -5,7 +5,7 @@
  left: 0;
  right: 0;
  background-color: var(--Base-Surface-Primary-light-Normal);
-  padding: var(--Spacing-x3) var(--Spacing-x7) var(--Spacing-x5);
+  padding: var(--Spacing-x2) var(--Spacing-x3) var(--Spacing-x5);
  display: flex;
  justify-content: space-between;
  align-items: center;
@@ -13,5 +13,50 @@

 .summaryPrice {
  display: flex;
+  width: 100%;
  gap: var(--Spacing-x4);
 }
+
+.petInfo {
+  border-left: 1px solid var(--Primary-Light-On-Surface-Divider-subtle);
+  padding-left: var(--Spacing-x2);
+  display: none;
+}
+
+.summaryText {
+  display: none;
+}
+
+.summaryPriceTextDesktop {
+  display: none;
+}
+
+.continueButton {
+  margin-left: auto;
+  height: fit-content;
+  width: 100%;
+}
+
+.summaryPriceTextMobile {
+  white-space: nowrap;
+}
+
+@media (min-width: 768px) {
+  .summary {
+    padding: var(--Spacing-x3) var(--Spacing-x7) var(--Spacing-x5);
+  }
+  .petInfo,
+  .summaryText,
+  .summaryPriceTextDesktop {
+    display: block;
+  }
+  .summaryPriceTextMobile {
+    display: none;
+  }
+  .summaryPrice {
+    width: auto;
+  }
+  .continueButton {
+    width: auto;
+  }
+}
--- a/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx
@@ -1,5 +1,6 @@
 "use client"

+import { createElement } from "react"
 import { useIntl } from "react-intl"

 import { RateDefinition } from "@/server/routers/hotels/output"
@@ -11,6 +12,7 @@ import Footnote from "@/components/TempDesignSystem/Text/Footnote"
 import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"

 import ImageGallery from "../../ImageGallery"
+import { getIconForFeatureCode } from "../../utils"
 import RoomSidePeek from "../RoomSidePeek"

 import styles from "./roomCard.module.css"
@@ -24,18 +26,18 @@ export default function RoomCard({
  handleSelectRate,
 }: RoomCardProps) {
  const intl = useIntl()
-  const saveRate = rateDefinitions.find(
-    // TODO: Update string when API has decided
-    (rate) => rate.cancellationRule === "NonCancellable"
-  )
-  const changeRate = rateDefinitions.find(
-    // TODO: Update string when API has decided
-    (rate) => rate.cancellationRule === "Modifiable"
-  )
-  const flexRate = rateDefinitions.find(
-    // TODO: Update string when API has decided
-    (rate) => rate.cancellationRule === "CancellableBefore6PM"
-  )
+
+  const rates = {
+    saveRate: rateDefinitions.find(
+      (rate) => rate.cancellationRule === "NonCancellable"
+    ),
+    changeRate: rateDefinitions.find(
+      (rate) => rate.cancellationRule === "Modifiable"
+    ),
+    flexRate: rateDefinitions.find(
+      (rate) => rate.cancellationRule === "CancellableBefore6PM"
+    ),
+  }

  function findProductForRate(rate: RateDefinition | undefined) {
    return rate
@@ -47,20 +49,15 @@ export default function RoomCard({
      : undefined
  }

-  function getPriceForRate(
-    rate: typeof saveRate | typeof changeRate | typeof flexRate
-  ) {
+  function getPriceInformationForRate(rate: RateDefinition | undefined) {
    return rateDefinitions.find((def) => def.rateCode === rate?.rateCode)
      ?.generalTerms
  }
+
  const selectedRoom = roomCategories.find(
    (room) => room.name === roomConfiguration.roomType
  )
-
-  const roomSize = selectedRoom?.roomSize
-  const occupancy = selectedRoom?.occupancy.total
-  const roomDescription = selectedRoom?.descriptions.short
-  const images = selectedRoom?.images
+  const { roomSize, occupancy, descriptions, images } = selectedRoom || {}
  const mainImage = images?.[0]

  return (
@@ -68,12 +65,11 @@ export default function RoomCard({
      <div className={styles.cardBody}>
        <div className={styles.specification}>
          <Caption color="uiTextMediumContrast" className={styles.guests}>
-            {/*TODO: Handle pluralisation*/}
            {intl.formatMessage(
              {
                id: "booking.guests",
              },
-              { nrOfGuests: occupancy }
+              { nrOfGuests: occupancy?.total }
            )}
          </Caption>
          <Caption color="uiTextMediumContrast">
@@ -92,7 +88,7 @@ export default function RoomCard({
            <Subtitle className={styles.name} type="two">
              {roomConfiguration.roomType}
            </Subtitle>
-            <Body>{roomDescription}</Body>
+            <Body>{descriptions?.short}</Body>
          </div>
          <Caption color="uiTextHighContrast">
            {intl.formatMessage({
@@ -100,49 +96,53 @@ export default function RoomCard({
            })}
          </Caption>
          <div className={styles.flexibilityOptions}>
-            <FlexibilityOption
-              name={intl.formatMessage({ id: "Non-refundable" })}
-              value="non-refundable"
-              paymentTerm={intl.formatMessage({ id: "Pay now" })}
-              product={findProductForRate(saveRate)}
-              priceInformation={getPriceForRate(saveRate)}
-              handleSelectRate={handleSelectRate}
-              roomType={roomConfiguration.roomType}
-              roomTypeCode={roomConfiguration.roomTypeCode}
-            />
-            <FlexibilityOption
-              name={intl.formatMessage({ id: "Free rebooking" })}
-              value="free-rebooking"
-              paymentTerm={intl.formatMessage({ id: "Pay now" })}
-              product={findProductForRate(changeRate)}
-              priceInformation={getPriceForRate(changeRate)}
-              handleSelectRate={handleSelectRate}
-              roomType={roomConfiguration.roomType}
-              roomTypeCode={roomConfiguration.roomTypeCode}
-            />
-            <FlexibilityOption
-              name={intl.formatMessage({ id: "Free cancellation" })}
-              value="free-cancellation"
-              paymentTerm={intl.formatMessage({ id: "Pay later" })}
-              product={findProductForRate(flexRate)}
-              priceInformation={getPriceForRate(flexRate)}
-              handleSelectRate={handleSelectRate}
-              roomType={roomConfiguration.roomType}
-              roomTypeCode={roomConfiguration.roomTypeCode}
-            />
+            {Object.entries(rates).map(([key, rate]) => (
+              <FlexibilityOption
+                key={key}
+                name={intl.formatMessage({
+                  id:
+                    key === "flexRate"
+                      ? "Free cancellation"
+                      : key === "saveRate"
+                        ? "Non-refundable"
+                        : "Free rebooking",
+                })}
+                value={key.toLowerCase()}
+                paymentTerm={intl.formatMessage({
+                  id: key === "flexRate" ? "Pay later" : "Pay now",
+                })}
+                product={findProductForRate(rate)}
+                priceInformation={getPriceInformationForRate(rate)}
+                handleSelectRate={handleSelectRate}
+                roomType={roomConfiguration.roomType}
+                roomTypeCode={roomConfiguration.roomTypeCode}
+                features={roomConfiguration.features}
+              />
+            ))}
          </div>
        </div>
      </div>
      {mainImage && (
        <div className={styles.imageContainer}>
-          {roomConfiguration.roomsLeft < 5 && (
-            <span className={styles.roomsLeft}>
-              <Footnote
-                color="burgundy"
-                textTransform="uppercase"
-              >{`${roomConfiguration.roomsLeft} ${intl.formatMessage({ id: "Left" })}`}</Footnote>
-            </span>
-          )}
+          <div className={styles.chipContainer}>
+            {roomConfiguration.roomsLeft < 5 && (
+              <span className={styles.chip}>
+                <Footnote
+                  color="burgundy"
+                  textTransform="uppercase"
+                >{`${roomConfiguration.roomsLeft} ${intl.formatMessage({ id: "Left" })}`}</Footnote>
+              </span>
+            )}
+            {roomConfiguration.features.map((feature) => (
+              <span className={styles.chip} key={feature.code}>
+                {createElement(getIconForFeatureCode(feature.code), {
+                  width: 16,
+                  height: 16,
+                  color: "burgundy",
+                })}
+              </span>
+            ))}
+          </div>
          {/*NOTE: images from the test API are hosted on test3.scandichotels.com,
         which can't be accessed unless on Scandic's Wifi or using Citrix. */}
          {images && (
--- a/components/HotelReservation/SelectRate/RoomSelection/RoomCard/roomCard.module.css
+++ b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/roomCard.module.css
@@ -64,10 +64,17 @@
  gap: var(--Spacing-x2);
 }

-.roomsLeft {
+.chipContainer {
  position: absolute;
+  z-index: 1;
  top: 12px;
  left: 12px;
+  display: flex;
+  flex-direction: row;
+  gap: var(--Spacing-x1);
+}
+
+.chip {
  background-color: var(--Main-Grey-White);
  padding: var(--Spacing-x-half) var(--Spacing-x1);
  border-radius: var(--Corner-radius-Small);
--- a/components/HotelReservation/SelectRate/RoomSelection/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomSelection/index.tsx
@@ -1,6 +1,6 @@
 "use client"
 import { useRouter, useSearchParams } from "next/navigation"
-import { useState } from "react"
+import { useMemo, useState } from "react"

 import RateSummary from "./RateSummary"
 import RoomCard from "./RoomCard"
@@ -8,13 +8,14 @@ import getHotelReservationQueryParams from "./utils"

 import styles from "./roomSelection.module.css"

-import { RoomSelectionProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
-import { Rate } from "@/types/components/hotelReservation/selectRate/selectRate"
+import type { RoomSelectionProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
+import type { Rate } from "@/types/components/hotelReservation/selectRate/selectRate"

 export default function RoomSelection({
-  roomConfigurations,
+  roomsAvailability,
  roomCategories,
  user,
+  packages,
 }: RoomSelectionProps) {
  const [rateSummary, setRateSummary] = useState<Rate | null>(null)

@@ -22,27 +23,32 @@ export default function RoomSelection({
  const searchParams = useSearchParams()
  const isUserLoggedIn = !!user

-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-    const searchParamsObject = getHotelReservationQueryParams(searchParams)
+  const { roomConfigurations, rateDefinitions } = roomsAvailability

-    const queryParams = new URLSearchParams(searchParams)
+  const queryParams = useMemo(() => {
+    const params = new URLSearchParams(searchParams)
+    const searchParamsObject = getHotelReservationQueryParams(searchParams)

    searchParamsObject.room.forEach((item, index) => {
      if (rateSummary?.roomTypeCode) {
-        queryParams.set(`room[${index}].roomtype`, rateSummary.roomTypeCode)
+        params.set(`room[${index}].roomtype`, rateSummary.roomTypeCode)
      }
      if (rateSummary?.public?.rateCode) {
-        queryParams.set(`room[${index}].ratecode`, rateSummary.public.rateCode)
+        params.set(`room[${index}].ratecode`, rateSummary.public.rateCode)
      }
      if (rateSummary?.member?.rateCode) {
-        queryParams.set(
+        params.set(
          `room[${index}].counterratecode`,
          rateSummary.member.rateCode
        )
      }
    })

+    return params
+  }, [searchParams, rateSummary])
+
+  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault()
    router.push(`select-bed?${queryParams}`)
  }

@@ -54,10 +60,10 @@ export default function RoomSelection({
        onSubmit={handleSubmit}
      >
        <ul className={styles.roomList}>
-          {roomConfigurations.roomConfigurations.map((roomConfiguration) => (
-            <li key={roomConfiguration.roomType}>
+          {roomConfigurations.map((roomConfiguration) => (
+            <li key={roomConfiguration.roomTypeCode}>
              <RoomCard
-                rateDefinitions={roomConfigurations.rateDefinitions}
+                rateDefinitions={rateDefinitions}
                roomConfiguration={roomConfiguration}
                roomCategories={roomCategories}
                handleSelectRate={setRateSummary}
@@ -69,6 +75,8 @@ export default function RoomSelection({
          <RateSummary
            rateSummary={rateSummary}
            isUserLoggedIn={isUserLoggedIn}
+            packages={packages}
+            roomsAvailability={roomsAvailability}
          />
        )}
      </form>
--- a/components/HotelReservation/SelectRate/RoomSelection/roomSelection.module.css
+++ b/components/HotelReservation/SelectRate/RoomSelection/roomSelection.module.css
@@ -3,7 +3,6 @@
 }

 .roomList {
-  margin-top: var(--Spacing-x4);
  list-style: none;
  display: grid;
  grid-template-columns: 1fr;
--- a/components/HotelReservation/SelectRate/RoomSelection/utils.ts
+++ b/components/HotelReservation/SelectRate/RoomSelection/utils.ts
@@ -1,28 +1,12 @@
-import { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
+import { getFormattedUrlQueryParams } from "@/utils/url"
+
+import type { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"

 function getHotelReservationQueryParams(searchParams: URLSearchParams) {
-  const searchParamsObject: Record<string, unknown> = Array.from(
-    searchParams.entries()
-  ).reduce<Record<string, unknown>>(
-    (acc, [key, value]) => {
-      const keys = key.replace(/\]/g, "").split(/\[|\./) // Split keys by '[' or '.'
-      keys.reduce((nestedAcc, k, i) => {
-        if (i === keys.length - 1) {
-          // Convert value to number if the key is 'adults' or 'age'
-          ;(nestedAcc as Record<string, unknown>)[k] =
-            k === "adults" || k === "age" ? Number(value) : value
-        } else {
-          if (!nestedAcc[k]) {
-            nestedAcc[k] = isNaN(Number(keys[i + 1])) ? {} : [] // Initialize as object or array
-          }
-        }
-        return nestedAcc[k] as Record<string, unknown>
-      }, acc)
-      return acc
-    },
-    {} as Record<string, unknown>
-  )
-  return searchParamsObject as SelectRateSearchParams
+  return getFormattedUrlQueryParams(searchParams, {
+    adults: "number",
+    age: "number",
+  }) as SelectRateSearchParams
 }

 export default getHotelReservationQueryParams
--- a/components/HotelReservation/SelectRate/Rooms/index.tsx
+++ b/components/HotelReservation/SelectRate/Rooms/index.tsx
@@ -0,0 +1,66 @@
+"use client"
+
+import { useCallback, useState } from "react"
+
+import { RoomsAvailability } from "@/server/routers/hotels/output"
+
+import RoomFilter from "../RoomFilter"
+import RoomSelection from "../RoomSelection"
+
+import styles from "./rooms.module.css"
+
+import type { RoomSelectionProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
+
+export default function Rooms({
+  roomsAvailability,
+  roomCategories = [],
+  user,
+  packages,
+}: RoomSelectionProps) {
+  const defaultRooms = roomsAvailability.roomConfigurations.filter(
+    (room) => room.features.length === 0
+  )
+  const [rooms, setRooms] = useState<RoomsAvailability>({
+    ...roomsAvailability,
+    roomConfigurations: defaultRooms,
+  })
+
+  const handleFilter = useCallback(
+    (filter: Record<string, boolean | undefined>) => {
+      const selectedCodes = Object.keys(filter).filter((key) => filter[key])
+
+      if (selectedCodes.length === 0) {
+        setRooms({
+          ...roomsAvailability,
+          roomConfigurations: defaultRooms,
+        })
+        return
+      }
+
+      const filteredRooms = roomsAvailability.roomConfigurations.filter(
+        (room) =>
+          selectedCodes.every((selectedCode) =>
+            room.features.some((feature) => feature.code === selectedCode)
+          )
+      )
+      setRooms({ ...roomsAvailability, roomConfigurations: filteredRooms })
+    },
+    [roomsAvailability, defaultRooms]
+  )
+
+  return (
+    <div className={styles.content}>
+      <RoomFilter
+        numberOfRooms={rooms.roomConfigurations.length}
+        onFilter={handleFilter}
+        filterOptions={packages}
+      />
+      <RoomSelection
+        roomsAvailability={rooms}
+        roomCategories={roomCategories}
+        user={user}
+        packages={packages}
+      />
+    </div>
+  )
+}
--- a/components/HotelReservation/SelectRate/Rooms/rooms.module.css
+++ b/components/HotelReservation/SelectRate/Rooms/rooms.module.css
@@ -0,0 +1,8 @@
+.content {
+  max-width: var(--max-width);
+  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x2);
+  padding: var(--Spacing-x2);
+}
--- a/components/HotelReservation/SelectRate/utils.ts
+++ b/components/HotelReservation/SelectRate/utils.ts
@@ -0,0 +1,19 @@
+import { AllergyIcon, PetsIcon, WheelchairIcon } from "@/components/Icons"
+
+import {
+  RoomPackageCodeEnum,
+  type RoomPackageCodes,
+} from "@/types/components/hotelReservation/selectRate/roomFilter"
+
+export function getIconForFeatureCode(featureCode: RoomPackageCodes) {
+  switch (featureCode) {
+    case RoomPackageCodeEnum.ACCESSIBILITY_ROOM:
+      return WheelchairIcon
+    case RoomPackageCodeEnum.ALLERGY_ROOM:
+      return AllergyIcon
+    case RoomPackageCodeEnum.PET_ROOM:
+      return PetsIcon
+    default:
+      return PetsIcon
+  }
+}
--- a/components/Icons/Ac.tsx
+++ b/components/Icons/Ac.tsx
@@ -14,23 +14,10 @@ export default function AcIcon({ className, color, ...props }: IconProps) {
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3450"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3450)">
-        <path
-          d="M3.19995 20.8V6.13458C3.19995 5.31983 3.48554 4.62703 4.05673 4.0562C4.62791 3.48537 5.32148 3.19995 6.13745 3.19995H9.99995C10.8159 3.19995 11.5095 3.48513 12.0807 4.0555C12.6519 4.62587 12.9375 5.31846 12.9375 6.13328V20.8H3.19995ZM9.93745 15.0625H11.0625V9.93745H9.93745V15.0625ZM5.07495 18.925H11.0625V16.9375H9.93745C9.42182 16.9375 8.98041 16.7539 8.61323 16.3867C8.24604 16.0195 8.06245 15.5781 8.06245 15.0625V9.93745C8.06245 9.42182 8.24604 8.98041 8.61323 8.61323C8.98041 8.24604 9.42182 8.06245 9.93745 8.06245H11.0625V6.13745C11.0625 5.83642 10.9606 5.58408 10.757 5.38043C10.5533 5.17678 10.301 5.07495 9.99995 5.07495H6.13745C5.83642 5.07495 5.58408 5.17678 5.38043 5.38043C5.17678 5.58408 5.07495 5.83642 5.07495 6.13745V18.925ZM17.0875 13.5125C16.6671 13.5125 16.2549 13.4565 15.8507 13.3445C15.4465 13.2325 15.0505 13.0885 14.6625 12.9125L15.25 11.1375C15.5748 11.2803 15.8956 11.3994 16.2124 11.4946C16.5291 11.5898 16.8291 11.6375 17.1125 11.6375C17.318 11.6375 17.5236 11.6041 17.7291 11.5375C17.9347 11.4708 18.15 11.3666 18.375 11.225C18.7686 10.9465 19.1622 10.7581 19.5558 10.6599C19.9494 10.5616 20.3266 10.5125 20.6875 10.5125C21.0881 10.5125 21.5007 10.5666 21.9254 10.675C22.3501 10.7833 22.7541 10.9208 23.1375 11.0875L22.55 12.875C22.2333 12.7666 21.9062 12.6583 21.5687 12.55C21.2312 12.4416 20.9391 12.3875 20.6923 12.3875C20.4807 12.3875 20.252 12.427 20.0062 12.5062C19.7604 12.5854 19.5 12.7166 19.225 12.9C18.8833 13.1333 18.536 13.2937 18.1831 13.3812C17.8302 13.4687 17.465 13.5125 17.0875 13.5125ZM17.1125 9.61245C16.6958 9.61245 16.2791 9.5562 15.8625 9.4437C15.4458 9.3312 15.0458 9.18908 14.6625 9.01733L15.25 7.23745C15.675 7.42078 16.0333 7.54995 16.325 7.62495C16.6166 7.69995 16.8791 7.73745 17.1125 7.73745C17.318 7.73745 17.5236 7.7062 17.7291 7.6437C17.9347 7.5812 18.15 7.47495 18.375 7.32495C18.785 7.0465 19.1827 6.85814 19.5681 6.75988C19.9535 6.66159 20.3266 6.61245 20.6875 6.61245C21.0902 6.61245 21.493 6.66453 21.8958 6.7687C22.2986 6.87287 22.7125 7.01245 23.1375 7.18745L22.55 8.97495C22.125 8.83328 21.7666 8.71662 21.475 8.62495C21.1833 8.53328 20.9208 8.48745 20.6875 8.48745C20.4627 8.48745 20.2336 8.52078 20.0001 8.58745C19.7667 8.65412 19.5083 8.79162 19.225 8.99995C18.9333 9.20828 18.6027 9.36245 18.2332 9.46245C17.8637 9.56245 17.4902 9.61245 17.1125 9.61245ZM17.1147 17.4125C16.6882 17.4125 16.2708 17.3562 15.8625 17.2437C15.4541 17.1312 15.0541 16.9875 14.6625 16.8125L15.25 15.0375C15.6 15.1875 15.9333 15.3083 16.25 15.4C16.5666 15.4916 16.8541 15.5375 17.1125 15.5375C17.318 15.5375 17.5236 15.5062 17.7291 15.4437C17.9347 15.3812 18.15 15.275 18.375 15.125C18.7583 14.8666 19.1604 14.6833 19.5812 14.575C20.002 14.4666 20.3791 14.4125 20.7125 14.4125C21.1166 14.4125 21.5289 14.4684 21.9492 14.5802C22.3695 14.692 22.7656 14.8277 23.1375 14.9875L22.55 16.775C22.125 16.6333 21.7625 16.5166 21.4625 16.425C21.1625 16.3333 20.9041 16.2875 20.6875 16.2875C20.4541 16.2875 20.2125 16.327 19.9625 16.4062C19.7125 16.4854 19.4666 16.6166 19.225 16.8C18.95 16.9916 18.6279 17.1416 18.2588 17.25C17.8898 17.3583 17.5084 17.4125 17.1147 17.4125Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.19995 20.8V6.13458C3.19995 5.31983 3.48554 4.62703 4.05673 4.0562C4.62791 3.48537 5.32148 3.19995 6.13745 3.19995H9.99995C10.8159 3.19995 11.5095 3.48513 12.0807 4.0555C12.6519 4.62587 12.9375 5.31846 12.9375 6.13328V20.8H3.19995ZM9.93745 15.0625H11.0625V9.93745H9.93745V15.0625ZM5.07495 18.925H11.0625V16.9375H9.93745C9.42182 16.9375 8.98041 16.7539 8.61323 16.3867C8.24604 16.0195 8.06245 15.5781 8.06245 15.0625V9.93745C8.06245 9.42182 8.24604 8.98041 8.61323 8.61323C8.98041 8.24604 9.42182 8.06245 9.93745 8.06245H11.0625V6.13745C11.0625 5.83642 10.9606 5.58408 10.757 5.38043C10.5533 5.17678 10.301 5.07495 9.99995 5.07495H6.13745C5.83642 5.07495 5.58408 5.17678 5.38043 5.38043C5.17678 5.58408 5.07495 5.83642 5.07495 6.13745V18.925ZM17.0875 13.5125C16.6671 13.5125 16.2549 13.4565 15.8507 13.3445C15.4465 13.2325 15.0505 13.0885 14.6625 12.9125L15.25 11.1375C15.5748 11.2803 15.8956 11.3994 16.2124 11.4946C16.5291 11.5898 16.8291 11.6375 17.1125 11.6375C17.318 11.6375 17.5236 11.6041 17.7291 11.5375C17.9347 11.4708 18.15 11.3666 18.375 11.225C18.7686 10.9465 19.1622 10.7581 19.5558 10.6599C19.9494 10.5616 20.3266 10.5125 20.6875 10.5125C21.0881 10.5125 21.5007 10.5666 21.9254 10.675C22.3501 10.7833 22.7541 10.9208 23.1375 11.0875L22.55 12.875C22.2333 12.7666 21.9062 12.6583 21.5687 12.55C21.2312 12.4416 20.9391 12.3875 20.6923 12.3875C20.4807 12.3875 20.252 12.427 20.0062 12.5062C19.7604 12.5854 19.5 12.7166 19.225 12.9C18.8833 13.1333 18.536 13.2937 18.1831 13.3812C17.8302 13.4687 17.465 13.5125 17.0875 13.5125ZM17.1125 9.61245C16.6958 9.61245 16.2791 9.5562 15.8625 9.4437C15.4458 9.3312 15.0458 9.18908 14.6625 9.01733L15.25 7.23745C15.675 7.42078 16.0333 7.54995 16.325 7.62495C16.6166 7.69995 16.8791 7.73745 17.1125 7.73745C17.318 7.73745 17.5236 7.7062 17.7291 7.6437C17.9347 7.5812 18.15 7.47495 18.375 7.32495C18.785 7.0465 19.1827 6.85814 19.5681 6.75988C19.9535 6.66159 20.3266 6.61245 20.6875 6.61245C21.0902 6.61245 21.493 6.66453 21.8958 6.7687C22.2986 6.87287 22.7125 7.01245 23.1375 7.18745L22.55 8.97495C22.125 8.83328 21.7666 8.71662 21.475 8.62495C21.1833 8.53328 20.9208 8.48745 20.6875 8.48745C20.4627 8.48745 20.2336 8.52078 20.0001 8.58745C19.7667 8.65412 19.5083 8.79162 19.225 8.99995C18.9333 9.20828 18.6027 9.36245 18.2332 9.46245C17.8637 9.56245 17.4902 9.61245 17.1125 9.61245ZM17.1147 17.4125C16.6882 17.4125 16.2708 17.3562 15.8625 17.2437C15.4541 17.1312 15.0541 16.9875 14.6625 16.8125L15.25 15.0375C15.6 15.1875 15.9333 15.3083 16.25 15.4C16.5666 15.4916 16.8541 15.5375 17.1125 15.5375C17.318 15.5375 17.5236 15.5062 17.7291 15.4437C17.9347 15.3812 18.15 15.275 18.375 15.125C18.7583 14.8666 19.1604 14.6833 19.5812 14.575C20.002 14.4666 20.3791 14.4125 20.7125 14.4125C21.1166 14.4125 21.5289 14.4684 21.9492 14.5802C22.3695 14.692 22.7656 14.8277 23.1375 14.9875L22.55 16.775C22.125 16.6333 21.7625 16.5166 21.4625 16.425C21.1625 16.3333 20.9041 16.2875 20.6875 16.2875C20.4541 16.2875 20.2125 16.327 19.9625 16.4062C19.7125 16.4854 19.4666 16.6166 19.225 16.8C18.95 16.9916 18.6279 17.1416 18.2588 17.25C17.8898 17.3583 17.5084 17.4125 17.1147 17.4125Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Accesories.tsx
+++ b/components/Icons/Accesories.tsx
@@ -18,23 +18,10 @@ export default function AccesoriesIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_4039_3291"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4039_3291)">
-        <path
-          d="M6.40085 22C5.55984 22 4.80868 21.4739 4.52127 20.6835L1.56362 12.5499C1.23633 11.6499 1.593 10.6442 2.41421 10.1515L6 8V3C6 2.44772 6.44772 2 7 2H9C9.55229 2 10 2.44772 10 3V8L13.5858 10.1515C14.407 10.6442 14.7637 11.6499 14.4364 12.5499L11.4787 20.6835C11.1913 21.4739 10.4402 22 9.59915 22H6.40085ZM17 22C16.7167 22 16.4792 21.9042 16.2875 21.7125C16.0958 21.5208 16 21.2833 16 21C16 20.7167 16.0958 20.4792 16.2875 20.2875C16.4792 20.0958 16.7167 20 17 20H20V18H17C16.7167 18 16.4792 17.9042 16.2875 17.7125C16.0958 17.5208 16 17.2833 16 17C16 16.7167 16.0958 16.4792 16.2875 16.2875C16.4792 16.0958 16.7167 16 17 16H20V14H17C16.7167 14 16.4792 13.9042 16.2875 13.7125C16.0958 13.5208 16 13.2833 16 13C16 12.7167 16.0958 12.4792 16.2875 12.2875C16.4792 12.0958 16.7167 12 17 12H20V10H17C16.7167 10 16.4792 9.90417 16.2875 9.7125C16.0958 9.52083 16 9.28333 16 9C16 8.71667 16.0958 8.47917 16.2875 8.2875C16.4792 8.09583 16.7167 8 17 8H20V6H17C16.7167 6 16.4792 5.90417 16.2875 5.7125C16.0958 5.52083 16 5.28333 16 5C16 4.71667 16.0958 4.47917 16.2875 4.2875C16.4792 4.09583 16.7167 4 17 4H21C21.55 4 22.0208 4.19583 22.4125 4.5875C22.8042 4.97917 23 5.45 23 6V20C23 20.55 22.8042 21.0208 22.4125 21.4125C22.0208 21.8042 21.55 22 21 22H17ZM6.16123 19.3404C6.30454 19.7363 6.68048 20 7.10153 20H8.89847C9.31952 20 9.69546 19.7363 9.83877 19.3404L12.2691 12.6261C12.4322 12.1755 12.2527 11.6726 11.8412 11.427L9.45 10H6.55L4.15876 11.427C3.74728 11.6726 3.56783 12.1755 3.73092 12.6261L6.16123 19.3404Z"
-          fill="#1C1B1F"
-        />
-      </g>
+      <path
+        d="M6.40085 22C5.55984 22 4.80868 21.4739 4.52127 20.6835L1.56362 12.5499C1.23633 11.6499 1.593 10.6442 2.41421 10.1515L6 8V3C6 2.44772 6.44772 2 7 2H9C9.55229 2 10 2.44772 10 3V8L13.5858 10.1515C14.407 10.6442 14.7637 11.6499 14.4364 12.5499L11.4787 20.6835C11.1913 21.4739 10.4402 22 9.59915 22H6.40085ZM17 22C16.7167 22 16.4792 21.9042 16.2875 21.7125C16.0958 21.5208 16 21.2833 16 21C16 20.7167 16.0958 20.4792 16.2875 20.2875C16.4792 20.0958 16.7167 20 17 20H20V18H17C16.7167 18 16.4792 17.9042 16.2875 17.7125C16.0958 17.5208 16 17.2833 16 17C16 16.7167 16.0958 16.4792 16.2875 16.2875C16.4792 16.0958 16.7167 16 17 16H20V14H17C16.7167 14 16.4792 13.9042 16.2875 13.7125C16.0958 13.5208 16 13.2833 16 13C16 12.7167 16.0958 12.4792 16.2875 12.2875C16.4792 12.0958 16.7167 12 17 12H20V10H17C16.7167 10 16.4792 9.90417 16.2875 9.7125C16.0958 9.52083 16 9.28333 16 9C16 8.71667 16.0958 8.47917 16.2875 8.2875C16.4792 8.09583 16.7167 8 17 8H20V6H17C16.7167 6 16.4792 5.90417 16.2875 5.7125C16.0958 5.52083 16 5.28333 16 5C16 4.71667 16.0958 4.47917 16.2875 4.2875C16.4792 4.09583 16.7167 4 17 4H21C21.55 4 22.0208 4.19583 22.4125 4.5875C22.8042 4.97917 23 5.45 23 6V20C23 20.55 22.8042 21.0208 22.4125 21.4125C22.0208 21.8042 21.55 22 21 22H17ZM6.16123 19.3404C6.30454 19.7363 6.68048 20 7.10153 20H8.89847C9.31952 20 9.69546 19.7363 9.83877 19.3404L12.2691 12.6261C12.4322 12.1755 12.2527 11.6726 11.8412 11.427L9.45 10H6.55L4.15876 11.427C3.74728 11.6726 3.56783 12.1755 3.73092 12.6261L6.16123 19.3404Z"
+        fill="#1C1B1F"
+      />
    </svg>
  )
 }
--- a/components/Icons/Accessibility.tsx
+++ b/components/Icons/Accessibility.tsx
@@ -18,23 +18,10 @@ export default function AccessibilityIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_554_11936"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_554_11936)">
-        <path
-          d="M12.0001 6.0499C11.4584 6.0499 10.998 5.86032 10.6188 5.48115C10.2397 5.10199 10.0501 4.64157 10.0501 4.0999C10.0501 3.55824 10.2397 3.09782 10.6188 2.71865C10.998 2.33949 11.4584 2.1499 12.0001 2.1499C12.5418 2.1499 13.0022 2.33949 13.3813 2.71865C13.7605 3.09782 13.9501 3.55824 13.9501 4.0999C13.9501 4.64157 13.7605 5.10199 13.3813 5.48115C13.0022 5.86032 12.5418 6.0499 12.0001 6.0499ZM9.1251 20.8624V8.9749H4.1626C3.90426 8.9749 3.68343 8.88324 3.5001 8.6999C3.31676 8.51657 3.2251 8.29574 3.2251 8.0374C3.2251 7.77907 3.31676 7.55824 3.5001 7.3749C3.68343 7.19157 3.90426 7.0999 4.1626 7.0999H19.8376C20.0959 7.0999 20.3168 7.19157 20.5001 7.3749C20.6834 7.55824 20.7751 7.77907 20.7751 8.0374C20.7751 8.29574 20.6834 8.51657 20.5001 8.6999C20.3168 8.88324 20.0959 8.9749 19.8376 8.9749H14.8751V20.8624C14.8751 21.1207 14.7834 21.3416 14.6001 21.5249C14.4168 21.7082 14.1959 21.7999 13.9376 21.7999C13.6793 21.7999 13.4584 21.7082 13.2751 21.5249C13.0918 21.3416 13.0001 21.1207 13.0001 20.8624V15.9249H11.0001V20.8624C11.0001 21.1207 10.9084 21.3416 10.7251 21.5249C10.5418 21.7082 10.3209 21.7999 10.0626 21.7999C9.80427 21.7999 9.58343 21.7082 9.4001 21.5249C9.21676 21.3416 9.1251 21.1207 9.1251 20.8624Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M12.0001 6.0499C11.4584 6.0499 10.998 5.86032 10.6188 5.48115C10.2397 5.10199 10.0501 4.64157 10.0501 4.0999C10.0501 3.55824 10.2397 3.09782 10.6188 2.71865C10.998 2.33949 11.4584 2.1499 12.0001 2.1499C12.5418 2.1499 13.0022 2.33949 13.3813 2.71865C13.7605 3.09782 13.9501 3.55824 13.9501 4.0999C13.9501 4.64157 13.7605 5.10199 13.3813 5.48115C13.0022 5.86032 12.5418 6.0499 12.0001 6.0499ZM9.1251 20.8624V8.9749H4.1626C3.90426 8.9749 3.68343 8.88324 3.5001 8.6999C3.31676 8.51657 3.2251 8.29574 3.2251 8.0374C3.2251 7.77907 3.31676 7.55824 3.5001 7.3749C3.68343 7.19157 3.90426 7.0999 4.1626 7.0999H19.8376C20.0959 7.0999 20.3168 7.19157 20.5001 7.3749C20.6834 7.55824 20.7751 7.77907 20.7751 8.0374C20.7751 8.29574 20.6834 8.51657 20.5001 8.6999C20.3168 8.88324 20.0959 8.9749 19.8376 8.9749H14.8751V20.8624C14.8751 21.1207 14.7834 21.3416 14.6001 21.5249C14.4168 21.7082 14.1959 21.7999 13.9376 21.7999C13.6793 21.7999 13.4584 21.7082 13.2751 21.5249C13.0918 21.3416 13.0001 21.1207 13.0001 20.8624V15.9249H11.0001V20.8624C11.0001 21.1207 10.9084 21.3416 10.7251 21.5249C10.5418 21.7082 10.3209 21.7999 10.0626 21.7999C9.80427 21.7999 9.58343 21.7082 9.4001 21.5249C9.21676 21.3416 9.1251 21.1207 9.1251 20.8624Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/Air.tsx
+++ b/components/Icons/Air.tsx
@@ -14,23 +14,10 @@ export default function AirIcon({ className, color, ...props }: IconProps) {
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_69_3423"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3423)">
-        <path
-          d="M11.5125 19.8C10.9884 19.8 10.5011 19.6708 10.0507 19.4125C9.60022 19.1541 9.24167 18.8 8.975 18.35C8.8 18.0416 8.79453 17.7312 8.9586 17.4187C9.12267 17.1062 9.37657 16.95 9.7203 16.95C9.92343 16.95 10.1042 17.0104 10.2625 17.1312C10.4208 17.252 10.5583 17.3916 10.675 17.55C10.764 17.675 10.8842 17.7687 11.0355 17.8312C11.1868 17.8937 11.3458 17.925 11.5125 17.925C11.7958 17.925 12.0375 17.825 12.2375 17.625C12.4375 17.425 12.5375 17.1833 12.5375 16.9C12.5375 16.6166 12.4375 16.375 12.2375 16.175C12.0375 15.975 11.7976 15.875 11.5178 15.875H3.125C2.86667 15.875 2.64583 15.7833 2.4625 15.6C2.27917 15.4166 2.1875 15.1958 2.1875 14.9375C2.1875 14.6791 2.27917 14.4583 2.4625 14.275C2.64583 14.0916 2.86667 14 3.125 14H11.5125C12.318 14 13.0028 14.2822 13.5667 14.8467C14.1306 15.4111 14.4125 16.0965 14.4125 16.9029C14.4125 17.7093 14.1306 18.3937 13.5667 18.9562C13.0028 19.5187 12.318 19.8 11.5125 19.8ZM3.125 9.99995C2.86667 9.99995 2.64583 9.90828 2.4625 9.72495C2.27917 9.54162 2.1875 9.32078 2.1875 9.06245C2.1875 8.80412 2.27917 8.58328 2.4625 8.39995C2.64583 8.21662 2.86667 8.12495 3.125 8.12495H15.4375C15.8611 8.12495 16.2212 7.97654 16.5177 7.67973C16.8142 7.38291 16.9625 7.02249 16.9625 6.59848C16.9625 6.17446 16.8148 5.81453 16.5193 5.5187C16.2237 5.22287 15.8649 5.07495 15.4428 5.07495C15.1726 5.07495 14.9208 5.13593 14.6875 5.25788C14.4542 5.37983 14.2708 5.55463 14.1375 5.78228C14.0208 5.97739 13.8816 6.15412 13.7199 6.31245C13.5581 6.47078 13.364 6.54995 13.1375 6.54995C12.8208 6.54995 12.5688 6.42495 12.3813 6.17495C12.1938 5.92495 12.1542 5.65828 12.2625 5.37495C12.4958 4.70828 12.9038 4.17912 13.4863 3.78745C14.0689 3.39578 14.7193 3.19995 15.4375 3.19995C16.3765 3.19995 17.178 3.53213 17.8418 4.19648C18.5056 4.86083 18.8375 5.66291 18.8375 6.60273C18.8375 7.54254 18.5056 8.3437 17.8418 9.0062C17.178 9.6687 16.3765 9.99995 15.4375 9.99995H3.125ZM19.85 17.5625C19.525 17.7041 19.2125 17.6864 18.9125 17.5094C18.6125 17.3323 18.4625 17.0745 18.4625 16.7358C18.4625 16.5202 18.5375 16.3354 18.6875 16.1812C18.8375 16.027 19.0083 15.9 19.2 15.8C19.4417 15.6666 19.625 15.478 19.75 15.2341C19.875 14.9901 19.9375 14.7287 19.9375 14.45C19.9375 14.0263 19.7892 13.6663 19.4927 13.3698C19.1962 13.0732 18.8361 12.925 18.4125 12.925H3.125C2.86667 12.925 2.64583 12.8333 2.4625 12.65C2.27917 12.4666 2.1875 12.2458 2.1875 11.9875C2.1875 11.7291 2.27917 11.5083 2.4625 11.325C2.64583 11.1416 2.86667 11.05 3.125 11.05H18.4125C19.3516 11.05 20.153 11.3813 20.8168 12.044C21.4806 12.7067 21.8125 13.5067 21.8125 14.4442C21.8125 15.123 21.637 15.7433 21.286 16.3049C20.935 16.8665 20.4563 17.2857 19.85 17.5625Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M11.5125 19.8C10.9884 19.8 10.5011 19.6708 10.0507 19.4125C9.60022 19.1541 9.24167 18.8 8.975 18.35C8.8 18.0416 8.79453 17.7312 8.9586 17.4187C9.12267 17.1062 9.37657 16.95 9.7203 16.95C9.92343 16.95 10.1042 17.0104 10.2625 17.1312C10.4208 17.252 10.5583 17.3916 10.675 17.55C10.764 17.675 10.8842 17.7687 11.0355 17.8312C11.1868 17.8937 11.3458 17.925 11.5125 17.925C11.7958 17.925 12.0375 17.825 12.2375 17.625C12.4375 17.425 12.5375 17.1833 12.5375 16.9C12.5375 16.6166 12.4375 16.375 12.2375 16.175C12.0375 15.975 11.7976 15.875 11.5178 15.875H3.125C2.86667 15.875 2.64583 15.7833 2.4625 15.6C2.27917 15.4166 2.1875 15.1958 2.1875 14.9375C2.1875 14.6791 2.27917 14.4583 2.4625 14.275C2.64583 14.0916 2.86667 14 3.125 14H11.5125C12.318 14 13.0028 14.2822 13.5667 14.8467C14.1306 15.4111 14.4125 16.0965 14.4125 16.9029C14.4125 17.7093 14.1306 18.3937 13.5667 18.9562C13.0028 19.5187 12.318 19.8 11.5125 19.8ZM3.125 9.99995C2.86667 9.99995 2.64583 9.90828 2.4625 9.72495C2.27917 9.54162 2.1875 9.32078 2.1875 9.06245C2.1875 8.80412 2.27917 8.58328 2.4625 8.39995C2.64583 8.21662 2.86667 8.12495 3.125 8.12495H15.4375C15.8611 8.12495 16.2212 7.97654 16.5177 7.67973C16.8142 7.38291 16.9625 7.02249 16.9625 6.59848C16.9625 6.17446 16.8148 5.81453 16.5193 5.5187C16.2237 5.22287 15.8649 5.07495 15.4428 5.07495C15.1726 5.07495 14.9208 5.13593 14.6875 5.25788C14.4542 5.37983 14.2708 5.55463 14.1375 5.78228C14.0208 5.97739 13.8816 6.15412 13.7199 6.31245C13.5581 6.47078 13.364 6.54995 13.1375 6.54995C12.8208 6.54995 12.5688 6.42495 12.3813 6.17495C12.1938 5.92495 12.1542 5.65828 12.2625 5.37495C12.4958 4.70828 12.9038 4.17912 13.4863 3.78745C14.0689 3.39578 14.7193 3.19995 15.4375 3.19995C16.3765 3.19995 17.178 3.53213 17.8418 4.19648C18.5056 4.86083 18.8375 5.66291 18.8375 6.60273C18.8375 7.54254 18.5056 8.3437 17.8418 9.0062C17.178 9.6687 16.3765 9.99995 15.4375 9.99995H3.125ZM19.85 17.5625C19.525 17.7041 19.2125 17.6864 18.9125 17.5094C18.6125 17.3323 18.4625 17.0745 18.4625 16.7358C18.4625 16.5202 18.5375 16.3354 18.6875 16.1812C18.8375 16.027 19.0083 15.9 19.2 15.8C19.4417 15.6666 19.625 15.478 19.75 15.2341C19.875 14.9901 19.9375 14.7287 19.9375 14.45C19.9375 14.0263 19.7892 13.6663 19.4927 13.3698C19.1962 13.0732 18.8361 12.925 18.4125 12.925H3.125C2.86667 12.925 2.64583 12.8333 2.4625 12.65C2.27917 12.4666 2.1875 12.2458 2.1875 11.9875C2.1875 11.7291 2.27917 11.5083 2.4625 11.325C2.64583 11.1416 2.86667 11.05 3.125 11.05H18.4125C19.3516 11.05 20.153 11.3813 20.8168 12.044C21.4806 12.7067 21.8125 13.5067 21.8125 14.4442C21.8125 15.123 21.637 15.7433 21.286 16.3049C20.935 16.8665 20.4563 17.2857 19.85 17.5625Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Airplane.tsx
+++ b/components/Icons/Airplane.tsx
@@ -18,23 +18,10 @@ export default function AirplaneIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_4597_1552"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4597_1552)">
-        <path
-          d="M9.9251 21.125L7.4501 16.525L2.8501 14.05L4.6251 12.3L8.2501 12.925L10.8001 10.375L2.8751 7L4.9751 4.85L14.6001 6.55L17.7001 3.45C18.0834 3.06667 18.5584 2.875 19.1251 2.875C19.6918 2.875 20.1668 3.06667 20.5501 3.45C20.9334 3.83333 21.1251 4.30417 21.1251 4.8625C21.1251 5.42083 20.9334 5.89167 20.5501 6.275L17.4251 9.4L19.1251 19L17.0001 21.125L13.6001 13.2L11.0501 15.75L11.7001 19.35L9.9251 21.125Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M9.9251 21.125L7.4501 16.525L2.8501 14.05L4.6251 12.3L8.2501 12.925L10.8001 10.375L2.8751 7L4.9751 4.85L14.6001 6.55L17.7001 3.45C18.0834 3.06667 18.5584 2.875 19.1251 2.875C19.6918 2.875 20.1668 3.06667 20.5501 3.45C20.9334 3.83333 21.1251 4.30417 21.1251 4.8625C21.1251 5.42083 20.9334 5.89167 20.5501 6.275L17.4251 9.4L19.1251 19L17.0001 21.125L13.6001 13.2L11.0501 15.75L11.7001 19.35L9.9251 21.125Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Allergy.tsx
+++ b/components/Icons/Allergy.tsx
--- a/components/Icons/ArrowRight.tsx
+++ b/components/Icons/ArrowRight.tsx
@@ -20,23 +20,10 @@ export default function ArrowRightIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        height="25"
-        id="mask0_4176_4181"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="24"
-        x="0"
-        y="0"
-      >
-        <rect y="0.632812" width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4176_4181)">
-        <path
-          d="M16.15 13.5703H5.1875C4.92917 13.5703 4.70833 13.4786 4.525 13.2953C4.34167 13.112 4.25 12.8911 4.25 12.6328C4.25 12.3745 4.34167 12.1536 4.525 11.9703C4.70833 11.787 4.92917 11.6953 5.1875 11.6953H16.15L11.325 6.8703C11.1333 6.67863 11.0396 6.4578 11.0438 6.2078C11.0479 5.9578 11.1458 5.73697 11.3375 5.5453C11.5292 5.36197 11.75 5.26822 12 5.26405C12.25 5.25988 12.4708 5.35363 12.6625 5.5453L19.0875 11.9703C19.1792 12.062 19.2479 12.164 19.2937 12.2765C19.3396 12.389 19.3625 12.5078 19.3625 12.6328C19.3625 12.7578 19.3396 12.8765 19.2937 12.989C19.2479 13.1016 19.1792 13.2036 19.0875 13.2953L12.6625 19.7203C12.4792 19.9036 12.2604 19.9953 12.0062 19.9953C11.7521 19.9953 11.5292 19.9036 11.3375 19.7203C11.1458 19.5286 11.05 19.3057 11.05 19.0516C11.05 18.7974 11.1458 18.5745 11.3375 18.3828L16.15 13.5703Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M16.15 13.5703H5.1875C4.92917 13.5703 4.70833 13.4786 4.525 13.2953C4.34167 13.112 4.25 12.8911 4.25 12.6328C4.25 12.3745 4.34167 12.1536 4.525 11.9703C4.70833 11.787 4.92917 11.6953 5.1875 11.6953H16.15L11.325 6.8703C11.1333 6.67863 11.0396 6.4578 11.0438 6.2078C11.0479 5.9578 11.1458 5.73697 11.3375 5.5453C11.5292 5.36197 11.75 5.26822 12 5.26405C12.25 5.25988 12.4708 5.35363 12.6625 5.5453L19.0875 11.9703C19.1792 12.062 19.2479 12.164 19.2937 12.2765C19.3396 12.389 19.3625 12.5078 19.3625 12.6328C19.3625 12.7578 19.3396 12.8765 19.2937 12.989C19.2479 13.1016 19.1792 13.2036 19.0875 13.2953L12.6625 19.7203C12.4792 19.9036 12.2604 19.9953 12.0062 19.9953C11.7521 19.9953 11.5292 19.9036 11.3375 19.7203C11.1458 19.5286 11.05 19.3057 11.05 19.0516C11.05 18.7974 11.1458 18.5745 11.3375 18.3828L16.15 13.5703Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/Bar.tsx
+++ b/components/Icons/Bar.tsx
@@ -14,23 +14,10 @@ export default function BarIcon({ className, color, ...props }: IconProps) {
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        id="mask0_554_11961"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_554_11961)">
-        <path
-          d="M11.0625 18.9501V13.8751L3.68755 5.5626C3.57088 5.42926 3.47713 5.28551 3.4063 5.13135C3.33547 4.97718 3.30005 4.8126 3.30005 4.6376C3.30005 4.2376 3.43963 3.90218 3.7188 3.63135C3.99797 3.36051 4.33755 3.2251 4.73755 3.2251H19.2625C19.6625 3.2251 20.0021 3.36051 20.2813 3.63135C20.5605 3.90218 20.7 4.2376 20.7 4.6376C20.7 4.8126 20.6646 4.97718 20.5938 5.13135C20.523 5.28551 20.4292 5.42926 20.3125 5.5626L12.9375 13.8751V18.9501H16.875C17.1334 18.9501 17.3542 19.0418 17.5375 19.2251C17.7209 19.4084 17.8125 19.6293 17.8125 19.8876C17.8125 20.1459 17.7209 20.3668 17.5375 20.5501C17.3542 20.7334 17.1334 20.8251 16.875 20.8251H7.12505C6.86672 20.8251 6.64588 20.7334 6.46255 20.5501C6.27922 20.3668 6.18755 20.1459 6.18755 19.8876C6.18755 19.6293 6.27922 19.4084 6.46255 19.2251C6.64588 19.0418 6.86672 18.9501 7.12505 18.9501H11.0625ZM7.52505 7.0751H16.475L18.25 5.1001H5.75005L7.52505 7.0751ZM12 12.0751L14.8125 8.9501H9.18755L12 12.0751Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M11.0625 18.9501V13.8751L3.68755 5.5626C3.57088 5.42926 3.47713 5.28551 3.4063 5.13135C3.33547 4.97718 3.30005 4.8126 3.30005 4.6376C3.30005 4.2376 3.43963 3.90218 3.7188 3.63135C3.99797 3.36051 4.33755 3.2251 4.73755 3.2251H19.2625C19.6625 3.2251 20.0021 3.36051 20.2813 3.63135C20.5605 3.90218 20.7 4.2376 20.7 4.6376C20.7 4.8126 20.6646 4.97718 20.5938 5.13135C20.523 5.28551 20.4292 5.42926 20.3125 5.5626L12.9375 13.8751V18.9501H16.875C17.1334 18.9501 17.3542 19.0418 17.5375 19.2251C17.7209 19.4084 17.8125 19.6293 17.8125 19.8876C17.8125 20.1459 17.7209 20.3668 17.5375 20.5501C17.3542 20.7334 17.1334 20.8251 16.875 20.8251H7.12505C6.86672 20.8251 6.64588 20.7334 6.46255 20.5501C6.27922 20.3668 6.18755 20.1459 6.18755 19.8876C6.18755 19.6293 6.27922 19.4084 6.46255 19.2251C6.64588 19.0418 6.86672 18.9501 7.12505 18.9501H11.0625ZM7.52505 7.0751H16.475L18.25 5.1001H5.75005L7.52505 7.0751ZM12 12.0751L14.8125 8.9501H9.18755L12 12.0751Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/Bathtub.tsx
+++ b/components/Icons/Bathtub.tsx
@@ -14,23 +14,10 @@ export default function BathtubIcon({ className, color, ...props }: IconProps) {
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3451"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3451)">
-        <path
-          d="M7.075 9.13755C6.54563 9.13755 6.09246 8.94906 5.71548 8.57207C5.33849 8.19511 5.15 7.74193 5.15 7.21255C5.15 6.68317 5.33849 6.22999 5.71548 5.85302C6.09246 5.47604 6.54563 5.28755 7.075 5.28755C7.60438 5.28755 8.05756 5.47604 8.43453 5.85302C8.81151 6.22999 9 6.68317 9 7.21255C9 7.74193 8.81151 8.19511 8.43453 8.57207C8.05756 8.94906 7.60438 9.13755 7.075 9.13755ZM5.125 21.75C4.84167 21.75 4.60417 21.6554 4.4125 21.4661C4.22083 21.2769 4.125 21.0423 4.125 20.7625C3.60937 20.7625 3.16796 20.579 2.80077 20.2118C2.43359 19.8446 2.25 19.4032 2.25 18.8875V13.9875C2.25 13.7292 2.34167 13.5084 2.525 13.325C2.70833 13.1417 2.92917 13.05 3.1875 13.05H5.175V12.3276C5.175 11.7176 5.38444 11.2021 5.80332 10.7813C6.22222 10.3605 6.73778 10.15 7.35 10.15C7.66667 10.15 7.96667 10.2125 8.25 10.3375C8.53333 10.4625 8.78333 10.6417 9 10.875L10.35 12.375C10.475 12.5 10.6 12.6209 10.725 12.7375C10.85 12.8542 10.9833 12.9584 11.125 13.05H17.875V5.00005C17.875 4.75642 17.7892 4.54759 17.6177 4.37357C17.4461 4.19956 17.2402 4.11255 17 4.11255C16.8941 4.11255 16.7926 4.13338 16.6956 4.17505C16.5985 4.21672 16.509 4.27869 16.4269 4.36097L15.1962 5.59522C15.2782 5.87497 15.2946 6.15061 15.2454 6.42215C15.1962 6.69368 15.0977 6.94465 14.95 7.17505L12.3 4.50005C12.5333 4.35005 12.7833 4.25422 13.05 4.21255C13.3167 4.17088 13.5833 4.20005 13.85 4.30005L15.075 3.06255C15.3323 2.80373 15.6258 2.60152 15.9554 2.45592C16.2851 2.31034 16.6348 2.23755 17.0047 2.23755C17.7766 2.23755 18.4271 2.50411 18.9563 3.03722C19.4854 3.57034 19.75 4.22462 19.75 5.00005V13.05H20.8125C21.0708 13.05 21.2917 13.1417 21.475 13.325C21.6583 13.5084 21.75 13.7292 21.75 13.9875V18.8875C21.75 19.4032 21.5664 19.8446 21.1992 20.2118C20.832 20.579 20.3906 20.7625 19.875 20.7625C19.875 21.0423 19.7792 21.2769 19.5875 21.4661C19.3958 21.6554 19.1583 21.75 18.875 21.75H5.125ZM4.125 18.8875H19.875V14.925H4.125V18.8875Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M7.075 9.13755C6.54563 9.13755 6.09246 8.94906 5.71548 8.57207C5.33849 8.19511 5.15 7.74193 5.15 7.21255C5.15 6.68317 5.33849 6.22999 5.71548 5.85302C6.09246 5.47604 6.54563 5.28755 7.075 5.28755C7.60438 5.28755 8.05756 5.47604 8.43453 5.85302C8.81151 6.22999 9 6.68317 9 7.21255C9 7.74193 8.81151 8.19511 8.43453 8.57207C8.05756 8.94906 7.60438 9.13755 7.075 9.13755ZM5.125 21.75C4.84167 21.75 4.60417 21.6554 4.4125 21.4661C4.22083 21.2769 4.125 21.0423 4.125 20.7625C3.60937 20.7625 3.16796 20.579 2.80077 20.2118C2.43359 19.8446 2.25 19.4032 2.25 18.8875V13.9875C2.25 13.7292 2.34167 13.5084 2.525 13.325C2.70833 13.1417 2.92917 13.05 3.1875 13.05H5.175V12.3276C5.175 11.7176 5.38444 11.2021 5.80332 10.7813C6.22222 10.3605 6.73778 10.15 7.35 10.15C7.66667 10.15 7.96667 10.2125 8.25 10.3375C8.53333 10.4625 8.78333 10.6417 9 10.875L10.35 12.375C10.475 12.5 10.6 12.6209 10.725 12.7375C10.85 12.8542 10.9833 12.9584 11.125 13.05H17.875V5.00005C17.875 4.75642 17.7892 4.54759 17.6177 4.37357C17.4461 4.19956 17.2402 4.11255 17 4.11255C16.8941 4.11255 16.7926 4.13338 16.6956 4.17505C16.5985 4.21672 16.509 4.27869 16.4269 4.36097L15.1962 5.59522C15.2782 5.87497 15.2946 6.15061 15.2454 6.42215C15.1962 6.69368 15.0977 6.94465 14.95 7.17505L12.3 4.50005C12.5333 4.35005 12.7833 4.25422 13.05 4.21255C13.3167 4.17088 13.5833 4.20005 13.85 4.30005L15.075 3.06255C15.3323 2.80373 15.6258 2.60152 15.9554 2.45592C16.2851 2.31034 16.6348 2.23755 17.0047 2.23755C17.7766 2.23755 18.4271 2.50411 18.9563 3.03722C19.4854 3.57034 19.75 4.22462 19.75 5.00005V13.05H20.8125C21.0708 13.05 21.2917 13.1417 21.475 13.325C21.6583 13.5084 21.75 13.7292 21.75 13.9875V18.8875C21.75 19.4032 21.5664 19.8446 21.1992 20.2118C20.832 20.579 20.3906 20.7625 19.875 20.7625C19.875 21.0423 19.7792 21.2769 19.5875 21.4661C19.3958 21.6554 19.1583 21.75 18.875 21.75H5.125ZM4.125 18.8875H19.875V14.925H4.125V18.8875Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/BedDouble.tsx
+++ b/components/Icons/BedDouble.tsx
@@ -18,23 +18,10 @@ export default function BedDoubleIcon({
      className={classNames}
      {...props}
    >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3418"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3418)">
-        <path
-          d="M3.25 17.8875V13C3.25 12.575 3.3375 12.1813 3.5125 11.8188C3.6875 11.4563 3.925 11.1417 4.225 10.875V8.17505C4.225 7.38338 4.50625 6.7063 5.06875 6.1438C5.63125 5.5813 6.30833 5.30005 7.1 5.30005H10.075C10.4417 5.30005 10.7875 5.37088 11.1125 5.51255C11.4375 5.65422 11.7333 5.85005 12 6.10005C12.2667 5.85005 12.5625 5.65422 12.8875 5.51255C13.2125 5.37088 13.5583 5.30005 13.925 5.30005H16.9C17.6917 5.30005 18.3687 5.5813 18.9312 6.1438C19.4937 6.7063 19.775 7.38338 19.775 8.17505V10.875C20.075 11.1417 20.3125 11.4563 20.4875 11.8188C20.6625 12.1813 20.75 12.575 20.75 13V17.8875C20.75 18.1459 20.6583 18.3667 20.475 18.55C20.2917 18.7334 20.0708 18.825 19.8125 18.825C19.5542 18.825 19.3333 18.7334 19.15 18.55C18.9667 18.3667 18.875 18.1459 18.875 17.8875V16.85H5.125V17.8875C5.125 18.1459 5.03333 18.3667 4.85 18.55C4.66667 18.7334 4.44583 18.825 4.1875 18.825C3.92917 18.825 3.70833 18.7334 3.525 18.55C3.34167 18.3667 3.25 18.1459 3.25 17.8875ZM12.95 10.15H17.9V8.17067C17.9 7.89026 17.8046 7.65422 17.6138 7.46255C17.423 7.27088 17.1866 7.17505 16.9046 7.17505H13.923C13.641 7.17505 13.4083 7.27088 13.225 7.46255C13.0417 7.65422 12.95 7.89172 12.95 8.17505V10.15ZM6.1 10.15H11.05V8.17067C11.05 7.89026 10.9583 7.65422 10.775 7.46255C10.5917 7.27088 10.359 7.17505 10.077 7.17505H7.0954C6.81337 7.17505 6.57696 7.27088 6.38618 7.46255C6.19539 7.65422 6.1 7.89172 6.1 8.17505V10.15ZM5.125 14.975H18.875V12.9957C18.875 12.7153 18.7833 12.4834 18.6 12.3C18.4167 12.1167 18.1852 12.025 17.9057 12.025H6.09427C5.81476 12.025 5.58333 12.1167 5.4 12.3C5.21667 12.4834 5.125 12.7153 5.125 12.9957V14.975Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.25 17.8875V13C3.25 12.575 3.3375 12.1813 3.5125 11.8188C3.6875 11.4563 3.925 11.1417 4.225 10.875V8.17505C4.225 7.38338 4.50625 6.7063 5.06875 6.1438C5.63125 5.5813 6.30833 5.30005 7.1 5.30005H10.075C10.4417 5.30005 10.7875 5.37088 11.1125 5.51255C11.4375 5.65422 11.7333 5.85005 12 6.10005C12.2667 5.85005 12.5625 5.65422 12.8875 5.51255C13.2125 5.37088 13.5583 5.30005 13.925 5.30005H16.9C17.6917 5.30005 18.3687 5.5813 18.9312 6.1438C19.4937 6.7063 19.775 7.38338 19.775 8.17505V10.875C20.075 11.1417 20.3125 11.4563 20.4875 11.8188C20.6625 12.1813 20.75 12.575 20.75 13V17.8875C20.75 18.1459 20.6583 18.3667 20.475 18.55C20.2917 18.7334 20.0708 18.825 19.8125 18.825C19.5542 18.825 19.3333 18.7334 19.15 18.55C18.9667 18.3667 18.875 18.1459 18.875 17.8875V16.85H5.125V17.8875C5.125 18.1459 5.03333 18.3667 4.85 18.55C4.66667 18.7334 4.44583 18.825 4.1875 18.825C3.92917 18.825 3.70833 18.7334 3.525 18.55C3.34167 18.3667 3.25 18.1459 3.25 17.8875ZM12.95 10.15H17.9V8.17067C17.9 7.89026 17.8046 7.65422 17.6138 7.46255C17.423 7.27088 17.1866 7.17505 16.9046 7.17505H13.923C13.641 7.17505 13.4083 7.27088 13.225 7.46255C13.0417 7.65422 12.95 7.89172 12.95 8.17505V10.15ZM6.1 10.15H11.05V8.17067C11.05 7.89026 10.9583 7.65422 10.775 7.46255C10.5917 7.27088 10.359 7.17505 10.077 7.17505H7.0954C6.81337 7.17505 6.57696 7.27088 6.38618 7.46255C6.19539 7.65422 6.1 7.89172 6.1 8.17505V10.15ZM5.125 14.975H18.875V12.9957C18.875 12.7153 18.7833 12.4834 18.6 12.3C18.4167 12.1167 18.1852 12.025 17.9057 12.025H6.09427C5.81476 12.025 5.58333 12.1167 5.4 12.3C5.21667 12.4834 5.125 12.7153 5.125 12.9957V14.975Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Biking.tsx
+++ b/components/Icons/Biking.tsx
@@ -14,23 +14,10 @@ export default function BikingIcon({ className, color, ...props }: IconProps) {
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_554_11969"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_554_11969)">
-        <path
-          d="M15.4125 5.5751C14.8875 5.5751 14.4354 5.38551 14.0562 5.00635C13.677 4.62718 13.4875 4.1751 13.4875 3.6501C13.4875 3.1251 13.677 2.67301 14.0562 2.29385C14.4354 1.91468 14.8875 1.7251 15.4125 1.7251C15.9375 1.7251 16.3895 1.91468 16.7687 2.29385C17.1479 2.67301 17.3375 3.1251 17.3375 3.6501C17.3375 4.1751 17.1479 4.62718 16.7687 5.00635C16.3895 5.38551 15.9375 5.5751 15.4125 5.5751ZM10.7875 10.4751L12.4375 12.2376C12.6041 12.4126 12.7291 12.6084 12.8125 12.8251C12.8958 13.0418 12.9375 13.2709 12.9375 13.5126V17.9126C12.9375 18.1709 12.8458 18.3918 12.6625 18.5751C12.4791 18.7584 12.2583 18.8501 12 18.8501C11.7416 18.8501 11.5208 18.7584 11.3375 18.5751C11.1541 18.3918 11.0625 18.1709 11.0625 17.9126V13.9501L7.86245 11.1501C7.65412 10.9668 7.5062 10.7688 7.4187 10.5563C7.3312 10.3438 7.28745 10.1001 7.28745 9.8251C7.28745 9.5501 7.33328 9.31052 7.42495 9.10635C7.51662 8.90218 7.66245 8.7001 7.86245 8.5001L10.6625 5.7251C10.8625 5.5251 11.0833 5.37926 11.325 5.2876C11.5666 5.19593 11.825 5.1501 12.1 5.1501C12.375 5.1501 12.6333 5.19593 12.875 5.2876C13.1166 5.37926 13.3375 5.5251 13.5375 5.7251L15.4125 7.6001C15.7541 7.94176 16.1395 8.23551 16.5687 8.48135C16.9979 8.72718 17.4791 8.89593 18.0125 8.9876C18.2708 9.02926 18.4895 9.14593 18.6687 9.3376C18.8479 9.52926 18.9375 9.75426 18.9375 10.0126C18.9375 10.2793 18.8416 10.5001 18.65 10.6751C18.4583 10.8501 18.2333 10.9209 17.975 10.8876C17.175 10.7793 16.4395 10.5501 15.7687 10.2001C15.0979 9.8501 14.5041 9.41677 13.9875 8.9001L13.175 8.0876L10.7875 10.4751ZM5.13745 12.0251C6.51245 12.0251 7.6687 12.4938 8.6062 13.4313C9.5437 14.3688 10.0125 15.5251 10.0125 16.9001C10.0125 18.2751 9.5437 19.4313 8.6062 20.3688C7.6687 21.3063 6.51245 21.7751 5.13745 21.7751C3.76245 21.7751 2.6062 21.3063 1.6687 20.3688C0.731201 19.4313 0.262451 18.2751 0.262451 16.9001C0.262451 15.5251 0.731201 14.3688 1.6687 13.4313C2.6062 12.4938 3.76245 12.0251 5.13745 12.0251ZM5.13745 20.3501C6.07912 20.3501 6.88953 20.0105 7.5687 19.3313C8.24787 18.6522 8.58745 17.8418 8.58745 16.9001C8.58745 15.9584 8.24787 15.148 7.5687 14.4688C6.88953 13.7897 6.07912 13.4501 5.13745 13.4501C4.19578 13.4501 3.38537 13.7897 2.7062 14.4688C2.02703 15.148 1.68745 15.9584 1.68745 16.9001C1.68745 17.8418 2.02703 18.6522 2.7062 19.3313C3.38537 20.0105 4.19578 20.3501 5.13745 20.3501ZM18.8375 12.0251C20.2125 12.0251 21.3729 12.4938 22.3187 13.4313C23.2645 14.3688 23.7375 15.5251 23.7375 16.9001C23.7375 18.2751 23.2645 19.4313 22.3187 20.3688C21.3729 21.3063 20.2125 21.7751 18.8375 21.7751C17.4625 21.7751 16.3104 21.3063 15.3812 20.3688C14.452 19.4313 13.9875 18.2751 13.9875 16.9001C13.9875 15.5251 14.452 14.3688 15.3812 13.4313C16.3104 12.4938 17.4625 12.0251 18.8375 12.0251ZM18.8625 20.3501C19.8041 20.3501 20.6145 20.0105 21.2937 19.3313C21.9729 18.6522 22.3125 17.8418 22.3125 16.9001C22.3125 15.9584 21.9729 15.148 21.2937 14.4688C20.6145 13.7897 19.8041 13.4501 18.8625 13.4501C17.9208 13.4501 17.1104 13.7897 16.4312 14.4688C15.752 15.148 15.4125 15.9584 15.4125 16.9001C15.4125 17.8418 15.752 18.6522 16.4312 19.3313C17.1104 20.0105 17.9208 20.3501 18.8625 20.3501Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M15.4125 5.5751C14.8875 5.5751 14.4354 5.38551 14.0562 5.00635C13.677 4.62718 13.4875 4.1751 13.4875 3.6501C13.4875 3.1251 13.677 2.67301 14.0562 2.29385C14.4354 1.91468 14.8875 1.7251 15.4125 1.7251C15.9375 1.7251 16.3895 1.91468 16.7687 2.29385C17.1479 2.67301 17.3375 3.1251 17.3375 3.6501C17.3375 4.1751 17.1479 4.62718 16.7687 5.00635C16.3895 5.38551 15.9375 5.5751 15.4125 5.5751ZM10.7875 10.4751L12.4375 12.2376C12.6041 12.4126 12.7291 12.6084 12.8125 12.8251C12.8958 13.0418 12.9375 13.2709 12.9375 13.5126V17.9126C12.9375 18.1709 12.8458 18.3918 12.6625 18.5751C12.4791 18.7584 12.2583 18.8501 12 18.8501C11.7416 18.8501 11.5208 18.7584 11.3375 18.5751C11.1541 18.3918 11.0625 18.1709 11.0625 17.9126V13.9501L7.86245 11.1501C7.65412 10.9668 7.5062 10.7688 7.4187 10.5563C7.3312 10.3438 7.28745 10.1001 7.28745 9.8251C7.28745 9.5501 7.33328 9.31052 7.42495 9.10635C7.51662 8.90218 7.66245 8.7001 7.86245 8.5001L10.6625 5.7251C10.8625 5.5251 11.0833 5.37926 11.325 5.2876C11.5666 5.19593 11.825 5.1501 12.1 5.1501C12.375 5.1501 12.6333 5.19593 12.875 5.2876C13.1166 5.37926 13.3375 5.5251 13.5375 5.7251L15.4125 7.6001C15.7541 7.94176 16.1395 8.23551 16.5687 8.48135C16.9979 8.72718 17.4791 8.89593 18.0125 8.9876C18.2708 9.02926 18.4895 9.14593 18.6687 9.3376C18.8479 9.52926 18.9375 9.75426 18.9375 10.0126C18.9375 10.2793 18.8416 10.5001 18.65 10.6751C18.4583 10.8501 18.2333 10.9209 17.975 10.8876C17.175 10.7793 16.4395 10.5501 15.7687 10.2001C15.0979 9.8501 14.5041 9.41677 13.9875 8.9001L13.175 8.0876L10.7875 10.4751ZM5.13745 12.0251C6.51245 12.0251 7.6687 12.4938 8.6062 13.4313C9.5437 14.3688 10.0125 15.5251 10.0125 16.9001C10.0125 18.2751 9.5437 19.4313 8.6062 20.3688C7.6687 21.3063 6.51245 21.7751 5.13745 21.7751C3.76245 21.7751 2.6062 21.3063 1.6687 20.3688C0.731201 19.4313 0.262451 18.2751 0.262451 16.9001C0.262451 15.5251 0.731201 14.3688 1.6687 13.4313C2.6062 12.4938 3.76245 12.0251 5.13745 12.0251ZM5.13745 20.3501C6.07912 20.3501 6.88953 20.0105 7.5687 19.3313C8.24787 18.6522 8.58745 17.8418 8.58745 16.9001C8.58745 15.9584 8.24787 15.148 7.5687 14.4688C6.88953 13.7897 6.07912 13.4501 5.13745 13.4501C4.19578 13.4501 3.38537 13.7897 2.7062 14.4688C2.02703 15.148 1.68745 15.9584 1.68745 16.9001C1.68745 17.8418 2.02703 18.6522 2.7062 19.3313C3.38537 20.0105 4.19578 20.3501 5.13745 20.3501ZM18.8375 12.0251C20.2125 12.0251 21.3729 12.4938 22.3187 13.4313C23.2645 14.3688 23.7375 15.5251 23.7375 16.9001C23.7375 18.2751 23.2645 19.4313 22.3187 20.3688C21.3729 21.3063 20.2125 21.7751 18.8375 21.7751C17.4625 21.7751 16.3104 21.3063 15.3812 20.3688C14.452 19.4313 13.9875 18.2751 13.9875 16.9001C13.9875 15.5251 14.452 14.3688 15.3812 13.4313C16.3104 12.4938 17.4625 12.0251 18.8375 12.0251ZM18.8625 20.3501C19.8041 20.3501 20.6145 20.0105 21.2937 19.3313C21.9729 18.6522 22.3125 17.8418 22.3125 16.9001C22.3125 15.9584 21.9729 15.148 21.2937 14.4688C20.6145 13.7897 19.8041 13.4501 18.8625 13.4501C17.9208 13.4501 17.1104 13.7897 16.4312 14.4688C15.752 15.148 15.4125 15.9584 15.4125 16.9001C15.4125 17.8418 15.752 18.6522 16.4312 19.3313C17.1104 20.0105 17.9208 20.3501 18.8625 20.3501Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/Breakfast.tsx
+++ b/components/Icons/Breakfast.tsx
@@ -18,23 +18,10 @@ export default function BreakfastIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        height="33"
-        id="mask0_5171_13483"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="32"
-        x="0"
-        y="0"
-      >
-        <rect y="0.5" width="32" height="32" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_5171_13483)">
-        <path
-          d="M3 27H21.2167V28.25C21.2167 28.5944 21.0944 28.8889 20.85 29.1333C20.6056 29.3778 20.3111 29.5 19.9667 29.5H4.25C3.90556 29.5 3.61111 29.3778 3.36667 29.1333C3.12222 28.8889 3 28.5944 3 28.25V27ZM3 24.4333V23.1833C3 22.8389 3.12222 22.5444 3.36667 22.3C3.61111 22.0556 3.90556 21.9333 4.25 21.9333H9.53333V20.75C9.53333 20.4056 9.65556 20.1111 9.9 19.8667C10.1444 19.6222 10.4389 19.5 10.7833 19.5H13.4333C13.7778 19.5 14.0722 19.6222 14.3167 19.8667C14.5611 20.1111 14.6833 20.4056 14.6833 20.75V21.9333H19.9667C20.3111 21.9333 20.6056 22.0556 20.85 22.3C21.0944 22.5444 21.2167 22.8389 21.2167 23.1833V24.4333H3ZM23.9167 21.4667C23.15 20.6444 22.5278 19.7889 22.05 18.9C21.5722 18.0111 21.3333 16.9556 21.3333 15.7333V4.75C21.3333 4.40556 21.4556 4.11111 21.7 3.86667C21.9444 3.62222 22.2389 3.5 22.5833 3.5H27.75C28.0944 3.5 28.3889 3.62222 28.6333 3.86667C28.8778 4.11111 29 4.40556 29 4.75V15.7333C29 16.9556 28.7639 18.0139 28.2917 18.9083C27.8194 19.8028 27.1944 20.6556 26.4167 21.4667V27H27.7167C28.0611 27 28.3556 27.1222 28.6 27.3667C28.8444 27.6111 28.9667 27.9056 28.9667 28.25C28.9667 28.5944 28.8444 28.8889 28.6 29.1333C28.3556 29.3778 28.0611 29.5 27.7167 29.5H25.1667C24.8222 29.5 24.5278 29.3778 24.2833 29.1333C24.0389 28.8889 23.9167 28.5944 23.9167 28.25V21.4667ZM23.8333 11.3H26.5V6H23.8333V11.3ZM25.1667 19.1667C25.5667 18.7111 25.8889 18.1806 26.1333 17.575C26.3778 16.9694 26.5 16.3556 26.5 15.7333V13.8H23.8333V15.7333C23.8333 16.3556 23.95 16.9694 24.1833 17.575C24.4167 18.1806 24.7444 18.7111 25.1667 19.1667Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3 27H21.2167V28.25C21.2167 28.5944 21.0944 28.8889 20.85 29.1333C20.6056 29.3778 20.3111 29.5 19.9667 29.5H4.25C3.90556 29.5 3.61111 29.3778 3.36667 29.1333C3.12222 28.8889 3 28.5944 3 28.25V27ZM3 24.4333V23.1833C3 22.8389 3.12222 22.5444 3.36667 22.3C3.61111 22.0556 3.90556 21.9333 4.25 21.9333H9.53333V20.75C9.53333 20.4056 9.65556 20.1111 9.9 19.8667C10.1444 19.6222 10.4389 19.5 10.7833 19.5H13.4333C13.7778 19.5 14.0722 19.6222 14.3167 19.8667C14.5611 20.1111 14.6833 20.4056 14.6833 20.75V21.9333H19.9667C20.3111 21.9333 20.6056 22.0556 20.85 22.3C21.0944 22.5444 21.2167 22.8389 21.2167 23.1833V24.4333H3ZM23.9167 21.4667C23.15 20.6444 22.5278 19.7889 22.05 18.9C21.5722 18.0111 21.3333 16.9556 21.3333 15.7333V4.75C21.3333 4.40556 21.4556 4.11111 21.7 3.86667C21.9444 3.62222 22.2389 3.5 22.5833 3.5H27.75C28.0944 3.5 28.3889 3.62222 28.6333 3.86667C28.8778 4.11111 29 4.40556 29 4.75V15.7333C29 16.9556 28.7639 18.0139 28.2917 18.9083C27.8194 19.8028 27.1944 20.6556 26.4167 21.4667V27H27.7167C28.0611 27 28.3556 27.1222 28.6 27.3667C28.8444 27.6111 28.9667 27.9056 28.9667 28.25C28.9667 28.5944 28.8444 28.8889 28.6 29.1333C28.3556 29.3778 28.0611 29.5 27.7167 29.5H25.1667C24.8222 29.5 24.5278 29.3778 24.2833 29.1333C24.0389 28.8889 23.9167 28.5944 23.9167 28.25V21.4667ZM23.8333 11.3H26.5V6H23.8333V11.3ZM25.1667 19.1667C25.5667 18.7111 25.8889 18.1806 26.1333 17.575C26.3778 16.9694 26.5 16.3556 26.5 15.7333V13.8H23.8333V15.7333C23.8333 16.3556 23.95 16.9694 24.1833 17.575C24.4167 18.1806 24.7444 18.7111 25.1667 19.1667Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Business.tsx
+++ b/components/Icons/Business.tsx
@@ -18,23 +18,10 @@ export default function BusinessIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_69_3397"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3397)">
-        <path
-          d="M4.125 20.75C3.60937 20.75 3.16796 20.5664 2.80077 20.1992C2.43359 19.832 2.25 19.3906 2.25 18.875V7.875C2.25 7.35937 2.43359 6.91796 2.80077 6.55078C3.16796 6.18359 3.60937 6 4.125 6H8.15V4.1239C8.15 3.60797 8.33359 3.16667 8.70078 2.8C9.06796 2.43333 9.50937 2.25 10.025 2.25H13.975C14.4906 2.25 14.932 2.43359 15.2992 2.80078C15.6664 3.16796 15.85 3.60937 15.85 4.125V6H19.875C20.3906 6 20.832 6.18359 21.1992 6.55078C21.5664 6.91796 21.75 7.35937 21.75 7.875V18.875C21.75 19.3906 21.5664 19.832 21.1992 20.1992C20.832 20.5664 20.3906 20.75 19.875 20.75H4.125ZM10.025 6H13.975V4.125H10.025V6ZM19.875 14.925H14.8625V15.9125C14.8625 16.1708 14.7708 16.3917 14.5875 16.575C14.4042 16.7583 14.1833 16.85 13.925 16.85H10.075C9.81667 16.85 9.59583 16.7583 9.4125 16.575C9.22917 16.3917 9.1375 16.1708 9.1375 15.9125V14.925H4.125V18.875H19.875V14.925ZM11.0125 14.975H12.9875V13H11.0125V14.975ZM4.125 13.05H9.1375V12.0625C9.1375 11.8042 9.22917 11.5833 9.4125 11.4C9.59583 11.2167 9.81667 11.125 10.075 11.125H13.925C14.1833 11.125 14.4042 11.2167 14.5875 11.4C14.7708 11.5833 14.8625 11.8042 14.8625 12.0625V13.05H19.875V7.875H4.125V13.05Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M4.125 20.75C3.60937 20.75 3.16796 20.5664 2.80077 20.1992C2.43359 19.832 2.25 19.3906 2.25 18.875V7.875C2.25 7.35937 2.43359 6.91796 2.80077 6.55078C3.16796 6.18359 3.60937 6 4.125 6H8.15V4.1239C8.15 3.60797 8.33359 3.16667 8.70078 2.8C9.06796 2.43333 9.50937 2.25 10.025 2.25H13.975C14.4906 2.25 14.932 2.43359 15.2992 2.80078C15.6664 3.16796 15.85 3.60937 15.85 4.125V6H19.875C20.3906 6 20.832 6.18359 21.1992 6.55078C21.5664 6.91796 21.75 7.35937 21.75 7.875V18.875C21.75 19.3906 21.5664 19.832 21.1992 20.1992C20.832 20.5664 20.3906 20.75 19.875 20.75H4.125ZM10.025 6H13.975V4.125H10.025V6ZM19.875 14.925H14.8625V15.9125C14.8625 16.1708 14.7708 16.3917 14.5875 16.575C14.4042 16.7583 14.1833 16.85 13.925 16.85H10.075C9.81667 16.85 9.59583 16.7583 9.4125 16.575C9.22917 16.3917 9.1375 16.1708 9.1375 15.9125V14.925H4.125V18.875H19.875V14.925ZM11.0125 14.975H12.9875V13H11.0125V14.975ZM4.125 13.05H9.1375V12.0625C9.1375 11.8042 9.22917 11.5833 9.4125 11.4C9.59583 11.2167 9.81667 11.125 10.075 11.125H13.925C14.1833 11.125 14.4042 11.2167 14.5875 11.4C14.7708 11.5833 14.8625 11.8042 14.8625 12.0625V13.05H19.875V7.875H4.125V13.05Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Calendar.tsx
+++ b/components/Icons/Calendar.tsx
@@ -18,23 +18,10 @@ export default function CalendarIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        height="20"
-        id="mask0_1572_4288"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="20"
-        x="0"
-        y="0"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_1572_4288)">
-        <path
-          d="M4.5 18C4.0875 18 3.73437 17.8507 3.44062 17.5521C3.14687 17.2535 3 16.9028 3 16.5V5.5C3 5.09722 3.14687 4.74653 3.44062 4.44792C3.73437 4.14931 4.0875 4 4.5 4H6V2.75C6 2.5375 6.07145 2.35937 6.21435 2.21562C6.35727 2.07187 6.53435 2 6.7456 2C6.95687 2 7.13542 2.07187 7.28125 2.21562C7.42708 2.35937 7.5 2.5375 7.5 2.75V4H12.5V2.75C12.5 2.5375 12.5715 2.35937 12.7144 2.21562C12.8573 2.07187 13.0344 2 13.2456 2C13.4569 2 13.6354 2.07187 13.7812 2.21562C13.9271 2.35937 14 2.5375 14 2.75V4H15.5C15.9125 4 16.2656 4.14931 16.5594 4.44792C16.8531 4.74653 17 5.09722 17 5.5V16.5C17 16.9028 16.8531 17.2535 16.5594 17.5521C16.2656 17.8507 15.9125 18 15.5 18H4.5ZM4.5 16.5H15.5V9H4.5V16.5ZM4.5 7.5H15.5V5.5H4.5V7.5ZM10.0044 12C9.79313 12 9.61458 11.9285 9.46875 11.7856C9.32292 11.6427 9.25 11.4656 9.25 11.2544C9.25 11.0431 9.32145 10.8646 9.46435 10.7188C9.60727 10.5729 9.78435 10.5 9.9956 10.5C10.2069 10.5 10.3854 10.5715 10.5312 10.7144C10.6771 10.8573 10.75 11.0344 10.75 11.2456C10.75 11.4569 10.6785 11.6354 10.5356 11.7812C10.3927 11.9271 10.2156 12 10.0044 12ZM6.7544 12C6.54313 12 6.36458 11.9285 6.21875 11.7856C6.07292 11.6427 6 11.4656 6 11.2544C6 11.0431 6.07145 10.8646 6.21435 10.7188C6.35727 10.5729 6.53435 10.5 6.7456 10.5C6.95687 10.5 7.13542 10.5715 7.28125 10.7144C7.42708 10.8573 7.5 11.0344 7.5 11.2456C7.5 11.4569 7.42855 11.6354 7.28565 11.7812C7.14273 11.9271 6.96565 12 6.7544 12ZM13.2544 12C13.0431 12 12.8646 11.9285 12.7188 11.7856C12.5729 11.6427 12.5 11.4656 12.5 11.2544C12.5 11.0431 12.5715 10.8646 12.7144 10.7188C12.8573 10.5729 13.0344 10.5 13.2456 10.5C13.4569 10.5 13.6354 10.5715 13.7812 10.7144C13.9271 10.8573 14 11.0344 14 11.2456C14 11.4569 13.9285 11.6354 13.7856 11.7812C13.6427 11.9271 13.4656 12 13.2544 12ZM10.0044 15C9.79313 15 9.61458 14.9285 9.46875 14.7856C9.32292 14.6427 9.25 14.4656 9.25 14.2544C9.25 14.0431 9.32145 13.8646 9.46435 13.7188C9.60727 13.5729 9.78435 13.5 9.9956 13.5C10.2069 13.5 10.3854 13.5715 10.5312 13.7144C10.6771 13.8573 10.75 14.0344 10.75 14.2456C10.75 14.4569 10.6785 14.6354 10.5356 14.7812C10.3927 14.9271 10.2156 15 10.0044 15ZM6.7544 15C6.54313 15 6.36458 14.9285 6.21875 14.7856C6.07292 14.6427 6 14.4656 6 14.2544C6 14.0431 6.07145 13.8646 6.21435 13.7188C6.35727 13.5729 6.53435 13.5 6.7456 13.5C6.95687 13.5 7.13542 13.5715 7.28125 13.7144C7.42708 13.8573 7.5 14.0344 7.5 14.2456C7.5 14.4569 7.42855 14.6354 7.28565 14.7812C7.14273 14.9271 6.96565 15 6.7544 15ZM13.2544 15C13.0431 15 12.8646 14.9285 12.7188 14.7856C12.5729 14.6427 12.5 14.4656 12.5 14.2544C12.5 14.0431 12.5715 13.8646 12.7144 13.7188C12.8573 13.5729 13.0344 13.5 13.2456 13.5C13.4569 13.5 13.6354 13.5715 13.7812 13.7144C13.9271 13.8573 14 14.0344 14 14.2456C14 14.4569 13.9285 14.6354 13.7856 14.7812C13.6427 14.9271 13.4656 15 13.2544 15Z"
-          fill="#1C1B1F"
-        />
-      </g>
+      <path
+        d="M4.5 18C4.0875 18 3.73437 17.8507 3.44062 17.5521C3.14687 17.2535 3 16.9028 3 16.5V5.5C3 5.09722 3.14687 4.74653 3.44062 4.44792C3.73437 4.14931 4.0875 4 4.5 4H6V2.75C6 2.5375 6.07145 2.35937 6.21435 2.21562C6.35727 2.07187 6.53435 2 6.7456 2C6.95687 2 7.13542 2.07187 7.28125 2.21562C7.42708 2.35937 7.5 2.5375 7.5 2.75V4H12.5V2.75C12.5 2.5375 12.5715 2.35937 12.7144 2.21562C12.8573 2.07187 13.0344 2 13.2456 2C13.4569 2 13.6354 2.07187 13.7812 2.21562C13.9271 2.35937 14 2.5375 14 2.75V4H15.5C15.9125 4 16.2656 4.14931 16.5594 4.44792C16.8531 4.74653 17 5.09722 17 5.5V16.5C17 16.9028 16.8531 17.2535 16.5594 17.5521C16.2656 17.8507 15.9125 18 15.5 18H4.5ZM4.5 16.5H15.5V9H4.5V16.5ZM4.5 7.5H15.5V5.5H4.5V7.5ZM10.0044 12C9.79313 12 9.61458 11.9285 9.46875 11.7856C9.32292 11.6427 9.25 11.4656 9.25 11.2544C9.25 11.0431 9.32145 10.8646 9.46435 10.7188C9.60727 10.5729 9.78435 10.5 9.9956 10.5C10.2069 10.5 10.3854 10.5715 10.5312 10.7144C10.6771 10.8573 10.75 11.0344 10.75 11.2456C10.75 11.4569 10.6785 11.6354 10.5356 11.7812C10.3927 11.9271 10.2156 12 10.0044 12ZM6.7544 12C6.54313 12 6.36458 11.9285 6.21875 11.7856C6.07292 11.6427 6 11.4656 6 11.2544C6 11.0431 6.07145 10.8646 6.21435 10.7188C6.35727 10.5729 6.53435 10.5 6.7456 10.5C6.95687 10.5 7.13542 10.5715 7.28125 10.7144C7.42708 10.8573 7.5 11.0344 7.5 11.2456C7.5 11.4569 7.42855 11.6354 7.28565 11.7812C7.14273 11.9271 6.96565 12 6.7544 12ZM13.2544 12C13.0431 12 12.8646 11.9285 12.7188 11.7856C12.5729 11.6427 12.5 11.4656 12.5 11.2544C12.5 11.0431 12.5715 10.8646 12.7144 10.7188C12.8573 10.5729 13.0344 10.5 13.2456 10.5C13.4569 10.5 13.6354 10.5715 13.7812 10.7144C13.9271 10.8573 14 11.0344 14 11.2456C14 11.4569 13.9285 11.6354 13.7856 11.7812C13.6427 11.9271 13.4656 12 13.2544 12ZM10.0044 15C9.79313 15 9.61458 14.9285 9.46875 14.7856C9.32292 14.6427 9.25 14.4656 9.25 14.2544C9.25 14.0431 9.32145 13.8646 9.46435 13.7188C9.60727 13.5729 9.78435 13.5 9.9956 13.5C10.2069 13.5 10.3854 13.5715 10.5312 13.7144C10.6771 13.8573 10.75 14.0344 10.75 14.2456C10.75 14.4569 10.6785 14.6354 10.5356 14.7812C10.3927 14.9271 10.2156 15 10.0044 15ZM6.7544 15C6.54313 15 6.36458 14.9285 6.21875 14.7856C6.07292 14.6427 6 14.4656 6 14.2544C6 14.0431 6.07145 13.8646 6.21435 13.7188C6.35727 13.5729 6.53435 13.5 6.7456 13.5C6.95687 13.5 7.13542 13.5715 7.28125 13.7144C7.42708 13.8573 7.5 14.0344 7.5 14.2456C7.5 14.4569 7.42855 14.6354 7.28565 14.7812C7.14273 14.9271 6.96565 15 6.7544 15ZM13.2544 15C13.0431 15 12.8646 14.9285 12.7188 14.7856C12.5729 14.6427 12.5 14.4656 12.5 14.2544C12.5 14.0431 12.5715 13.8646 12.7144 13.7188C12.8573 13.5729 13.0344 13.5 13.2456 13.5C13.4569 13.5 13.6354 13.5715 13.7812 13.7144C13.9271 13.8573 14 14.0344 14 14.2456C14 14.4569 13.9285 14.6354 13.7856 14.7812C13.6427 14.9271 13.4656 15 13.2544 15Z"
+        fill="#1C1B1F"
+      />
    </svg>
  )
 }
--- a/components/Icons/Camera.tsx
+++ b/components/Icons/Camera.tsx
@@ -14,23 +14,10 @@ export default function CameraIcon({ className, color, ...props }: IconProps) {
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_69_3288"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3288)">
-        <path
-          d="M12 17.375C13.225 17.375 14.2625 16.95 15.1125 16.1C15.9625 15.25 16.3875 14.2125 16.3875 12.9875C16.3875 11.7625 15.9625 10.725 15.1125 9.875C14.2625 9.025 13.225 8.6 12 8.6C10.775 8.6 9.7375 9.025 8.8875 9.875C8.0375 10.725 7.6125 11.7625 7.6125 12.9875C7.6125 14.2125 8.0375 15.25 8.8875 16.1C9.7375 16.95 10.775 17.375 12 17.375ZM11.9949 15.5C11.29 15.5 10.6958 15.2583 10.2125 14.775C9.72917 14.2917 9.4875 13.6975 9.4875 12.9926C9.4875 12.2877 9.72917 11.6918 10.2125 11.2051C10.6958 10.7184 11.29 10.475 11.9949 10.475C12.6998 10.475 13.2957 10.7184 13.7824 11.2051C14.2691 11.6918 14.5125 12.2877 14.5125 12.9926C14.5125 13.6975 14.2691 14.2917 13.7824 14.775C13.2957 15.2583 12.6998 15.5 11.9949 15.5ZM4.125 20.75C3.60937 20.75 3.16796 20.5664 2.80077 20.1992C2.43359 19.832 2.25 19.3906 2.25 18.875V7.1125C2.25 6.59687 2.43359 6.15546 2.80077 5.78828C3.16796 5.42109 3.60937 5.2375 4.125 5.2375H7.275L8.5125 3.875C8.68652 3.6827 8.89613 3.53046 9.14133 3.41828C9.38651 3.30609 9.64357 3.25 9.9125 3.25H14.0875C14.3564 3.25 14.6135 3.30609 14.8587 3.41828C15.1039 3.53046 15.3135 3.6827 15.4875 3.875L16.725 5.2375H19.875C20.3906 5.2375 20.832 5.42109 21.1992 5.78828C21.5664 6.15546 21.75 6.59687 21.75 7.1125V18.875C21.75 19.3906 21.5664 19.832 21.1992 20.1992C20.832 20.5664 20.3906 20.75 19.875 20.75H4.125ZM4.125 18.875H19.875V7.1125H15.8853L14.0875 5.125H9.9162L8.125 7.1125H4.125V18.875Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M12 17.375C13.225 17.375 14.2625 16.95 15.1125 16.1C15.9625 15.25 16.3875 14.2125 16.3875 12.9875C16.3875 11.7625 15.9625 10.725 15.1125 9.875C14.2625 9.025 13.225 8.6 12 8.6C10.775 8.6 9.7375 9.025 8.8875 9.875C8.0375 10.725 7.6125 11.7625 7.6125 12.9875C7.6125 14.2125 8.0375 15.25 8.8875 16.1C9.7375 16.95 10.775 17.375 12 17.375ZM11.9949 15.5C11.29 15.5 10.6958 15.2583 10.2125 14.775C9.72917 14.2917 9.4875 13.6975 9.4875 12.9926C9.4875 12.2877 9.72917 11.6918 10.2125 11.2051C10.6958 10.7184 11.29 10.475 11.9949 10.475C12.6998 10.475 13.2957 10.7184 13.7824 11.2051C14.2691 11.6918 14.5125 12.2877 14.5125 12.9926C14.5125 13.6975 14.2691 14.2917 13.7824 14.775C13.2957 15.2583 12.6998 15.5 11.9949 15.5ZM4.125 20.75C3.60937 20.75 3.16796 20.5664 2.80077 20.1992C2.43359 19.832 2.25 19.3906 2.25 18.875V7.1125C2.25 6.59687 2.43359 6.15546 2.80077 5.78828C3.16796 5.42109 3.60937 5.2375 4.125 5.2375H7.275L8.5125 3.875C8.68652 3.6827 8.89613 3.53046 9.14133 3.41828C9.38651 3.30609 9.64357 3.25 9.9125 3.25H14.0875C14.3564 3.25 14.6135 3.30609 14.8587 3.41828C15.1039 3.53046 15.3135 3.6827 15.4875 3.875L16.725 5.2375H19.875C20.3906 5.2375 20.832 5.42109 21.1992 5.78828C21.5664 6.15546 21.75 6.59687 21.75 7.1125V18.875C21.75 19.3906 21.5664 19.832 21.1992 20.1992C20.832 20.5664 20.3906 20.75 19.875 20.75H4.125ZM4.125 18.875H19.875V7.1125H15.8853L14.0875 5.125H9.9162L8.125 7.1125H4.125V18.875Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Cellphone.tsx
+++ b/components/Icons/Cellphone.tsx
@@ -18,23 +18,10 @@ export default function CellphoneIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        height="20"
-        id="mask0_58_5381"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="21"
-        x="0"
-        y="0"
-      >
-        <rect x="0.449219" width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_58_5381)">
-        <path
-          d="M6.20694 18.5831C5.83183 18.5831 5.51476 18.4536 5.25573 18.1946C4.9967 17.9356 4.86719 17.6185 4.86719 17.2434V2.75625C4.86719 2.38114 4.9967 2.06407 5.25573 1.80505C5.51476 1.54602 5.83183 1.4165 6.20694 1.4165H14.6941C15.0692 1.4165 15.3862 1.54602 15.6453 1.80505C15.9043 2.06407 16.0338 2.38114 16.0338 2.75625V17.2434C16.0338 17.6185 15.9043 17.9356 15.6453 18.1946C15.3862 18.4536 15.0692 18.5831 14.6941 18.5831H6.20694ZM5.9505 16.2915V17.2434C5.9505 17.3075 5.97721 17.3663 6.03063 17.4197C6.08406 17.4731 6.14283 17.4998 6.20694 17.4998H14.6941C14.7582 17.4998 14.8169 17.4731 14.8704 17.4197C14.9238 17.3663 14.9505 17.3075 14.9505 17.2434V16.2915H5.9505ZM5.9505 15.2082H14.9505V4.79146H5.9505V15.2082ZM5.9505 3.70817H14.9505V2.75625C14.9505 2.69214 14.9238 2.63337 14.8704 2.57994C14.8169 2.52653 14.7582 2.49982 14.6941 2.49982H6.20694C6.14283 2.49982 6.08406 2.52653 6.03063 2.57994C5.97721 2.63337 5.9505 2.69214 5.9505 2.75625V3.70817Z"
-          fill="#1C1B1F"
-        />
-      </g>
+      <path
+        d="M6.20694 18.5831C5.83183 18.5831 5.51476 18.4536 5.25573 18.1946C4.9967 17.9356 4.86719 17.6185 4.86719 17.2434V2.75625C4.86719 2.38114 4.9967 2.06407 5.25573 1.80505C5.51476 1.54602 5.83183 1.4165 6.20694 1.4165H14.6941C15.0692 1.4165 15.3862 1.54602 15.6453 1.80505C15.9043 2.06407 16.0338 2.38114 16.0338 2.75625V17.2434C16.0338 17.6185 15.9043 17.9356 15.6453 18.1946C15.3862 18.4536 15.0692 18.5831 14.6941 18.5831H6.20694ZM5.9505 16.2915V17.2434C5.9505 17.3075 5.97721 17.3663 6.03063 17.4197C6.08406 17.4731 6.14283 17.4998 6.20694 17.4998H14.6941C14.7582 17.4998 14.8169 17.4731 14.8704 17.4197C14.9238 17.3663 14.9505 17.3075 14.9505 17.2434V16.2915H5.9505ZM5.9505 15.2082H14.9505V4.79146H5.9505V15.2082ZM5.9505 3.70817H14.9505V2.75625C14.9505 2.69214 14.9238 2.63337 14.8704 2.57994C14.8169 2.52653 14.7582 2.49982 14.6941 2.49982H6.20694C6.14283 2.49982 6.08406 2.52653 6.03063 2.57994C5.97721 2.63337 5.9505 2.69214 5.9505 2.75625V3.70817Z"
+        fill="#1C1B1F"
+      />
    </svg>
  )
 }
--- a/components/Icons/Chair.tsx
+++ b/components/Icons/Chair.tsx
@@ -14,23 +14,10 @@ export default function ChairIcon({ className, color, ...props }: IconProps) {
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3444"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3444)">
-        <path
-          d="M5.1202 20.7C4.85675 20.7 4.63336 20.6113 4.45002 20.4341C4.26669 20.2568 4.17502 20.0371 4.17502 19.775V18.775H4.12502C3.33336 18.775 2.66044 18.4979 2.10627 17.9437C1.55211 17.3896 1.27502 16.7166 1.27502 15.925V11C1.27502 10.1916 1.55419 9.51456 2.11252 8.96873C2.67086 8.42289 3.34169 8.14998 4.12502 8.14998V6.19998C4.12502 5.40831 4.40627 4.73539 4.96877 4.18123C5.53127 3.62706 6.20836 3.34998 7.00002 3.34998H17.025C17.8167 3.34998 18.4938 3.62706 19.0563 4.18123C19.6188 4.73539 19.9 5.40831 19.9 6.19998V8.14998C20.6917 8.14998 21.3646 8.42706 21.9188 8.98123C22.4729 9.53539 22.75 10.2083 22.75 11V15.925C22.75 16.7166 22.4729 17.3896 21.9188 17.9437C21.3646 18.4979 20.6917 18.775 19.9 18.775H19.85V19.775C19.85 20.0371 19.759 20.2568 19.5769 20.4341C19.3948 20.6113 19.1692 20.7 18.9 20.7C18.6379 20.7 18.4183 20.6113 18.241 20.4341C18.0637 20.2568 17.975 20.0371 17.975 19.775V18.775H6.05002V19.775C6.05002 20.0333 5.96092 20.2521 5.7827 20.4312C5.60448 20.6104 5.38365 20.7 5.1202 20.7ZM4.12502 16.9H19.9C20.1667 16.9 20.3959 16.8083 20.5875 16.625C20.7792 16.4416 20.875 16.2101 20.875 15.9304V10.9945C20.875 10.7148 20.7792 10.4833 20.5875 10.3C20.3959 10.1166 20.1667 10.025 19.9 10.025C19.6167 10.025 19.3792 10.1166 19.1875 10.3C18.9959 10.4833 18.9 10.7166 18.9 11V14.9H5.12502V11C5.12502 10.7166 5.02919 10.4833 4.83752 10.3C4.64586 10.1166 4.40836 10.025 4.12502 10.025C3.85836 10.025 3.62919 10.1166 3.43752 10.3C3.24586 10.4833 3.15002 10.7148 3.15002 10.9945V15.9304C3.15002 16.2101 3.24586 16.4416 3.43752 16.625C3.62919 16.8083 3.85836 16.9 4.12502 16.9ZM7.00002 13.025H17.025V11C17.025 10.5583 17.1167 10.1604 17.3 9.80623C17.4834 9.45206 17.725 9.1401 18.025 8.87035V6.2046C18.025 5.93485 17.929 5.70414 17.7369 5.51248C17.5449 5.32081 17.3069 5.22498 17.0229 5.22498H7.0021C6.71818 5.22498 6.48019 5.32081 6.28812 5.51248C6.09606 5.70414 6.00002 5.93505 6.00002 6.2052V8.87498C6.30002 9.14164 6.54169 9.45206 6.72502 9.80623C6.90836 10.1604 7.00002 10.5583 7.00002 11V13.025Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M5.1202 20.7C4.85675 20.7 4.63336 20.6113 4.45002 20.4341C4.26669 20.2568 4.17502 20.0371 4.17502 19.775V18.775H4.12502C3.33336 18.775 2.66044 18.4979 2.10627 17.9437C1.55211 17.3896 1.27502 16.7166 1.27502 15.925V11C1.27502 10.1916 1.55419 9.51456 2.11252 8.96873C2.67086 8.42289 3.34169 8.14998 4.12502 8.14998V6.19998C4.12502 5.40831 4.40627 4.73539 4.96877 4.18123C5.53127 3.62706 6.20836 3.34998 7.00002 3.34998H17.025C17.8167 3.34998 18.4938 3.62706 19.0563 4.18123C19.6188 4.73539 19.9 5.40831 19.9 6.19998V8.14998C20.6917 8.14998 21.3646 8.42706 21.9188 8.98123C22.4729 9.53539 22.75 10.2083 22.75 11V15.925C22.75 16.7166 22.4729 17.3896 21.9188 17.9437C21.3646 18.4979 20.6917 18.775 19.9 18.775H19.85V19.775C19.85 20.0371 19.759 20.2568 19.5769 20.4341C19.3948 20.6113 19.1692 20.7 18.9 20.7C18.6379 20.7 18.4183 20.6113 18.241 20.4341C18.0637 20.2568 17.975 20.0371 17.975 19.775V18.775H6.05002V19.775C6.05002 20.0333 5.96092 20.2521 5.7827 20.4312C5.60448 20.6104 5.38365 20.7 5.1202 20.7ZM4.12502 16.9H19.9C20.1667 16.9 20.3959 16.8083 20.5875 16.625C20.7792 16.4416 20.875 16.2101 20.875 15.9304V10.9945C20.875 10.7148 20.7792 10.4833 20.5875 10.3C20.3959 10.1166 20.1667 10.025 19.9 10.025C19.6167 10.025 19.3792 10.1166 19.1875 10.3C18.9959 10.4833 18.9 10.7166 18.9 11V14.9H5.12502V11C5.12502 10.7166 5.02919 10.4833 4.83752 10.3C4.64586 10.1166 4.40836 10.025 4.12502 10.025C3.85836 10.025 3.62919 10.1166 3.43752 10.3C3.24586 10.4833 3.15002 10.7148 3.15002 10.9945V15.9304C3.15002 16.2101 3.24586 16.4416 3.43752 16.625C3.62919 16.8083 3.85836 16.9 4.12502 16.9ZM7.00002 13.025H17.025V11C17.025 10.5583 17.1167 10.1604 17.3 9.80623C17.4834 9.45206 17.725 9.1401 18.025 8.87035V6.2046C18.025 5.93485 17.929 5.70414 17.7369 5.51248C17.5449 5.32081 17.3069 5.22498 17.0229 5.22498H7.0021C6.71818 5.22498 6.48019 5.32081 6.28812 5.51248C6.09606 5.70414 6.00002 5.93505 6.00002 6.2052V8.87498C6.30002 9.14164 6.54169 9.45206 6.72502 9.80623C6.90836 10.1604 7.00002 10.5583 7.00002 11V13.025Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Check.tsx
+++ b/components/Icons/Check.tsx
@@ -14,23 +14,10 @@ export default function CheckIcon({ className, color, ...props }: IconProps) {
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_2570_1776"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_2570_1776)">
-        <path
-          d="M9.57552 15.1752L17.9505 6.8002C18.1422 6.60853 18.3651 6.5127 18.6193 6.5127C18.8734 6.5127 19.0964 6.60853 19.288 6.8002C19.4797 6.99186 19.5755 7.21478 19.5755 7.46895C19.5755 7.72311 19.4797 7.94603 19.288 8.1377L10.238 17.1877C10.0464 17.3794 9.82552 17.4752 9.57552 17.4752C9.32552 17.4752 9.10469 17.3794 8.91302 17.1877L4.71302 12.9877C4.52136 12.796 4.42761 12.5731 4.43177 12.3189C4.43594 12.0648 4.53386 11.8419 4.72552 11.6502C4.91719 11.4585 5.14011 11.3627 5.39427 11.3627C5.64844 11.3627 5.87136 11.4585 6.06302 11.6502L9.57552 15.1752Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M9.57552 15.1752L17.9505 6.8002C18.1422 6.60853 18.3651 6.5127 18.6193 6.5127C18.8734 6.5127 19.0964 6.60853 19.288 6.8002C19.4797 6.99186 19.5755 7.21478 19.5755 7.46895C19.5755 7.72311 19.4797 7.94603 19.288 8.1377L10.238 17.1877C10.0464 17.3794 9.82552 17.4752 9.57552 17.4752C9.32552 17.4752 9.10469 17.3794 8.91302 17.1877L4.71302 12.9877C4.52136 12.796 4.42761 12.5731 4.43177 12.3189C4.43594 12.0648 4.53386 11.8419 4.72552 11.6502C4.91719 11.4585 5.14011 11.3627 5.39427 11.3627C5.64844 11.3627 5.87136 11.4585 6.06302 11.6502L9.57552 15.1752Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/CheckCircle.tsx
+++ b/components/Icons/CheckCircle.tsx
@@ -18,23 +18,10 @@ export default function CheckCircleIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        height="32"
-        id="mask0_2991_3013"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="33"
-        x="0"
-        y="0"
-      >
-        <rect x="0.5" width="32" height="32" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_2991_3013)">
-        <path
-          d="M14.6667 18.4333L11.8148 15.5814C11.5716 15.3383 11.2778 15.2167 10.9333 15.2167C10.5889 15.2167 10.2944 15.3389 10.05 15.5833C9.80556 15.8278 9.68333 16.1222 9.68333 16.4667C9.68333 16.8111 9.8036 17.1036 10.0441 17.3441L13.7833 21.0833C14.0348 21.3389 14.3283 21.4667 14.6636 21.4667C14.999 21.4667 15.2944 21.3389 15.55 21.0833L22.95 13.6833C23.1944 13.4389 23.3167 13.1444 23.3167 12.8C23.3167 12.4556 23.1944 12.1611 22.95 11.9167C22.7056 11.6722 22.4111 11.55 22.0667 11.55C21.7222 11.55 21.4292 11.6708 21.1877 11.9123L14.6667 18.4333ZM16.5 29C14.7021 29 13.0125 28.6582 11.4312 27.9746C9.84986 27.2909 8.47433 26.3632 7.3046 25.1912C6.13487 24.0193 5.20833 22.6435 4.525 21.0638C3.84167 19.484 3.5 17.7961 3.5 16C3.5 14.2021 3.84181 12.5125 4.52543 10.9312C5.20906 9.34986 6.13683 7.97433 7.30877 6.8046C8.4807 5.63487 9.85652 4.70833 11.4362 4.025C13.016 3.34167 14.7039 3 16.5 3C18.2979 3 19.9875 3.34181 21.5688 4.02543C23.1501 4.70906 24.5257 5.63683 25.6954 6.80877C26.8651 7.9807 27.7917 9.35652 28.475 10.9362C29.1583 12.516 29.5 14.2039 29.5 16C29.5 17.7979 29.1582 19.4875 28.4746 21.0688C27.7909 22.6501 26.8632 24.0257 25.6912 25.1954C24.5193 26.3651 23.1435 27.2917 21.5638 27.975C19.984 28.6583 18.2961 29 16.5 29Z"
-          fill="#33800A"
-        />
-      </g>
+      <path
+        d="M14.6667 18.4333L11.8148 15.5814C11.5716 15.3383 11.2778 15.2167 10.9333 15.2167C10.5889 15.2167 10.2944 15.3389 10.05 15.5833C9.80556 15.8278 9.68333 16.1222 9.68333 16.4667C9.68333 16.8111 9.8036 17.1036 10.0441 17.3441L13.7833 21.0833C14.0348 21.3389 14.3283 21.4667 14.6636 21.4667C14.999 21.4667 15.2944 21.3389 15.55 21.0833L22.95 13.6833C23.1944 13.4389 23.3167 13.1444 23.3167 12.8C23.3167 12.4556 23.1944 12.1611 22.95 11.9167C22.7056 11.6722 22.4111 11.55 22.0667 11.55C21.7222 11.55 21.4292 11.6708 21.1877 11.9123L14.6667 18.4333ZM16.5 29C14.7021 29 13.0125 28.6582 11.4312 27.9746C9.84986 27.2909 8.47433 26.3632 7.3046 25.1912C6.13487 24.0193 5.20833 22.6435 4.525 21.0638C3.84167 19.484 3.5 17.7961 3.5 16C3.5 14.2021 3.84181 12.5125 4.52543 10.9312C5.20906 9.34986 6.13683 7.97433 7.30877 6.8046C8.4807 5.63487 9.85652 4.70833 11.4362 4.025C13.016 3.34167 14.7039 3 16.5 3C18.2979 3 19.9875 3.34181 21.5688 4.02543C23.1501 4.70906 24.5257 5.63683 25.6954 6.80877C26.8651 7.9807 27.7917 9.35652 28.475 10.9362C29.1583 12.516 29.5 14.2039 29.5 16C29.5 17.7979 29.1582 19.4875 28.4746 21.0688C27.7909 22.6501 26.8632 24.0257 25.6912 25.1954C24.5193 26.3651 23.1435 27.2917 21.5638 27.975C19.984 28.6583 18.2961 29 16.5 29Z"
+        fill="#33800A"
+      />
    </svg>
  )
 }
--- a/components/Icons/ChevronDown.tsx
+++ b/components/Icons/ChevronDown.tsx
@@ -18,23 +18,10 @@ export default function ChevronDownIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        height="20"
-        id="mask0_4971_13121"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="20"
-        x="0"
-        y="0"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4971_13121)">
-        <path
-          d="M10.422 11.9374L16.2449 6.1145C16.4254 5.93395 16.6459 5.84193 16.9063 5.83846C17.1668 5.83499 17.3873 5.92353 17.5678 6.10409C17.7484 6.28464 17.8386 6.50513 17.8386 6.76554C17.8386 7.02596 17.7484 7.24645 17.5678 7.427L11.4011 13.6041C11.2553 13.7499 11.1025 13.8523 10.9428 13.9114C10.7831 13.9704 10.6095 13.9999 10.422 13.9999C10.2345 13.9999 10.0609 13.9704 9.90114 13.9114C9.74142 13.8523 9.58864 13.7499 9.44281 13.6041L3.27614 7.43742C3.09558 7.25686 3.00357 7.03464 3.0001 6.77075C2.99663 6.50686 3.08517 6.28464 3.26572 6.10409C3.44628 5.92353 3.66676 5.83325 3.92718 5.83325C4.1876 5.83325 4.40808 5.92353 4.58864 6.10409L10.422 11.9374Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M10.422 11.9374L16.2449 6.1145C16.4254 5.93395 16.6459 5.84193 16.9063 5.83846C17.1668 5.83499 17.3873 5.92353 17.5678 6.10409C17.7484 6.28464 17.8386 6.50513 17.8386 6.76554C17.8386 7.02596 17.7484 7.24645 17.5678 7.427L11.4011 13.6041C11.2553 13.7499 11.1025 13.8523 10.9428 13.9114C10.7831 13.9704 10.6095 13.9999 10.422 13.9999C10.2345 13.9999 10.0609 13.9704 9.90114 13.9114C9.74142 13.8523 9.58864 13.7499 9.44281 13.6041L3.27614 7.43742C3.09558 7.25686 3.00357 7.03464 3.0001 6.77075C2.99663 6.50686 3.08517 6.28464 3.26572 6.10409C3.44628 5.92353 3.66676 5.83325 3.92718 5.83325C4.1876 5.83325 4.40808 5.92353 4.58864 6.10409L10.422 11.9374Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/ChevronLeft.tsx
+++ b/components/Icons/ChevronLeft.tsx
@@ -18,23 +18,10 @@ export default function ChevronLeftIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_2291_1760"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="20"
-        height="20"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_2291_1760)">
-        <path
-          d="M7.75 10.0001L13.5729 15.823C13.7535 16.0036 13.8455 16.2258 13.849 16.4897C13.8524 16.7536 13.7639 16.9758 13.5833 17.1563C13.4028 17.3369 13.1806 17.4272 12.9167 17.4272C12.6528 17.4272 12.4306 17.3369 12.25 17.1563L6.08333 10.9793C5.9375 10.8334 5.83507 10.6807 5.77604 10.5209C5.71701 10.3612 5.6875 10.1876 5.6875 10.0001C5.6875 9.8126 5.71701 9.63899 5.77604 9.47927C5.83507 9.31954 5.9375 9.16677 6.08333 9.02093L12.25 2.85426C12.4306 2.67371 12.651 2.5817 12.9115 2.57822C13.1719 2.57475 13.3924 2.66329 13.5729 2.84385C13.7535 3.0244 13.8438 3.24663 13.8438 3.51051C13.8438 3.7744 13.7535 3.99663 13.5729 4.17718L7.75 10.0001Z"
-          fill="#CD0921"
-        />
-      </g>
+      <path
+        d="M7.75 10.0001L13.5729 15.823C13.7535 16.0036 13.8455 16.2258 13.849 16.4897C13.8524 16.7536 13.7639 16.9758 13.5833 17.1563C13.4028 17.3369 13.1806 17.4272 12.9167 17.4272C12.6528 17.4272 12.4306 17.3369 12.25 17.1563L6.08333 10.9793C5.9375 10.8334 5.83507 10.6807 5.77604 10.5209C5.71701 10.3612 5.6875 10.1876 5.6875 10.0001C5.6875 9.8126 5.71701 9.63899 5.77604 9.47927C5.83507 9.31954 5.9375 9.16677 6.08333 9.02093L12.25 2.85426C12.4306 2.67371 12.651 2.5817 12.9115 2.57822C13.1719 2.57475 13.3924 2.66329 13.5729 2.84385C13.7535 3.0244 13.8438 3.24663 13.8438 3.51051C13.8438 3.7744 13.7535 3.99663 13.5729 4.17718L7.75 10.0001Z"
+        fill="#CD0921"
+      />
    </svg>
  )
 }
--- a/components/Icons/ChevronRight.tsx
+++ b/components/Icons/ChevronRight.tsx
@@ -18,23 +18,10 @@ export default function ChevronRightIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_2291_1656"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="20"
-        height="20"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_2291_1656)">
-        <path
-          d="M12.1042 9.99967L6.28125 4.17676C6.10069 3.9962 6.00868 3.77572 6.00521 3.5153C6.00174 3.25488 6.09028 3.0344 6.27083 2.85384C6.45139 2.67329 6.67188 2.58301 6.93229 2.58301C7.19271 2.58301 7.41319 2.67329 7.59375 2.85384L13.7708 9.02051C13.9167 9.16634 14.0191 9.31912 14.0781 9.47884C14.1372 9.63856 14.1667 9.81217 14.1667 9.99967C14.1667 10.1872 14.1372 10.3608 14.0781 10.5205C14.0191 10.6802 13.9167 10.833 13.7708 10.9788L7.60417 17.1455C7.42361 17.3261 7.20139 17.4181 6.9375 17.4215C6.67361 17.425 6.45139 17.3365 6.27083 17.1559C6.09028 16.9754 6 16.7549 6 16.4945C6 16.234 6.09028 16.0136 6.27083 15.833L12.1042 9.99967Z"
-          fill="#CD0921"
-        />
-      </g>
+      <path
+        d="M12.1042 9.99967L6.28125 4.17676C6.10069 3.9962 6.00868 3.77572 6.00521 3.5153C6.00174 3.25488 6.09028 3.0344 6.27083 2.85384C6.45139 2.67329 6.67188 2.58301 6.93229 2.58301C7.19271 2.58301 7.41319 2.67329 7.59375 2.85384L13.7708 9.02051C13.9167 9.16634 14.0191 9.31912 14.0781 9.47884C14.1372 9.63856 14.1667 9.81217 14.1667 9.99967C14.1667 10.1872 14.1372 10.3608 14.0781 10.5205C14.0191 10.6802 13.9167 10.833 13.7708 10.9788L7.60417 17.1455C7.42361 17.3261 7.20139 17.4181 6.9375 17.4215C6.67361 17.425 6.45139 17.3365 6.27083 17.1559C6.09028 16.9754 6 16.7549 6 16.4945C6 16.234 6.09028 16.0136 6.27083 15.833L12.1042 9.99967Z"
+        fill="#CD0921"
+      />
    </svg>
  )
 }
--- a/components/Icons/City.tsx
+++ b/components/Icons/City.tsx
@@ -14,23 +14,10 @@ export default function CityIcon({ className, color, ...props }: IconProps) {
      className={classNames}
      {...props}
    >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3390"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3390)">
-        <path
-          d="M3.57495 18.4248V9.0486C3.57495 8.5329 3.75854 8.09079 4.12573 7.72227C4.49291 7.35374 4.93432 7.16947 5.44995 7.16947H9.19995V6.06392C9.19995 5.81301 9.24578 5.57713 9.33745 5.3563C9.42912 5.13547 9.55828 4.93755 9.72495 4.76255L10.6639 3.7943C11.0238 3.42313 11.4698 3.23755 12.0019 3.23755C12.5339 3.23755 12.9833 3.42505 13.35 3.80005L14.2911 4.76082C14.4637 4.93697 14.5958 5.13648 14.6875 5.35935C14.7791 5.58222 14.825 5.81662 14.825 6.06255V10.922H18.575C19.0906 10.922 19.532 11.1059 19.8992 11.4737C20.2664 11.8415 20.45 12.2836 20.45 12.8V18.425C20.45 18.9407 20.2663 19.3821 19.8991 19.7493C19.5319 20.1165 19.0904 20.3 18.5748 20.3H5.44848C4.93279 20.3 4.49162 20.1164 4.12495 19.7492C3.75828 19.382 3.57495 18.9405 3.57495 18.4248ZM5.44995 18.425H7.32495V16.55H5.44995V18.425ZM5.44995 14.675H7.32495V12.8H5.44995V14.675ZM5.44995 10.925H7.32495V9.05005H5.44995V10.925ZM11.075 18.425H12.95V16.55H11.075V18.425ZM11.075 14.675H12.95V12.8H11.075V14.675ZM11.075 10.925H12.95V9.05005H11.075V10.925ZM11.075 7.17505H12.95V5.30005H11.075V7.17505ZM16.7 18.425H18.575V16.55H16.7V18.425ZM16.7 14.675H18.575V12.8H16.7V14.675Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.57495 18.4248V9.0486C3.57495 8.5329 3.75854 8.09079 4.12573 7.72227C4.49291 7.35374 4.93432 7.16947 5.44995 7.16947H9.19995V6.06392C9.19995 5.81301 9.24578 5.57713 9.33745 5.3563C9.42912 5.13547 9.55828 4.93755 9.72495 4.76255L10.6639 3.7943C11.0238 3.42313 11.4698 3.23755 12.0019 3.23755C12.5339 3.23755 12.9833 3.42505 13.35 3.80005L14.2911 4.76082C14.4637 4.93697 14.5958 5.13648 14.6875 5.35935C14.7791 5.58222 14.825 5.81662 14.825 6.06255V10.922H18.575C19.0906 10.922 19.532 11.1059 19.8992 11.4737C20.2664 11.8415 20.45 12.2836 20.45 12.8V18.425C20.45 18.9407 20.2663 19.3821 19.8991 19.7493C19.5319 20.1165 19.0904 20.3 18.5748 20.3H5.44848C4.93279 20.3 4.49162 20.1164 4.12495 19.7492C3.75828 19.382 3.57495 18.9405 3.57495 18.4248ZM5.44995 18.425H7.32495V16.55H5.44995V18.425ZM5.44995 14.675H7.32495V12.8H5.44995V14.675ZM5.44995 10.925H7.32495V9.05005H5.44995V10.925ZM11.075 18.425H12.95V16.55H11.075V18.425ZM11.075 14.675H12.95V12.8H11.075V14.675ZM11.075 10.925H12.95V9.05005H11.075V10.925ZM11.075 7.17505H12.95V5.30005H11.075V7.17505ZM16.7 18.425H18.575V16.55H16.7V18.425ZM16.7 14.675H18.575V12.8H16.7V14.675Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Close.tsx
+++ b/components/Icons/Close.tsx
@@ -14,23 +14,10 @@ export default function CloseIcon({ className, color, ...props }: IconProps) {
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        height="20"
-        id="mask0_7531_17458"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="20"
-        x="0"
-        y="0"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_7531_17458)">
-        <path
-          d="M10 11.0936L7.58333 13.5207C7.43056 13.6734 7.24653 13.7498 7.03125 13.7498C6.81597 13.7498 6.63194 13.6734 6.47917 13.5207C6.32639 13.3679 6.25 13.1839 6.25 12.9686C6.25 12.7533 6.32639 12.5693 6.47917 12.4165L8.90625 9.99984L6.47917 7.59359C6.32639 7.44081 6.25 7.25678 6.25 7.0415C6.25 6.82623 6.32639 6.6422 6.47917 6.48942C6.63194 6.33664 6.81597 6.26025 7.03125 6.26025C7.24653 6.26025 7.43056 6.33664 7.58333 6.48942L10 8.9165L12.4062 6.48942C12.559 6.33664 12.7431 6.26025 12.9583 6.26025C13.1736 6.26025 13.3576 6.33664 13.5104 6.48942C13.6701 6.64914 13.75 6.83491 13.75 7.04671C13.75 7.25852 13.6701 7.44081 13.5104 7.59359L11.0833 9.99984L13.5104 12.4165C13.6632 12.5693 13.7396 12.7533 13.7396 12.9686C13.7396 13.1839 13.6632 13.3679 13.5104 13.5207C13.3507 13.6804 13.1649 13.7603 12.9531 13.7603C12.7413 13.7603 12.559 13.6804 12.4062 13.5207L10 11.0936Z"
-          fill="#CD0921"
-        />
-      </g>
+      <path
+        d="M10 11.0936L7.58333 13.5207C7.43056 13.6734 7.24653 13.7498 7.03125 13.7498C6.81597 13.7498 6.63194 13.6734 6.47917 13.5207C6.32639 13.3679 6.25 13.1839 6.25 12.9686C6.25 12.7533 6.32639 12.5693 6.47917 12.4165L8.90625 9.99984L6.47917 7.59359C6.32639 7.44081 6.25 7.25678 6.25 7.0415C6.25 6.82623 6.32639 6.6422 6.47917 6.48942C6.63194 6.33664 6.81597 6.26025 7.03125 6.26025C7.24653 6.26025 7.43056 6.33664 7.58333 6.48942L10 8.9165L12.4062 6.48942C12.559 6.33664 12.7431 6.26025 12.9583 6.26025C13.1736 6.26025 13.3576 6.33664 13.5104 6.48942C13.6701 6.64914 13.75 6.83491 13.75 7.04671C13.75 7.25852 13.6701 7.44081 13.5104 7.59359L11.0833 9.99984L13.5104 12.4165C13.6632 12.5693 13.7396 12.7533 13.7396 12.9686C13.7396 13.1839 13.6632 13.3679 13.5104 13.5207C13.3507 13.6804 13.1649 13.7603 12.9531 13.7603C12.7413 13.7603 12.559 13.6804 12.4062 13.5207L10 11.0936Z"
+        fill="#CD0921"
+      />
    </svg>
  )
 }
--- a/components/Icons/CloseLarge.tsx
+++ b/components/Icons/CloseLarge.tsx
@@ -18,23 +18,10 @@ export default function CloseLargeIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        id="mask0_1756_2612"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_1756_2612)">
-        <path
-          d="M12 13.5422L6.34057 19.2016C6.12719 19.415 5.87017 19.5193 5.5695 19.5144C5.26882 19.5096 5.0118 19.4004 4.79842 19.1871C4.59474 18.9737 4.49532 18.7191 4.50017 18.4233C4.50502 18.1274 4.60928 17.8777 4.81297 17.674L10.4578 12L4.81297 6.32606C4.60928 6.12237 4.50744 5.87262 4.50744 5.5768C4.50744 5.28098 4.60928 5.02638 4.81297 4.813C5.01665 4.59961 5.26882 4.4905 5.5695 4.48565C5.87017 4.4808 6.12719 4.58507 6.34057 4.79845L12 10.4579L17.6594 4.79845C17.8728 4.58507 18.1298 4.4808 18.4305 4.48565C18.7312 4.4905 18.9882 4.59961 19.2016 4.813C19.4053 5.02638 19.5047 5.28098 19.4998 5.5768C19.495 5.87262 19.3907 6.12237 19.187 6.32606L13.5422 12L19.187 17.674C19.3907 17.8777 19.4926 18.1274 19.4926 18.4233C19.4926 18.7191 19.3907 18.9737 19.187 19.1871C18.9834 19.4004 18.7312 19.5096 18.4305 19.5144C18.1298 19.5193 17.8728 19.415 17.6594 19.2016L12 13.5422Z"
-          fill="#57514E"
-        />
-      </g>
+      <path
+        d="M12 13.5422L6.34057 19.2016C6.12719 19.415 5.87017 19.5193 5.5695 19.5144C5.26882 19.5096 5.0118 19.4004 4.79842 19.1871C4.59474 18.9737 4.49532 18.7191 4.50017 18.4233C4.50502 18.1274 4.60928 17.8777 4.81297 17.674L10.4578 12L4.81297 6.32606C4.60928 6.12237 4.50744 5.87262 4.50744 5.5768C4.50744 5.28098 4.60928 5.02638 4.81297 4.813C5.01665 4.59961 5.26882 4.4905 5.5695 4.48565C5.87017 4.4808 6.12719 4.58507 6.34057 4.79845L12 10.4579L17.6594 4.79845C17.8728 4.58507 18.1298 4.4808 18.4305 4.48565C18.7312 4.4905 18.9882 4.59961 19.2016 4.813C19.4053 5.02638 19.5047 5.28098 19.4998 5.5768C19.495 5.87262 19.3907 6.12237 19.187 6.32606L13.5422 12L19.187 17.674C19.3907 17.8777 19.4926 18.1274 19.4926 18.4233C19.4926 18.7191 19.3907 18.9737 19.187 19.1871C18.9834 19.4004 18.7312 19.5096 18.4305 19.5144C18.1298 19.5193 17.8728 19.415 17.6594 19.2016L12 13.5422Z"
+        fill="#57514E"
+      />
    </svg>
  )
 }
--- a/components/Icons/CoffeeAlt.tsx
+++ b/components/Icons/CoffeeAlt.tsx
@@ -18,23 +18,10 @@ export default function CoffeeAltIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        id="mask0_554_11923"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_554_11923)">
-        <path
-          d="M11.0625 17.8125C9.17083 17.8125 7.5625 17.1542 6.2375 15.8375C4.9125 14.5208 4.25 12.9167 4.25 11.025V5.125C4.25 4.60833 4.43333 4.16667 4.8 3.8C5.16667 3.43333 5.60833 3.25 6.125 3.25H18.3875C19.3208 3.25 20.1167 3.57708 20.775 4.23125C21.4333 4.88542 21.7625 5.67917 21.7625 6.6125C21.7625 7.59583 21.4396 8.44792 20.7938 9.16875C20.1479 9.88958 19.3458 10.25 18.3875 10.25H17.75V11.025C17.75 12.9083 17.1021 14.5104 15.8063 15.8313C14.5104 17.1521 12.9292 17.8125 11.0625 17.8125ZM6.125 8.375H15.875V5.125H6.125V8.375ZM11.0625 15.9375C12.4042 15.9375 13.5417 15.4563 14.475 14.4938C15.4083 13.5313 15.875 12.375 15.875 11.025V10.25H6.125V11.025C6.125 12.3917 6.60625 13.5521 7.56875 14.5063C8.53125 15.4604 9.69583 15.9375 11.0625 15.9375ZM17.75 8.375H18.3875C18.8375 8.375 19.2 8.19792 19.475 7.84375C19.75 7.48958 19.8875 7.07917 19.8875 6.6125C19.8875 6.19583 19.7417 5.84375 19.45 5.55625C19.1583 5.26875 18.8042 5.125 18.3875 5.125H17.75V8.375ZM5.1875 20.75C4.92917 20.75 4.70833 20.6583 4.525 20.475C4.34167 20.2917 4.25 20.0708 4.25 19.8125C4.25 19.5542 4.34167 19.3333 4.525 19.15C4.70833 18.9667 4.92917 18.875 5.1875 18.875H18.8125C19.0708 18.875 19.2917 18.9667 19.475 19.15C19.6583 19.3333 19.75 19.5542 19.75 19.8125C19.75 20.0708 19.6583 20.2917 19.475 20.475C19.2917 20.6583 19.0708 20.75 18.8125 20.75H5.1875Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M11.0625 17.8125C9.17083 17.8125 7.5625 17.1542 6.2375 15.8375C4.9125 14.5208 4.25 12.9167 4.25 11.025V5.125C4.25 4.60833 4.43333 4.16667 4.8 3.8C5.16667 3.43333 5.60833 3.25 6.125 3.25H18.3875C19.3208 3.25 20.1167 3.57708 20.775 4.23125C21.4333 4.88542 21.7625 5.67917 21.7625 6.6125C21.7625 7.59583 21.4396 8.44792 20.7938 9.16875C20.1479 9.88958 19.3458 10.25 18.3875 10.25H17.75V11.025C17.75 12.9083 17.1021 14.5104 15.8063 15.8313C14.5104 17.1521 12.9292 17.8125 11.0625 17.8125ZM6.125 8.375H15.875V5.125H6.125V8.375ZM11.0625 15.9375C12.4042 15.9375 13.5417 15.4563 14.475 14.4938C15.4083 13.5313 15.875 12.375 15.875 11.025V10.25H6.125V11.025C6.125 12.3917 6.60625 13.5521 7.56875 14.5063C8.53125 15.4604 9.69583 15.9375 11.0625 15.9375ZM17.75 8.375H18.3875C18.8375 8.375 19.2 8.19792 19.475 7.84375C19.75 7.48958 19.8875 7.07917 19.8875 6.6125C19.8875 6.19583 19.7417 5.84375 19.45 5.55625C19.1583 5.26875 18.8042 5.125 18.3875 5.125H17.75V8.375ZM5.1875 20.75C4.92917 20.75 4.70833 20.6583 4.525 20.475C4.34167 20.2917 4.25 20.0708 4.25 19.8125C4.25 19.5542 4.34167 19.3333 4.525 19.15C4.70833 18.9667 4.92917 18.875 5.1875 18.875H18.8125C19.0708 18.875 19.2917 18.9667 19.475 19.15C19.6583 19.3333 19.75 19.5542 19.75 19.8125C19.75 20.0708 19.6583 20.2917 19.475 20.475C19.2917 20.6583 19.0708 20.75 18.8125 20.75H5.1875Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/Concierge.tsx
+++ b/components/Icons/Concierge.tsx
@@ -18,23 +18,10 @@ export default function ConciergeIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_554_11950"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_554_11950)">
-        <path
-          d="M11 21.7501C10.7417 21.7501 10.5208 21.6584 10.3375 21.4751C10.1542 21.2918 10.0625 21.0709 10.0625 20.8126C10.0625 20.5543 10.1542 20.3334 10.3375 20.1501C10.5208 19.9668 10.7417 19.8751 11 19.8751H22C22.2583 19.8751 22.4792 19.9668 22.6625 20.1501C22.8458 20.3334 22.9375 20.5543 22.9375 20.8126C22.9375 21.0709 22.8458 21.2918 22.6625 21.4751C22.4792 21.6584 22.2583 21.7501 22 21.7501H11ZM11.0625 19.0001C11.0625 17.6501 11.4875 16.4772 12.3375 15.4813C13.1875 14.4855 14.2625 13.8751 15.5625 13.6501V12.9876C15.5625 12.7293 15.6542 12.5084 15.8375 12.3251C16.0208 12.1418 16.2417 12.0501 16.5 12.0501C16.7583 12.0501 16.9792 12.1418 17.1625 12.3251C17.3458 12.5084 17.4375 12.7293 17.4375 12.9876V13.6501C18.7208 13.8751 19.7917 14.4855 20.65 15.4813C21.5083 16.4772 21.9375 17.6501 21.9375 19.0001H11.0625ZM13.475 17.1126H19.4875C19.1792 16.6126 18.7625 16.2063 18.2375 15.8938C17.7125 15.5813 17.1337 15.4251 16.501 15.4251C15.8504 15.4251 15.2604 15.5813 14.7312 15.8938C14.2021 16.2063 13.7833 16.6126 13.475 17.1126ZM1.25 10.8751V4.0751C1.25 3.55946 1.43359 3.11806 1.80077 2.75087C2.16796 2.38369 2.60937 2.2001 3.125 2.2001H5.0875C5.49583 2.2001 5.87917 2.33551 6.2375 2.60635C6.59583 2.87718 6.84167 3.20843 6.975 3.6001L13.3875 1.8001C13.5589 1.7501 13.7381 1.7251 13.925 1.7251C14.1119 1.7251 14.2911 1.75426 14.4625 1.8126L21.075 3.8876C21.2762 3.9516 21.4348 4.0676 21.5509 4.2356C21.667 4.4036 21.725 4.5876 21.725 4.7876V5.0876C21.725 5.87926 21.4479 6.54593 20.8938 7.0876C20.3396 7.62926 19.6667 7.9001 18.875 7.9001H16.8V8.2001C16.8 8.68343 16.6646 9.12718 16.3938 9.53135C16.1229 9.93551 15.7583 10.2209 15.3 10.3876L9.25285 12.6406C9.14262 12.6719 9.03542 12.698 8.93125 12.7188C8.82708 12.7397 8.71667 12.7501 8.6 12.7501H3.125C2.60937 12.7501 2.16796 12.5665 1.80077 12.1993C1.43359 11.8321 1.25 11.3907 1.25 10.8751ZM3.125 10.8751H5.1V4.0751H3.125V10.8751ZM6.975 10.8751H8.6L14.3523 8.78592C14.5341 8.72037 14.675 8.60426 14.775 8.4376C14.875 8.27093 14.925 8.09176 14.925 7.9001H13.15L11.1875 8.5501C10.9356 8.63343 10.6956 8.61468 10.4674 8.49385C10.2391 8.37301 10.0833 8.18343 10 7.9251C9.925 7.6751 9.94194 7.43873 10.0508 7.216C10.1597 6.99328 10.3386 6.84215 10.5875 6.7626L12.75 6.0251H18.875C19.0333 6.0251 19.2188 5.96847 19.4312 5.85522C19.6437 5.74196 19.75 5.60691 19.75 5.4501L13.875 3.6251L6.975 5.5251V10.8751Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M11 21.7501C10.7417 21.7501 10.5208 21.6584 10.3375 21.4751C10.1542 21.2918 10.0625 21.0709 10.0625 20.8126C10.0625 20.5543 10.1542 20.3334 10.3375 20.1501C10.5208 19.9668 10.7417 19.8751 11 19.8751H22C22.2583 19.8751 22.4792 19.9668 22.6625 20.1501C22.8458 20.3334 22.9375 20.5543 22.9375 20.8126C22.9375 21.0709 22.8458 21.2918 22.6625 21.4751C22.4792 21.6584 22.2583 21.7501 22 21.7501H11ZM11.0625 19.0001C11.0625 17.6501 11.4875 16.4772 12.3375 15.4813C13.1875 14.4855 14.2625 13.8751 15.5625 13.6501V12.9876C15.5625 12.7293 15.6542 12.5084 15.8375 12.3251C16.0208 12.1418 16.2417 12.0501 16.5 12.0501C16.7583 12.0501 16.9792 12.1418 17.1625 12.3251C17.3458 12.5084 17.4375 12.7293 17.4375 12.9876V13.6501C18.7208 13.8751 19.7917 14.4855 20.65 15.4813C21.5083 16.4772 21.9375 17.6501 21.9375 19.0001H11.0625ZM13.475 17.1126H19.4875C19.1792 16.6126 18.7625 16.2063 18.2375 15.8938C17.7125 15.5813 17.1337 15.4251 16.501 15.4251C15.8504 15.4251 15.2604 15.5813 14.7312 15.8938C14.2021 16.2063 13.7833 16.6126 13.475 17.1126ZM1.25 10.8751V4.0751C1.25 3.55946 1.43359 3.11806 1.80077 2.75087C2.16796 2.38369 2.60937 2.2001 3.125 2.2001H5.0875C5.49583 2.2001 5.87917 2.33551 6.2375 2.60635C6.59583 2.87718 6.84167 3.20843 6.975 3.6001L13.3875 1.8001C13.5589 1.7501 13.7381 1.7251 13.925 1.7251C14.1119 1.7251 14.2911 1.75426 14.4625 1.8126L21.075 3.8876C21.2762 3.9516 21.4348 4.0676 21.5509 4.2356C21.667 4.4036 21.725 4.5876 21.725 4.7876V5.0876C21.725 5.87926 21.4479 6.54593 20.8938 7.0876C20.3396 7.62926 19.6667 7.9001 18.875 7.9001H16.8V8.2001C16.8 8.68343 16.6646 9.12718 16.3938 9.53135C16.1229 9.93551 15.7583 10.2209 15.3 10.3876L9.25285 12.6406C9.14262 12.6719 9.03542 12.698 8.93125 12.7188C8.82708 12.7397 8.71667 12.7501 8.6 12.7501H3.125C2.60937 12.7501 2.16796 12.5665 1.80077 12.1993C1.43359 11.8321 1.25 11.3907 1.25 10.8751ZM3.125 10.8751H5.1V4.0751H3.125V10.8751ZM6.975 10.8751H8.6L14.3523 8.78592C14.5341 8.72037 14.675 8.60426 14.775 8.4376C14.875 8.27093 14.925 8.09176 14.925 7.9001H13.15L11.1875 8.5501C10.9356 8.63343 10.6956 8.61468 10.4674 8.49385C10.2391 8.37301 10.0833 8.18343 10 7.9251C9.925 7.6751 9.94194 7.43873 10.0508 7.216C10.1597 6.99328 10.3386 6.84215 10.5875 6.7626L12.75 6.0251H18.875C19.0333 6.0251 19.2188 5.96847 19.4312 5.85522C19.6437 5.74196 19.75 5.60691 19.75 5.4501L13.875 3.6251L6.975 5.5251V10.8751Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/ConvenienceStore24h.tsx
+++ b/components/Icons/ConvenienceStore24h.tsx
@@ -18,23 +18,10 @@ export default function ConvenienceStore24hIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_69_3405"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3405)">
-        <path
-          d="M20.825 11.075V18.925C20.825 19.4407 20.6414 19.8821 20.2742 20.2493C19.9071 20.6165 19.4657 20.8 18.95 20.8H5.07502C4.55938 20.8 4.11797 20.6165 3.75079 20.2493C3.38361 19.8821 3.20002 19.4407 3.20002 18.925V11.075C2.79168 10.7584 2.4896 10.3188 2.29377 9.7563C2.09793 9.1938 2.10002 8.59172 2.30002 7.95005L3.32502 4.62505C3.4566 4.20617 3.69097 3.85977 4.02814 3.58587C4.36531 3.31199 4.75593 3.17505 5.20002 3.17505H18.8258C19.267 3.17505 19.6542 3.3063 19.9875 3.5688C20.3209 3.8313 20.5603 4.18272 20.7059 4.62305L21.725 7.95005C21.925 8.59172 21.9271 9.18755 21.7313 9.73755C21.5354 10.2875 21.2334 10.7334 20.825 11.075ZM14.175 10.075C14.6417 10.075 14.9896 9.92088 15.2188 9.61255C15.4479 9.30422 15.5375 8.95838 15.4875 8.57505L14.95 5.05005H12.95V8.72505C12.95 9.08852 13.0691 9.40438 13.3073 9.67265C13.5455 9.94092 13.8347 10.075 14.175 10.075ZM9.74902 10.075C10.14 10.075 10.4588 9.94092 10.7053 9.67265C10.9518 9.40438 11.075 9.08852 11.075 8.72505V5.05005H9.07502L8.53752 8.57505C8.47918 8.96672 8.56877 9.31463 8.80627 9.6188C9.04377 9.92297 9.35802 10.075 9.74902 10.075ZM5.37502 10.075C5.69168 10.075 5.96252 9.96436 6.18752 9.74297C6.41252 9.52161 6.55002 9.24063 6.60002 8.90005L7.16252 5.05005H5.13752L4.12502 8.37505C4.00835 8.76672 4.0646 9.14797 4.29377 9.5188C4.52293 9.88963 4.88335 10.075 5.37502 10.075ZM18.65 10.075C19.1334 10.075 19.4958 9.8938 19.7375 9.5313C19.9792 9.1688 20.0333 8.78338 19.9 8.37505L18.8625 5.05005H16.8625L17.4235 8.90005C17.4745 9.23338 17.6125 9.51255 17.8375 9.73755C18.0625 9.96255 18.3333 10.075 18.65 10.075ZM5.07502 18.925H18.95V11.9125C18.875 11.9375 18.8167 11.95 18.775 11.95H18.65C18.2066 11.95 17.8166 11.875 17.48 11.725C17.1433 11.575 16.8149 11.3334 16.4947 11C16.2066 11.3 15.8728 11.5334 15.4933 11.7C15.1139 11.8667 14.7097 11.95 14.2807 11.95C13.8352 11.95 13.4229 11.8667 13.0438 11.7C12.6646 11.5334 12.325 11.3 12.025 11C11.7417 11.3 11.4125 11.5334 11.0375 11.7C10.6625 11.8667 10.2662 11.95 9.84864 11.95C9.38289 11.95 8.95418 11.8709 8.56252 11.7125C8.17085 11.5542 7.82502 11.3167 7.52502 11C7.15835 11.3667 6.81043 11.6167 6.48127 11.75C6.1521 11.8834 5.78335 11.95 5.37502 11.95H5.23037C5.1768 11.95 5.12502 11.9375 5.07502 11.9125V18.925ZM8.56344 17.875H10.5171C10.6474 17.875 10.7604 17.8263 10.8563 17.7288C10.9521 17.6313 11 17.5175 11 17.3875C11 17.2575 10.9513 17.1438 10.8538 17.0463C10.7563 16.9488 10.6425 16.9 10.5125 16.9H9.05002V15.925H10.5125C10.6425 15.925 10.7563 15.8763 10.8538 15.7788C10.9513 15.6813 11 15.5675 11 15.4375V13.4603C11 13.3285 10.9512 13.2146 10.8535 13.1188C10.7558 13.023 10.6418 12.975 10.5116 12.975H8.55789C8.42764 12.975 8.3146 13.0238 8.21877 13.1213C8.12293 13.2188 8.07502 13.3325 8.07502 13.4625C8.07502 13.5925 8.12377 13.7063 8.22127 13.8038C8.31877 13.9013 8.43252 13.95 8.56252 13.95H10.025V14.95H8.55812C8.42772 14.95 8.3146 14.9989 8.21877 15.0966C8.12293 15.1943 8.07502 15.3082 8.07502 15.4385V17.3922C8.07502 17.5224 8.12386 17.6355 8.22154 17.7313C8.31922 17.8271 8.43319 17.875 8.56344 17.875ZM14.9707 15.9294V17.3886C14.9707 17.5183 15.0193 17.6318 15.1166 17.7291C15.2139 17.8264 15.3292 17.875 15.4625 17.875C15.5958 17.875 15.7104 17.8263 15.8063 17.7288C15.9021 17.6313 15.95 17.5175 15.95 17.3875V13.459C15.95 13.328 15.9013 13.2146 15.8038 13.1188C15.7063 13.023 15.5925 12.975 15.4625 12.975C15.3325 12.975 15.2188 13.0238 15.1213 13.1213C15.0238 13.2188 14.975 13.3325 14.975 13.4625V14.95H14V13.4611C14 13.3287 13.9513 13.2146 13.8538 13.1188C13.7563 13.023 13.6425 12.975 13.5125 12.975C13.3825 12.975 13.2688 13.0238 13.1713 13.1213C13.0738 13.2188 13.025 13.3325 13.025 13.4625V15.4398C13.025 15.5716 13.0737 15.6862 13.1709 15.7835C13.2682 15.8808 13.3817 15.9294 13.5114 15.9294H14.9707Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M20.825 11.075V18.925C20.825 19.4407 20.6414 19.8821 20.2742 20.2493C19.9071 20.6165 19.4657 20.8 18.95 20.8H5.07502C4.55938 20.8 4.11797 20.6165 3.75079 20.2493C3.38361 19.8821 3.20002 19.4407 3.20002 18.925V11.075C2.79168 10.7584 2.4896 10.3188 2.29377 9.7563C2.09793 9.1938 2.10002 8.59172 2.30002 7.95005L3.32502 4.62505C3.4566 4.20617 3.69097 3.85977 4.02814 3.58587C4.36531 3.31199 4.75593 3.17505 5.20002 3.17505H18.8258C19.267 3.17505 19.6542 3.3063 19.9875 3.5688C20.3209 3.8313 20.5603 4.18272 20.7059 4.62305L21.725 7.95005C21.925 8.59172 21.9271 9.18755 21.7313 9.73755C21.5354 10.2875 21.2334 10.7334 20.825 11.075ZM14.175 10.075C14.6417 10.075 14.9896 9.92088 15.2188 9.61255C15.4479 9.30422 15.5375 8.95838 15.4875 8.57505L14.95 5.05005H12.95V8.72505C12.95 9.08852 13.0691 9.40438 13.3073 9.67265C13.5455 9.94092 13.8347 10.075 14.175 10.075ZM9.74902 10.075C10.14 10.075 10.4588 9.94092 10.7053 9.67265C10.9518 9.40438 11.075 9.08852 11.075 8.72505V5.05005H9.07502L8.53752 8.57505C8.47918 8.96672 8.56877 9.31463 8.80627 9.6188C9.04377 9.92297 9.35802 10.075 9.74902 10.075ZM5.37502 10.075C5.69168 10.075 5.96252 9.96436 6.18752 9.74297C6.41252 9.52161 6.55002 9.24063 6.60002 8.90005L7.16252 5.05005H5.13752L4.12502 8.37505C4.00835 8.76672 4.0646 9.14797 4.29377 9.5188C4.52293 9.88963 4.88335 10.075 5.37502 10.075ZM18.65 10.075C19.1334 10.075 19.4958 9.8938 19.7375 9.5313C19.9792 9.1688 20.0333 8.78338 19.9 8.37505L18.8625 5.05005H16.8625L17.4235 8.90005C17.4745 9.23338 17.6125 9.51255 17.8375 9.73755C18.0625 9.96255 18.3333 10.075 18.65 10.075ZM5.07502 18.925H18.95V11.9125C18.875 11.9375 18.8167 11.95 18.775 11.95H18.65C18.2066 11.95 17.8166 11.875 17.48 11.725C17.1433 11.575 16.8149 11.3334 16.4947 11C16.2066 11.3 15.8728 11.5334 15.4933 11.7C15.1139 11.8667 14.7097 11.95 14.2807 11.95C13.8352 11.95 13.4229 11.8667 13.0438 11.7C12.6646 11.5334 12.325 11.3 12.025 11C11.7417 11.3 11.4125 11.5334 11.0375 11.7C10.6625 11.8667 10.2662 11.95 9.84864 11.95C9.38289 11.95 8.95418 11.8709 8.56252 11.7125C8.17085 11.5542 7.82502 11.3167 7.52502 11C7.15835 11.3667 6.81043 11.6167 6.48127 11.75C6.1521 11.8834 5.78335 11.95 5.37502 11.95H5.23037C5.1768 11.95 5.12502 11.9375 5.07502 11.9125V18.925ZM8.56344 17.875H10.5171C10.6474 17.875 10.7604 17.8263 10.8563 17.7288C10.9521 17.6313 11 17.5175 11 17.3875C11 17.2575 10.9513 17.1438 10.8538 17.0463C10.7563 16.9488 10.6425 16.9 10.5125 16.9H9.05002V15.925H10.5125C10.6425 15.925 10.7563 15.8763 10.8538 15.7788C10.9513 15.6813 11 15.5675 11 15.4375V13.4603C11 13.3285 10.9512 13.2146 10.8535 13.1188C10.7558 13.023 10.6418 12.975 10.5116 12.975H8.55789C8.42764 12.975 8.3146 13.0238 8.21877 13.1213C8.12293 13.2188 8.07502 13.3325 8.07502 13.4625C8.07502 13.5925 8.12377 13.7063 8.22127 13.8038C8.31877 13.9013 8.43252 13.95 8.56252 13.95H10.025V14.95H8.55812C8.42772 14.95 8.3146 14.9989 8.21877 15.0966C8.12293 15.1943 8.07502 15.3082 8.07502 15.4385V17.3922C8.07502 17.5224 8.12386 17.6355 8.22154 17.7313C8.31922 17.8271 8.43319 17.875 8.56344 17.875ZM14.9707 15.9294V17.3886C14.9707 17.5183 15.0193 17.6318 15.1166 17.7291C15.2139 17.8264 15.3292 17.875 15.4625 17.875C15.5958 17.875 15.7104 17.8263 15.8063 17.7288C15.9021 17.6313 15.95 17.5175 15.95 17.3875V13.459C15.95 13.328 15.9013 13.2146 15.8038 13.1188C15.7063 13.023 15.5925 12.975 15.4625 12.975C15.3325 12.975 15.2188 13.0238 15.1213 13.1213C15.0238 13.2188 14.975 13.3325 14.975 13.4625V14.95H14V13.4611C14 13.3287 13.9513 13.2146 13.8538 13.1188C13.7563 13.023 13.6425 12.975 13.5125 12.975C13.3825 12.975 13.2688 13.0238 13.1713 13.1213C13.0738 13.2188 13.025 13.3325 13.025 13.4625V15.4398C13.025 15.5716 13.0737 15.6862 13.1709 15.7835C13.2682 15.8808 13.3817 15.9294 13.5114 15.9294H14.9707Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Cool.tsx
+++ b/components/Icons/Cool.tsx
@@ -14,23 +14,10 @@ export default function CoolIcon({ className, color, ...props }: IconProps) {
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_69_3415"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3415)">
-        <path
-          d="M11.075 17.625L8.46245 20.2125C8.28745 20.3875 8.07078 20.475 7.81245 20.475C7.55412 20.475 7.33745 20.3792 7.16245 20.1875C6.97912 20.0042 6.88745 19.7875 6.88745 19.5375C6.88745 19.2875 6.98328 19.0667 7.17495 18.875L11.075 14.975V12.925H9.02495L5.09995 16.85C4.92495 17.025 4.71245 17.1125 4.46245 17.1125C4.21245 17.1125 3.99162 17.0209 3.79995 16.8375C3.61662 16.6625 3.52495 16.4459 3.52495 16.1875C3.52495 15.9292 3.61662 15.7084 3.79995 15.525L6.37495 12.925H3.11245C2.85412 12.925 2.63745 12.8355 2.46245 12.6563C2.28745 12.4771 2.19995 12.2542 2.19995 11.9875C2.19995 11.7292 2.28953 11.5084 2.4687 11.325C2.64787 11.1417 2.87078 11.05 3.13745 11.05H6.37495L3.78745 8.46255C3.61245 8.28755 3.52495 8.07088 3.52495 7.81255C3.52495 7.55422 3.62078 7.33338 3.81245 7.15005C3.99578 6.97505 4.21245 6.88755 4.46245 6.88755C4.71245 6.88755 4.93328 6.97922 5.12495 7.16255L9.02495 11.05H11.075V9.00005L7.14995 5.10005C6.97495 4.92505 6.88745 4.71255 6.88745 4.46255C6.88745 4.21255 6.97912 3.99172 7.16245 3.80005C7.33745 3.61672 7.55412 3.52505 7.81245 3.52505C8.07078 3.52505 8.29162 3.61672 8.47495 3.80005L11.075 6.35005V3.11255C11.075 2.85422 11.1645 2.63338 11.3437 2.45005C11.5229 2.26672 11.7458 2.17505 12.0125 2.17505C12.2708 2.17505 12.4916 2.26672 12.675 2.45005C12.8583 2.63338 12.95 2.85422 12.95 3.11255V6.35005L15.5375 3.78755C15.7125 3.61255 15.9291 3.52505 16.1875 3.52505C16.4458 3.52505 16.6666 3.61672 16.85 3.80005C17.025 3.99172 17.1125 4.21255 17.1125 4.46255C17.1125 4.71255 17.0208 4.92922 16.8375 5.11255L12.95 9.00005V11.05H15L18.9 7.15005C19.075 6.97505 19.2875 6.88755 19.5375 6.88755C19.7875 6.88755 20.0083 6.97922 20.2 7.16255C20.3833 7.33755 20.475 7.55422 20.475 7.81255C20.475 8.07088 20.3833 8.29172 20.2 8.47505L17.65 11.05H20.8875C21.1458 11.05 21.3666 11.1417 21.55 11.325C21.7333 11.5084 21.825 11.7292 21.825 11.9875C21.825 12.2542 21.7333 12.4771 21.55 12.6563C21.3666 12.8355 21.1458 12.925 20.8875 12.925H17.65L20.2125 15.5375C20.3875 15.7125 20.475 15.9292 20.475 16.1875C20.475 16.4459 20.3833 16.6625 20.2 16.8375C20.0083 17.0209 19.7875 17.1125 19.5375 17.1125C19.2875 17.1125 19.0708 17.0167 18.8875 16.825L15 12.925H12.95V14.975L16.85 18.9C17.025 19.075 17.1125 19.2875 17.1125 19.5375C17.1125 19.7875 17.0208 20.0084 16.8375 20.2C16.6625 20.3834 16.4458 20.475 16.1875 20.475C15.9291 20.475 15.7083 20.3834 15.525 20.2L12.95 17.625V20.8875C12.95 21.1459 12.8583 21.3626 12.675 21.5375C12.4916 21.7125 12.2708 21.8 12.0125 21.8C11.7458 21.8 11.5229 21.7105 11.3437 21.5313C11.1645 21.3521 11.075 21.1292 11.075 20.8625V17.625Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M11.075 17.625L8.46245 20.2125C8.28745 20.3875 8.07078 20.475 7.81245 20.475C7.55412 20.475 7.33745 20.3792 7.16245 20.1875C6.97912 20.0042 6.88745 19.7875 6.88745 19.5375C6.88745 19.2875 6.98328 19.0667 7.17495 18.875L11.075 14.975V12.925H9.02495L5.09995 16.85C4.92495 17.025 4.71245 17.1125 4.46245 17.1125C4.21245 17.1125 3.99162 17.0209 3.79995 16.8375C3.61662 16.6625 3.52495 16.4459 3.52495 16.1875C3.52495 15.9292 3.61662 15.7084 3.79995 15.525L6.37495 12.925H3.11245C2.85412 12.925 2.63745 12.8355 2.46245 12.6563C2.28745 12.4771 2.19995 12.2542 2.19995 11.9875C2.19995 11.7292 2.28953 11.5084 2.4687 11.325C2.64787 11.1417 2.87078 11.05 3.13745 11.05H6.37495L3.78745 8.46255C3.61245 8.28755 3.52495 8.07088 3.52495 7.81255C3.52495 7.55422 3.62078 7.33338 3.81245 7.15005C3.99578 6.97505 4.21245 6.88755 4.46245 6.88755C4.71245 6.88755 4.93328 6.97922 5.12495 7.16255L9.02495 11.05H11.075V9.00005L7.14995 5.10005C6.97495 4.92505 6.88745 4.71255 6.88745 4.46255C6.88745 4.21255 6.97912 3.99172 7.16245 3.80005C7.33745 3.61672 7.55412 3.52505 7.81245 3.52505C8.07078 3.52505 8.29162 3.61672 8.47495 3.80005L11.075 6.35005V3.11255C11.075 2.85422 11.1645 2.63338 11.3437 2.45005C11.5229 2.26672 11.7458 2.17505 12.0125 2.17505C12.2708 2.17505 12.4916 2.26672 12.675 2.45005C12.8583 2.63338 12.95 2.85422 12.95 3.11255V6.35005L15.5375 3.78755C15.7125 3.61255 15.9291 3.52505 16.1875 3.52505C16.4458 3.52505 16.6666 3.61672 16.85 3.80005C17.025 3.99172 17.1125 4.21255 17.1125 4.46255C17.1125 4.71255 17.0208 4.92922 16.8375 5.11255L12.95 9.00005V11.05H15L18.9 7.15005C19.075 6.97505 19.2875 6.88755 19.5375 6.88755C19.7875 6.88755 20.0083 6.97922 20.2 7.16255C20.3833 7.33755 20.475 7.55422 20.475 7.81255C20.475 8.07088 20.3833 8.29172 20.2 8.47505L17.65 11.05H20.8875C21.1458 11.05 21.3666 11.1417 21.55 11.325C21.7333 11.5084 21.825 11.7292 21.825 11.9875C21.825 12.2542 21.7333 12.4771 21.55 12.6563C21.3666 12.8355 21.1458 12.925 20.8875 12.925H17.65L20.2125 15.5375C20.3875 15.7125 20.475 15.9292 20.475 16.1875C20.475 16.4459 20.3833 16.6625 20.2 16.8375C20.0083 17.0209 19.7875 17.1125 19.5375 17.1125C19.2875 17.1125 19.0708 17.0167 18.8875 16.825L15 12.925H12.95V14.975L16.85 18.9C17.025 19.075 17.1125 19.2875 17.1125 19.5375C17.1125 19.7875 17.0208 20.0084 16.8375 20.2C16.6625 20.3834 16.4458 20.475 16.1875 20.475C15.9291 20.475 15.7083 20.3834 15.525 20.2L12.95 17.625V20.8875C12.95 21.1459 12.8583 21.3626 12.675 21.5375C12.4916 21.7125 12.2708 21.8 12.0125 21.8C11.7458 21.8 11.5229 21.7105 11.3437 21.5313C11.1645 21.3521 11.075 21.1292 11.075 20.8625V17.625Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Copy.tsx
+++ b/components/Icons/Copy.tsx
@@ -14,23 +14,10 @@ export default function CopyIcon({ className, color, ...props }: IconProps) {
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        height="20"
-        id="mask0_1572_4523"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="20"
-        x="0"
-        y="0"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_1572_4523)">
-        <path
-          d="M7.54804 15.4742C7.17293 15.4742 6.85587 15.3447 6.59685 15.0857C6.33783 14.8267 6.20831 14.5096 6.20831 14.1345V4.64737C6.20831 4.27226 6.33783 3.95519 6.59685 3.69616C6.85587 3.43713 7.17293 3.30762 7.54804 3.30762H15.0352C15.4103 3.30762 15.7273 3.43713 15.9864 3.69616C16.2454 3.95519 16.3749 4.27226 16.3749 4.64737V14.1345C16.3749 14.5096 16.2454 14.8267 15.9864 15.0857C15.7273 15.3447 15.4103 15.4742 15.0352 15.4742H7.54804ZM7.54804 14.3909H15.0352C15.0993 14.3909 15.158 14.3642 15.2115 14.3108C15.2649 14.2574 15.2916 14.1986 15.2916 14.1345V4.64737C15.2916 4.58326 15.2649 4.52449 15.2115 4.47106C15.158 4.41764 15.0993 4.39093 15.0352 4.39093H7.54804C7.48393 4.39093 7.42517 4.41764 7.37175 4.47106C7.31832 4.52449 7.2916 4.58326 7.2916 4.64737V14.1345C7.2916 14.1986 7.31832 14.2574 7.37175 14.3108C7.42517 14.3642 7.48393 14.3909 7.54804 14.3909ZM4.96473 18.0575C4.58963 18.0575 4.27257 17.928 4.01354 17.669C3.75451 17.41 3.625 17.0929 3.625 16.7178V6.68901C3.625 6.53528 3.67642 6.40657 3.77927 6.30289C3.8821 6.19921 4.00977 6.14737 4.16227 6.14737C4.31476 6.14737 4.44389 6.19921 4.54967 6.30289C4.65543 6.40657 4.70831 6.53528 4.70831 6.68901V16.7178C4.70831 16.7819 4.73502 16.8407 4.78844 16.8941C4.84187 16.9475 4.90063 16.9742 4.96473 16.9742H12.9935C13.1473 16.9742 13.276 17.0257 13.3796 17.1285C13.4833 17.2313 13.5352 17.359 13.5352 17.5115C13.5352 17.664 13.4833 17.7931 13.3796 17.8989C13.276 18.0047 13.1473 18.0575 12.9935 18.0575H4.96473Z"
-          fill="#060606"
-        />
-      </g>
+      <path
+        d="M7.54804 15.4742C7.17293 15.4742 6.85587 15.3447 6.59685 15.0857C6.33783 14.8267 6.20831 14.5096 6.20831 14.1345V4.64737C6.20831 4.27226 6.33783 3.95519 6.59685 3.69616C6.85587 3.43713 7.17293 3.30762 7.54804 3.30762H15.0352C15.4103 3.30762 15.7273 3.43713 15.9864 3.69616C16.2454 3.95519 16.3749 4.27226 16.3749 4.64737V14.1345C16.3749 14.5096 16.2454 14.8267 15.9864 15.0857C15.7273 15.3447 15.4103 15.4742 15.0352 15.4742H7.54804ZM7.54804 14.3909H15.0352C15.0993 14.3909 15.158 14.3642 15.2115 14.3108C15.2649 14.2574 15.2916 14.1986 15.2916 14.1345V4.64737C15.2916 4.58326 15.2649 4.52449 15.2115 4.47106C15.158 4.41764 15.0993 4.39093 15.0352 4.39093H7.54804C7.48393 4.39093 7.42517 4.41764 7.37175 4.47106C7.31832 4.52449 7.2916 4.58326 7.2916 4.64737V14.1345C7.2916 14.1986 7.31832 14.2574 7.37175 14.3108C7.42517 14.3642 7.48393 14.3909 7.54804 14.3909ZM4.96473 18.0575C4.58963 18.0575 4.27257 17.928 4.01354 17.669C3.75451 17.41 3.625 17.0929 3.625 16.7178V6.68901C3.625 6.53528 3.67642 6.40657 3.77927 6.30289C3.8821 6.19921 4.00977 6.14737 4.16227 6.14737C4.31476 6.14737 4.44389 6.19921 4.54967 6.30289C4.65543 6.40657 4.70831 6.53528 4.70831 6.68901V16.7178C4.70831 16.7819 4.73502 16.8407 4.78844 16.8941C4.84187 16.9475 4.90063 16.9742 4.96473 16.9742H12.9935C13.1473 16.9742 13.276 17.0257 13.3796 17.1285C13.4833 17.2313 13.5352 17.359 13.5352 17.5115C13.5352 17.664 13.4833 17.7931 13.3796 17.8989C13.276 18.0047 13.1473 18.0575 12.9935 18.0575H4.96473Z"
+        fill="#060606"
+      />
    </svg>
  )
 }
--- a/components/Icons/CreditCard.tsx
+++ b/components/Icons/CreditCard.tsx
@@ -18,23 +18,10 @@ export default function CreditCardIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        id="mask0_7561_16317"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <svg mask="url(#mask0_7561_16317)">
-        <path
-          d="M21.75 6.1001V17.9001C21.75 18.4157 21.5664 18.8571 21.1992 19.2243C20.832 19.5915 20.3906 19.7751 19.875 19.7751H4.125C3.60937 19.7751 3.16796 19.5915 2.80077 19.2243C2.43359 18.8571 2.25 18.4157 2.25 17.9001V6.1001C2.25 5.58446 2.43359 5.14306 2.80077 4.77587C3.16796 4.40869 3.60937 4.2251 4.125 4.2251H19.875C20.3906 4.2251 20.832 4.40869 21.1992 4.77587C21.5664 5.14306 21.75 5.58446 21.75 6.1001ZM4.125 8.1251H19.875V6.1001H4.125V8.1251ZM4.125 11.9251V17.9001H19.875V11.9251H4.125Z"
-          fill="#26201E"
-        />
-      </svg>
+      <path
+        d="M21.75 6.1001V17.9001C21.75 18.4157 21.5664 18.8571 21.1992 19.2243C20.832 19.5915 20.3906 19.7751 19.875 19.7751H4.125C3.60937 19.7751 3.16796 19.5915 2.80077 19.2243C2.43359 18.8571 2.25 18.4157 2.25 17.9001V6.1001C2.25 5.58446 2.43359 5.14306 2.80077 4.77587C3.16796 4.40869 3.60937 4.2251 4.125 4.2251H19.875C20.3906 4.2251 20.832 4.40869 21.1992 4.77587C21.5664 5.14306 21.75 5.58446 21.75 6.1001ZM4.125 8.1251H19.875V6.1001H4.125V8.1251ZM4.125 11.9251V17.9001H19.875V11.9251H4.125Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/CrossCircle.tsx
+++ b/components/Icons/CrossCircle.tsx
@@ -18,23 +18,10 @@ export default function CrossCircleIcon({
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        id="mask0_1756_2637"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_1756_2637)">
-        <path
-          d="M12 13.3L14.9 16.2C15.075 16.375 15.2917 16.4625 15.55 16.4625C15.8083 16.4625 16.025 16.375 16.2 16.2C16.375 16.025 16.4625 15.8083 16.4625 15.55C16.4625 15.2917 16.375 15.075 16.2 14.9L13.3 12L16.2 9.1C16.375 8.925 16.4625 8.70833 16.4625 8.45C16.4625 8.19167 16.375 7.975 16.2 7.8C16.025 7.625 15.8083 7.5375 15.55 7.5375C15.2917 7.5375 15.075 7.625 14.9 7.8L12 10.7L9.1 7.8C8.925 7.625 8.70833 7.5375 8.45 7.5375C8.19167 7.5375 7.975 7.625 7.8 7.8C7.625 7.975 7.5375 8.19167 7.5375 8.45C7.5375 8.70833 7.625 8.925 7.8 9.1L10.7 12L7.8 14.9C7.625 15.075 7.5375 15.2917 7.5375 15.55C7.5375 15.8083 7.625 16.025 7.8 16.2C7.975 16.375 8.19167 16.4625 8.45 16.4625C8.70833 16.4625 8.925 16.375 9.1 16.2L12 13.3ZM12 21.75C10.6516 21.75 9.38434 21.4936 8.19838 20.9809C7.01239 20.4682 5.98075 19.7724 5.10345 18.8934C4.22615 18.0145 3.53125 16.9826 3.01875 15.7978C2.50625 14.613 2.25 13.3471 2.25 12C2.25 10.6516 2.50636 9.38434 3.01908 8.19838C3.53179 7.01239 4.22762 5.98075 5.10658 5.10345C5.98553 4.22615 7.01739 3.53125 8.20218 3.01875C9.38698 2.50625 10.6529 2.25 12 2.25C13.3484 2.25 14.6157 2.50636 15.8016 3.01908C16.9876 3.53179 18.0193 4.22762 18.8966 5.10658C19.7739 5.98553 20.4688 7.01739 20.9813 8.20217C21.4938 9.38697 21.75 10.6529 21.75 12C21.75 13.3484 21.4936 14.6157 20.9809 15.8016C20.4682 16.9876 19.7724 18.0193 18.8934 18.8966C18.0145 19.7739 16.9826 20.4688 15.7978 20.9813C14.613 21.4938 13.3471 21.75 12 21.75Z"
-          fill="white"
-        />
-      </g>
+      <path
+        d="M12 13.3L14.9 16.2C15.075 16.375 15.2917 16.4625 15.55 16.4625C15.8083 16.4625 16.025 16.375 16.2 16.2C16.375 16.025 16.4625 15.8083 16.4625 15.55C16.4625 15.2917 16.375 15.075 16.2 14.9L13.3 12L16.2 9.1C16.375 8.925 16.4625 8.70833 16.4625 8.45C16.4625 8.19167 16.375 7.975 16.2 7.8C16.025 7.625 15.8083 7.5375 15.55 7.5375C15.2917 7.5375 15.075 7.625 14.9 7.8L12 10.7L9.1 7.8C8.925 7.625 8.70833 7.5375 8.45 7.5375C8.19167 7.5375 7.975 7.625 7.8 7.8C7.625 7.975 7.5375 8.19167 7.5375 8.45C7.5375 8.70833 7.625 8.925 7.8 9.1L10.7 12L7.8 14.9C7.625 15.075 7.5375 15.2917 7.5375 15.55C7.5375 15.8083 7.625 16.025 7.8 16.2C7.975 16.375 8.19167 16.4625 8.45 16.4625C8.70833 16.4625 8.925 16.375 9.1 16.2L12 13.3ZM12 21.75C10.6516 21.75 9.38434 21.4936 8.19838 20.9809C7.01239 20.4682 5.98075 19.7724 5.10345 18.8934C4.22615 18.0145 3.53125 16.9826 3.01875 15.7978C2.50625 14.613 2.25 13.3471 2.25 12C2.25 10.6516 2.50636 9.38434 3.01908 8.19838C3.53179 7.01239 4.22762 5.98075 5.10658 5.10345C5.98553 4.22615 7.01739 3.53125 8.20218 3.01875C9.38698 2.50625 10.6529 2.25 12 2.25C13.3484 2.25 14.6157 2.50636 15.8016 3.01908C16.9876 3.53179 18.0193 4.22762 18.8966 5.10658C19.7739 5.98553 20.4688 7.01739 20.9813 8.20217C21.4938 9.38697 21.75 10.6529 21.75 12C21.75 13.3484 21.4936 14.6157 20.9809 15.8016C20.4682 16.9876 19.7724 18.0193 18.8934 18.8966C18.0145 19.7739 16.9826 20.4688 15.7978 20.9813C14.613 21.4938 13.3471 21.75 12 21.75Z"
+        fill="white"
+      />
    </svg>
  )
 }
--- a/components/Icons/Cultural.tsx
+++ b/components/Icons/Cultural.tsx
@@ -18,23 +18,10 @@ export default function CulturalIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_71_1002"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_71_1002)">
-        <path
-          d="M18.8424 7.51255C19.1058 7.51255 19.3292 7.4226 19.5125 7.2427C19.6959 7.0628 19.7875 6.83988 19.7875 6.57395C19.7875 6.30802 19.6965 6.08547 19.5144 5.9063C19.3323 5.72713 19.1067 5.63755 18.8375 5.63755C18.5755 5.63755 18.3558 5.72922 18.1785 5.91255C18.0012 6.09588 17.9125 6.31672 17.9125 6.57505C17.9125 6.83338 18.0017 7.05422 18.1799 7.23755C18.3581 7.42088 18.5789 7.51255 18.8424 7.51255ZM14.9 7.51255C15.1584 7.51255 15.3792 7.42088 15.5625 7.23755C15.7459 7.05422 15.8375 6.83338 15.8375 6.57505C15.8375 6.31672 15.7459 6.09588 15.5625 5.91255C15.3792 5.72922 15.1584 5.63755 14.9 5.63755C14.6417 5.63755 14.4209 5.72922 14.2375 5.91255C14.0542 6.09588 13.9625 6.31672 13.9625 6.57505C13.9625 6.83338 14.0542 7.05422 14.2375 7.23755C14.4209 7.42088 14.6417 7.51255 14.9 7.51255ZM16.875 9.06255C16.4212 9.06255 15.9869 9.1438 15.5721 9.3063C15.1574 9.4688 14.8417 9.74172 14.625 10.125C14.5167 10.3 14.5292 10.4709 14.6625 10.6375C14.7959 10.8042 14.975 10.8875 15.2 10.8875H18.55C18.775 10.8875 18.9542 10.8042 19.0875 10.6375C19.2209 10.4709 19.2334 10.3 19.125 10.125C18.9084 9.74172 18.5927 9.4688 18.1779 9.3063C17.7632 9.1438 17.3289 9.06255 16.875 9.06255ZM7.11035 21.75C5.49515 21.75 4.12297 21.1849 2.9938 20.0547C1.86463 18.9245 1.30005 17.5521 1.30005 15.9375V11.0125C1.30005 10.4969 1.48364 10.0555 1.85082 9.68832C2.21801 9.32114 2.65942 9.13755 3.17505 9.13755H11.05C11.5657 9.13755 12.0071 9.32114 12.3743 9.68832C12.7415 10.0555 12.925 10.4969 12.925 11.0125V15.9375C12.925 17.5521 12.3597 18.9245 11.2291 20.0547C10.0985 21.1849 8.72555 21.75 7.11035 21.75ZM7.11255 19.875C8.20422 19.875 9.13338 19.4917 9.90005 18.725C10.6667 17.9584 11.05 17.0292 11.05 15.9375V11.0125H3.17505V15.9375C3.17505 17.0292 3.55838 17.9584 4.32505 18.725C5.09172 19.4917 6.02088 19.875 7.11255 19.875ZM16.875 14.85C16.4417 14.85 16.0084 14.8021 15.575 14.7063C15.1417 14.6105 14.7334 14.4667 14.35 14.275V12.0625C14.7167 12.3542 15.1153 12.5792 15.5457 12.7375C15.9762 12.8959 16.4193 12.975 16.875 12.975C17.9667 12.975 18.8959 12.5917 19.6625 11.825C20.4292 11.0584 20.8125 10.1292 20.8125 9.03755V4.11255H12.925V7.71255H11.05V4.11255C11.05 3.59692 11.2336 3.15551 11.6008 2.78832C11.968 2.42114 12.4094 2.23755 12.925 2.23755H20.8125C21.3282 2.23755 21.7696 2.42114 22.1368 2.78832C22.504 3.15551 22.6875 3.59692 22.6875 4.11255V9.03755C22.6875 10.6521 22.1224 12.0245 20.9922 13.1547C19.862 14.2849 18.4896 14.85 16.875 14.85ZM5.16255 14.4C5.42463 14.4 5.64432 14.3109 5.82162 14.1327C5.99891 13.9545 6.08755 13.7337 6.08755 13.4702C6.08755 13.2068 5.99844 12.9834 5.82022 12.8C5.64201 12.6167 5.42117 12.525 5.15772 12.525C4.89427 12.525 4.67088 12.6161 4.48755 12.7982C4.30422 12.9803 4.21255 13.2059 4.21255 13.475C4.21255 13.7371 4.30359 13.9568 4.48567 14.1341C4.66776 14.3114 4.89338 14.4 5.16255 14.4ZM9.08755 14.4C9.34588 14.4 9.56672 14.3109 9.75005 14.1327C9.93338 13.9545 10.025 13.7337 10.025 13.4702C10.025 13.2068 9.9351 12.9834 9.7552 12.8C9.5753 12.6167 9.35238 12.525 9.08645 12.525C8.82052 12.525 8.59797 12.6161 8.4188 12.7982C8.23963 12.9803 8.15005 13.2059 8.15005 13.475C8.15005 13.7371 8.24172 13.9568 8.42505 14.1341C8.60838 14.3114 8.82922 14.4 9.08755 14.4ZM7.12317 17.7875C7.57442 17.7875 8.00213 17.7042 8.4063 17.5375C8.81047 17.3709 9.12922 17.1042 9.36255 16.7375C9.47088 16.5542 9.46418 16.375 9.34245 16.2C9.2207 16.025 9.04823 15.9375 8.82505 15.9375H5.42505C5.20187 15.9375 5.0294 16.025 4.90765 16.2C4.78592 16.375 4.77922 16.5542 4.88755 16.7375C5.12088 17.1042 5.43901 17.3709 5.84192 17.5375C6.24482 17.7042 6.67191 17.7875 7.12317 17.7875Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M18.8424 7.51255C19.1058 7.51255 19.3292 7.4226 19.5125 7.2427C19.6959 7.0628 19.7875 6.83988 19.7875 6.57395C19.7875 6.30802 19.6965 6.08547 19.5144 5.9063C19.3323 5.72713 19.1067 5.63755 18.8375 5.63755C18.5755 5.63755 18.3558 5.72922 18.1785 5.91255C18.0012 6.09588 17.9125 6.31672 17.9125 6.57505C17.9125 6.83338 18.0017 7.05422 18.1799 7.23755C18.3581 7.42088 18.5789 7.51255 18.8424 7.51255ZM14.9 7.51255C15.1584 7.51255 15.3792 7.42088 15.5625 7.23755C15.7459 7.05422 15.8375 6.83338 15.8375 6.57505C15.8375 6.31672 15.7459 6.09588 15.5625 5.91255C15.3792 5.72922 15.1584 5.63755 14.9 5.63755C14.6417 5.63755 14.4209 5.72922 14.2375 5.91255C14.0542 6.09588 13.9625 6.31672 13.9625 6.57505C13.9625 6.83338 14.0542 7.05422 14.2375 7.23755C14.4209 7.42088 14.6417 7.51255 14.9 7.51255ZM16.875 9.06255C16.4212 9.06255 15.9869 9.1438 15.5721 9.3063C15.1574 9.4688 14.8417 9.74172 14.625 10.125C14.5167 10.3 14.5292 10.4709 14.6625 10.6375C14.7959 10.8042 14.975 10.8875 15.2 10.8875H18.55C18.775 10.8875 18.9542 10.8042 19.0875 10.6375C19.2209 10.4709 19.2334 10.3 19.125 10.125C18.9084 9.74172 18.5927 9.4688 18.1779 9.3063C17.7632 9.1438 17.3289 9.06255 16.875 9.06255ZM7.11035 21.75C5.49515 21.75 4.12297 21.1849 2.9938 20.0547C1.86463 18.9245 1.30005 17.5521 1.30005 15.9375V11.0125C1.30005 10.4969 1.48364 10.0555 1.85082 9.68832C2.21801 9.32114 2.65942 9.13755 3.17505 9.13755H11.05C11.5657 9.13755 12.0071 9.32114 12.3743 9.68832C12.7415 10.0555 12.925 10.4969 12.925 11.0125V15.9375C12.925 17.5521 12.3597 18.9245 11.2291 20.0547C10.0985 21.1849 8.72555 21.75 7.11035 21.75ZM7.11255 19.875C8.20422 19.875 9.13338 19.4917 9.90005 18.725C10.6667 17.9584 11.05 17.0292 11.05 15.9375V11.0125H3.17505V15.9375C3.17505 17.0292 3.55838 17.9584 4.32505 18.725C5.09172 19.4917 6.02088 19.875 7.11255 19.875ZM16.875 14.85C16.4417 14.85 16.0084 14.8021 15.575 14.7063C15.1417 14.6105 14.7334 14.4667 14.35 14.275V12.0625C14.7167 12.3542 15.1153 12.5792 15.5457 12.7375C15.9762 12.8959 16.4193 12.975 16.875 12.975C17.9667 12.975 18.8959 12.5917 19.6625 11.825C20.4292 11.0584 20.8125 10.1292 20.8125 9.03755V4.11255H12.925V7.71255H11.05V4.11255C11.05 3.59692 11.2336 3.15551 11.6008 2.78832C11.968 2.42114 12.4094 2.23755 12.925 2.23755H20.8125C21.3282 2.23755 21.7696 2.42114 22.1368 2.78832C22.504 3.15551 22.6875 3.59692 22.6875 4.11255V9.03755C22.6875 10.6521 22.1224 12.0245 20.9922 13.1547C19.862 14.2849 18.4896 14.85 16.875 14.85ZM5.16255 14.4C5.42463 14.4 5.64432 14.3109 5.82162 14.1327C5.99891 13.9545 6.08755 13.7337 6.08755 13.4702C6.08755 13.2068 5.99844 12.9834 5.82022 12.8C5.64201 12.6167 5.42117 12.525 5.15772 12.525C4.89427 12.525 4.67088 12.6161 4.48755 12.7982C4.30422 12.9803 4.21255 13.2059 4.21255 13.475C4.21255 13.7371 4.30359 13.9568 4.48567 14.1341C4.66776 14.3114 4.89338 14.4 5.16255 14.4ZM9.08755 14.4C9.34588 14.4 9.56672 14.3109 9.75005 14.1327C9.93338 13.9545 10.025 13.7337 10.025 13.4702C10.025 13.2068 9.9351 12.9834 9.7552 12.8C9.5753 12.6167 9.35238 12.525 9.08645 12.525C8.82052 12.525 8.59797 12.6161 8.4188 12.7982C8.23963 12.9803 8.15005 13.2059 8.15005 13.475C8.15005 13.7371 8.24172 13.9568 8.42505 14.1341C8.60838 14.3114 8.82922 14.4 9.08755 14.4ZM7.12317 17.7875C7.57442 17.7875 8.00213 17.7042 8.4063 17.5375C8.81047 17.3709 9.12922 17.1042 9.36255 16.7375C9.47088 16.5542 9.46418 16.375 9.34245 16.2C9.2207 16.025 9.04823 15.9375 8.82505 15.9375H5.42505C5.20187 15.9375 5.0294 16.025 4.90765 16.2C4.78592 16.375 4.77922 16.5542 4.88755 16.7375C5.12088 17.1042 5.43901 17.3709 5.84192 17.5375C6.24482 17.7042 6.67191 17.7875 7.12317 17.7875Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/Delete.tsx
+++ b/components/Icons/Delete.tsx
@@ -14,23 +14,10 @@ export default function DeleteIcon({ className, color, ...props }: IconProps) {
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        id="mask0_7561_16314"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_7561_16314)">
-        <path
-          d="M7.07656 20.75C6.5599 20.75 6.11823 20.5667 5.75156 20.2C5.3849 19.8333 5.20156 19.3917 5.20156 18.875V6.075H5.16406C4.90573 6.075 4.6849 5.98333 4.50156 5.8C4.31823 5.61667 4.22656 5.39583 4.22656 5.1375C4.22656 4.87917 4.31823 4.65833 4.50156 4.475C4.6849 4.29167 4.90573 4.2 5.16406 4.2H9.05156V4.1875C9.05156 3.92917 9.14323 3.70833 9.32656 3.525C9.5099 3.34167 9.73073 3.25 9.98906 3.25H14.0391C14.2974 3.25 14.5182 3.34167 14.7016 3.525C14.8849 3.70833 14.9766 3.92917 14.9766 4.1875V4.2H18.8641C19.1224 4.2 19.3432 4.29167 19.5266 4.475C19.7099 4.65833 19.8016 4.87917 19.8016 5.1375C19.8016 5.39583 19.7099 5.61667 19.5266 5.8C19.3432 5.98333 19.1224 6.075 18.8641 6.075H18.8266V18.875C18.8266 19.3917 18.6432 19.8333 18.2766 20.2C17.9099 20.5667 17.4682 20.75 16.9516 20.75H7.07656ZM16.9516 6.075H7.07656V18.875H16.9516V6.075ZM10.0641 16.9125C10.3224 16.9125 10.5432 16.8208 10.7266 16.6375C10.9099 16.4542 11.0016 16.2333 11.0016 15.975V8.975C11.0016 8.71667 10.9099 8.49583 10.7266 8.3125C10.5432 8.12917 10.3224 8.0375 10.0641 8.0375C9.80573 8.0375 9.5849 8.12917 9.40156 8.3125C9.21823 8.49583 9.12656 8.71667 9.12656 8.975V15.975C9.12656 16.2333 9.21823 16.4542 9.40156 16.6375C9.5849 16.8208 9.80573 16.9125 10.0641 16.9125ZM13.9641 16.9125C14.2224 16.9125 14.4432 16.8208 14.6266 16.6375C14.8099 16.4542 14.9016 16.2333 14.9016 15.975V8.975C14.9016 8.71667 14.8099 8.49583 14.6266 8.3125C14.4432 8.12917 14.2224 8.0375 13.9641 8.0375C13.7057 8.0375 13.4849 8.12917 13.3016 8.3125C13.1182 8.49583 13.0266 8.71667 13.0266 8.975V15.975C13.0266 16.2333 13.1182 16.4542 13.3016 16.6375C13.4849 16.8208 13.7057 16.9125 13.9641 16.9125Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M7.07656 20.75C6.5599 20.75 6.11823 20.5667 5.75156 20.2C5.3849 19.8333 5.20156 19.3917 5.20156 18.875V6.075H5.16406C4.90573 6.075 4.6849 5.98333 4.50156 5.8C4.31823 5.61667 4.22656 5.39583 4.22656 5.1375C4.22656 4.87917 4.31823 4.65833 4.50156 4.475C4.6849 4.29167 4.90573 4.2 5.16406 4.2H9.05156V4.1875C9.05156 3.92917 9.14323 3.70833 9.32656 3.525C9.5099 3.34167 9.73073 3.25 9.98906 3.25H14.0391C14.2974 3.25 14.5182 3.34167 14.7016 3.525C14.8849 3.70833 14.9766 3.92917 14.9766 4.1875V4.2H18.8641C19.1224 4.2 19.3432 4.29167 19.5266 4.475C19.7099 4.65833 19.8016 4.87917 19.8016 5.1375C19.8016 5.39583 19.7099 5.61667 19.5266 5.8C19.3432 5.98333 19.1224 6.075 18.8641 6.075H18.8266V18.875C18.8266 19.3917 18.6432 19.8333 18.2766 20.2C17.9099 20.5667 17.4682 20.75 16.9516 20.75H7.07656ZM16.9516 6.075H7.07656V18.875H16.9516V6.075ZM10.0641 16.9125C10.3224 16.9125 10.5432 16.8208 10.7266 16.6375C10.9099 16.4542 11.0016 16.2333 11.0016 15.975V8.975C11.0016 8.71667 10.9099 8.49583 10.7266 8.3125C10.5432 8.12917 10.3224 8.0375 10.0641 8.0375C9.80573 8.0375 9.5849 8.12917 9.40156 8.3125C9.21823 8.49583 9.12656 8.71667 9.12656 8.975V15.975C9.12656 16.2333 9.21823 16.4542 9.40156 16.6375C9.5849 16.8208 9.80573 16.9125 10.0641 16.9125ZM13.9641 16.9125C14.2224 16.9125 14.4432 16.8208 14.6266 16.6375C14.8099 16.4542 14.9016 16.2333 14.9016 15.975V8.975C14.9016 8.71667 14.8099 8.49583 14.6266 8.3125C14.4432 8.12917 14.2224 8.0375 13.9641 8.0375C13.7057 8.0375 13.4849 8.12917 13.3016 8.3125C13.1182 8.49583 13.0266 8.71667 13.0266 8.975V15.975C13.0266 16.2333 13.1182 16.4542 13.3016 16.6375C13.4849 16.8208 13.7057 16.9125 13.9641 16.9125Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/Desk.tsx
+++ b/components/Icons/Desk.tsx
@@ -14,23 +14,10 @@ export default function DeskIcon({ className, color, ...props }: IconProps) {
      xmlns="http://www.w3.org/2000/svg"
      {...props}
    >
-      <mask
-        id="mask0_81_882"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_81_882)">
-        <path
-          d="M2.0625 17V7.9375C2.0625 7.42187 2.24609 6.98046 2.61327 6.61328C2.98046 6.24609 3.42187 6.0625 3.9375 6.0625H20.0625C20.5781 6.0625 21.0195 6.24609 21.3867 6.61328C21.7539 6.98046 21.9375 7.42187 21.9375 7.9375V17C21.9375 17.2583 21.8458 17.4792 21.6625 17.6625C21.4792 17.8458 21.2583 17.9375 21 17.9375C20.7417 17.9375 20.5208 17.8458 20.3375 17.6625C20.1542 17.4792 20.0625 17.2583 20.0625 17V15.9375H15.9375V17C15.9375 17.2583 15.8458 17.4792 15.6625 17.6625C15.4792 17.8458 15.2583 17.9375 15 17.9375C14.7417 17.9375 14.5208 17.8458 14.3375 17.6625C14.1542 17.4792 14.0625 17.2583 14.0625 17V7.9375H3.9375V17C3.9375 17.2583 3.84583 17.4792 3.6625 17.6625C3.47917 17.8458 3.25833 17.9375 3 17.9375C2.74167 17.9375 2.52083 17.8458 2.3375 17.6625C2.15417 17.4792 2.0625 17.2583 2.0625 17ZM15.9375 10.0625H20.0625V7.9375H15.9375V10.0625ZM15.9375 14.0625H20.0625V11.9375H15.9375V14.0625Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M2.0625 17V7.9375C2.0625 7.42187 2.24609 6.98046 2.61327 6.61328C2.98046 6.24609 3.42187 6.0625 3.9375 6.0625H20.0625C20.5781 6.0625 21.0195 6.24609 21.3867 6.61328C21.7539 6.98046 21.9375 7.42187 21.9375 7.9375V17C21.9375 17.2583 21.8458 17.4792 21.6625 17.6625C21.4792 17.8458 21.2583 17.9375 21 17.9375C20.7417 17.9375 20.5208 17.8458 20.3375 17.6625C20.1542 17.4792 20.0625 17.2583 20.0625 17V15.9375H15.9375V17C15.9375 17.2583 15.8458 17.4792 15.6625 17.6625C15.4792 17.8458 15.2583 17.9375 15 17.9375C14.7417 17.9375 14.5208 17.8458 14.3375 17.6625C14.1542 17.4792 14.0625 17.2583 14.0625 17V7.9375H3.9375V17C3.9375 17.2583 3.84583 17.4792 3.6625 17.6625C3.47917 17.8458 3.25833 17.9375 3 17.9375C2.74167 17.9375 2.52083 17.8458 2.3375 17.6625C2.15417 17.4792 2.0625 17.2583 2.0625 17ZM15.9375 10.0625H20.0625V7.9375H15.9375V10.0625ZM15.9375 14.0625H20.0625V11.9375H15.9375V14.0625Z"
+        fill="#26201E"
+      />
    </svg>
  )
 }
--- a/components/Icons/DoorOpen.tsx
+++ b/components/Icons/DoorOpen.tsx
@@ -18,23 +18,10 @@ export default function DoorOpenIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_554_11985"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_554_11985)">
-        <path
-          d="M4.2124 20.75C3.95407 20.75 3.73324 20.6583 3.5499 20.475C3.36657 20.2916 3.2749 20.0708 3.2749 19.8125C3.2749 19.5541 3.36657 19.3333 3.5499 19.15C3.73324 18.9666 3.95407 18.875 4.2124 18.875H5.2499V4.16248C5.2499 3.90414 5.34157 3.68331 5.5249 3.49998C5.70824 3.31664 5.92907 3.22498 6.1874 3.22498H13.9749C14.237 3.22498 14.4567 3.31363 14.634 3.49093C14.8113 3.66821 14.8999 3.88789 14.8999 4.14998V4.19998H17.8249C18.087 4.19998 18.3067 4.28863 18.484 4.46593C18.6613 4.64321 18.7499 4.86289 18.7499 5.12498V18.875H19.7874C20.0457 18.875 20.2666 18.9666 20.4499 19.15C20.6332 19.3333 20.7249 19.5541 20.7249 19.8125C20.7249 20.0708 20.6332 20.2916 20.4499 20.475C20.2666 20.6583 20.0457 20.75 19.7874 20.75H17.7999C17.5378 20.75 17.3181 20.6613 17.1409 20.4841C16.9636 20.3068 16.8749 20.0871 16.8749 19.825V6.07498H14.8999V19.825C14.8999 20.0871 14.8113 20.3068 14.634 20.4841C14.4567 20.6613 14.237 20.75 13.9749 20.75H4.2124ZM12.0499 12.0013C12.0499 11.7254 11.9566 11.4937 11.77 11.3062C11.5833 11.1187 11.3521 11.025 11.0762 11.025C10.8003 11.025 10.5687 11.1183 10.3812 11.3049C10.1937 11.4915 10.0999 11.7228 10.0999 11.9987C10.0999 12.2745 10.1932 12.5062 10.3798 12.6937C10.5665 12.8812 10.7977 12.975 11.0736 12.975C11.3495 12.975 11.5812 12.8817 11.7687 12.6951C11.9562 12.5084 12.0499 12.2772 12.0499 12.0013ZM7.1249 18.875H13.0249V5.09998H7.1249V18.875Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M4.2124 20.75C3.95407 20.75 3.73324 20.6583 3.5499 20.475C3.36657 20.2916 3.2749 20.0708 3.2749 19.8125C3.2749 19.5541 3.36657 19.3333 3.5499 19.15C3.73324 18.9666 3.95407 18.875 4.2124 18.875H5.2499V4.16248C5.2499 3.90414 5.34157 3.68331 5.5249 3.49998C5.70824 3.31664 5.92907 3.22498 6.1874 3.22498H13.9749C14.237 3.22498 14.4567 3.31363 14.634 3.49093C14.8113 3.66821 14.8999 3.88789 14.8999 4.14998V4.19998H17.8249C18.087 4.19998 18.3067 4.28863 18.484 4.46593C18.6613 4.64321 18.7499 4.86289 18.7499 5.12498V18.875H19.7874C20.0457 18.875 20.2666 18.9666 20.4499 19.15C20.6332 19.3333 20.7249 19.5541 20.7249 19.8125C20.7249 20.0708 20.6332 20.2916 20.4499 20.475C20.2666 20.6583 20.0457 20.75 19.7874 20.75H17.7999C17.5378 20.75 17.3181 20.6613 17.1409 20.4841C16.9636 20.3068 16.8749 20.0871 16.8749 19.825V6.07498H14.8999V19.825C14.8999 20.0871 14.8113 20.3068 14.634 20.4841C14.4567 20.6613 14.237 20.75 13.9749 20.75H4.2124ZM12.0499 12.0013C12.0499 11.7254 11.9566 11.4937 11.77 11.3062C11.5833 11.1187 11.3521 11.025 11.0762 11.025C10.8003 11.025 10.5687 11.1183 10.3812 11.3049C10.1937 11.4915 10.0999 11.7228 10.0999 11.9987C10.0999 12.2745 10.1932 12.5062 10.3798 12.6937C10.5665 12.8812 10.7977 12.975 11.0736 12.975C11.3495 12.975 11.5812 12.8817 11.7687 12.6951C11.9562 12.5084 12.0499 12.2772 12.0499 12.0013ZM7.1249 18.875H13.0249V5.09998H7.1249V18.875Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/components/Icons/Download.tsx
+++ b/components/Icons/Download.tsx
@@ -18,23 +18,10 @@ export default function DownloadIcon({
      fill="none"
      {...props}
    >
-      <mask
-        id="mask0_6955_3250"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="21"
-        height="21"
-      >
-        <rect x="0.5" y="0.000244141" width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_6955_3250)">
-        <path
-          d="M10.5013 12.9065C10.3971 12.9065 10.2982 12.8874 10.2044 12.8492C10.1107 12.811 10.0256 12.7537 9.94922 12.6773L7.05339 9.78145C6.90061 9.62868 6.82595 9.44812 6.82943 9.23979C6.8329 9.03145 6.90755 8.8509 7.05339 8.69812C7.20616 8.54534 7.38846 8.46722 7.60026 8.46375C7.81207 8.46027 7.99436 8.53493 8.14714 8.6877L9.72005 10.2606V4.32312C9.72005 4.10784 9.79644 3.92381 9.94922 3.77104C10.102 3.61826 10.286 3.54187 10.5013 3.54187C10.7166 3.54187 10.9006 3.61826 11.0534 3.77104C11.2062 3.92381 11.2826 4.10784 11.2826 4.32312V10.2606L12.8555 8.6877C13.0082 8.53493 13.1905 8.46027 13.4023 8.46375C13.6142 8.46722 13.7964 8.54534 13.9492 8.69812C14.0951 8.8509 14.1697 9.03145 14.1732 9.23979C14.1767 9.44812 14.102 9.62868 13.9492 9.78145L11.0534 12.6773C10.977 12.7537 10.8919 12.811 10.7982 12.8492C10.7044 12.8874 10.6055 12.9065 10.5013 12.9065ZM5.60547 16.4585C5.17491 16.4585 4.80686 16.3058 4.5013 16.0002C4.19575 15.6946 4.04297 15.3266 4.04297 14.896V13.2294C4.04297 13.0141 4.11936 12.8301 4.27214 12.6773C4.42491 12.5245 4.60894 12.4481 4.82422 12.4481C5.0395 12.4481 5.22352 12.5245 5.3763 12.6773C5.52908 12.8301 5.60547 13.0141 5.60547 13.2294V14.896H15.3971V13.2294C15.3971 13.0141 15.4735 12.8301 15.6263 12.6773C15.7791 12.5245 15.9631 12.4481 16.1784 12.4481C16.3937 12.4481 16.5777 12.5245 16.7305 12.6773C16.8832 12.8301 16.9596 13.0141 16.9596 13.2294V14.896C16.9596 15.3266 16.8069 15.6946 16.5013 16.0002C16.1957 16.3058 15.8277 16.4585 15.3971 16.4585H5.60547Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M10.5013 12.9065C10.3971 12.9065 10.2982 12.8874 10.2044 12.8492C10.1107 12.811 10.0256 12.7537 9.94922 12.6773L7.05339 9.78145C6.90061 9.62868 6.82595 9.44812 6.82943 9.23979C6.8329 9.03145 6.90755 8.8509 7.05339 8.69812C7.20616 8.54534 7.38846 8.46722 7.60026 8.46375C7.81207 8.46027 7.99436 8.53493 8.14714 8.6877L9.72005 10.2606V4.32312C9.72005 4.10784 9.79644 3.92381 9.94922 3.77104C10.102 3.61826 10.286 3.54187 10.5013 3.54187C10.7166 3.54187 10.9006 3.61826 11.0534 3.77104C11.2062 3.92381 11.2826 4.10784 11.2826 4.32312V10.2606L12.8555 8.6877C13.0082 8.53493 13.1905 8.46027 13.4023 8.46375C13.6142 8.46722 13.7964 8.54534 13.9492 8.69812C14.0951 8.8509 14.1697 9.03145 14.1732 9.23979C14.1767 9.44812 14.102 9.62868 13.9492 9.78145L11.0534 12.6773C10.977 12.7537 10.8919 12.811 10.7982 12.8492C10.7044 12.8874 10.6055 12.9065 10.5013 12.9065ZM5.60547 16.4585C5.17491 16.4585 4.80686 16.3058 4.5013 16.0002C4.19575 15.6946 4.04297 15.3266 4.04297 14.896V13.2294C4.04297 13.0141 4.11936 12.8301 4.27214 12.6773C4.42491 12.5245 4.60894 12.4481 4.82422 12.4481C5.0395 12.4481 5.22352 12.5245 5.3763 12.6773C5.52908 12.8301 5.60547 13.0141 5.60547 13.2294V14.896H15.3971V13.2294C15.3971 13.0141 15.4735 12.8301 15.6263 12.6773C15.7791 12.5245 15.9631 12.4481 16.1784 12.4481C16.3937 12.4481 16.5777 12.5245 16.7305 12.6773C16.8832 12.8301 16.9596 13.0141 16.9596 13.2294V14.896C16.9596 15.3266 16.8069 15.6946 16.5013 16.0002C16.1957 16.3058 15.8277 16.4585 15.3971 16.4585H5.60547Z"
+        fill="#4D001B"
+      />
    </svg>
  )
 }
--- a/Show More
+++ b/Show More