diff --git a/.gitignore b/.gitignore
index 4663988fb..8a6f4e73e 100644
--- 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
\ No newline at end of file
diff --git a/actions/editProfile.ts b/actions/editProfile.ts
index 8f0791c48..acf5d1b12 100644
--- 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: {
diff --git a/actions/registerUser.ts b/actions/registerUser.ts
index e65fc357f..ecd2318b4 100644
--- 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}`,
diff --git a/actions/registerUserBookingFlow.ts b/actions/registerUserBookingFlow.ts
index a0539d351..a34cad231 100644
--- 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}`,
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/layout.tsx
index 13512d701..73496fe4e 100644
--- 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>
   )
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/[...paths]/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/[...paths]/page.tsx
new file mode 100644
index 000000000..03a82e5f5
--- /dev/null
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/[...paths]/page.tsx
@@ -0,0 +1 @@
+export { default } from "../page"
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/loading.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/loading.tsx
new file mode 100644
index 000000000..0fad268cc
--- /dev/null
+++ 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 />
+}
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@hotelHeader/page.tsx
new file mode 100644
index 000000000..58a216006
--- /dev/null
+++ 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} />
+}
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/[...paths]/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/[...paths]/page.tsx
new file mode 100644
index 000000000..03a82e5f5
--- /dev/null
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/[...paths]/page.tsx
@@ -0,0 +1 @@
+export { default } from "../page"
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/loading.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/loading.tsx
new file mode 100644
index 000000000..67515d4f5
--- /dev/null
+++ 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 />
+}
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/@sidePeek/page.tsx
new file mode 100644
index 000000000..13b770699
--- /dev/null
+++ 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} />
+}
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/layout.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/layout.tsx
index 0e8edd50e..271d19e6d 100644
--- 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>
   )
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/[step]/page.tsx
index 8e8d3c891..264f5b04d 100644
--- 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>
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
index 1a2bb5118..fe98723e8 100644
--- 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()),
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts
index 8dfc76a1d..a6a48e12f 100644
--- 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(",")}]`
+}
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.module.css b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.module.css
deleted file mode 100644
index 464c8ce65..000000000
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.module.css
+++ /dev/null
@@ -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;
-}
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
index 2d80356ac..35a940f0b 100644
--- 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 ?? []}
+      />
+    </>
   )
 }
diff --git a/app/[lang]/(live)/@bookingwidget/page.tsx b/app/[lang]/(live)/@bookingwidget/page.tsx
index 16bc85731..6c944ae69 100644
--- 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
   }
diff --git a/components/BookingWidget/Client.tsx b/components/BookingWidget/Client.tsx
index fda8683c9..6a594199e 100644
--- 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: [],
         },
       ],
     },
diff --git a/components/BookingWidget/MobileToggleButton/index.tsx b/components/BookingWidget/MobileToggleButton/index.tsx
index df84cd65d..a58bdd1b2 100644
--- 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}>
diff --git a/components/ContentType/ContentPage/HotelListingItem/hotelListingItem.module.css b/components/ContentType/ContentPage/HotelListingItem/hotelListingItem.module.css
new file mode 100644
index 000000000..5a7bf6f7d
--- /dev/null
+++ 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);
+  }
+}
diff --git a/components/ContentType/ContentPage/HotelListingItem/index.tsx b/components/ContentType/ContentPage/HotelListingItem/index.tsx
new file mode 100644
index 000000000..2f2d0dd81
--- /dev/null
+++ 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>
+  )
+}
diff --git a/components/ContentType/HotelPage/PreviewImages/index.tsx b/components/ContentType/HotelPage/PreviewImages/index.tsx
index 99704a61b..2a0074c5c 100644
--- 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}
diff --git a/components/ContentType/HotelPage/index.tsx b/components/ContentType/HotelPage/index.tsx
index d10244040..8eb441e01 100644
--- 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>
diff --git a/components/DatePicker/Screen/Desktop.tsx b/components/DatePicker/Screen/Desktop.tsx
index 9056f9183..d3b30dbf8 100644
--- 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>
diff --git a/components/DatePicker/Screen/Mobile.tsx b/components/DatePicker/Screen/Mobile.tsx
index 0407f9b63..6e68ba1fc 100644
--- 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} />
diff --git a/components/DatePicker/index.tsx b/components/DatePicker/index.tsx
index a68f137ea..b18a4d9ca 100644
--- 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" />
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/index.tsx b/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/index.tsx
index 3b4391998..ae1f8f4d0 100644
--- 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>
   )
diff --git a/components/Forms/BookingWidget/FormContent/index.tsx b/components/Forms/BookingWidget/FormContent/index.tsx
index bd7a65ba6..002edb44a 100644
--- 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>
diff --git a/components/Forms/BookingWidget/index.tsx b/components/Forms/BookingWidget/index.tsx
index 270a38b04..8c9ccb48e 100644
--- 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()
diff --git a/components/Forms/BookingWidget/schema.ts b/components/Forms/BookingWidget/schema.ts
index aa42b542d..973ab6ad6 100644
--- 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(),
diff --git a/components/GuestsRoomsPicker/AdultSelector/index.tsx b/components/GuestsRoomsPicker/AdultSelector/index.tsx
index 72d60ebaf..06dbd56c3 100644
--- 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
           )
diff --git a/components/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx b/components/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx
index 107bfd8b6..f219293ab 100644
--- 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}
diff --git a/components/GuestsRoomsPicker/ChildSelector/index.tsx b/components/GuestsRoomsPicker/ChildSelector/index.tsx
index 827bcd2e6..22d594397 100644
--- 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,
+      })
     }
   }
 
diff --git a/components/GuestsRoomsPicker/Provider/GuestsRoomsProvider.tsx b/components/GuestsRoomsPicker/Provider/GuestsRoomsProvider.tsx
new file mode 100644
index 000000000..5a85102e7
--- /dev/null
+++ 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>
+  )
+}
diff --git a/components/GuestsRoomsPicker/index.tsx b/components/GuestsRoomsPicker/index.tsx
index f12ecebde..090fc3803 100644
--- 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">
diff --git a/components/Header/MainMenu/MobileMenu/index.tsx b/components/Header/MainMenu/MobileMenu/index.tsx
index 1f2660770..ae79675dd 100644
--- 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
diff --git a/components/Header/MainMenu/MyPagesMenu/index.tsx b/components/Header/MainMenu/MyPagesMenu/index.tsx
index fb739399c..b0504c582 100644
--- 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 : ""}`}
diff --git a/components/Header/MainMenu/NavigationMenu/MegaMenu/index.tsx b/components/Header/MainMenu/NavigationMenu/MegaMenu/index.tsx
index ab400ac38..c6f7cd2d4 100644
--- 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>
diff --git a/components/HotelReservation/EnterDetails/BedType/index.tsx b/components/HotelReservation/EnterDetails/BedType/index.tsx
index 106aaa80a..e73eacf87 100644
--- 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>
diff --git a/components/HotelReservation/EnterDetails/BedType/schema.ts b/components/HotelReservation/EnterDetails/BedType/schema.ts
index d9f52a407..8f77ba768 100644
--- 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),
 })
diff --git a/components/HotelReservation/EnterDetails/Breakfast/index.tsx b/components/HotelReservation/EnterDetails/Breakfast/index.tsx
index c2ea00754..603a3aaad 100644
--- 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>
diff --git a/components/HotelReservation/EnterDetails/Breakfast/schema.ts b/components/HotelReservation/EnterDetails/Breakfast/schema.ts
index 34cc5efca..5f8c1f354 100644
--- 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)),
 })
diff --git a/components/HotelReservation/EnterDetails/Payment/GuaranteeDetails/guaranteeDetails.module.css b/components/HotelReservation/EnterDetails/Payment/GuaranteeDetails/guaranteeDetails.module.css
new file mode 100644
index 000000000..32e678fbe
--- /dev/null
+++ 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;
+}
diff --git a/components/HotelReservation/EnterDetails/Payment/GuaranteeDetails/index.tsx b/components/HotelReservation/EnterDetails/Payment/GuaranteeDetails/index.tsx
new file mode 100644
index 000000000..f1f8f6783
--- /dev/null
+++ 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>
+  )
+}
diff --git a/components/HotelReservation/EnterDetails/Payment/index.tsx b/components/HotelReservation/EnterDetails/Payment/index.tsx
index 0da2b79e2..e29692993 100644
--- 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}
diff --git a/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx b/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx
index 120c0385d..b48220795 100644
--- 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}>
diff --git a/components/HotelReservation/SelectRate/ImageGallery/index.tsx b/components/HotelReservation/SelectRate/ImageGallery/index.tsx
index 1d4500cdb..4ff21af9f 100644
--- 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}
diff --git a/components/HotelReservation/SelectRate/RoomFilter/index.tsx b/components/HotelReservation/SelectRate/RoomFilter/index.tsx
new file mode 100644
index 000000000..eb7c442b3
--- /dev/null
+++ 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>
+  )
+}
diff --git a/components/HotelReservation/SelectRate/RoomFilter/roomFilter.module.css b/components/HotelReservation/SelectRate/RoomFilter/roomFilter.module.css
new file mode 100644
index 000000000..9cce04e43
--- /dev/null
+++ 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;
+  }
+}
diff --git a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/index.tsx
index 76f366adb..dc7ca20fc 100644
--- 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>
           ) : (
diff --git a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/priceList.module.css b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceList/priceList.module.css
index 7320cf1be..4f3431525 100644
--- 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);
+}
diff --git a/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx
index a523305ae..a0a92bb66 100644
--- 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)
   }
diff --git a/components/HotelReservation/SelectRate/RoomSelection/RateSummary/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/RateSummary/index.tsx
index b929bfe76..827a1d280 100644
--- 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>
diff --git a/components/HotelReservation/SelectRate/RoomSelection/RateSummary/rateSummary.module.css b/components/HotelReservation/SelectRate/RoomSelection/RateSummary/rateSummary.module.css
index c8352efb1..5cb5a4229 100644
--- 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;
+  }
+}
diff --git a/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx
index 1afec6119..665d91b31 100644
--- 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 && (
diff --git a/components/HotelReservation/SelectRate/RoomSelection/RoomCard/roomCard.module.css b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/roomCard.module.css
index ef5d9b8fc..537c1b30a 100644
--- 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);
diff --git a/components/HotelReservation/SelectRate/RoomSelection/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/index.tsx
index c4c5e2e87..9929a7451 100644
--- 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>
diff --git a/components/HotelReservation/SelectRate/RoomSelection/roomSelection.module.css b/components/HotelReservation/SelectRate/RoomSelection/roomSelection.module.css
index 66a27302e..1dab63afb 100644
--- 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;
diff --git a/components/HotelReservation/SelectRate/RoomSelection/utils.ts b/components/HotelReservation/SelectRate/RoomSelection/utils.ts
index e47a0da70..1ae94cc9c 100644
--- 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
diff --git a/components/HotelReservation/SelectRate/Rooms/index.tsx b/components/HotelReservation/SelectRate/Rooms/index.tsx
new file mode 100644
index 000000000..8f9030149
--- /dev/null
+++ 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>
+  )
+}
diff --git a/components/HotelReservation/SelectRate/Rooms/rooms.module.css b/components/HotelReservation/SelectRate/Rooms/rooms.module.css
new file mode 100644
index 000000000..5e2bca00b
--- /dev/null
+++ 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);
+}
diff --git a/components/HotelReservation/SelectRate/utils.ts b/components/HotelReservation/SelectRate/utils.ts
new file mode 100644
index 000000000..d91476bb5
--- /dev/null
+++ 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
+  }
+}
diff --git a/components/Icons/Ac.tsx b/components/Icons/Ac.tsx
index 5449112ca..b8b5a781a 100644
--- 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>
   )
 }
diff --git a/components/Icons/Accesories.tsx b/components/Icons/Accesories.tsx
index 9aaf0c894..4ca631cee 100644
--- 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>
   )
 }
diff --git a/components/Icons/Accessibility.tsx b/components/Icons/Accessibility.tsx
index 60d9a79d4..bf711678d 100644
--- 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>
   )
 }
diff --git a/components/Icons/Air.tsx b/components/Icons/Air.tsx
index 239566515..75b19a56c 100644
--- 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>
   )
 }
diff --git a/components/Icons/Airplane.tsx b/components/Icons/Airplane.tsx
index c68c37ce1..e68a911b2 100644
--- 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>
   )
 }
diff --git a/components/Icons/Allergy.tsx b/components/Icons/Allergy.tsx
new file mode 100644
index 000000000..0fe399445
--- /dev/null
+++ b/components/Icons/Allergy.tsx
@@ -0,0 +1,36 @@
+import { iconVariants } from "./variants"
+
+import type { IconProps } from "@/types/components/icon"
+
+export default function AllergyIcon({ className, color, ...props }: IconProps) {
+  const classNames = iconVariants({ className, color })
+  return (
+    <svg
+      className={classNames}
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <mask
+        id="mask0_7488_25219"
+        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_7488_1017)">
+        <path
+          d="M8.83333 18.2812C8.14543 18.2812 7.62276 18.0729 7.26533 17.6562C6.90789 17.2396 6.72569 16.7708 6.71875 16.25C6.71875 15.9028 6.79688 15.5608 6.95312 15.224C7.10938 14.8872 7.35069 14.6111 7.67708 14.3958C7.98887 14.193 8.24043 13.9322 8.43175 13.6135C8.62308 13.2948 8.75694 12.9549 8.83333 12.5938C8.73611 12.5451 8.6441 12.4983 8.55729 12.4531C8.47049 12.408 8.38542 12.3542 8.30208 12.2917L6.35904 12.988C6.11968 13.0724 5.89075 13.1424 5.67225 13.1979C5.45375 13.2535 5.22842 13.2812 4.99627 13.2812C4.13592 13.2812 3.37458 12.9036 2.71225 12.1482C2.04992 11.3928 1.71875 10.2879 1.71875 8.83333C1.71875 8.14583 1.92361 7.62153 2.33333 7.26042C2.74306 6.89931 3.20673 6.71875 3.72435 6.71875C4.07852 6.71875 4.42587 6.79691 4.76642 6.95323C5.10697 7.10956 5.38622 7.35085 5.60417 7.67708C5.80699 7.98887 6.06776 8.24043 6.3865 8.43175C6.70522 8.62308 7.04514 8.75694 7.40625 8.83333C7.45486 8.73611 7.50174 8.6441 7.54688 8.55729C7.59201 8.47049 7.64583 8.38542 7.70833 8.30208L7.01042 6.35417C6.92708 6.1235 6.85764 5.89963 6.80208 5.68254C6.74653 5.46545 6.71875 5.24835 6.71875 5.03125C6.73264 4.16319 7.11534 3.3941 7.86685 2.72396C8.61837 2.05382 9.71831 1.71875 11.1667 1.71875C11.8542 1.71875 12.3785 1.92521 12.7396 2.33812C13.1007 2.75104 13.2812 3.21472 13.2812 3.72917C13.2812 4.07639 13.2031 4.42188 13.0469 4.76562C12.8906 5.10938 12.6493 5.38889 12.3229 5.60417C12.0111 5.80699 11.7596 6.06776 11.5682 6.3865C11.3769 6.70522 11.2431 7.04514 11.1667 7.40625C11.2639 7.45486 11.3559 7.50174 11.4427 7.54688C11.5295 7.59201 11.6146 7.64583 11.6979 7.70833L13.641 6.99115C13.8803 6.90677 14.1058 6.84028 14.3175 6.79167C14.5292 6.74306 14.7511 6.71875 14.9832 6.71875C16.0894 6.71875 16.9156 7.17875 17.4619 8.09875C18.0081 9.01876 18.2812 10.0414 18.2812 11.1667C18.2812 11.8546 18.0642 12.3772 17.6302 12.7347C17.1962 13.0921 16.7153 13.2743 16.1875 13.2812C15.8542 13.2812 15.5269 13.2031 15.2057 13.0468C14.8845 12.8904 14.6145 12.6492 14.3958 12.3229C14.193 12.0111 13.9322 11.7596 13.6135 11.5682C13.2948 11.3769 12.9549 11.2431 12.5938 11.1667C12.5451 11.2639 12.4983 11.3559 12.4531 11.4427C12.408 11.5295 12.3542 11.6146 12.2917 11.6979L12.9896 13.6458C13.066 13.8611 13.1337 14.0747 13.1927 14.2865C13.2517 14.4983 13.2812 14.7083 13.2812 14.9167C13.2743 15.7917 12.8959 16.5712 12.1461 17.2552C11.3963 17.9392 10.2921 18.2812 8.83333 18.2812ZM9.9994 11.3021C10.3609 11.3021 10.6684 11.1755 10.9219 10.9225C11.1753 10.6694 11.3021 10.3621 11.3021 10.0006C11.3021 9.63909 11.1755 9.3316 10.9225 9.07812C10.6694 8.82465 10.3621 8.69792 10.0006 8.69792C9.63909 8.69792 9.3316 8.82445 9.07812 9.07752C8.82465 9.33058 8.69792 9.63787 8.69792 9.9994C8.69792 10.3609 8.82445 10.6684 9.07752 10.9219C9.33058 11.1753 9.63787 11.3021 9.9994 11.3021ZM9.01042 7.3125C9.10764 7.27778 9.20733 7.25 9.30948 7.22917C9.41165 7.20833 9.50988 7.19097 9.60417 7.17708C9.71528 6.59375 9.92708 6.04861 10.2396 5.54167C10.5521 5.03472 10.9618 4.61806 11.4688 4.29167C11.5521 4.22917 11.6146 4.15327 11.6562 4.06398C11.6979 3.9747 11.7188 3.8631 11.7188 3.72917C11.7188 3.60343 11.6727 3.49735 11.5807 3.41092C11.4887 3.32447 11.3507 3.28125 11.1667 3.28125C10.6287 3.28125 10.0202 3.39938 9.34129 3.63565C8.66237 3.87191 8.30903 4.3337 8.28125 5.02102C8.28125 5.1499 8.29861 5.2716 8.33333 5.38615C8.36806 5.5007 8.39931 5.6081 8.42708 5.70833L9.01042 7.3125ZM5 11.7188C5.19444 11.7188 5.43056 11.6701 5.70833 11.5729L7.3125 10.9896C7.27778 10.8924 7.25 10.7927 7.22917 10.6905C7.20833 10.5884 7.19097 10.4901 7.17708 10.3958C6.59375 10.2847 6.04861 10.0729 5.54167 9.76042C5.03472 9.44792 4.61806 9.03819 4.29167 8.53125C4.22917 8.44792 4.14757 8.38542 4.04688 8.34375C3.94618 8.30208 3.84028 8.28125 3.72917 8.28125C3.58772 8.28125 3.47771 8.32726 3.39913 8.41927C3.32054 8.51128 3.28125 8.64931 3.28125 8.83333C3.28125 9.59713 3.42708 10.269 3.71875 10.8489C4.01042 11.4288 4.4375 11.7188 5 11.7188ZM8.83333 16.7188C9.49321 16.7188 10.1425 16.5851 10.7814 16.3177C11.4202 16.0503 11.7326 15.5868 11.7188 14.9271C11.7188 14.8084 11.7031 14.6971 11.6719 14.5933C11.6406 14.4894 11.6076 14.3889 11.5729 14.2917L10.9896 12.6875C10.8924 12.7222 10.7927 12.75 10.6905 12.7708C10.5884 12.7917 10.4901 12.809 10.3958 12.8229C10.2847 13.4062 10.0729 13.9514 9.76042 14.4583C9.44792 14.9653 9.03819 15.3819 8.53125 15.7083C8.44792 15.7708 8.38368 15.8524 8.33854 15.9531C8.2934 16.0538 8.27431 16.1562 8.28125 16.2604C8.29703 16.3826 8.34438 16.4896 8.42329 16.5813C8.50221 16.6729 8.63889 16.7188 8.83333 16.7188ZM16.1833 11.7188C16.325 11.7188 16.4497 11.6804 16.5573 11.6037C16.6649 11.527 16.7188 11.3814 16.7188 11.1667C16.7188 10.6292 16.6046 10.0174 16.3762 9.33146C16.1478 8.64546 15.6838 8.29539 14.9844 8.28125C14.8559 8.28125 14.7326 8.29514 14.6146 8.32292C14.4965 8.35069 14.3877 8.37894 14.2881 8.40765L12.6875 9.01042C12.7222 9.10764 12.75 9.20733 12.7708 9.30948C12.7917 9.41164 12.809 9.50988 12.8229 9.60417C13.4062 9.71528 13.9514 9.92708 14.4583 10.2396C14.9653 10.5521 15.3819 10.9618 15.7083 11.4688C15.7569 11.5451 15.8247 11.6059 15.9115 11.651C15.9983 11.6962 16.0889 11.7188 16.1833 11.7188Z"
+          fill="#787472"
+        />
+      </g>
+    </svg>
+  )
+}
diff --git a/components/Icons/ArrowRight.tsx b/components/Icons/ArrowRight.tsx
index 5f05e5f09..d21fb311c 100644
--- 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>
   )
 }
diff --git a/components/Icons/Bar.tsx b/components/Icons/Bar.tsx
index 45796be66..8ab06dcd7 100644
--- 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>
   )
 }
diff --git a/components/Icons/Bathtub.tsx b/components/Icons/Bathtub.tsx
index 26ab4ed54..52c8a0265 100644
--- 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>
   )
 }
diff --git a/components/Icons/BedDouble.tsx b/components/Icons/BedDouble.tsx
index 6eb59d7b0..be6e87ac8 100644
--- 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>
   )
 }
diff --git a/components/Icons/Biking.tsx b/components/Icons/Biking.tsx
index 1cc9b3b9f..2ed9143b5 100644
--- 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>
   )
 }
diff --git a/components/Icons/Breakfast.tsx b/components/Icons/Breakfast.tsx
index dccfc0c39..6bd0e3705 100644
--- 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>
   )
 }
diff --git a/components/Icons/Business.tsx b/components/Icons/Business.tsx
index cb6ded53d..57e0e7f9f 100644
--- 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>
   )
 }
diff --git a/components/Icons/Calendar.tsx b/components/Icons/Calendar.tsx
index eaa8f42ac..82f4ba811 100644
--- 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>
   )
 }
diff --git a/components/Icons/Camera.tsx b/components/Icons/Camera.tsx
index 728a9e1c1..a41729cb6 100644
--- 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>
   )
 }
diff --git a/components/Icons/Cellphone.tsx b/components/Icons/Cellphone.tsx
index be9d5c0af..d40fdbc8d 100644
--- 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>
   )
 }
diff --git a/components/Icons/Chair.tsx b/components/Icons/Chair.tsx
index d7cdc81a2..0696cea8f 100644
--- 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>
   )
 }
diff --git a/components/Icons/Check.tsx b/components/Icons/Check.tsx
index 47c5067a0..b9b266bb0 100644
--- 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>
   )
 }
diff --git a/components/Icons/CheckCircle.tsx b/components/Icons/CheckCircle.tsx
index f8278019b..55f100ceb 100644
--- 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>
   )
 }
diff --git a/components/Icons/ChevronDown.tsx b/components/Icons/ChevronDown.tsx
index 1bf541d43..b1370284c 100644
--- 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>
   )
 }
diff --git a/components/Icons/ChevronLeft.tsx b/components/Icons/ChevronLeft.tsx
index eb14d07dd..9676480a0 100644
--- 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>
   )
 }
diff --git a/components/Icons/ChevronRight.tsx b/components/Icons/ChevronRight.tsx
index 9930ac095..98c1a57a5 100644
--- 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>
   )
 }
diff --git a/components/Icons/City.tsx b/components/Icons/City.tsx
index 791242ade..9f101a27d 100644
--- 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>
   )
 }
diff --git a/components/Icons/Close.tsx b/components/Icons/Close.tsx
index 6fdb13a67..4cd21c489 100644
--- 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>
   )
 }
diff --git a/components/Icons/CloseLarge.tsx b/components/Icons/CloseLarge.tsx
index e6692f914..2ea89eb5b 100644
--- 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>
   )
 }
diff --git a/components/Icons/CoffeeAlt.tsx b/components/Icons/CoffeeAlt.tsx
index e76da5126..1f3051176 100644
--- 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>
   )
 }
diff --git a/components/Icons/Concierge.tsx b/components/Icons/Concierge.tsx
index 69119a969..24362e8c3 100644
--- 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>
   )
 }
diff --git a/components/Icons/ConvenienceStore24h.tsx b/components/Icons/ConvenienceStore24h.tsx
index ace46579c..1c7696aa9 100644
--- 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>
   )
 }
diff --git a/components/Icons/Cool.tsx b/components/Icons/Cool.tsx
index efa5ae67f..2deb081ad 100644
--- 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>
   )
 }
diff --git a/components/Icons/Copy.tsx b/components/Icons/Copy.tsx
index 05a5268a5..738456695 100644
--- 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>
   )
 }
diff --git a/components/Icons/CreditCard.tsx b/components/Icons/CreditCard.tsx
index ae74314bb..d81ce95f2 100644
--- 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>
   )
 }
diff --git a/components/Icons/CrossCircle.tsx b/components/Icons/CrossCircle.tsx
index f4c4c258a..f2c188a75 100644
--- 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>
   )
 }
diff --git a/components/Icons/Cultural.tsx b/components/Icons/Cultural.tsx
index ede6800b6..af3b9894f 100644
--- 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>
   )
 }
diff --git a/components/Icons/Delete.tsx b/components/Icons/Delete.tsx
index c91d632a8..2a4150666 100644
--- 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>
   )
 }
diff --git a/components/Icons/Desk.tsx b/components/Icons/Desk.tsx
index de9d79ac6..289a227a8 100644
--- 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>
   )
 }
diff --git a/components/Icons/DoorOpen.tsx b/components/Icons/DoorOpen.tsx
index 93bc2caf4..27957f2bd 100644
--- 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>
   )
 }
diff --git a/components/Icons/Download.tsx b/components/Icons/Download.tsx
index 7c1e9017a..3e47c8a5a 100644
--- 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>
   )
 }
diff --git a/components/Icons/Dresser.tsx b/components/Icons/Dresser.tsx
index b81f2bece..2b7d06f1c 100644
--- a/components/Icons/Dresser.tsx
+++ b/components/Icons/Dresser.tsx
@@ -14,23 +14,10 @@ export default function DresserIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3455"
-        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_3455)">
-        <path
-          d="M4.0625 20.9375V4.9375C4.0625 4.42187 4.24609 3.98046 4.61328 3.61328C4.98046 3.24609 5.42187 3.0625 5.9375 3.0625H18.0625C18.5781 3.0625 19.0195 3.24609 19.3867 3.61328C19.7539 3.98046 19.9375 4.42187 19.9375 4.9375V20.9375H18.0625V18.9375H5.9375V20.9375H4.0625ZM5.9375 11.0625H11.0625V4.9375H5.9375V11.0625ZM12.9375 7.0625H18.0625V4.9375H12.9375V7.0625ZM12.9375 11.0625H18.0625V8.9375H12.9375V11.0625ZM10.0625 15.9375H13.9375V14.0625H10.0625V15.9375ZM5.9375 12.9375V17.0625H18.0625V12.9375H5.9375Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M4.0625 20.9375V4.9375C4.0625 4.42187 4.24609 3.98046 4.61328 3.61328C4.98046 3.24609 5.42187 3.0625 5.9375 3.0625H18.0625C18.5781 3.0625 19.0195 3.24609 19.3867 3.61328C19.7539 3.98046 19.9375 4.42187 19.9375 4.9375V20.9375H18.0625V18.9375H5.9375V20.9375H4.0625ZM5.9375 11.0625H11.0625V4.9375H5.9375V11.0625ZM12.9375 7.0625H18.0625V4.9375H12.9375V7.0625ZM12.9375 11.0625H18.0625V8.9375H12.9375V11.0625ZM10.0625 15.9375H13.9375V14.0625H10.0625V15.9375ZM5.9375 12.9375V17.0625H18.0625V12.9375H5.9375Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Edit.tsx b/components/Icons/Edit.tsx
index 209e16883..b0fa6141e 100644
--- a/components/Icons/Edit.tsx
+++ b/components/Icons/Edit.tsx
@@ -14,23 +14,10 @@ export default function EditIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="20"
-        id="mask0_162_2666"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="20"
-        x="0"
-        y="0"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_162_2666)">
-        <path
-          d="M4.58333 16.8125C4.19949 16.8125 3.87088 16.6758 3.59752 16.4025C3.32417 16.1291 3.1875 15.8005 3.1875 15.4167V4.58333C3.1875 4.19375 3.32313 3.86024 3.5944 3.58281C3.86566 3.30538 4.19531 3.17361 4.58333 3.1875H11.7292L10.3333 4.58333H4.58333V15.4167H15.4167V9.65625L16.8125 8.26042V15.4167C16.8125 15.8005 16.6758 16.1291 16.4025 16.4025C16.1291 16.6758 15.8005 16.8125 15.4167 16.8125H4.58333ZM8.05208 11.9479V8.83333L15.4583 1.42708C15.6042 1.28125 15.7569 1.17882 15.9167 1.11979C16.0764 1.06076 16.245 1.03125 16.4224 1.03125C16.6116 1.03125 16.7899 1.06076 16.9573 1.11979C17.1247 1.17882 17.2808 1.27974 17.4259 1.42256L18.5625 2.5625C18.7083 2.70833 18.8125 2.86585 18.875 3.03504C18.9375 3.20424 18.9688 3.38006 18.9688 3.5625C18.9688 3.74529 18.9373 3.91971 18.8745 4.08575C18.8118 4.25179 18.7077 4.40724 18.5625 4.55208L11.1667 11.9479H8.05208ZM9.44792 10.5521H10.5938L15.4583 5.67708L14.8958 5.09375L14.3229 4.54167L9.44792 9.40625V10.5521Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M4.58333 16.8125C4.19949 16.8125 3.87088 16.6758 3.59752 16.4025C3.32417 16.1291 3.1875 15.8005 3.1875 15.4167V4.58333C3.1875 4.19375 3.32313 3.86024 3.5944 3.58281C3.86566 3.30538 4.19531 3.17361 4.58333 3.1875H11.7292L10.3333 4.58333H4.58333V15.4167H15.4167V9.65625L16.8125 8.26042V15.4167C16.8125 15.8005 16.6758 16.1291 16.4025 16.4025C16.1291 16.6758 15.8005 16.8125 15.4167 16.8125H4.58333ZM8.05208 11.9479V8.83333L15.4583 1.42708C15.6042 1.28125 15.7569 1.17882 15.9167 1.11979C16.0764 1.06076 16.245 1.03125 16.4224 1.03125C16.6116 1.03125 16.7899 1.06076 16.9573 1.11979C17.1247 1.17882 17.2808 1.27974 17.4259 1.42256L18.5625 2.5625C18.7083 2.70833 18.8125 2.86585 18.875 3.03504C18.9375 3.20424 18.9688 3.38006 18.9688 3.5625C18.9688 3.74529 18.9373 3.91971 18.8745 4.08575C18.8118 4.25179 18.7077 4.40724 18.5625 4.55208L11.1667 11.9479H8.05208ZM9.44792 10.5521H10.5938L15.4583 5.67708L14.8958 5.09375L14.3229 4.54167L9.44792 9.40625V10.5521Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/ElectricBike.tsx b/components/Icons/ElectricBike.tsx
index 44e796cd8..1e0787c63 100644
--- a/components/Icons/ElectricBike.tsx
+++ b/components/Icons/ElectricBike.tsx
@@ -18,23 +18,10 @@ export default function ElectricBikeIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_554_11973"
-        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_11973)">
-        <path
-          d="M5.125 16.875C3.75 16.875 2.59375 16.4062 1.65625 15.4687C0.71875 14.5312 0.25 13.375 0.25 12C0.25 10.625 0.72775 9.46453 1.68325 8.5187C2.63875 7.57287 3.79433 7.09995 5.15 7.09995C6.35833 7.09995 7.39792 7.47912 8.26875 8.23745C9.13958 8.99578 9.68333 9.93328 9.9 11.05H10.65L8.85 6.02495H8.0625C7.80417 6.02495 7.58333 5.93328 7.4 5.74995C7.21667 5.56662 7.125 5.34578 7.125 5.08745C7.125 4.82912 7.21667 4.60828 7.4 4.42495C7.58333 4.24162 7.80417 4.14995 8.0625 4.14995H11.0375C11.2958 4.14995 11.5167 4.24162 11.7 4.42495C11.8833 4.60828 11.975 4.82912 11.975 5.08745C11.975 5.34578 11.8833 5.56662 11.7 5.74995C11.5167 5.93328 11.2958 6.02495 11.0375 6.02495H10.85L11.225 7.09995H16.075L14.6 3.07495H12.9875C12.7292 3.07495 12.5083 2.98328 12.325 2.79995C12.1417 2.61662 12.05 2.39578 12.05 2.13745C12.05 1.87912 12.1417 1.65828 12.325 1.47495C12.5083 1.29162 12.7292 1.19995 12.9875 1.19995H14.575C14.9922 1.19995 15.3652 1.31037 15.6941 1.5312C16.023 1.75203 16.2583 2.05828 16.4 2.44995L18.075 7.07495H18.9C20.2487 7.07495 21.3984 7.55043 22.3491 8.5014C23.2997 9.45237 23.775 10.6025 23.775 11.9517C23.775 13.3172 23.3021 14.4791 22.3563 15.4375C21.4104 16.3958 20.2563 16.875 18.8938 16.875C17.7259 16.875 16.7 16.5046 15.816 15.764C14.932 15.0234 14.3683 14.077 14.125 12.925H9.9C9.68333 14.0666 9.13489 15.0104 8.25468 15.7562C7.37446 16.502 6.33123 16.875 5.125 16.875ZM5.125 15C5.80833 15 6.4 14.8062 6.9 14.4187C7.4 14.0312 7.75 13.5333 7.95 12.925H6.1125C5.85417 12.925 5.63333 12.8333 5.45 12.65C5.26667 12.4666 5.175 12.2458 5.175 11.9875C5.175 11.7291 5.26667 11.5083 5.45 11.325C5.63333 11.1416 5.85417 11.05 6.1125 11.05H7.95C7.75 10.425 7.4 9.92703 6.9 9.5562C6.4 9.18537 5.80833 8.99995 5.125 8.99995C4.275 8.99995 3.5625 9.28745 2.9875 9.86245C2.4125 10.4375 2.125 11.15 2.125 12C2.125 12.8416 2.4125 13.552 2.9875 14.1312C3.5625 14.7104 4.275 15 5.125 15ZM12.6747 11.05H14.1209C14.207 10.6666 14.3271 10.2958 14.4812 9.93745C14.6354 9.57912 14.8417 9.25828 15.1 8.97495H11.9L12.6747 11.05ZM18.9 15C19.75 15 20.4625 14.7104 21.0375 14.1312C21.6125 13.552 21.9 12.8416 21.9 12C21.9 11.15 21.6125 10.4375 21.0375 9.86245C20.4625 9.28745 19.75 8.99995 18.9 8.99995H18.75L19.4 10.75C19.4917 11 19.4831 11.2389 19.3742 11.4667C19.2653 11.6946 19.0864 11.8557 18.8375 11.95C18.5875 12.0416 18.3462 12.033 18.1136 11.9241C17.8809 11.8152 17.7181 11.6363 17.625 11.3875L17 9.64995C16.6417 9.93328 16.3688 10.275 16.1813 10.675C15.9938 11.075 15.9 11.5182 15.9 12.0046C15.9 12.8432 16.1875 13.552 16.7625 14.1312C17.3375 14.7104 18.05 15 18.9 15ZM12.975 20.85V22.05C12.975 22.2213 12.9021 22.3538 12.7563 22.4472C12.6104 22.5407 12.4583 22.5458 12.3 22.4625L8.0375 20.325C7.92917 20.2666 7.88693 20.177 7.9108 20.0562C7.93467 19.9354 8.01023 19.875 8.1375 19.875H11.05V18.675C11.05 18.5036 11.1229 18.3711 11.2688 18.2777C11.4146 18.1842 11.5667 18.1791 11.725 18.2625L15.9875 20.4C16.0958 20.4583 16.1381 20.5479 16.1142 20.6687C16.0903 20.7895 16.0148 20.85 15.8875 20.85H12.975Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M5.125 16.875C3.75 16.875 2.59375 16.4062 1.65625 15.4687C0.71875 14.5312 0.25 13.375 0.25 12C0.25 10.625 0.72775 9.46453 1.68325 8.5187C2.63875 7.57287 3.79433 7.09995 5.15 7.09995C6.35833 7.09995 7.39792 7.47912 8.26875 8.23745C9.13958 8.99578 9.68333 9.93328 9.9 11.05H10.65L8.85 6.02495H8.0625C7.80417 6.02495 7.58333 5.93328 7.4 5.74995C7.21667 5.56662 7.125 5.34578 7.125 5.08745C7.125 4.82912 7.21667 4.60828 7.4 4.42495C7.58333 4.24162 7.80417 4.14995 8.0625 4.14995H11.0375C11.2958 4.14995 11.5167 4.24162 11.7 4.42495C11.8833 4.60828 11.975 4.82912 11.975 5.08745C11.975 5.34578 11.8833 5.56662 11.7 5.74995C11.5167 5.93328 11.2958 6.02495 11.0375 6.02495H10.85L11.225 7.09995H16.075L14.6 3.07495H12.9875C12.7292 3.07495 12.5083 2.98328 12.325 2.79995C12.1417 2.61662 12.05 2.39578 12.05 2.13745C12.05 1.87912 12.1417 1.65828 12.325 1.47495C12.5083 1.29162 12.7292 1.19995 12.9875 1.19995H14.575C14.9922 1.19995 15.3652 1.31037 15.6941 1.5312C16.023 1.75203 16.2583 2.05828 16.4 2.44995L18.075 7.07495H18.9C20.2487 7.07495 21.3984 7.55043 22.3491 8.5014C23.2997 9.45237 23.775 10.6025 23.775 11.9517C23.775 13.3172 23.3021 14.4791 22.3563 15.4375C21.4104 16.3958 20.2563 16.875 18.8938 16.875C17.7259 16.875 16.7 16.5046 15.816 15.764C14.932 15.0234 14.3683 14.077 14.125 12.925H9.9C9.68333 14.0666 9.13489 15.0104 8.25468 15.7562C7.37446 16.502 6.33123 16.875 5.125 16.875ZM5.125 15C5.80833 15 6.4 14.8062 6.9 14.4187C7.4 14.0312 7.75 13.5333 7.95 12.925H6.1125C5.85417 12.925 5.63333 12.8333 5.45 12.65C5.26667 12.4666 5.175 12.2458 5.175 11.9875C5.175 11.7291 5.26667 11.5083 5.45 11.325C5.63333 11.1416 5.85417 11.05 6.1125 11.05H7.95C7.75 10.425 7.4 9.92703 6.9 9.5562C6.4 9.18537 5.80833 8.99995 5.125 8.99995C4.275 8.99995 3.5625 9.28745 2.9875 9.86245C2.4125 10.4375 2.125 11.15 2.125 12C2.125 12.8416 2.4125 13.552 2.9875 14.1312C3.5625 14.7104 4.275 15 5.125 15ZM12.6747 11.05H14.1209C14.207 10.6666 14.3271 10.2958 14.4812 9.93745C14.6354 9.57912 14.8417 9.25828 15.1 8.97495H11.9L12.6747 11.05ZM18.9 15C19.75 15 20.4625 14.7104 21.0375 14.1312C21.6125 13.552 21.9 12.8416 21.9 12C21.9 11.15 21.6125 10.4375 21.0375 9.86245C20.4625 9.28745 19.75 8.99995 18.9 8.99995H18.75L19.4 10.75C19.4917 11 19.4831 11.2389 19.3742 11.4667C19.2653 11.6946 19.0864 11.8557 18.8375 11.95C18.5875 12.0416 18.3462 12.033 18.1136 11.9241C17.8809 11.8152 17.7181 11.6363 17.625 11.3875L17 9.64995C16.6417 9.93328 16.3688 10.275 16.1813 10.675C15.9938 11.075 15.9 11.5182 15.9 12.0046C15.9 12.8432 16.1875 13.552 16.7625 14.1312C17.3375 14.7104 18.05 15 18.9 15ZM12.975 20.85V22.05C12.975 22.2213 12.9021 22.3538 12.7563 22.4472C12.6104 22.5407 12.4583 22.5458 12.3 22.4625L8.0375 20.325C7.92917 20.2666 7.88693 20.177 7.9108 20.0562C7.93467 19.9354 8.01023 19.875 8.1375 19.875H11.05V18.675C11.05 18.5036 11.1229 18.3711 11.2688 18.2777C11.4146 18.1842 11.5667 18.1791 11.725 18.2625L15.9875 20.4C16.0958 20.4583 16.1381 20.5479 16.1142 20.6687C16.0903 20.7895 16.0148 20.85 15.8875 20.85H12.975Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/ElectricCar.tsx b/components/Icons/ElectricCar.tsx
index 1f9500b64..1af91af32 100644
--- a/components/Icons/ElectricCar.tsx
+++ b/components/Icons/ElectricCar.tsx
@@ -18,23 +18,10 @@ export default function ElectricCarIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3543"
-        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_3543)">
-        <path
-          d="M6.0251 14.875V15.425C6.0251 15.8139 5.8887 16.1445 5.6159 16.4167C5.34311 16.6889 5.01186 16.825 4.62215 16.825C4.23245 16.825 3.90218 16.6889 3.63135 16.4167C3.36051 16.1445 3.2251 15.8139 3.2251 15.425V8.40002C3.2251 8.29447 3.23343 8.18892 3.2501 8.08335C3.26676 7.9778 3.29166 7.87571 3.32477 7.77707L5.1876 2.52502C5.32093 2.15002 5.54593 1.84794 5.8626 1.61877C6.17926 1.38961 6.54176 1.27502 6.9501 1.27502H17.0501C17.4584 1.27502 17.8209 1.38961 18.1376 1.61877C18.4543 1.84794 18.6793 2.15002 18.8126 2.52502L20.6754 7.77707C20.7085 7.87571 20.7334 7.9778 20.7501 8.08335C20.7668 8.18892 20.7751 8.29447 20.7751 8.40002V15.425C20.7751 15.8139 20.6387 16.1445 20.3659 16.4167C20.0931 16.6889 19.7619 16.825 19.3722 16.825C18.9825 16.825 18.6522 16.6889 18.3813 16.4167C18.1105 16.1445 17.9751 15.8139 17.9751 15.425V14.875H6.0251ZM5.8501 6.20002H18.1501L17.0751 3.15002H6.9251L5.8501 6.20002ZM7.54715 11.975C7.94911 11.975 8.29176 11.8343 8.5751 11.553C8.85843 11.2716 9.0001 10.9299 9.0001 10.528C9.0001 10.126 8.85942 9.78336 8.57805 9.50002C8.29666 9.21669 7.955 9.07502 7.55305 9.07502C7.15108 9.07502 6.80843 9.21571 6.5251 9.49708C6.24176 9.77846 6.1001 10.1201 6.1001 10.5221C6.1001 10.924 6.24078 11.2667 6.52215 11.55C6.80353 11.8334 7.1452 11.975 7.54715 11.975ZM16.4471 11.975C16.8491 11.975 17.1918 11.8343 17.4751 11.553C17.7584 11.2716 17.9001 10.9299 17.9001 10.528C17.9001 10.126 17.7594 9.78336 17.478 9.50002C17.1967 9.21669 16.855 9.07502 16.453 9.07502C16.0511 9.07502 15.7084 9.21571 15.4251 9.49708C15.1418 9.77846 15.0001 10.1201 15.0001 10.5221C15.0001 10.924 15.1408 11.2667 15.4221 11.55C15.7035 11.8334 16.0452 11.975 16.4471 11.975ZM12.9751 20.875V22.0445C12.9751 22.2232 12.9014 22.3584 12.754 22.45C12.6066 22.5417 12.4553 22.5459 12.3001 22.4625L8.0376 20.35C7.92927 20.2917 7.88731 20.2021 7.91172 20.0813C7.93614 19.9604 8.01346 19.9 8.1437 19.9H11.0251V18.7C11.0251 18.5286 11.098 18.3962 11.2438 18.3027C11.3897 18.2093 11.5418 18.2042 11.7001 18.2875L15.9626 20.425C16.0709 20.4834 16.1129 20.5729 16.0885 20.6938C16.0641 20.8146 15.9867 20.875 15.8565 20.875H12.9751ZM5.1001 13H18.9001V8.07502H5.1001V13Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M6.0251 14.875V15.425C6.0251 15.8139 5.8887 16.1445 5.6159 16.4167C5.34311 16.6889 5.01186 16.825 4.62215 16.825C4.23245 16.825 3.90218 16.6889 3.63135 16.4167C3.36051 16.1445 3.2251 15.8139 3.2251 15.425V8.40002C3.2251 8.29447 3.23343 8.18892 3.2501 8.08335C3.26676 7.9778 3.29166 7.87571 3.32477 7.77707L5.1876 2.52502C5.32093 2.15002 5.54593 1.84794 5.8626 1.61877C6.17926 1.38961 6.54176 1.27502 6.9501 1.27502H17.0501C17.4584 1.27502 17.8209 1.38961 18.1376 1.61877C18.4543 1.84794 18.6793 2.15002 18.8126 2.52502L20.6754 7.77707C20.7085 7.87571 20.7334 7.9778 20.7501 8.08335C20.7668 8.18892 20.7751 8.29447 20.7751 8.40002V15.425C20.7751 15.8139 20.6387 16.1445 20.3659 16.4167C20.0931 16.6889 19.7619 16.825 19.3722 16.825C18.9825 16.825 18.6522 16.6889 18.3813 16.4167C18.1105 16.1445 17.9751 15.8139 17.9751 15.425V14.875H6.0251ZM5.8501 6.20002H18.1501L17.0751 3.15002H6.9251L5.8501 6.20002ZM7.54715 11.975C7.94911 11.975 8.29176 11.8343 8.5751 11.553C8.85843 11.2716 9.0001 10.9299 9.0001 10.528C9.0001 10.126 8.85942 9.78336 8.57805 9.50002C8.29666 9.21669 7.955 9.07502 7.55305 9.07502C7.15108 9.07502 6.80843 9.21571 6.5251 9.49708C6.24176 9.77846 6.1001 10.1201 6.1001 10.5221C6.1001 10.924 6.24078 11.2667 6.52215 11.55C6.80353 11.8334 7.1452 11.975 7.54715 11.975ZM16.4471 11.975C16.8491 11.975 17.1918 11.8343 17.4751 11.553C17.7584 11.2716 17.9001 10.9299 17.9001 10.528C17.9001 10.126 17.7594 9.78336 17.478 9.50002C17.1967 9.21669 16.855 9.07502 16.453 9.07502C16.0511 9.07502 15.7084 9.21571 15.4251 9.49708C15.1418 9.77846 15.0001 10.1201 15.0001 10.5221C15.0001 10.924 15.1408 11.2667 15.4221 11.55C15.7035 11.8334 16.0452 11.975 16.4471 11.975ZM12.9751 20.875V22.0445C12.9751 22.2232 12.9014 22.3584 12.754 22.45C12.6066 22.5417 12.4553 22.5459 12.3001 22.4625L8.0376 20.35C7.92927 20.2917 7.88731 20.2021 7.91172 20.0813C7.93614 19.9604 8.01346 19.9 8.1437 19.9H11.0251V18.7C11.0251 18.5286 11.098 18.3962 11.2438 18.3027C11.3897 18.2093 11.5418 18.2042 11.7001 18.2875L15.9626 20.425C16.0709 20.4834 16.1129 20.5729 16.0885 20.6938C16.0641 20.8146 15.9867 20.875 15.8565 20.875H12.9751ZM5.1001 13H18.9001V8.07502H5.1001V13Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Email.tsx b/components/Icons/Email.tsx
index 8915e3991..7f781781f 100644
--- a/components/Icons/Email.tsx
+++ b/components/Icons/Email.tsx
@@ -20,23 +20,10 @@ export default function EmailIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="20"
-        id="mask0_58_5363"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="20"
-        x="0"
-        y="0"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_58_5363)">
-        <path
-          d="M10.0094 17.5831C8.9638 17.5831 7.98052 17.3858 7.05961 16.991C6.1387 16.5963 5.33232 16.0532 4.64047 15.3617C3.94861 14.6701 3.40523 13.864 3.01032 12.9432C2.61542 12.0224 2.41797 11.0386 2.41797 9.99167C2.41797 8.94475 2.61533 7.96388 3.01005 7.04905C3.40477 6.1342 3.9479 5.33085 4.63943 4.63901C5.33097 3.94714 6.13713 3.40376 7.05791 3.00886C7.97868 2.61396 8.96252 2.4165 10.0094 2.4165C11.0563 2.4165 12.0372 2.6139 12.9521 3.00869C13.8669 3.40348 14.6702 3.94671 15.3621 4.63838C16.054 5.33005 16.5973 6.13317 16.9922 7.04776C17.3871 7.96232 17.5846 8.94634 17.5846 9.99982V11.0575C17.5846 11.7605 17.3373 12.3572 16.8428 12.8475C16.3482 13.3379 15.7483 13.5831 15.0429 13.5831C14.5654 13.5831 14.134 13.449 13.7489 13.1809C13.3637 12.9127 13.0552 12.5682 12.8233 12.1472C12.4793 12.5767 12.0619 12.9234 11.571 13.1873C11.0801 13.4512 10.5568 13.5831 10.0013 13.5831C9.00681 13.5831 8.16097 13.2341 7.46376 12.5359C6.76657 11.8378 6.41797 10.9909 6.41797 9.99511C6.41797 8.99933 6.76703 8.15395 7.46516 7.45896C8.16327 6.76399 9.01021 6.4165 10.006 6.4165C11.0018 6.4165 11.8471 6.7651 12.5421 7.4623C13.2371 8.1595 13.5846 9.00534 13.5846 9.99982V11.0575C13.5846 11.455 13.7288 11.7948 14.0173 12.0768C14.3057 12.3588 14.6476 12.4998 15.0429 12.4998C15.4382 12.4998 15.7801 12.3588 16.0686 12.0768C16.3571 11.7948 16.5013 11.455 16.5013 11.0575V9.99982C16.5013 8.19426 15.8693 6.65954 14.6054 5.39565C13.3416 4.13176 11.8068 3.49982 10.0013 3.49982C8.19573 3.49982 6.661 4.13176 5.39711 5.39565C4.13323 6.65954 3.50128 8.19426 3.50128 9.99982C3.50128 11.8054 4.13323 13.3401 5.39711 14.604C6.661 15.8679 8.19573 16.4998 10.0013 16.4998H14.0013V17.5831H10.0094ZM10.0013 12.4998C10.6957 12.4998 11.286 12.2568 11.7721 11.7707C12.2582 11.2845 12.5013 10.6943 12.5013 9.99982C12.5013 9.30537 12.2582 8.7151 11.7721 8.22898C11.286 7.74287 10.6957 7.49982 10.0013 7.49982C9.30684 7.49982 8.71656 7.74287 8.23045 8.22898C7.74434 8.7151 7.50128 9.30537 7.50128 9.99982C7.50128 10.6943 7.74434 11.2845 8.23045 11.7707C8.71656 12.2568 9.30684 12.4998 10.0013 12.4998Z"
-          fill="#1C1B1F"
-        />
-      </g>
+      <path
+        d="M10.0094 17.5831C8.9638 17.5831 7.98052 17.3858 7.05961 16.991C6.1387 16.5963 5.33232 16.0532 4.64047 15.3617C3.94861 14.6701 3.40523 13.864 3.01032 12.9432C2.61542 12.0224 2.41797 11.0386 2.41797 9.99167C2.41797 8.94475 2.61533 7.96388 3.01005 7.04905C3.40477 6.1342 3.9479 5.33085 4.63943 4.63901C5.33097 3.94714 6.13713 3.40376 7.05791 3.00886C7.97868 2.61396 8.96252 2.4165 10.0094 2.4165C11.0563 2.4165 12.0372 2.6139 12.9521 3.00869C13.8669 3.40348 14.6702 3.94671 15.3621 4.63838C16.054 5.33005 16.5973 6.13317 16.9922 7.04776C17.3871 7.96232 17.5846 8.94634 17.5846 9.99982V11.0575C17.5846 11.7605 17.3373 12.3572 16.8428 12.8475C16.3482 13.3379 15.7483 13.5831 15.0429 13.5831C14.5654 13.5831 14.134 13.449 13.7489 13.1809C13.3637 12.9127 13.0552 12.5682 12.8233 12.1472C12.4793 12.5767 12.0619 12.9234 11.571 13.1873C11.0801 13.4512 10.5568 13.5831 10.0013 13.5831C9.00681 13.5831 8.16097 13.2341 7.46376 12.5359C6.76657 11.8378 6.41797 10.9909 6.41797 9.99511C6.41797 8.99933 6.76703 8.15395 7.46516 7.45896C8.16327 6.76399 9.01021 6.4165 10.006 6.4165C11.0018 6.4165 11.8471 6.7651 12.5421 7.4623C13.2371 8.1595 13.5846 9.00534 13.5846 9.99982V11.0575C13.5846 11.455 13.7288 11.7948 14.0173 12.0768C14.3057 12.3588 14.6476 12.4998 15.0429 12.4998C15.4382 12.4998 15.7801 12.3588 16.0686 12.0768C16.3571 11.7948 16.5013 11.455 16.5013 11.0575V9.99982C16.5013 8.19426 15.8693 6.65954 14.6054 5.39565C13.3416 4.13176 11.8068 3.49982 10.0013 3.49982C8.19573 3.49982 6.661 4.13176 5.39711 5.39565C4.13323 6.65954 3.50128 8.19426 3.50128 9.99982C3.50128 11.8054 4.13323 13.3401 5.39711 14.604C6.661 15.8679 8.19573 16.4998 10.0013 16.4998H14.0013V17.5831H10.0094ZM10.0013 12.4998C10.6957 12.4998 11.286 12.2568 11.7721 11.7707C12.2582 11.2845 12.5013 10.6943 12.5013 9.99982C12.5013 9.30537 12.2582 8.7151 11.7721 8.22898C11.286 7.74287 10.6957 7.49982 10.0013 7.49982C9.30684 7.49982 8.71656 7.74287 8.23045 8.22898C7.74434 8.7151 7.50128 9.30537 7.50128 9.99982C7.50128 10.6943 7.74434 11.2845 8.23045 11.7707C8.71656 12.2568 9.30684 12.4998 10.0013 12.4998Z"
+        fill="#1C1B1F"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/ErrorCircle.tsx b/components/Icons/ErrorCircle.tsx
index 87b1514d3..4ba0fcde8 100644
--- a/components/Icons/ErrorCircle.tsx
+++ b/components/Icons/ErrorCircle.tsx
@@ -18,23 +18,10 @@ export default function ErrorCircleIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="20"
-        id="mask0_157_2210"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="20"
-        x="0"
-        y="0"
-      >
-        <rect width="20" height="20" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_157_2210)">
-        <path
-          d="M10.0061 13.8958C10.1965 13.8958 10.3612 13.8274 10.5 13.6906C10.6389 13.5538 10.7084 13.3896 10.7084 13.1979V9.71873C10.7084 9.52706 10.6404 9.36283 10.5044 9.22602C10.3685 9.08922 10.2053 9.02081 10.0149 9.02081C9.82442 9.02081 9.65976 9.08922 9.52087 9.22602C9.38199 9.36283 9.31254 9.52706 9.31254 9.71873V13.1979C9.31254 13.3896 9.38052 13.5538 9.51648 13.6906C9.65245 13.8274 9.81564 13.8958 10.0061 13.8958ZM9.99346 7.58331C10.1923 7.58331 10.3612 7.51606 10.5 7.38156C10.6389 7.24706 10.7084 7.0804 10.7084 6.88156C10.7084 6.68273 10.6411 6.51387 10.5066 6.37498C10.3721 6.23609 10.2055 6.16665 10.0066 6.16665C9.80779 6.16665 9.63893 6.2339 9.50004 6.3684C9.36115 6.5029 9.29171 6.66956 9.29171 6.8684C9.29171 7.06723 9.35896 7.23609 9.49346 7.37498C9.62796 7.51387 9.79462 7.58331 9.99346 7.58331ZM10.0058 17.7916C8.9338 17.7916 7.92449 17.5884 6.97785 17.182C6.0312 16.7756 5.20275 16.2165 4.4925 15.5049C3.78225 14.7933 3.224 13.9649 2.81775 13.0199C2.4115 12.0748 2.20837 11.065 2.20837 9.99044C2.20837 8.91476 2.41159 7.90707 2.81802 6.96738C3.22445 6.02767 3.78348 5.20269 4.4951 4.49244C5.20673 3.78219 6.03508 3.22394 6.98017 2.81769C7.92523 2.41144 8.93504 2.20831 10.0096 2.20831C11.0853 2.20831 12.093 2.41153 13.0326 2.81796C13.9724 3.22439 14.7973 3.78342 15.5076 4.49504C16.2178 5.20667 16.7761 6.0334 17.1823 6.97523C17.5886 7.91705 17.7917 8.92338 17.7917 9.99423C17.7917 11.0662 17.5885 12.0755 17.1821 13.0222C16.7756 13.9688 16.2166 14.7973 15.505 15.5075C14.7934 16.2178 13.9666 16.776 13.0248 17.1823C12.083 17.5885 11.0766 17.7916 10.0058 17.7916ZM10 16.3958C11.7709 16.3958 13.2796 15.7725 14.5261 14.526C15.7726 13.2795 16.3959 11.7708 16.3959 9.99998C16.3959 8.22915 15.7726 6.72047 14.5261 5.47394C13.2796 4.22741 11.7709 3.60415 10 3.60415C8.22921 3.60415 6.72053 4.22741 5.474 5.47394C4.22747 6.72047 3.60421 8.22915 3.60421 9.99998C3.60421 11.7708 4.22747 13.2795 5.474 14.526C6.72053 15.7725 8.22921 16.3958 10 16.3958Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M10.0061 13.8958C10.1965 13.8958 10.3612 13.8274 10.5 13.6906C10.6389 13.5538 10.7084 13.3896 10.7084 13.1979V9.71873C10.7084 9.52706 10.6404 9.36283 10.5044 9.22602C10.3685 9.08922 10.2053 9.02081 10.0149 9.02081C9.82442 9.02081 9.65976 9.08922 9.52087 9.22602C9.38199 9.36283 9.31254 9.52706 9.31254 9.71873V13.1979C9.31254 13.3896 9.38052 13.5538 9.51648 13.6906C9.65245 13.8274 9.81564 13.8958 10.0061 13.8958ZM9.99346 7.58331C10.1923 7.58331 10.3612 7.51606 10.5 7.38156C10.6389 7.24706 10.7084 7.0804 10.7084 6.88156C10.7084 6.68273 10.6411 6.51387 10.5066 6.37498C10.3721 6.23609 10.2055 6.16665 10.0066 6.16665C9.80779 6.16665 9.63893 6.2339 9.50004 6.3684C9.36115 6.5029 9.29171 6.66956 9.29171 6.8684C9.29171 7.06723 9.35896 7.23609 9.49346 7.37498C9.62796 7.51387 9.79462 7.58331 9.99346 7.58331ZM10.0058 17.7916C8.9338 17.7916 7.92449 17.5884 6.97785 17.182C6.0312 16.7756 5.20275 16.2165 4.4925 15.5049C3.78225 14.7933 3.224 13.9649 2.81775 13.0199C2.4115 12.0748 2.20837 11.065 2.20837 9.99044C2.20837 8.91476 2.41159 7.90707 2.81802 6.96738C3.22445 6.02767 3.78348 5.20269 4.4951 4.49244C5.20673 3.78219 6.03508 3.22394 6.98017 2.81769C7.92523 2.41144 8.93504 2.20831 10.0096 2.20831C11.0853 2.20831 12.093 2.41153 13.0326 2.81796C13.9724 3.22439 14.7973 3.78342 15.5076 4.49504C16.2178 5.20667 16.7761 6.0334 17.1823 6.97523C17.5886 7.91705 17.7917 8.92338 17.7917 9.99423C17.7917 11.0662 17.5885 12.0755 17.1821 13.0222C16.7756 13.9688 16.2166 14.7973 15.505 15.5075C14.7934 16.2178 13.9666 16.776 13.0248 17.1823C12.083 17.5885 11.0766 17.7916 10.0058 17.7916ZM10 16.3958C11.7709 16.3958 13.2796 15.7725 14.5261 14.526C15.7726 13.2795 16.3959 11.7708 16.3959 9.99998C16.3959 8.22915 15.7726 6.72047 14.5261 5.47394C13.2796 4.22741 11.7709 3.60415 10 3.60415C8.22921 3.60415 6.72053 4.22741 5.474 5.47394C4.22747 6.72047 3.60421 8.22915 3.60421 9.99998C3.60421 11.7708 4.22747 13.2795 5.474 14.526C6.72053 15.7725 8.22921 16.3958 10 16.3958Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/EyeHide.tsx b/components/Icons/EyeHide.tsx
index cc1db5926..c3da6d258 100644
--- a/components/Icons/EyeHide.tsx
+++ b/components/Icons/EyeHide.tsx
@@ -14,23 +14,10 @@ export default function EyeHideIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        id="mask0_69_3263"
-        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_3263)">
-        <path
-          d="M15.9625 13.3L14.6 11.9375C14.7834 11.0335 14.5521 10.2616 13.9063 9.62196C13.2604 8.98231 12.4792 8.74165 11.5625 8.89999L10.2 7.53749C10.4834 7.40832 10.775 7.31145 11.075 7.24686C11.375 7.18228 11.6834 7.14999 12 7.14999C13.2084 7.14999 14.2354 7.5729 15.0813 8.41874C15.9271 9.26457 16.35 10.2917 16.35 11.5C16.35 11.8167 16.3177 12.125 16.2531 12.425C16.1886 12.725 16.0917 13.0167 15.9625 13.3ZM19.05 16.3625L17.7125 15.05C18.3485 14.5667 18.9176 14.0292 19.4197 13.4375C19.9218 12.8458 20.3403 12.2 20.675 11.5C19.8584 9.83332 18.6709 8.51249 17.1125 7.53749C15.5542 6.56249 13.85 6.07499 12 6.07499C11.5167 6.07499 11.0396 6.1104 10.5688 6.18124C10.0979 6.25207 9.62919 6.35832 9.16252 6.49999L7.70002 5.03749C8.39169 4.75415 9.09591 4.54374 9.81267 4.40624C10.5294 4.26874 11.2585 4.19999 12 4.19999C14.2167 4.19999 16.25 4.78749 18.1 5.96249C19.95 7.13749 21.3625 8.71665 22.3375 10.7C22.4042 10.825 22.4521 10.9542 22.4813 11.0877C22.5104 11.2212 22.525 11.3586 22.525 11.5C22.525 11.6413 22.5125 11.7788 22.4875 11.9122C22.4625 12.0457 22.4209 12.1792 22.3625 12.3125C21.9875 13.1208 21.5188 13.8646 20.9563 14.5437C20.3938 15.2229 19.7584 15.8292 19.05 16.3625ZM12 18.8C9.81669 18.8 7.82502 18.2083 6.02502 17.025C4.22502 15.8417 2.79942 14.2901 1.74822 12.3702C1.66609 12.2401 1.60836 12.1013 1.57502 11.9539C1.54169 11.8064 1.52502 11.6552 1.52502 11.5C1.52502 11.3423 1.54077 11.1926 1.57225 11.0507C1.60373 10.9088 1.65882 10.7669 1.73752 10.625C2.07919 9.96665 2.46877 9.33332 2.90627 8.72499C3.34377 8.11665 3.84169 7.56665 4.40002 7.07499L2.32502 4.92499C2.15002 4.74054 2.06669 4.52151 2.07502 4.26791C2.08336 4.0143 2.17502 3.79999 2.35002 3.62499C2.52502 3.44999 2.74169 3.36249 3.00002 3.36249C3.25836 3.36249 3.47502 3.44999 3.65002 3.62499L20.3375 20.3125C20.5209 20.4958 20.6125 20.7167 20.6125 20.975C20.6125 21.2333 20.5167 21.4542 20.325 21.6375C20.1417 21.8125 19.9229 21.8979 19.6688 21.8937C19.4146 21.8896 19.2 21.8 19.025 21.625L15.5875 18.2375C15.0042 18.4208 14.4139 18.5604 13.8166 18.6562C13.2194 18.7521 12.6139 18.8 12 18.8ZM5.72502 8.37499C5.22502 8.80832 4.77086 9.2854 4.36252 9.80624C3.95419 10.3271 3.60836 10.8917 3.32502 11.5C4.14169 13.1667 5.32919 14.4875 6.88752 15.4625C8.44586 16.4375 10.15 16.925 12 16.925C12.3535 16.925 12.6981 16.9042 13.0339 16.8625C13.3696 16.8208 13.7084 16.7667 14.05 16.7L13.1 15.7C12.9167 15.75 12.7363 15.7875 12.5589 15.8125C12.3815 15.8375 12.1952 15.85 12 15.85C10.7917 15.85 9.76461 15.4271 8.91877 14.5812C8.07294 13.7354 7.65002 12.7083 7.65002 11.5C7.65002 11.3167 7.66252 11.1375 7.68752 10.9625C7.71252 10.7875 7.75002 10.6083 7.80002 10.425L5.72502 8.37499Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M15.9625 13.3L14.6 11.9375C14.7834 11.0335 14.5521 10.2616 13.9063 9.62196C13.2604 8.98231 12.4792 8.74165 11.5625 8.89999L10.2 7.53749C10.4834 7.40832 10.775 7.31145 11.075 7.24686C11.375 7.18228 11.6834 7.14999 12 7.14999C13.2084 7.14999 14.2354 7.5729 15.0813 8.41874C15.9271 9.26457 16.35 10.2917 16.35 11.5C16.35 11.8167 16.3177 12.125 16.2531 12.425C16.1886 12.725 16.0917 13.0167 15.9625 13.3ZM19.05 16.3625L17.7125 15.05C18.3485 14.5667 18.9176 14.0292 19.4197 13.4375C19.9218 12.8458 20.3403 12.2 20.675 11.5C19.8584 9.83332 18.6709 8.51249 17.1125 7.53749C15.5542 6.56249 13.85 6.07499 12 6.07499C11.5167 6.07499 11.0396 6.1104 10.5688 6.18124C10.0979 6.25207 9.62919 6.35832 9.16252 6.49999L7.70002 5.03749C8.39169 4.75415 9.09591 4.54374 9.81267 4.40624C10.5294 4.26874 11.2585 4.19999 12 4.19999C14.2167 4.19999 16.25 4.78749 18.1 5.96249C19.95 7.13749 21.3625 8.71665 22.3375 10.7C22.4042 10.825 22.4521 10.9542 22.4813 11.0877C22.5104 11.2212 22.525 11.3586 22.525 11.5C22.525 11.6413 22.5125 11.7788 22.4875 11.9122C22.4625 12.0457 22.4209 12.1792 22.3625 12.3125C21.9875 13.1208 21.5188 13.8646 20.9563 14.5437C20.3938 15.2229 19.7584 15.8292 19.05 16.3625ZM12 18.8C9.81669 18.8 7.82502 18.2083 6.02502 17.025C4.22502 15.8417 2.79942 14.2901 1.74822 12.3702C1.66609 12.2401 1.60836 12.1013 1.57502 11.9539C1.54169 11.8064 1.52502 11.6552 1.52502 11.5C1.52502 11.3423 1.54077 11.1926 1.57225 11.0507C1.60373 10.9088 1.65882 10.7669 1.73752 10.625C2.07919 9.96665 2.46877 9.33332 2.90627 8.72499C3.34377 8.11665 3.84169 7.56665 4.40002 7.07499L2.32502 4.92499C2.15002 4.74054 2.06669 4.52151 2.07502 4.26791C2.08336 4.0143 2.17502 3.79999 2.35002 3.62499C2.52502 3.44999 2.74169 3.36249 3.00002 3.36249C3.25836 3.36249 3.47502 3.44999 3.65002 3.62499L20.3375 20.3125C20.5209 20.4958 20.6125 20.7167 20.6125 20.975C20.6125 21.2333 20.5167 21.4542 20.325 21.6375C20.1417 21.8125 19.9229 21.8979 19.6688 21.8937C19.4146 21.8896 19.2 21.8 19.025 21.625L15.5875 18.2375C15.0042 18.4208 14.4139 18.5604 13.8166 18.6562C13.2194 18.7521 12.6139 18.8 12 18.8ZM5.72502 8.37499C5.22502 8.80832 4.77086 9.2854 4.36252 9.80624C3.95419 10.3271 3.60836 10.8917 3.32502 11.5C4.14169 13.1667 5.32919 14.4875 6.88752 15.4625C8.44586 16.4375 10.15 16.925 12 16.925C12.3535 16.925 12.6981 16.9042 13.0339 16.8625C13.3696 16.8208 13.7084 16.7667 14.05 16.7L13.1 15.7C12.9167 15.75 12.7363 15.7875 12.5589 15.8125C12.3815 15.8375 12.1952 15.85 12 15.85C10.7917 15.85 9.76461 15.4271 8.91877 14.5812C8.07294 13.7354 7.65002 12.7083 7.65002 11.5C7.65002 11.3167 7.66252 11.1375 7.68752 10.9625C7.71252 10.7875 7.75002 10.6083 7.80002 10.425L5.72502 8.37499Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/EyeShow.tsx b/components/Icons/EyeShow.tsx
index c3fdaf17d..fc308c352 100644
--- a/components/Icons/EyeShow.tsx
+++ b/components/Icons/EyeShow.tsx
@@ -14,23 +14,10 @@ export default function EyeShowIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        id="mask0_69_3264"
-        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_3264)">
-        <path
-          d="M12 15.85C13.2083 15.85 14.2354 15.4271 15.0812 14.5813C15.9271 13.7354 16.35 12.7083 16.35 11.5C16.35 10.2917 15.9271 9.2646 15.0812 8.41876C14.2354 7.57293 13.2083 7.15001 12 7.15001C10.7916 7.15001 9.76456 7.57293 8.91873 8.41876C8.07289 9.2646 7.64998 10.2917 7.64998 11.5C7.64998 12.7083 8.07289 13.7354 8.91873 14.5813C9.76456 15.4271 10.7916 15.85 12 15.85ZM12.0029 14.15C11.2676 14.15 10.6416 13.8927 10.125 13.378C9.60831 12.8632 9.34998 12.2382 9.34998 11.503C9.34998 10.7677 9.60733 10.1417 10.122 9.62501C10.6367 9.10835 11.2617 8.85001 11.997 8.85001C12.7323 8.85001 13.3583 9.10736 13.875 9.62206C14.3916 10.1368 14.65 10.7618 14.65 11.4971C14.65 12.2324 14.3926 12.8583 13.8779 13.375C13.3632 13.8917 12.7382 14.15 12.0029 14.15ZM12.0019 18.8C9.8256 18.8 7.83956 18.2125 6.04373 17.0375C4.24789 15.8625 2.82498 14.3167 1.77498 12.4C1.69164 12.2583 1.63123 12.1124 1.59373 11.9622C1.55623 11.812 1.53748 11.6578 1.53748 11.4997C1.53748 11.3416 1.55623 11.1875 1.59373 11.0375C1.63123 10.8875 1.69164 10.7417 1.77498 10.6C2.82498 8.68335 4.24727 7.13751 6.04185 5.96251C7.83645 4.78751 9.82187 4.20001 11.9981 4.20001C14.1744 4.20001 16.1604 4.78751 17.9562 5.96251C19.7521 7.13751 21.175 8.68335 22.225 10.6C22.3083 10.7417 22.3687 10.8876 22.4062 11.0378C22.4437 11.1881 22.4625 11.3422 22.4625 11.5003C22.4625 11.6585 22.4437 11.8125 22.4062 11.9625C22.3687 12.1125 22.3083 12.2583 22.225 12.4C21.175 14.3167 19.7527 15.8625 17.9581 17.0375C16.1635 18.2125 14.1781 18.8 12.0019 18.8ZM11.9999 16.925C13.8583 16.925 15.5646 16.4375 17.1187 15.4625C18.6729 14.4875 19.8583 13.1667 20.675 11.5C19.8583 9.83335 18.6729 8.51251 17.1188 7.53751C15.5647 6.56251 13.8584 6.07501 12 6.07501C10.1417 6.07501 8.43539 6.56251 6.88123 7.53751C5.32706 8.51251 4.14164 9.83335 3.32498 11.5C4.14164 13.1667 5.32704 14.4875 6.88118 15.4625C8.43529 16.4375 10.1415 16.925 11.9999 16.925Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M12 15.85C13.2083 15.85 14.2354 15.4271 15.0812 14.5813C15.9271 13.7354 16.35 12.7083 16.35 11.5C16.35 10.2917 15.9271 9.2646 15.0812 8.41876C14.2354 7.57293 13.2083 7.15001 12 7.15001C10.7916 7.15001 9.76456 7.57293 8.91873 8.41876C8.07289 9.2646 7.64998 10.2917 7.64998 11.5C7.64998 12.7083 8.07289 13.7354 8.91873 14.5813C9.76456 15.4271 10.7916 15.85 12 15.85ZM12.0029 14.15C11.2676 14.15 10.6416 13.8927 10.125 13.378C9.60831 12.8632 9.34998 12.2382 9.34998 11.503C9.34998 10.7677 9.60733 10.1417 10.122 9.62501C10.6367 9.10835 11.2617 8.85001 11.997 8.85001C12.7323 8.85001 13.3583 9.10736 13.875 9.62206C14.3916 10.1368 14.65 10.7618 14.65 11.4971C14.65 12.2324 14.3926 12.8583 13.8779 13.375C13.3632 13.8917 12.7382 14.15 12.0029 14.15ZM12.0019 18.8C9.8256 18.8 7.83956 18.2125 6.04373 17.0375C4.24789 15.8625 2.82498 14.3167 1.77498 12.4C1.69164 12.2583 1.63123 12.1124 1.59373 11.9622C1.55623 11.812 1.53748 11.6578 1.53748 11.4997C1.53748 11.3416 1.55623 11.1875 1.59373 11.0375C1.63123 10.8875 1.69164 10.7417 1.77498 10.6C2.82498 8.68335 4.24727 7.13751 6.04185 5.96251C7.83645 4.78751 9.82187 4.20001 11.9981 4.20001C14.1744 4.20001 16.1604 4.78751 17.9562 5.96251C19.7521 7.13751 21.175 8.68335 22.225 10.6C22.3083 10.7417 22.3687 10.8876 22.4062 11.0378C22.4437 11.1881 22.4625 11.3422 22.4625 11.5003C22.4625 11.6585 22.4437 11.8125 22.4062 11.9625C22.3687 12.1125 22.3083 12.2583 22.225 12.4C21.175 14.3167 19.7527 15.8625 17.9581 17.0375C16.1635 18.2125 14.1781 18.8 12.0019 18.8ZM11.9999 16.925C13.8583 16.925 15.5646 16.4375 17.1187 15.4625C18.6729 14.4875 19.8583 13.1667 20.675 11.5C19.8583 9.83335 18.6729 8.51251 17.1188 7.53751C15.5647 6.56251 13.8584 6.07501 12 6.07501C10.1417 6.07501 8.43539 6.56251 6.88123 7.53751C5.32706 8.51251 4.14164 9.83335 3.32498 11.5C4.14164 13.1667 5.32704 14.4875 6.88118 15.4625C8.43529 16.4375 10.1415 16.925 11.9999 16.925Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Fan.tsx b/components/Icons/Fan.tsx
index 128200104..394d013f2 100644
--- a/components/Icons/Fan.tsx
+++ b/components/Icons/Fan.tsx
@@ -14,23 +14,10 @@ export default function FanIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3478"
-        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_3478)">
-        <path
-          d="M10.6 21.9375C9.77452 21.9375 9.14732 21.6875 8.7184 21.1875C8.28947 20.6875 8.07083 20.125 8.0625 19.5C8.0625 19.0833 8.15625 18.6729 8.34375 18.2688C8.53125 17.8646 8.82083 17.5333 9.2125 17.275C9.58665 17.0316 9.88852 16.7187 10.1181 16.3362C10.3477 15.9537 10.5083 15.5458 10.6 15.1125C10.4833 15.0542 10.3729 14.9979 10.2688 14.9438C10.1646 14.8896 10.0625 14.825 9.9625 14.75L7.63085 15.5856C7.34362 15.6869 7.0689 15.7708 6.8067 15.8375C6.5445 15.9042 6.27411 15.9375 5.99553 15.9375C4.96311 15.9375 4.0495 15.4843 3.2547 14.5778C2.4599 13.6714 2.0625 12.3454 2.0625 10.6C2.0625 9.775 2.30833 9.14583 2.8 8.7125C3.29167 8.27917 3.84807 8.0625 4.46922 8.0625C4.89422 8.0625 5.31105 8.15629 5.7197 8.34388C6.12837 8.53148 6.46347 8.82102 6.725 9.2125C6.96838 9.58665 7.28132 9.88852 7.6638 10.1181C8.04627 10.3477 8.45417 10.5083 8.8875 10.6C8.94583 10.4833 9.00208 10.3729 9.05625 10.2688C9.11042 10.1646 9.175 10.0625 9.25 9.9625L8.4125 7.625C8.3125 7.3482 8.22917 7.07955 8.1625 6.81905C8.09583 6.55853 8.0625 6.29802 8.0625 6.0375C8.07917 4.99583 8.53841 4.07292 9.44023 3.26875C10.342 2.46458 11.662 2.0625 13.4 2.0625C14.225 2.0625 14.8542 2.31025 15.2875 2.80575C15.7208 3.30125 15.9375 3.85767 15.9375 4.475C15.9375 4.89167 15.8438 5.30625 15.6562 5.71875C15.4688 6.13125 15.1792 6.46667 14.7875 6.725C14.4134 6.96838 14.1115 7.28132 13.8819 7.6638C13.6523 8.04627 13.4917 8.45417 13.4 8.8875C13.5167 8.94583 13.6271 9.00208 13.7312 9.05625C13.8354 9.11042 13.9375 9.175 14.0375 9.25L16.3692 8.38938C16.6564 8.28813 16.927 8.20833 17.181 8.15C17.435 8.09167 17.7013 8.0625 17.9799 8.0625C19.3073 8.0625 20.2987 8.6145 20.9543 9.7185C21.6098 10.8225 21.9375 12.0497 21.9375 13.4C21.9375 14.2255 21.6771 14.8527 21.1562 15.2816C20.6354 15.7105 20.0583 15.9292 19.425 15.9375C19.025 15.9375 18.6323 15.8437 18.2468 15.6561C17.8614 15.4685 17.5374 15.179 17.275 14.7875C17.0316 14.4134 16.7187 14.1115 16.3362 13.8819C15.9537 13.6523 15.5458 13.4917 15.1125 13.4C15.0542 13.5167 14.9979 13.6271 14.9438 13.7312C14.8896 13.8354 14.825 13.9375 14.75 14.0375L15.5875 16.375C15.6792 16.6333 15.7604 16.8896 15.8313 17.1438C15.9021 17.3979 15.9375 17.65 15.9375 17.9C15.9292 18.95 15.4751 19.8854 14.5753 20.7063C13.6756 21.5271 12.3505 21.9375 10.6 21.9375ZM11.9993 13.5625C12.4331 13.5625 12.8021 13.4107 13.1062 13.107C13.4104 12.8033 13.5625 12.4346 13.5625 12.0007C13.5625 11.5669 13.4107 11.1979 13.107 10.8938C12.8033 10.5896 12.4346 10.4375 12.0007 10.4375C11.5669 10.4375 11.1979 10.5893 10.8938 10.893C10.5896 11.1967 10.4375 11.5654 10.4375 11.9993C10.4375 12.4331 10.5893 12.8021 10.893 13.1062C11.1967 13.4104 11.5654 13.5625 11.9993 13.5625ZM10.8125 8.775C10.9292 8.73333 11.0488 8.7 11.1714 8.675C11.294 8.65 11.4119 8.62917 11.525 8.6125C11.6583 7.9125 11.9125 7.25833 12.2875 6.65C12.6625 6.04167 13.1542 5.54167 13.7625 5.15C13.8625 5.075 13.9375 4.98392 13.9875 4.87677C14.0375 4.76964 14.0625 4.63572 14.0625 4.475C14.0625 4.32412 14.0073 4.19682 13.8969 4.0931C13.7865 3.98937 13.6208 3.9375 13.4 3.9375C12.7544 3.9375 12.0243 4.07926 11.2095 4.36277C10.3948 4.64629 9.97083 5.20044 9.9375 6.02522C9.9375 6.17987 9.95833 6.32592 10 6.46337C10.0417 6.60084 10.0792 6.72972 10.1125 6.85L10.8125 8.775ZM6 14.0625C6.23333 14.0625 6.51667 14.0042 6.85 13.8875L8.775 13.1875C8.73333 13.0708 8.7 12.9512 8.675 12.8286C8.65 12.706 8.62917 12.5882 8.6125 12.475C7.9125 12.3417 7.25833 12.0875 6.65 11.7125C6.04167 11.3375 5.54167 10.8458 5.15 10.2375C5.075 10.1375 4.97708 10.0625 4.85625 10.0125C4.73542 9.9625 4.60833 9.9375 4.475 9.9375C4.30527 9.9375 4.17325 9.99271 4.07895 10.1031C3.98465 10.2135 3.9375 10.3792 3.9375 10.6C3.9375 11.5166 4.1125 12.3228 4.4625 13.0187C4.8125 13.7146 5.325 14.0625 6 14.0625ZM10.6 20.0625C11.3919 20.0625 12.1711 19.9021 12.9376 19.5813C13.7042 19.2604 14.0792 18.7042 14.0625 17.9125C14.0625 17.7701 14.0438 17.6366 14.0063 17.5119C13.9688 17.3873 13.9292 17.2667 13.8875 17.15L13.1875 15.225C13.0708 15.2667 12.9512 15.3 12.8286 15.325C12.706 15.35 12.5882 15.3708 12.475 15.3875C12.3417 16.0875 12.0875 16.7417 11.7125 17.35C11.3375 17.9583 10.8458 18.4583 10.2375 18.85C10.1375 18.925 10.0604 19.0229 10.0062 19.1438C9.95208 19.2646 9.92917 19.3875 9.9375 19.5125C9.95643 19.6592 10.0133 19.7875 10.108 19.8975C10.2027 20.0075 10.3667 20.0625 10.6 20.0625ZM19.42 14.0625C19.59 14.0625 19.7396 14.0165 19.8687 13.9245C19.9979 13.8325 20.0625 13.6576 20.0625 13.4C20.0625 12.755 19.9255 12.0209 19.6514 11.1977C19.3773 10.3745 18.8206 9.95447 17.9812 9.9375C17.8271 9.9375 17.6792 9.95417 17.5375 9.9875C17.3958 10.0208 17.2652 10.0547 17.1457 10.0892L15.225 10.8125C15.2667 10.9292 15.3 11.0488 15.325 11.1714C15.35 11.294 15.3708 11.4119 15.3875 11.525C16.0875 11.6583 16.7417 11.9125 17.35 12.2875C17.9583 12.6625 18.4583 13.1542 18.85 13.7625C18.9083 13.8542 18.9896 13.9271 19.0938 13.9812C19.1979 14.0354 19.3067 14.0625 19.42 14.0625Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M10.6 21.9375C9.77452 21.9375 9.14732 21.6875 8.7184 21.1875C8.28947 20.6875 8.07083 20.125 8.0625 19.5C8.0625 19.0833 8.15625 18.6729 8.34375 18.2688C8.53125 17.8646 8.82083 17.5333 9.2125 17.275C9.58665 17.0316 9.88852 16.7187 10.1181 16.3362C10.3477 15.9537 10.5083 15.5458 10.6 15.1125C10.4833 15.0542 10.3729 14.9979 10.2688 14.9438C10.1646 14.8896 10.0625 14.825 9.9625 14.75L7.63085 15.5856C7.34362 15.6869 7.0689 15.7708 6.8067 15.8375C6.5445 15.9042 6.27411 15.9375 5.99553 15.9375C4.96311 15.9375 4.0495 15.4843 3.2547 14.5778C2.4599 13.6714 2.0625 12.3454 2.0625 10.6C2.0625 9.775 2.30833 9.14583 2.8 8.7125C3.29167 8.27917 3.84807 8.0625 4.46922 8.0625C4.89422 8.0625 5.31105 8.15629 5.7197 8.34388C6.12837 8.53148 6.46347 8.82102 6.725 9.2125C6.96838 9.58665 7.28132 9.88852 7.6638 10.1181C8.04627 10.3477 8.45417 10.5083 8.8875 10.6C8.94583 10.4833 9.00208 10.3729 9.05625 10.2688C9.11042 10.1646 9.175 10.0625 9.25 9.9625L8.4125 7.625C8.3125 7.3482 8.22917 7.07955 8.1625 6.81905C8.09583 6.55853 8.0625 6.29802 8.0625 6.0375C8.07917 4.99583 8.53841 4.07292 9.44023 3.26875C10.342 2.46458 11.662 2.0625 13.4 2.0625C14.225 2.0625 14.8542 2.31025 15.2875 2.80575C15.7208 3.30125 15.9375 3.85767 15.9375 4.475C15.9375 4.89167 15.8438 5.30625 15.6562 5.71875C15.4688 6.13125 15.1792 6.46667 14.7875 6.725C14.4134 6.96838 14.1115 7.28132 13.8819 7.6638C13.6523 8.04627 13.4917 8.45417 13.4 8.8875C13.5167 8.94583 13.6271 9.00208 13.7312 9.05625C13.8354 9.11042 13.9375 9.175 14.0375 9.25L16.3692 8.38938C16.6564 8.28813 16.927 8.20833 17.181 8.15C17.435 8.09167 17.7013 8.0625 17.9799 8.0625C19.3073 8.0625 20.2987 8.6145 20.9543 9.7185C21.6098 10.8225 21.9375 12.0497 21.9375 13.4C21.9375 14.2255 21.6771 14.8527 21.1562 15.2816C20.6354 15.7105 20.0583 15.9292 19.425 15.9375C19.025 15.9375 18.6323 15.8437 18.2468 15.6561C17.8614 15.4685 17.5374 15.179 17.275 14.7875C17.0316 14.4134 16.7187 14.1115 16.3362 13.8819C15.9537 13.6523 15.5458 13.4917 15.1125 13.4C15.0542 13.5167 14.9979 13.6271 14.9438 13.7312C14.8896 13.8354 14.825 13.9375 14.75 14.0375L15.5875 16.375C15.6792 16.6333 15.7604 16.8896 15.8313 17.1438C15.9021 17.3979 15.9375 17.65 15.9375 17.9C15.9292 18.95 15.4751 19.8854 14.5753 20.7063C13.6756 21.5271 12.3505 21.9375 10.6 21.9375ZM11.9993 13.5625C12.4331 13.5625 12.8021 13.4107 13.1062 13.107C13.4104 12.8033 13.5625 12.4346 13.5625 12.0007C13.5625 11.5669 13.4107 11.1979 13.107 10.8938C12.8033 10.5896 12.4346 10.4375 12.0007 10.4375C11.5669 10.4375 11.1979 10.5893 10.8938 10.893C10.5896 11.1967 10.4375 11.5654 10.4375 11.9993C10.4375 12.4331 10.5893 12.8021 10.893 13.1062C11.1967 13.4104 11.5654 13.5625 11.9993 13.5625ZM10.8125 8.775C10.9292 8.73333 11.0488 8.7 11.1714 8.675C11.294 8.65 11.4119 8.62917 11.525 8.6125C11.6583 7.9125 11.9125 7.25833 12.2875 6.65C12.6625 6.04167 13.1542 5.54167 13.7625 5.15C13.8625 5.075 13.9375 4.98392 13.9875 4.87677C14.0375 4.76964 14.0625 4.63572 14.0625 4.475C14.0625 4.32412 14.0073 4.19682 13.8969 4.0931C13.7865 3.98937 13.6208 3.9375 13.4 3.9375C12.7544 3.9375 12.0243 4.07926 11.2095 4.36277C10.3948 4.64629 9.97083 5.20044 9.9375 6.02522C9.9375 6.17987 9.95833 6.32592 10 6.46337C10.0417 6.60084 10.0792 6.72972 10.1125 6.85L10.8125 8.775ZM6 14.0625C6.23333 14.0625 6.51667 14.0042 6.85 13.8875L8.775 13.1875C8.73333 13.0708 8.7 12.9512 8.675 12.8286C8.65 12.706 8.62917 12.5882 8.6125 12.475C7.9125 12.3417 7.25833 12.0875 6.65 11.7125C6.04167 11.3375 5.54167 10.8458 5.15 10.2375C5.075 10.1375 4.97708 10.0625 4.85625 10.0125C4.73542 9.9625 4.60833 9.9375 4.475 9.9375C4.30527 9.9375 4.17325 9.99271 4.07895 10.1031C3.98465 10.2135 3.9375 10.3792 3.9375 10.6C3.9375 11.5166 4.1125 12.3228 4.4625 13.0187C4.8125 13.7146 5.325 14.0625 6 14.0625ZM10.6 20.0625C11.3919 20.0625 12.1711 19.9021 12.9376 19.5813C13.7042 19.2604 14.0792 18.7042 14.0625 17.9125C14.0625 17.7701 14.0438 17.6366 14.0063 17.5119C13.9688 17.3873 13.9292 17.2667 13.8875 17.15L13.1875 15.225C13.0708 15.2667 12.9512 15.3 12.8286 15.325C12.706 15.35 12.5882 15.3708 12.475 15.3875C12.3417 16.0875 12.0875 16.7417 11.7125 17.35C11.3375 17.9583 10.8458 18.4583 10.2375 18.85C10.1375 18.925 10.0604 19.0229 10.0062 19.1438C9.95208 19.2646 9.92917 19.3875 9.9375 19.5125C9.95643 19.6592 10.0133 19.7875 10.108 19.8975C10.2027 20.0075 10.3667 20.0625 10.6 20.0625ZM19.42 14.0625C19.59 14.0625 19.7396 14.0165 19.8687 13.9245C19.9979 13.8325 20.0625 13.6576 20.0625 13.4C20.0625 12.755 19.9255 12.0209 19.6514 11.1977C19.3773 10.3745 18.8206 9.95447 17.9812 9.9375C17.8271 9.9375 17.6792 9.95417 17.5375 9.9875C17.3958 10.0208 17.2652 10.0547 17.1457 10.0892L15.225 10.8125C15.2667 10.9292 15.3 11.0488 15.325 11.1714C15.35 11.294 15.3708 11.4119 15.3875 11.525C16.0875 11.6583 16.7417 11.9125 17.35 12.2875C17.9583 12.6625 18.4583 13.1542 18.85 13.7625C18.9083 13.8542 18.9896 13.9271 19.0938 13.9812C19.1979 14.0354 19.3067 14.0625 19.42 14.0625Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Fitness.tsx b/components/Icons/Fitness.tsx
index 69b965a7b..113a90fb0 100644
--- a/components/Icons/Fitness.tsx
+++ b/components/Icons/Fitness.tsx
@@ -14,23 +14,10 @@ export default function FitnessIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_554_11977"
-        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_11977)">
-        <path
-          d="M7.11239 8.42495L4.28739 11.25C4.10406 11.4333 3.88114 11.527 3.61864 11.5312C3.35614 11.5354 3.12906 11.4416 2.93739 11.25C2.75406 11.0666 2.66031 10.8437 2.65614 10.5812C2.65198 10.3187 2.74156 10.0916 2.92489 9.89995L3.66239 9.14995L2.97489 8.46245C2.78323 8.27078 2.68739 8.04995 2.68739 7.79995C2.68739 7.54995 2.78323 7.32912 2.97489 7.13745L4.39989 5.71245L3.68739 4.98745C3.51239 4.81245 3.42489 4.59787 3.42489 4.3437C3.42489 4.08953 3.51656 3.87078 3.69989 3.68745C3.87489 3.51245 4.08948 3.42287 4.34364 3.4187C4.59781 3.41453 4.81656 3.49995 4.99989 3.67495L5.72489 4.38745L7.14989 2.96245C7.34156 2.77078 7.56239 2.67495 7.81239 2.67495C8.06239 2.67495 8.28323 2.77078 8.4749 2.96245L9.1624 3.64995L9.9124 2.91245C10.0957 2.72912 10.3186 2.63745 10.5811 2.63745C10.8436 2.63745 11.0707 2.73328 11.2624 2.92495C11.4457 3.10828 11.5374 3.33328 11.5374 3.59995C11.5374 3.86662 11.4457 4.09162 11.2624 4.27495L8.43739 7.09995L16.8874 15.55L19.7124 12.725C19.8957 12.5416 20.1186 12.4479 20.3811 12.4437C20.6436 12.4395 20.8707 12.5333 21.0624 12.725C21.2457 12.9083 21.3395 13.1312 21.3436 13.3937C21.3478 13.6562 21.2582 13.8833 21.0749 14.075L20.3374 14.825L21.0249 15.5125C21.2166 15.7041 21.3124 15.925 21.3124 16.175C21.3124 16.425 21.2166 16.6458 21.0249 16.8375L19.5999 18.2625L20.3124 18.9875C20.4874 19.1625 20.5749 19.377 20.5749 19.6312C20.5749 19.8854 20.4832 20.1041 20.2999 20.2875C20.1249 20.4625 19.9103 20.552 19.6561 20.5562C19.402 20.5604 19.1832 20.475 18.9999 20.3L18.2749 19.5875L16.8499 21.0125C16.6582 21.2041 16.4374 21.3 16.1874 21.3C15.9374 21.3 15.7166 21.2041 15.5249 21.0125L14.8374 20.325L14.0874 21.0625C13.9041 21.2458 13.6811 21.3375 13.4186 21.3375C13.1561 21.3375 12.9291 21.2416 12.7374 21.05C12.5541 20.8666 12.4624 20.6416 12.4624 20.375C12.4624 20.1083 12.5541 19.8833 12.7374 19.7L15.5624 16.875L7.11239 8.42495Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M7.11239 8.42495L4.28739 11.25C4.10406 11.4333 3.88114 11.527 3.61864 11.5312C3.35614 11.5354 3.12906 11.4416 2.93739 11.25C2.75406 11.0666 2.66031 10.8437 2.65614 10.5812C2.65198 10.3187 2.74156 10.0916 2.92489 9.89995L3.66239 9.14995L2.97489 8.46245C2.78323 8.27078 2.68739 8.04995 2.68739 7.79995C2.68739 7.54995 2.78323 7.32912 2.97489 7.13745L4.39989 5.71245L3.68739 4.98745C3.51239 4.81245 3.42489 4.59787 3.42489 4.3437C3.42489 4.08953 3.51656 3.87078 3.69989 3.68745C3.87489 3.51245 4.08948 3.42287 4.34364 3.4187C4.59781 3.41453 4.81656 3.49995 4.99989 3.67495L5.72489 4.38745L7.14989 2.96245C7.34156 2.77078 7.56239 2.67495 7.81239 2.67495C8.06239 2.67495 8.28323 2.77078 8.4749 2.96245L9.1624 3.64995L9.9124 2.91245C10.0957 2.72912 10.3186 2.63745 10.5811 2.63745C10.8436 2.63745 11.0707 2.73328 11.2624 2.92495C11.4457 3.10828 11.5374 3.33328 11.5374 3.59995C11.5374 3.86662 11.4457 4.09162 11.2624 4.27495L8.43739 7.09995L16.8874 15.55L19.7124 12.725C19.8957 12.5416 20.1186 12.4479 20.3811 12.4437C20.6436 12.4395 20.8707 12.5333 21.0624 12.725C21.2457 12.9083 21.3395 13.1312 21.3436 13.3937C21.3478 13.6562 21.2582 13.8833 21.0749 14.075L20.3374 14.825L21.0249 15.5125C21.2166 15.7041 21.3124 15.925 21.3124 16.175C21.3124 16.425 21.2166 16.6458 21.0249 16.8375L19.5999 18.2625L20.3124 18.9875C20.4874 19.1625 20.5749 19.377 20.5749 19.6312C20.5749 19.8854 20.4832 20.1041 20.2999 20.2875C20.1249 20.4625 19.9103 20.552 19.6561 20.5562C19.402 20.5604 19.1832 20.475 18.9999 20.3L18.2749 19.5875L16.8499 21.0125C16.6582 21.2041 16.4374 21.3 16.1874 21.3C15.9374 21.3 15.7166 21.2041 15.5249 21.0125L14.8374 20.325L14.0874 21.0625C13.9041 21.2458 13.6811 21.3375 13.4186 21.3375C13.1561 21.3375 12.9291 21.2416 12.7374 21.05C12.5541 20.8666 12.4624 20.6416 12.4624 20.375C12.4624 20.1083 12.5541 19.8833 12.7374 19.7L15.5624 16.875L7.11239 8.42495Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Footstool.tsx b/components/Icons/Footstool.tsx
index becb0fd80..6d7c6cc42 100644
--- a/components/Icons/Footstool.tsx
+++ b/components/Icons/Footstool.tsx
@@ -18,23 +18,10 @@ export default function FootstoolIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_81_881"
-        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_881)">
-        <path
-          d="M3.2251 19.8125V9.9444C3.2251 9.40648 3.41468 8.95211 3.79385 8.58127C4.17301 8.21044 4.63195 8.02502 5.17065 8.02502C14.2941 8.02502 15.6761 8.02502 18.8295 8.02502C19.3682 8.02502 19.8272 8.21044 20.2063 8.58127C20.5855 8.95211 20.7751 9.40648 20.7751 9.9444V19.8125C20.7751 20.0709 20.6834 20.2917 20.5001 20.475C20.3168 20.6584 20.0959 20.75 19.8376 20.75C19.5793 20.75 19.3584 20.6584 19.1751 20.475C18.9918 20.2917 18.9001 20.0709 18.9001 19.8125V14.8H5.1001V19.8125C5.1001 20.0709 5.00843 20.2917 4.8251 20.475C4.64176 20.6584 4.42093 20.75 4.1626 20.75C3.90426 20.75 3.68343 20.6584 3.5001 20.475C3.31676 20.2917 3.2251 20.0709 3.2251 19.8125ZM5.1001 12.925H18.9001V9.90003H5.1001V12.925Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.2251 19.8125V9.9444C3.2251 9.40648 3.41468 8.95211 3.79385 8.58127C4.17301 8.21044 4.63195 8.02502 5.17065 8.02502C14.2941 8.02502 15.6761 8.02502 18.8295 8.02502C19.3682 8.02502 19.8272 8.21044 20.2063 8.58127C20.5855 8.95211 20.7751 9.40648 20.7751 9.9444V19.8125C20.7751 20.0709 20.6834 20.2917 20.5001 20.475C20.3168 20.6584 20.0959 20.75 19.8376 20.75C19.5793 20.75 19.3584 20.6584 19.1751 20.475C18.9918 20.2917 18.9001 20.0709 18.9001 19.8125V14.8H5.1001V19.8125C5.1001 20.0709 5.00843 20.2917 4.8251 20.475C4.64176 20.6584 4.42093 20.75 4.1626 20.75C3.90426 20.75 3.68343 20.6584 3.5001 20.475C3.31676 20.2917 3.2251 20.0709 3.2251 19.8125ZM5.1001 12.925H18.9001V9.90003H5.1001V12.925Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Gallery.tsx b/components/Icons/Gallery.tsx
index 5bf1bc8b6..005f539f2 100644
--- a/components/Icons/Gallery.tsx
+++ b/components/Icons/Gallery.tsx
@@ -14,23 +14,10 @@ export default function GalleryIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3274"
-        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_5887_18142)">
-        <path
-          d="M9.15 13.9H18.65L15.3725 9.625L13.1875 12.475L11.715 10.575L9.15 13.9ZM8.2 17.7C7.6775 17.7 7.23021 17.514 6.85813 17.1419C6.48604 16.7698 6.3 16.3225 6.3 15.8V4.4C6.3 3.8775 6.48604 3.43021 6.85813 3.05813C7.23021 2.68604 7.6775 2.5 8.2 2.5H19.6C20.1225 2.5 20.5698 2.68604 20.9419 3.05813C21.314 3.43021 21.5 3.8775 21.5 4.4V15.8C21.5 16.3225 21.314 16.7698 20.9419 17.1419C20.5698 17.514 20.1225 17.7 19.6 17.7H8.2ZM8.2 15.8H19.6V4.4H8.2V15.8ZM4.4 21.5C3.8775 21.5 3.43021 21.314 3.05813 20.9419C2.68604 20.5698 2.5 20.1225 2.5 19.6V6.3H4.4V19.6H17.7V21.5H4.4Z"
-          fill="white"
-        />
-      </g>
+      <path
+        d="M9.15 13.9H18.65L15.3725 9.625L13.1875 12.475L11.715 10.575L9.15 13.9ZM8.2 17.7C7.6775 17.7 7.23021 17.514 6.85813 17.1419C6.48604 16.7698 6.3 16.3225 6.3 15.8V4.4C6.3 3.8775 6.48604 3.43021 6.85813 3.05813C7.23021 2.68604 7.6775 2.5 8.2 2.5H19.6C20.1225 2.5 20.5698 2.68604 20.9419 3.05813C21.314 3.43021 21.5 3.8775 21.5 4.4V15.8C21.5 16.3225 21.314 16.7698 20.9419 17.1419C20.5698 17.514 20.1225 17.7 19.6 17.7H8.2ZM8.2 15.8H19.6V4.4H8.2V15.8ZM4.4 21.5C3.8775 21.5 3.43021 21.314 3.05813 20.9419C2.68604 20.5698 2.5 20.1225 2.5 19.6V6.3H4.4V19.6H17.7V21.5H4.4Z"
+        fill="white"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Garage.tsx b/components/Icons/Garage.tsx
index b715532cc..597c3e90b 100644
--- a/components/Icons/Garage.tsx
+++ b/components/Icons/Garage.tsx
@@ -14,23 +14,10 @@ export default function GarageIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3539"
-        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_3539)">
-        <path
-          d="M4.13745 21.75C3.62182 21.75 3.18041 21.5664 2.81323 21.1992C2.44604 20.832 2.26245 20.3906 2.26245 19.875V4.125C2.26245 3.60937 2.44604 3.16796 2.81323 2.80078C3.18041 2.43359 3.62182 2.25 4.13745 2.25H19.8875C20.4031 2.25 20.8445 2.43359 21.2117 2.80078C21.5789 3.16796 21.7625 3.60937 21.7625 4.125V19.875C21.7625 20.3906 21.5789 20.832 21.2117 21.1992C20.8445 21.5664 20.4031 21.75 19.8875 21.75H4.13745ZM4.13745 19.875H19.8875V4.125H4.13745V19.875ZM9.01508 13.95C8.74666 13.95 8.52078 13.8592 8.33745 13.6776C8.15412 13.4961 8.06245 13.2711 8.06245 13.0026C8.06245 12.7342 8.15324 12.5083 8.33483 12.325C8.51639 12.1417 8.74139 12.05 9.00983 12.05C9.27824 12.05 9.50412 12.1408 9.68745 12.3224C9.87078 12.5039 9.96245 12.7289 9.96245 12.9974C9.96245 13.2658 9.87166 13.4917 9.69008 13.675C9.50851 13.8583 9.28351 13.95 9.01508 13.95ZM15.0151 13.95C14.7467 13.95 14.5208 13.8592 14.3375 13.6776C14.1541 13.4961 14.0625 13.2711 14.0625 13.0026C14.0625 12.7342 14.1532 12.5083 14.3348 12.325C14.5164 12.1417 14.7414 12.05 15.0098 12.05C15.2782 12.05 15.5041 12.1408 15.6875 12.3224C15.8708 12.5039 15.9625 12.7289 15.9625 12.9974C15.9625 13.2658 15.8717 13.4917 15.6901 13.675C15.5085 13.8583 15.2835 13.95 15.0151 13.95ZM6.14995 18.325C6.40828 18.325 6.62912 18.2333 6.81245 18.05C6.99578 17.8667 7.08745 17.6458 7.08745 17.3875V16.35H16.9375V17.3875C16.9375 17.6458 17.0291 17.8667 17.2125 18.05C17.3958 18.2333 17.6166 18.325 17.875 18.325C18.1333 18.325 18.3541 18.2333 18.5375 18.05C18.7208 17.8667 18.8125 17.6458 18.8125 17.3875V11.4625C18.8125 11.3526 18.8041 11.2466 18.7875 11.1445C18.7708 11.0424 18.7458 10.9442 18.7125 10.85L17.375 6.9625C17.2416 6.5875 17.0145 6.28333 16.6937 6.05C16.3729 5.81667 16.0083 5.7 15.6 5.7H8.42495C8.01662 5.7 7.65203 5.81667 7.3312 6.05C7.01037 6.28333 6.78328 6.5875 6.64995 6.9625L5.31245 10.85C5.27912 10.9442 5.25412 11.0424 5.23745 11.1445C5.22078 11.2466 5.21245 11.3526 5.21245 11.4625V17.3875C5.21245 17.6458 5.30412 17.8667 5.48745 18.05C5.67078 18.2333 5.89162 18.325 6.14995 18.325ZM7.68745 9.65L8.41245 7.575H15.6125L16.3375 9.65H7.68745ZM7.08745 14.475V11.525H16.9375V14.475H7.08745Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M4.13745 21.75C3.62182 21.75 3.18041 21.5664 2.81323 21.1992C2.44604 20.832 2.26245 20.3906 2.26245 19.875V4.125C2.26245 3.60937 2.44604 3.16796 2.81323 2.80078C3.18041 2.43359 3.62182 2.25 4.13745 2.25H19.8875C20.4031 2.25 20.8445 2.43359 21.2117 2.80078C21.5789 3.16796 21.7625 3.60937 21.7625 4.125V19.875C21.7625 20.3906 21.5789 20.832 21.2117 21.1992C20.8445 21.5664 20.4031 21.75 19.8875 21.75H4.13745ZM4.13745 19.875H19.8875V4.125H4.13745V19.875ZM9.01508 13.95C8.74666 13.95 8.52078 13.8592 8.33745 13.6776C8.15412 13.4961 8.06245 13.2711 8.06245 13.0026C8.06245 12.7342 8.15324 12.5083 8.33483 12.325C8.51639 12.1417 8.74139 12.05 9.00983 12.05C9.27824 12.05 9.50412 12.1408 9.68745 12.3224C9.87078 12.5039 9.96245 12.7289 9.96245 12.9974C9.96245 13.2658 9.87166 13.4917 9.69008 13.675C9.50851 13.8583 9.28351 13.95 9.01508 13.95ZM15.0151 13.95C14.7467 13.95 14.5208 13.8592 14.3375 13.6776C14.1541 13.4961 14.0625 13.2711 14.0625 13.0026C14.0625 12.7342 14.1532 12.5083 14.3348 12.325C14.5164 12.1417 14.7414 12.05 15.0098 12.05C15.2782 12.05 15.5041 12.1408 15.6875 12.3224C15.8708 12.5039 15.9625 12.7289 15.9625 12.9974C15.9625 13.2658 15.8717 13.4917 15.6901 13.675C15.5085 13.8583 15.2835 13.95 15.0151 13.95ZM6.14995 18.325C6.40828 18.325 6.62912 18.2333 6.81245 18.05C6.99578 17.8667 7.08745 17.6458 7.08745 17.3875V16.35H16.9375V17.3875C16.9375 17.6458 17.0291 17.8667 17.2125 18.05C17.3958 18.2333 17.6166 18.325 17.875 18.325C18.1333 18.325 18.3541 18.2333 18.5375 18.05C18.7208 17.8667 18.8125 17.6458 18.8125 17.3875V11.4625C18.8125 11.3526 18.8041 11.2466 18.7875 11.1445C18.7708 11.0424 18.7458 10.9442 18.7125 10.85L17.375 6.9625C17.2416 6.5875 17.0145 6.28333 16.6937 6.05C16.3729 5.81667 16.0083 5.7 15.6 5.7H8.42495C8.01662 5.7 7.65203 5.81667 7.3312 6.05C7.01037 6.28333 6.78328 6.5875 6.64995 6.9625L5.31245 10.85C5.27912 10.9442 5.25412 11.0424 5.23745 11.1445C5.22078 11.2466 5.21245 11.3526 5.21245 11.4625V17.3875C5.21245 17.6458 5.30412 17.8667 5.48745 18.05C5.67078 18.2333 5.89162 18.325 6.14995 18.325ZM7.68745 9.65L8.41245 7.575H15.6125L16.3375 9.65H7.68745ZM7.08745 14.475V11.525H16.9375V14.475H7.08745Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Gift.tsx b/components/Icons/Gift.tsx
index b07015db5..09914ab54 100644
--- a/components/Icons/Gift.tsx
+++ b/components/Icons/Gift.tsx
@@ -14,23 +14,10 @@ export default function GiftIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_4278_5138"
-        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_4278_5138)">
-        <path
-          d="M4 22V11H2V5H7.2C7.11667 4.85 7.0625 4.69167 7.0375 4.525C7.0125 4.35833 7 4.18333 7 4C7 3.16667 7.29167 2.45833 7.875 1.875C8.45833 1.29167 9.16667 1 10 1C10.3833 1 10.7417 1.07083 11.075 1.2125C11.4083 1.35417 11.7167 1.55 12 1.8C12.2833 1.53333 12.5917 1.33333 12.925 1.2C13.2583 1.06667 13.6167 1 14 1C14.8333 1 15.5417 1.29167 16.125 1.875C16.7083 2.45833 17 3.16667 17 4C17 4.18333 16.9833 4.35417 16.95 4.5125C16.9167 4.67083 16.8667 4.83333 16.8 5H22V11H20V22H4ZM14 3C13.7167 3 13.4792 3.09583 13.2875 3.2875C13.0958 3.47917 13 3.71667 13 4C13 4.28333 13.0958 4.52083 13.2875 4.7125C13.4792 4.90417 13.7167 5 14 5C14.2833 5 14.5208 4.90417 14.7125 4.7125C14.9042 4.52083 15 4.28333 15 4C15 3.71667 14.9042 3.47917 14.7125 3.2875C14.5208 3.09583 14.2833 3 14 3ZM9 4C9 4.28333 9.09583 4.52083 9.2875 4.7125C9.47917 4.90417 9.71667 5 10 5C10.2833 5 10.5208 4.90417 10.7125 4.7125C10.9042 4.52083 11 4.28333 11 4C11 3.71667 10.9042 3.47917 10.7125 3.2875C10.5208 3.09583 10.2833 3 10 3C9.71667 3 9.47917 3.09583 9.2875 3.2875C9.09583 3.47917 9 3.71667 9 4ZM4 7V9H11V7H4ZM11 20V11H6V20H11ZM13 20H18V11H13V20ZM20 9V7H13V9H20Z"
-          fill="#1C1B1F"
-        />
-      </g>
+      <path
+        d="M4 22V11H2V5H7.2C7.11667 4.85 7.0625 4.69167 7.0375 4.525C7.0125 4.35833 7 4.18333 7 4C7 3.16667 7.29167 2.45833 7.875 1.875C8.45833 1.29167 9.16667 1 10 1C10.3833 1 10.7417 1.07083 11.075 1.2125C11.4083 1.35417 11.7167 1.55 12 1.8C12.2833 1.53333 12.5917 1.33333 12.925 1.2C13.2583 1.06667 13.6167 1 14 1C14.8333 1 15.5417 1.29167 16.125 1.875C16.7083 2.45833 17 3.16667 17 4C17 4.18333 16.9833 4.35417 16.95 4.5125C16.9167 4.67083 16.8667 4.83333 16.8 5H22V11H20V22H4ZM14 3C13.7167 3 13.4792 3.09583 13.2875 3.2875C13.0958 3.47917 13 3.71667 13 4C13 4.28333 13.0958 4.52083 13.2875 4.7125C13.4792 4.90417 13.7167 5 14 5C14.2833 5 14.5208 4.90417 14.7125 4.7125C14.9042 4.52083 15 4.28333 15 4C15 3.71667 14.9042 3.47917 14.7125 3.2875C14.5208 3.09583 14.2833 3 14 3ZM9 4C9 4.28333 9.09583 4.52083 9.2875 4.7125C9.47917 4.90417 9.71667 5 10 5C10.2833 5 10.5208 4.90417 10.7125 4.7125C10.9042 4.52083 11 4.28333 11 4C11 3.71667 10.9042 3.47917 10.7125 3.2875C10.5208 3.09583 10.2833 3 10 3C9.71667 3 9.47917 3.09583 9.2875 3.2875C9.09583 3.47917 9 3.71667 9 4ZM4 7V9H11V7H4ZM11 20V11H6V20H11ZM13 20H18V11H13V20ZM20 9V7H13V9H20Z"
+        fill="#1C1B1F"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Globe.tsx b/components/Icons/Globe.tsx
index 7ea19bf87..16bda388e 100644
--- a/components/Icons/Globe.tsx
+++ b/components/Icons/Globe.tsx
@@ -14,23 +14,10 @@ export default function GlobeIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="24"
-        id="mask0_4077_9694"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="24"
-        x="0"
-        y="0"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4077_9694)">
-        <path
-          d="M11.994 21.75C10.6563 21.75 9.39542 21.4945 8.21127 20.9835C7.02714 20.4726 5.99304 19.7751 5.10897 18.891C4.22492 18.007 3.52742 16.9729 3.01645 15.7887C2.50548 14.6046 2.25 13.3437 2.25 12.006C2.25 10.652 2.50548 9.38608 3.01645 8.20825C3.52742 7.0304 4.22492 5.99877 5.10897 5.11337C5.99304 4.22796 7.02714 3.52938 8.21127 3.01763C9.39542 2.50588 10.6563 2.25 11.994 2.25C13.348 2.25 14.6139 2.50594 15.7917 3.01783C16.9696 3.52969 18.0012 4.22843 18.8866 5.11405C19.772 5.99968 20.4706 7.03157 20.9824 8.2097C21.4941 9.38782 21.75 10.6512 21.75 12C21.75 13.3417 21.4941 14.6046 20.9824 15.7887C20.4706 16.9729 19.772 18.007 18.8866 18.891C18.0012 19.7751 16.9696 20.4726 15.7917 20.9835C14.6139 21.4945 13.348 21.75 11.994 21.75ZM12 19.9C12.4435 19.2868 12.8273 18.6481 13.1514 17.9839C13.4755 17.3196 13.7375 16.6167 13.9375 15.875H10.0625C10.2625 16.6167 10.5245 17.3196 10.8486 17.9839C11.1727 18.6481 11.5565 19.2868 12 19.9ZM9.55 19.475C9.23333 18.9 8.95625 18.3146 8.71875 17.7188C8.48125 17.1229 8.28673 16.5083 8.1352 15.875H5.1625C5.64583 16.7333 6.25833 17.4688 7 18.0813C7.74167 18.6938 8.59167 19.1583 9.55 19.475ZM14.45 19.475C15.4083 19.1583 16.2583 18.6938 17 18.0813C17.7417 17.4688 18.3542 16.7333 18.8375 15.875H15.8648C15.7133 16.5083 15.5188 17.1229 15.2812 17.7188C15.0437 18.3146 14.7667 18.9 14.45 19.475ZM4.3875 14H7.75C7.7 13.6583 7.6625 13.325 7.6375 13C7.6125 12.675 7.6 12.3417 7.6 12C7.6 11.6583 7.6125 11.325 7.6375 11C7.6625 10.675 7.7 10.3417 7.75 10H4.3875C4.29583 10.3417 4.22917 10.6737 4.1875 10.996C4.14583 11.3182 4.125 11.6529 4.125 12C4.125 12.3471 4.14583 12.6818 4.1875 13.0041C4.22917 13.3264 4.29583 13.6583 4.3875 14ZM9.6375 14H14.3625C14.4208 13.6583 14.4625 13.3264 14.4875 13.0041C14.5125 12.6818 14.525 12.3471 14.525 12C14.525 11.6529 14.5125 11.3182 14.4875 10.996C14.4625 10.6737 14.4208 10.3417 14.3625 10H9.6375C9.57917 10.3417 9.5375 10.6737 9.5125 10.996C9.4875 11.3182 9.475 11.6529 9.475 12C9.475 12.3471 9.4875 12.6818 9.5125 13.0041C9.5375 13.3264 9.57917 13.6583 9.6375 14ZM16.25 14H19.6125C19.7042 13.6583 19.7708 13.3264 19.8125 13.0041C19.8542 12.6818 19.875 12.3471 19.875 12C19.875 11.6529 19.8542 11.3182 19.8125 10.996C19.7708 10.6737 19.7042 10.3417 19.6125 10H16.25C16.3 10.3417 16.3375 10.675 16.3625 11C16.3875 11.325 16.4 11.6583 16.4 12C16.4 12.3417 16.3875 12.675 16.3625 13C16.3375 13.325 16.3 13.6583 16.25 14ZM15.8648 8.125H18.8375C18.3542 7.26667 17.7417 6.53125 17 5.91875C16.2583 5.30625 15.4083 4.84167 14.45 4.525C14.7667 5.1 15.0437 5.68542 15.2812 6.28125C15.5188 6.87708 15.7133 7.49167 15.8648 8.125ZM10.0625 8.125H13.9375C13.7375 7.38333 13.4755 6.68038 13.1514 6.01613C12.8273 5.35186 12.4435 4.71315 12 4.1C11.5565 4.71315 11.1727 5.35186 10.8486 6.01613C10.5245 6.68038 10.2625 7.38333 10.0625 8.125ZM5.1625 8.125H8.1352C8.28673 7.49167 8.48125 6.87708 8.71875 6.28125C8.95625 5.68542 9.23333 5.1 9.55 4.525C8.59167 4.84167 7.74167 5.30625 7 5.91875C6.25833 6.53125 5.64583 7.26667 5.1625 8.125Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M11.994 21.75C10.6563 21.75 9.39542 21.4945 8.21127 20.9835C7.02714 20.4726 5.99304 19.7751 5.10897 18.891C4.22492 18.007 3.52742 16.9729 3.01645 15.7887C2.50548 14.6046 2.25 13.3437 2.25 12.006C2.25 10.652 2.50548 9.38608 3.01645 8.20825C3.52742 7.0304 4.22492 5.99877 5.10897 5.11337C5.99304 4.22796 7.02714 3.52938 8.21127 3.01763C9.39542 2.50588 10.6563 2.25 11.994 2.25C13.348 2.25 14.6139 2.50594 15.7917 3.01783C16.9696 3.52969 18.0012 4.22843 18.8866 5.11405C19.772 5.99968 20.4706 7.03157 20.9824 8.2097C21.4941 9.38782 21.75 10.6512 21.75 12C21.75 13.3417 21.4941 14.6046 20.9824 15.7887C20.4706 16.9729 19.772 18.007 18.8866 18.891C18.0012 19.7751 16.9696 20.4726 15.7917 20.9835C14.6139 21.4945 13.348 21.75 11.994 21.75ZM12 19.9C12.4435 19.2868 12.8273 18.6481 13.1514 17.9839C13.4755 17.3196 13.7375 16.6167 13.9375 15.875H10.0625C10.2625 16.6167 10.5245 17.3196 10.8486 17.9839C11.1727 18.6481 11.5565 19.2868 12 19.9ZM9.55 19.475C9.23333 18.9 8.95625 18.3146 8.71875 17.7188C8.48125 17.1229 8.28673 16.5083 8.1352 15.875H5.1625C5.64583 16.7333 6.25833 17.4688 7 18.0813C7.74167 18.6938 8.59167 19.1583 9.55 19.475ZM14.45 19.475C15.4083 19.1583 16.2583 18.6938 17 18.0813C17.7417 17.4688 18.3542 16.7333 18.8375 15.875H15.8648C15.7133 16.5083 15.5188 17.1229 15.2812 17.7188C15.0437 18.3146 14.7667 18.9 14.45 19.475ZM4.3875 14H7.75C7.7 13.6583 7.6625 13.325 7.6375 13C7.6125 12.675 7.6 12.3417 7.6 12C7.6 11.6583 7.6125 11.325 7.6375 11C7.6625 10.675 7.7 10.3417 7.75 10H4.3875C4.29583 10.3417 4.22917 10.6737 4.1875 10.996C4.14583 11.3182 4.125 11.6529 4.125 12C4.125 12.3471 4.14583 12.6818 4.1875 13.0041C4.22917 13.3264 4.29583 13.6583 4.3875 14ZM9.6375 14H14.3625C14.4208 13.6583 14.4625 13.3264 14.4875 13.0041C14.5125 12.6818 14.525 12.3471 14.525 12C14.525 11.6529 14.5125 11.3182 14.4875 10.996C14.4625 10.6737 14.4208 10.3417 14.3625 10H9.6375C9.57917 10.3417 9.5375 10.6737 9.5125 10.996C9.4875 11.3182 9.475 11.6529 9.475 12C9.475 12.3471 9.4875 12.6818 9.5125 13.0041C9.5375 13.3264 9.57917 13.6583 9.6375 14ZM16.25 14H19.6125C19.7042 13.6583 19.7708 13.3264 19.8125 13.0041C19.8542 12.6818 19.875 12.3471 19.875 12C19.875 11.6529 19.8542 11.3182 19.8125 10.996C19.7708 10.6737 19.7042 10.3417 19.6125 10H16.25C16.3 10.3417 16.3375 10.675 16.3625 11C16.3875 11.325 16.4 11.6583 16.4 12C16.4 12.3417 16.3875 12.675 16.3625 13C16.3375 13.325 16.3 13.6583 16.25 14ZM15.8648 8.125H18.8375C18.3542 7.26667 17.7417 6.53125 17 5.91875C16.2583 5.30625 15.4083 4.84167 14.45 4.525C14.7667 5.1 15.0437 5.68542 15.2812 6.28125C15.5188 6.87708 15.7133 7.49167 15.8648 8.125ZM10.0625 8.125H13.9375C13.7375 7.38333 13.4755 6.68038 13.1514 6.01613C12.8273 5.35186 12.4435 4.71315 12 4.1C11.5565 4.71315 11.1727 5.35186 10.8486 6.01613C10.5245 6.68038 10.2625 7.38333 10.0625 8.125ZM5.1625 8.125H8.1352C8.28673 7.49167 8.48125 6.87708 8.71875 6.28125C8.95625 5.68542 9.23333 5.1 9.55 4.525C8.59167 4.84167 7.74167 5.30625 7 5.91875C6.25833 6.53125 5.64583 7.26667 5.1625 8.125Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Golf.tsx b/components/Icons/Golf.tsx
index 027c906d7..a685ea440 100644
--- a/components/Icons/Golf.tsx
+++ b/components/Icons/Golf.tsx
@@ -14,23 +14,10 @@ export default function GolfIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3499"
-        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_3499)">
-        <path
-          d="M19.4 20.8C19.0041 20.8 18.6677 20.6614 18.3906 20.3844C18.1135 20.1073 17.975 19.7708 17.975 19.375C17.975 18.9792 18.1135 18.6427 18.3906 18.3656C18.6677 18.0885 19.0041 17.95 19.4 17.95C19.7958 17.95 20.1322 18.0885 20.4093 18.3656C20.6864 18.6427 20.825 18.9792 20.825 19.375C20.825 19.7708 20.6864 20.1073 20.4093 20.3844C20.1322 20.6614 19.7958 20.8 19.4 20.8ZM10.0625 21.8C8.42912 21.8 7.0437 21.6104 5.9062 21.2312C4.7687 20.8521 4.19995 20.3998 4.19995 19.8743C4.19995 19.5081 4.47703 19.1792 5.0312 18.8875C5.58537 18.5958 6.29995 18.3667 7.17495 18.2V18.95C7.17495 19.2262 7.26826 19.4578 7.45488 19.6447C7.64151 19.8316 7.87276 19.925 8.14863 19.925C8.42451 19.925 8.6562 19.8316 8.8437 19.6447C9.0312 19.4578 9.12495 19.2262 9.12495 18.95V3.72499C9.12495 3.37082 9.27287 3.10519 9.5687 2.92811C9.86453 2.75103 10.1666 2.73749 10.475 2.88749L15.175 5.17499C15.5333 5.3463 15.7125 5.62663 15.7125 6.01596C15.7125 6.40531 15.5375 6.68749 15.1875 6.86249L11 9.02054V18C12.4083 18.0833 13.5812 18.2979 14.5187 18.6437C15.4562 18.9896 15.925 19.4006 15.925 19.8768C15.925 20.4006 15.352 20.8521 14.2062 21.2312C13.0604 21.6104 11.6791 21.8 10.0625 21.8Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M19.4 20.8C19.0041 20.8 18.6677 20.6614 18.3906 20.3844C18.1135 20.1073 17.975 19.7708 17.975 19.375C17.975 18.9792 18.1135 18.6427 18.3906 18.3656C18.6677 18.0885 19.0041 17.95 19.4 17.95C19.7958 17.95 20.1322 18.0885 20.4093 18.3656C20.6864 18.6427 20.825 18.9792 20.825 19.375C20.825 19.7708 20.6864 20.1073 20.4093 20.3844C20.1322 20.6614 19.7958 20.8 19.4 20.8ZM10.0625 21.8C8.42912 21.8 7.0437 21.6104 5.9062 21.2312C4.7687 20.8521 4.19995 20.3998 4.19995 19.8743C4.19995 19.5081 4.47703 19.1792 5.0312 18.8875C5.58537 18.5958 6.29995 18.3667 7.17495 18.2V18.95C7.17495 19.2262 7.26826 19.4578 7.45488 19.6447C7.64151 19.8316 7.87276 19.925 8.14863 19.925C8.42451 19.925 8.6562 19.8316 8.8437 19.6447C9.0312 19.4578 9.12495 19.2262 9.12495 18.95V3.72499C9.12495 3.37082 9.27287 3.10519 9.5687 2.92811C9.86453 2.75103 10.1666 2.73749 10.475 2.88749L15.175 5.17499C15.5333 5.3463 15.7125 5.62663 15.7125 6.01596C15.7125 6.40531 15.5375 6.68749 15.1875 6.86249L11 9.02054V18C12.4083 18.0833 13.5812 18.2979 14.5187 18.6437C15.4562 18.9896 15.925 19.4006 15.925 19.8768C15.925 20.4006 15.352 20.8521 14.2062 21.2312C13.0604 21.6104 11.6791 21.8 10.0625 21.8Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Groceries.tsx b/components/Icons/Groceries.tsx
index 404f09f7b..69410ed29 100644
--- a/components/Icons/Groceries.tsx
+++ b/components/Icons/Groceries.tsx
@@ -18,23 +18,10 @@ export default function GroceriesIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3518"
-        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_3518)">
-        <path
-          d="M15.9265 21.75C14.3088 21.75 12.9333 21.1838 11.8 20.0515C10.6667 18.9191 10.1 17.5441 10.1 15.9265C10.1 14.3088 10.6662 12.9333 11.7985 11.8C12.9309 10.6667 14.3059 10.1 15.9235 10.1C17.5412 10.1 18.9167 10.6662 20.05 11.7985C21.1833 12.9309 21.75 14.3059 21.75 15.9235C21.75 17.5412 21.1838 18.9167 20.0515 20.05C18.9191 21.1833 17.5441 21.75 15.9265 21.75ZM15.925 19.875C17.0167 19.875 17.9479 19.4896 18.7188 18.7188C19.4896 17.9479 19.875 17.0167 19.875 15.925C19.875 14.8333 19.4896 13.9021 18.7188 13.1313C17.9479 12.3604 17.0167 11.975 15.925 11.975C14.8333 11.975 13.9021 12.3604 13.1313 13.1313C12.3604 13.9021 11.975 14.8333 11.975 15.925C11.975 17.0167 12.3604 17.9479 13.1313 18.7188C13.9021 19.4896 14.8333 19.875 15.925 19.875ZM4.125 19.8C3.60937 19.8 3.16796 19.6164 2.80077 19.2492C2.43359 18.882 2.25 18.4406 2.25 17.925V10.4955C2.25 10.3652 2.26667 10.225 2.3 10.075C2.33333 9.925 2.3747 9.78368 2.4241 9.65105L4.4 5.075H4.2C3.93083 5.075 3.70521 4.98396 3.52313 4.80188C3.34104 4.61979 3.25 4.39417 3.25 4.125V3.19518C3.25 2.93173 3.34104 2.70833 3.52313 2.525C3.70521 2.34167 3.93083 2.25 4.2 2.25H10.95C11.2192 2.25 11.4448 2.34104 11.6269 2.52312C11.809 2.70521 11.9 2.93083 11.9 3.2V4.12982C11.9 4.39327 11.809 4.61667 11.6269 4.8C11.4448 4.98333 11.2192 5.075 10.95 5.075H10.725L12.475 9.05C12.1917 9.2 11.9125 9.36458 11.6375 9.54375C11.3625 9.72292 11.1125 9.91667 10.8875 10.125L8.7 5.075H6.425L4.125 10.45V17.925H8.4875C8.56705 18.2496 8.67443 18.5703 8.80965 18.8872C8.94488 19.2041 9.10417 19.5083 9.2875 19.8H4.125ZM15.925 9.1C15.26 9.1 14.6979 8.87025 14.2387 8.41075C13.7796 7.95123 13.55 7.38873 13.55 6.72325C13.55 6.05775 13.7796 5.49583 14.2387 5.0375C14.6979 4.57917 15.26 4.35 15.925 4.35V9.1C15.925 8.435 16.1546 7.87292 16.6137 7.41375C17.0729 6.95458 17.635 6.725 18.3 6.725C18.965 6.725 19.5271 6.95458 19.9862 7.41375C20.4454 7.87292 20.675 8.435 20.675 9.1H15.925Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M15.9265 21.75C14.3088 21.75 12.9333 21.1838 11.8 20.0515C10.6667 18.9191 10.1 17.5441 10.1 15.9265C10.1 14.3088 10.6662 12.9333 11.7985 11.8C12.9309 10.6667 14.3059 10.1 15.9235 10.1C17.5412 10.1 18.9167 10.6662 20.05 11.7985C21.1833 12.9309 21.75 14.3059 21.75 15.9235C21.75 17.5412 21.1838 18.9167 20.0515 20.05C18.9191 21.1833 17.5441 21.75 15.9265 21.75ZM15.925 19.875C17.0167 19.875 17.9479 19.4896 18.7188 18.7188C19.4896 17.9479 19.875 17.0167 19.875 15.925C19.875 14.8333 19.4896 13.9021 18.7188 13.1313C17.9479 12.3604 17.0167 11.975 15.925 11.975C14.8333 11.975 13.9021 12.3604 13.1313 13.1313C12.3604 13.9021 11.975 14.8333 11.975 15.925C11.975 17.0167 12.3604 17.9479 13.1313 18.7188C13.9021 19.4896 14.8333 19.875 15.925 19.875ZM4.125 19.8C3.60937 19.8 3.16796 19.6164 2.80077 19.2492C2.43359 18.882 2.25 18.4406 2.25 17.925V10.4955C2.25 10.3652 2.26667 10.225 2.3 10.075C2.33333 9.925 2.3747 9.78368 2.4241 9.65105L4.4 5.075H4.2C3.93083 5.075 3.70521 4.98396 3.52313 4.80188C3.34104 4.61979 3.25 4.39417 3.25 4.125V3.19518C3.25 2.93173 3.34104 2.70833 3.52313 2.525C3.70521 2.34167 3.93083 2.25 4.2 2.25H10.95C11.2192 2.25 11.4448 2.34104 11.6269 2.52312C11.809 2.70521 11.9 2.93083 11.9 3.2V4.12982C11.9 4.39327 11.809 4.61667 11.6269 4.8C11.4448 4.98333 11.2192 5.075 10.95 5.075H10.725L12.475 9.05C12.1917 9.2 11.9125 9.36458 11.6375 9.54375C11.3625 9.72292 11.1125 9.91667 10.8875 10.125L8.7 5.075H6.425L4.125 10.45V17.925H8.4875C8.56705 18.2496 8.67443 18.5703 8.80965 18.8872C8.94488 19.2041 9.10417 19.5083 9.2875 19.8H4.125ZM15.925 9.1C15.26 9.1 14.6979 8.87025 14.2387 8.41075C13.7796 7.95123 13.55 7.38873 13.55 6.72325C13.55 6.05775 13.7796 5.49583 14.2387 5.0375C14.6979 4.57917 15.26 4.35 15.925 4.35V9.1C15.925 8.435 16.1546 7.87292 16.6137 7.41375C17.0729 6.95458 17.635 6.725 18.3 6.725C18.965 6.725 19.5271 6.95458 19.9862 7.41375C20.4454 7.87292 20.675 8.435 20.675 9.1H15.925Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Hairdryer.tsx b/components/Icons/Hairdryer.tsx
index 4d6ca72b2..bca9ef2e7 100644
--- a/components/Icons/Hairdryer.tsx
+++ b/components/Icons/Hairdryer.tsx
@@ -18,41 +18,28 @@ export default function HairdryerIcon({
       className={classNames}
       {...props}
     >
-      <mask
-        id="mask0_83_335"
-        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_83_335)">
-        <path
-          d="M20.3933 9.705C20.3933 8.89072 20.1059 8.19833 19.5311 7.62786C18.9563 7.05739 18.2584 6.77215 17.4372 6.77215H8.74704C8.49762 6.77215 8.2844 6.68439 8.1074 6.50886C7.93039 6.33332 7.84188 6.12189 7.84188 5.87455C7.84188 5.62722 7.93039 5.41578 8.1074 5.24025C8.2844 5.06472 8.49762 4.97696 8.74704 4.97696H17.4365C18.7554 4.97696 19.8797 5.43793 20.8093 6.35988C21.7389 7.28184 22.2037 8.39686 22.2037 9.70493V18.5425C22.2037 19.0713 21.7714 19.4999 21.2382 19.4999H17.6417C17.1085 19.4999 16.6762 19.0713 16.6762 18.5425V14.3764C15.8235 14.2551 15.0899 13.918 14.4037 13.3545C13.5291 12.6365 13.5745 12.5766 12.749 11.5593H9.71253C9.46311 11.5593 9.2499 11.4716 9.07289 11.296C8.89589 11.1205 8.80738 10.9091 8.80738 10.6617C8.80738 10.4144 8.89589 10.203 9.07289 10.0274C9.2499 9.85191 9.46311 9.76415 9.71253 9.76415H13.4811C13.9906 9.76415 14.3777 10.1879 14.5547 10.6617C14.7126 11.0846 14.987 11.4285 15.3419 11.7808C15.9167 12.3512 16.6147 12.6365 17.4358 12.6365C17.5165 12.6365 17.596 12.6337 17.6743 12.6282C18.077 12.5999 18.4865 12.8831 18.4865 13.2834V17.4563C18.4865 17.6675 18.6589 17.8388 18.8719 17.8393L20.0063 17.8417C20.2199 17.8422 20.3933 17.6706 20.3933 17.4587V9.705Z"
-          fill="#26201E"
-        />
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M17.438 11.4968C16.914 11.4968 16.465 11.3118 16.0909 10.9418C15.7167 10.5718 15.5297 10.127 15.5297 9.60736C15.5297 9.08776 15.7162 8.64246 16.0894 8.27145C16.4625 7.90044 16.911 7.71494 17.435 7.71494C17.959 7.71494 18.408 7.89995 18.7822 8.26996C19.1563 8.63998 19.3434 9.08479 19.3434 9.60439C19.3434 10.124 19.1568 10.5693 18.7837 10.9403C18.4105 11.3113 17.962 11.4968 17.438 11.4968ZM16.7667 10.2716C16.9477 10.4503 17.1714 10.5396 17.4378 10.5396C17.7041 10.5396 17.9274 10.4498 18.1076 10.2703C18.2878 10.0908 18.3779 9.86897 18.3779 9.60483C18.3779 9.3407 18.2874 9.11929 18.1063 8.9406C17.9253 8.76193 17.7016 8.67259 17.4352 8.67259C17.1689 8.67259 16.9456 8.76235 16.7654 8.94187C16.5852 9.12139 16.4952 9.34322 16.4952 9.60736C16.4952 9.87149 16.5857 10.0929 16.7667 10.2716Z"
-          fill="#26201E"
-        />
-        <path
-          d="M5.98812 5.09562C6.07942 4.92317 6.07619 4.74726 5.97901 4.57747L5.9783 4.57625C5.84295 4.34975 5.66047 4.17098 5.43173 4.04089C5.20285 3.91072 4.95481 3.84558 4.68894 3.84558C4.28066 3.84558 3.93106 3.98777 3.64455 4.27118C3.35796 4.55468 3.21397 4.90158 3.21397 5.30745C3.21397 5.71333 3.35796 6.06065 3.64446 6.34505C3.93094 6.62943 4.28058 6.77215 4.68894 6.77215H6.807C6.95148 6.77215 7.07707 6.72046 7.17963 6.61876C7.28221 6.51703 7.33458 6.3922 7.33458 6.24835C7.33458 6.10451 7.28221 5.97967 7.17963 5.87795C7.07707 5.77624 6.95148 5.72455 6.807 5.72455L4.68636 5.72455C4.57124 5.72455 4.47437 5.6846 4.39176 5.60268C4.30937 5.52098 4.26913 5.42445 4.26913 5.30887C4.26913 5.19328 4.30937 5.09675 4.39176 5.01505C4.47417 4.93333 4.57182 4.89318 4.68894 4.89318C4.75984 4.89318 4.82693 4.90631 4.89079 4.93246C4.95178 4.95745 4.99815 4.99387 5.03232 5.04145L5.03304 5.04243C5.09367 5.12402 5.1651 5.1959 5.24712 5.25797C5.3369 5.32591 5.44013 5.35993 5.55412 5.35993C5.64869 5.35993 5.73479 5.33849 5.80957 5.29285C5.88428 5.24726 5.94335 5.18019 5.98812 5.09562Z"
-          fill="#26201E"
-        />
-        <path
-          d="M8.55441 7.88364C8.45185 7.78193 8.32626 7.73024 8.18178 7.73024L2.52761 7.73024C2.38313 7.73024 2.25754 7.78193 2.15498 7.88364C2.0524 7.98536 2.00003 8.1102 2.00003 8.25404C2.00003 8.39789 2.0524 8.52273 2.15498 8.62445C2.25754 8.72615 2.38313 8.77784 2.52761 8.77784L8.18178 8.77784C8.32626 8.77784 8.45185 8.72615 8.55441 8.62445C8.65699 8.52273 8.70935 8.39789 8.70935 8.25404C8.70935 8.1102 8.65699 7.98536 8.55441 7.88364Z"
-          fill="#26201E"
-        />
-        <path
-          d="M6.2737 12.0792C6.33521 11.9188 6.31116 11.7643 6.20583 11.625C6.10083 11.4862 5.95678 11.4157 5.78093 11.4157C5.6522 11.4157 5.53973 11.4612 5.44757 11.5506C5.36483 11.6309 5.2936 11.7206 5.23395 11.8195C5.17676 11.9163 5.09834 11.9908 4.99816 12.0427C4.89649 12.0954 4.78683 12.1218 4.66806 12.1218C4.48377 12.1218 4.32963 12.0586 4.20124 11.9312C4.07292 11.8038 4.00942 11.6507 4.00942 11.4675C4.00942 11.2844 4.07312 11.131 4.20198 11.0031C4.33086 10.8752 4.4856 10.8117 4.67061 10.8117H7.71796C7.86244 10.8117 7.98803 10.7601 8.09059 10.6584C8.19317 10.5566 8.24554 10.4318 8.24554 10.2879C8.24554 10.1441 8.19317 10.0193 8.09059 9.91754C7.98803 9.81584 7.86244 9.76415 7.71796 9.76415L4.67061 9.76415C4.19765 9.76415 3.79177 9.93043 3.45719 10.2616C3.12254 10.5928 2.95427 10.9955 2.95427 11.4655C2.95427 11.9354 3.12253 12.3386 3.45712 12.6706C3.79168 13.0027 4.19758 13.1694 4.67061 13.1694C5.03173 13.1694 5.36026 13.0715 5.65414 12.8756C5.94859 12.6793 6.15561 12.4131 6.2737 12.0792Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M20.3933 9.705C20.3933 8.89072 20.1059 8.19833 19.5311 7.62786C18.9563 7.05739 18.2584 6.77215 17.4372 6.77215H8.74704C8.49762 6.77215 8.2844 6.68439 8.1074 6.50886C7.93039 6.33332 7.84188 6.12189 7.84188 5.87455C7.84188 5.62722 7.93039 5.41578 8.1074 5.24025C8.2844 5.06472 8.49762 4.97696 8.74704 4.97696H17.4365C18.7554 4.97696 19.8797 5.43793 20.8093 6.35988C21.7389 7.28184 22.2037 8.39686 22.2037 9.70493V18.5425C22.2037 19.0713 21.7714 19.4999 21.2382 19.4999H17.6417C17.1085 19.4999 16.6762 19.0713 16.6762 18.5425V14.3764C15.8235 14.2551 15.0899 13.918 14.4037 13.3545C13.5291 12.6365 13.5745 12.5766 12.749 11.5593H9.71253C9.46311 11.5593 9.2499 11.4716 9.07289 11.296C8.89589 11.1205 8.80738 10.9091 8.80738 10.6617C8.80738 10.4144 8.89589 10.203 9.07289 10.0274C9.2499 9.85191 9.46311 9.76415 9.71253 9.76415H13.4811C13.9906 9.76415 14.3777 10.1879 14.5547 10.6617C14.7126 11.0846 14.987 11.4285 15.3419 11.7808C15.9167 12.3512 16.6147 12.6365 17.4358 12.6365C17.5165 12.6365 17.596 12.6337 17.6743 12.6282C18.077 12.5999 18.4865 12.8831 18.4865 13.2834V17.4563C18.4865 17.6675 18.6589 17.8388 18.8719 17.8393L20.0063 17.8417C20.2199 17.8422 20.3933 17.6706 20.3933 17.4587V9.705Z"
+        fill="#26201E"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M17.438 11.4968C16.914 11.4968 16.465 11.3118 16.0909 10.9418C15.7167 10.5718 15.5297 10.127 15.5297 9.60736C15.5297 9.08776 15.7162 8.64246 16.0894 8.27145C16.4625 7.90044 16.911 7.71494 17.435 7.71494C17.959 7.71494 18.408 7.89995 18.7822 8.26996C19.1563 8.63998 19.3434 9.08479 19.3434 9.60439C19.3434 10.124 19.1568 10.5693 18.7837 10.9403C18.4105 11.3113 17.962 11.4968 17.438 11.4968ZM16.7667 10.2716C16.9477 10.4503 17.1714 10.5396 17.4378 10.5396C17.7041 10.5396 17.9274 10.4498 18.1076 10.2703C18.2878 10.0908 18.3779 9.86897 18.3779 9.60483C18.3779 9.3407 18.2874 9.11929 18.1063 8.9406C17.9253 8.76193 17.7016 8.67259 17.4352 8.67259C17.1689 8.67259 16.9456 8.76235 16.7654 8.94187C16.5852 9.12139 16.4952 9.34322 16.4952 9.60736C16.4952 9.87149 16.5857 10.0929 16.7667 10.2716Z"
+        fill="#26201E"
+      />
+      <path
+        d="M5.98812 5.09562C6.07942 4.92317 6.07619 4.74726 5.97901 4.57747L5.9783 4.57625C5.84295 4.34975 5.66047 4.17098 5.43173 4.04089C5.20285 3.91072 4.95481 3.84558 4.68894 3.84558C4.28066 3.84558 3.93106 3.98777 3.64455 4.27118C3.35796 4.55468 3.21397 4.90158 3.21397 5.30745C3.21397 5.71333 3.35796 6.06065 3.64446 6.34505C3.93094 6.62943 4.28058 6.77215 4.68894 6.77215H6.807C6.95148 6.77215 7.07707 6.72046 7.17963 6.61876C7.28221 6.51703 7.33458 6.3922 7.33458 6.24835C7.33458 6.10451 7.28221 5.97967 7.17963 5.87795C7.07707 5.77624 6.95148 5.72455 6.807 5.72455L4.68636 5.72455C4.57124 5.72455 4.47437 5.6846 4.39176 5.60268C4.30937 5.52098 4.26913 5.42445 4.26913 5.30887C4.26913 5.19328 4.30937 5.09675 4.39176 5.01505C4.47417 4.93333 4.57182 4.89318 4.68894 4.89318C4.75984 4.89318 4.82693 4.90631 4.89079 4.93246C4.95178 4.95745 4.99815 4.99387 5.03232 5.04145L5.03304 5.04243C5.09367 5.12402 5.1651 5.1959 5.24712 5.25797C5.3369 5.32591 5.44013 5.35993 5.55412 5.35993C5.64869 5.35993 5.73479 5.33849 5.80957 5.29285C5.88428 5.24726 5.94335 5.18019 5.98812 5.09562Z"
+        fill="#26201E"
+      />
+      <path
+        d="M8.55441 7.88364C8.45185 7.78193 8.32626 7.73024 8.18178 7.73024L2.52761 7.73024C2.38313 7.73024 2.25754 7.78193 2.15498 7.88364C2.0524 7.98536 2.00003 8.1102 2.00003 8.25404C2.00003 8.39789 2.0524 8.52273 2.15498 8.62445C2.25754 8.72615 2.38313 8.77784 2.52761 8.77784L8.18178 8.77784C8.32626 8.77784 8.45185 8.72615 8.55441 8.62445C8.65699 8.52273 8.70935 8.39789 8.70935 8.25404C8.70935 8.1102 8.65699 7.98536 8.55441 7.88364Z"
+        fill="#26201E"
+      />
+      <path
+        d="M6.2737 12.0792C6.33521 11.9188 6.31116 11.7643 6.20583 11.625C6.10083 11.4862 5.95678 11.4157 5.78093 11.4157C5.6522 11.4157 5.53973 11.4612 5.44757 11.5506C5.36483 11.6309 5.2936 11.7206 5.23395 11.8195C5.17676 11.9163 5.09834 11.9908 4.99816 12.0427C4.89649 12.0954 4.78683 12.1218 4.66806 12.1218C4.48377 12.1218 4.32963 12.0586 4.20124 11.9312C4.07292 11.8038 4.00942 11.6507 4.00942 11.4675C4.00942 11.2844 4.07312 11.131 4.20198 11.0031C4.33086 10.8752 4.4856 10.8117 4.67061 10.8117H7.71796C7.86244 10.8117 7.98803 10.7601 8.09059 10.6584C8.19317 10.5566 8.24554 10.4318 8.24554 10.2879C8.24554 10.1441 8.19317 10.0193 8.09059 9.91754C7.98803 9.81584 7.86244 9.76415 7.71796 9.76415L4.67061 9.76415C4.19765 9.76415 3.79177 9.93043 3.45719 10.2616C3.12254 10.5928 2.95427 10.9955 2.95427 11.4655C2.95427 11.9354 3.12253 12.3386 3.45712 12.6706C3.79168 13.0027 4.19758 13.1694 4.67061 13.1694C5.03173 13.1694 5.36026 13.0715 5.65414 12.8756C5.94859 12.6793 6.15561 12.4131 6.2737 12.0792Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/HandSoap.tsx b/components/Icons/HandSoap.tsx
index a6850e4fe..70efe77f0 100644
--- a/components/Icons/HandSoap.tsx
+++ b/components/Icons/HandSoap.tsx
@@ -18,32 +18,12 @@ export default function HandSoapIcon({
       className={classNames}
       {...props}
     >
-      <g clipPath="url(#clip0_4037_3127)">
-        <mask
-          style={{ maskType: "alpha" }}
-          id="mask0_4037_3127"
-          maskUnits="userSpaceOnUse"
-          x="0"
-          y="0"
-          width="24"
-          height="24"
-        >
-          <path d="M24 0H0V24H24V0Z" fill="#D9D9D9" />
-        </mask>
-        <g mask="url(#mask0_4037_3127)">
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M8.93432 2.50091C8.93432 2.01716 9.32648 1.625 9.81023 1.625H15.6496C16.2691 1.625 16.8632 1.87109 17.3013 2.30913C17.7393 2.74717 17.9854 3.34128 17.9854 3.96077C17.9854 4.44452 17.5933 4.83668 17.1095 4.83668C16.6257 4.83668 16.2336 4.44452 16.2336 3.96077C16.2336 3.8059 16.1721 3.65737 16.0626 3.54786C15.953 3.43835 15.8045 3.37682 15.6496 3.37682H12.8759V5.6396H14.1898C15.0029 5.6396 15.7826 5.96259 16.3576 6.53752C16.9325 7.11245 17.2555 7.89222 17.2555 8.70529V9.39167C17.9345 9.55274 18.562 9.89942 19.0635 10.4009C19.7753 11.1128 20.1752 12.0782 20.1752 13.0849V20.0192C20.1752 20.4451 20.006 20.8535 19.7049 21.1547C19.4037 21.4558 18.9952 21.625 18.5694 21.625H5.43067C5.00477 21.625 4.59632 21.4558 4.29517 21.1547C3.99402 20.8535 3.82483 20.4451 3.82483 20.0192V13.0849C3.82483 12.0782 4.22472 11.1128 4.93654 10.4009C5.43807 9.89942 6.0655 9.55274 6.74454 9.39167V8.70529C6.74454 7.89222 7.06753 7.11245 7.64246 6.53752C8.21739 5.96259 8.99716 5.6396 9.81023 5.6396H11.1241V3.37682H9.81023C9.32648 3.37682 8.93432 2.98467 8.93432 2.50091ZM9.81023 7.39142C9.46177 7.39142 9.12758 7.52985 8.88119 7.77625C8.63479 8.02264 8.49636 8.35683 8.49636 8.70529V9.28923H15.5037V8.70529C15.5037 8.35683 15.3652 8.02264 15.1188 7.77625C14.8724 7.52985 14.5383 7.39142 14.1898 7.39142H9.81023ZM7.62045 11.0411C7.0784 11.0411 6.55855 11.2564 6.17527 11.6397C5.79198 12.023 5.57665 12.5428 5.57665 13.0849V19.8732H18.4234V13.0849C18.4234 12.5428 18.208 12.023 17.8248 11.6397C17.4415 11.2564 16.9216 11.0411 16.3796 11.0411H7.62045Z"
-            fill="black"
-          />
-        </g>
-      </g>
-      <defs>
-        <clipPath id="clip0_4037_3127">
-          <rect width="24" height="24" fill="white" />
-        </clipPath>
-      </defs>
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M8.93432 2.50091C8.93432 2.01716 9.32648 1.625 9.81023 1.625H15.6496C16.2691 1.625 16.8632 1.87109 17.3013 2.30913C17.7393 2.74717 17.9854 3.34128 17.9854 3.96077C17.9854 4.44452 17.5933 4.83668 17.1095 4.83668C16.6257 4.83668 16.2336 4.44452 16.2336 3.96077C16.2336 3.8059 16.1721 3.65737 16.0626 3.54786C15.953 3.43835 15.8045 3.37682 15.6496 3.37682H12.8759V5.6396H14.1898C15.0029 5.6396 15.7826 5.96259 16.3576 6.53752C16.9325 7.11245 17.2555 7.89222 17.2555 8.70529V9.39167C17.9345 9.55274 18.562 9.89942 19.0635 10.4009C19.7753 11.1128 20.1752 12.0782 20.1752 13.0849V20.0192C20.1752 20.4451 20.006 20.8535 19.7049 21.1547C19.4037 21.4558 18.9952 21.625 18.5694 21.625H5.43067C5.00477 21.625 4.59632 21.4558 4.29517 21.1547C3.99402 20.8535 3.82483 20.4451 3.82483 20.0192V13.0849C3.82483 12.0782 4.22472 11.1128 4.93654 10.4009C5.43807 9.89942 6.0655 9.55274 6.74454 9.39167V8.70529C6.74454 7.89222 7.06753 7.11245 7.64246 6.53752C8.21739 5.96259 8.99716 5.6396 9.81023 5.6396H11.1241V3.37682H9.81023C9.32648 3.37682 8.93432 2.98467 8.93432 2.50091ZM9.81023 7.39142C9.46177 7.39142 9.12758 7.52985 8.88119 7.77625C8.63479 8.02264 8.49636 8.35683 8.49636 8.70529V9.28923H15.5037V8.70529C15.5037 8.35683 15.3652 8.02264 15.1188 7.77625C14.8724 7.52985 14.5383 7.39142 14.1898 7.39142H9.81023ZM7.62045 11.0411C7.0784 11.0411 6.55855 11.2564 6.17527 11.6397C5.79198 12.023 5.57665 12.5428 5.57665 13.0849V19.8732H18.4234V13.0849C18.4234 12.5428 18.208 12.023 17.8248 11.6397C17.4415 11.2564 16.9216 11.0411 16.3796 11.0411H7.62045Z"
+        fill="black"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Hanger.tsx b/components/Icons/Hanger.tsx
index 63c869619..e75ac5489 100644
--- a/components/Icons/Hanger.tsx
+++ b/components/Icons/Hanger.tsx
@@ -14,23 +14,10 @@ export default function HangerIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3472"
-        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_3472)">
-        <path
-          d="M6 17.875H18L12 13.425L6 17.875ZM10.625 7.0125C10.5473 7.18483 10.4346 7.32583 10.287 7.4355C10.1394 7.54517 9.96453 7.6 9.7625 7.6C9.50417 7.6 9.28333 7.50833 9.1 7.325C8.91667 7.14167 8.825 6.92121 8.825 6.66362C8.825 6.58787 8.82917 6.52083 8.8375 6.4625C8.84583 6.40417 8.86667 6.34167 8.9 6.275C9.175 5.66667 9.59388 5.17708 10.1566 4.80625C10.7194 4.43542 11.3384 4.25 12.0137 4.25C12.9462 4.25 13.7417 4.57292 14.4 5.21875C15.0583 5.86458 15.3875 6.65598 15.3875 7.59295C15.3875 8.35222 15.1625 9.03071 14.7125 9.62843C14.2625 10.2261 13.6708 10.6375 12.9375 10.8625V11.775L21.375 18.0625C21.5 18.142 21.5938 18.2494 21.6562 18.3847C21.7188 18.5199 21.75 18.6631 21.75 18.8143C21.75 19.0714 21.6583 19.2917 21.475 19.475C21.2917 19.6583 21.0708 19.75 20.8125 19.75H3.1875C2.92917 19.75 2.70833 19.6583 2.525 19.475C2.34167 19.2917 2.25 19.0714 2.25 18.8143C2.25 18.6631 2.28333 18.5208 2.35 18.3875C2.41667 18.2542 2.50833 18.1458 2.625 18.0625L11.0625 11.7698V10.0625C11.0625 9.79687 11.1564 9.57421 11.3442 9.39453C11.532 9.21484 11.759 9.125 12.025 9.125C12.45 9.125 12.8042 8.975 13.0875 8.675C13.3708 8.375 13.5125 8.0125 13.5125 7.5875C13.5125 7.17917 13.3667 6.83333 13.075 6.55C12.7833 6.26667 12.4292 6.125 12.0125 6.125C11.7125 6.125 11.4375 6.20208 11.1875 6.35625C10.9375 6.51042 10.75 6.72917 10.625 7.0125Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M6 17.875H18L12 13.425L6 17.875ZM10.625 7.0125C10.5473 7.18483 10.4346 7.32583 10.287 7.4355C10.1394 7.54517 9.96453 7.6 9.7625 7.6C9.50417 7.6 9.28333 7.50833 9.1 7.325C8.91667 7.14167 8.825 6.92121 8.825 6.66362C8.825 6.58787 8.82917 6.52083 8.8375 6.4625C8.84583 6.40417 8.86667 6.34167 8.9 6.275C9.175 5.66667 9.59388 5.17708 10.1566 4.80625C10.7194 4.43542 11.3384 4.25 12.0137 4.25C12.9462 4.25 13.7417 4.57292 14.4 5.21875C15.0583 5.86458 15.3875 6.65598 15.3875 7.59295C15.3875 8.35222 15.1625 9.03071 14.7125 9.62843C14.2625 10.2261 13.6708 10.6375 12.9375 10.8625V11.775L21.375 18.0625C21.5 18.142 21.5938 18.2494 21.6562 18.3847C21.7188 18.5199 21.75 18.6631 21.75 18.8143C21.75 19.0714 21.6583 19.2917 21.475 19.475C21.2917 19.6583 21.0708 19.75 20.8125 19.75H3.1875C2.92917 19.75 2.70833 19.6583 2.525 19.475C2.34167 19.2917 2.25 19.0714 2.25 18.8143C2.25 18.6631 2.28333 18.5208 2.35 18.3875C2.41667 18.2542 2.50833 18.1458 2.625 18.0625L11.0625 11.7698V10.0625C11.0625 9.79687 11.1564 9.57421 11.3442 9.39453C11.532 9.21484 11.759 9.125 12.025 9.125C12.45 9.125 12.8042 8.975 13.0875 8.675C13.3708 8.375 13.5125 8.0125 13.5125 7.5875C13.5125 7.17917 13.3667 6.83333 13.075 6.55C12.7833 6.26667 12.4292 6.125 12.0125 6.125C11.7125 6.125 11.4375 6.20208 11.1875 6.35625C10.9375 6.51042 10.75 6.72917 10.625 7.0125Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/HangerAlt.tsx b/components/Icons/HangerAlt.tsx
index 732656e60..67167cd8c 100644
--- a/components/Icons/HangerAlt.tsx
+++ b/components/Icons/HangerAlt.tsx
@@ -18,23 +18,10 @@ export default function HangerAltIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3439"
-        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_3439)">
-        <path
-          d="M7.1375 21.75V15.875H5.5375C4.90208 15.875 4.36198 15.651 3.9172 15.203C3.4724 14.755 3.25 14.211 3.25 13.571C3.25 13.107 3.37758 12.6792 3.63275 12.2876C3.88793 11.896 4.22285 11.6043 4.6375 11.4125L11.0625 8.5625V7.875C10.4708 7.675 9.99583 7.32766 9.6375 6.83297C9.27917 6.33829 9.1 5.78278 9.1 5.16645C9.1 4.35548 9.38309 3.66667 9.94928 3.1C10.5154 2.53333 11.2029 2.25 12.0118 2.25C12.8206 2.25 13.5083 2.53316 14.075 3.09948C14.6417 3.66579 14.925 4.35347 14.925 5.1625H13.05C13.05 4.87083 12.9508 4.625 12.7524 4.425C12.554 4.225 12.3082 4.125 12.0149 4.125C11.7216 4.125 11.475 4.22443 11.275 4.42328C11.075 4.62213 10.975 4.86853 10.975 5.1625C10.975 5.44938 11.0771 5.68985 11.2812 5.8839C11.4854 6.07797 11.7292 6.175 12.0125 6.175C12.2746 6.175 12.4943 6.26365 12.6715 6.44095C12.8489 6.61823 12.9375 6.83792 12.9375 7.1V8.5625L19.35 11.4125C19.775 11.6042 20.1146 11.8958 20.3687 12.2875C20.6229 12.6792 20.75 13.107 20.75 13.571C20.75 14.211 20.5276 14.755 20.0828 15.203C19.638 15.651 19.0979 15.875 18.4625 15.875H16.85V21.75H7.1375ZM5.5375 14H7.1375V13.025H16.85V14H18.4625C18.5875 14 18.6875 13.9542 18.7625 13.8625C18.8375 13.7708 18.875 13.6583 18.875 13.525C18.875 13.4313 18.85 13.3516 18.8 13.2859C18.75 13.2203 18.6843 13.1712 18.603 13.1387L12.0125 10.2125L5.38523 13.1387C5.30341 13.1712 5.23958 13.2229 5.19375 13.2937C5.14792 13.3646 5.125 13.4417 5.125 13.525C5.125 13.6583 5.1625 13.7708 5.2375 13.8625C5.3125 13.9542 5.4125 14 5.5375 14ZM9.0125 19.875H14.975V14.9H9.0125V19.875Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M7.1375 21.75V15.875H5.5375C4.90208 15.875 4.36198 15.651 3.9172 15.203C3.4724 14.755 3.25 14.211 3.25 13.571C3.25 13.107 3.37758 12.6792 3.63275 12.2876C3.88793 11.896 4.22285 11.6043 4.6375 11.4125L11.0625 8.5625V7.875C10.4708 7.675 9.99583 7.32766 9.6375 6.83297C9.27917 6.33829 9.1 5.78278 9.1 5.16645C9.1 4.35548 9.38309 3.66667 9.94928 3.1C10.5154 2.53333 11.2029 2.25 12.0118 2.25C12.8206 2.25 13.5083 2.53316 14.075 3.09948C14.6417 3.66579 14.925 4.35347 14.925 5.1625H13.05C13.05 4.87083 12.9508 4.625 12.7524 4.425C12.554 4.225 12.3082 4.125 12.0149 4.125C11.7216 4.125 11.475 4.22443 11.275 4.42328C11.075 4.62213 10.975 4.86853 10.975 5.1625C10.975 5.44938 11.0771 5.68985 11.2812 5.8839C11.4854 6.07797 11.7292 6.175 12.0125 6.175C12.2746 6.175 12.4943 6.26365 12.6715 6.44095C12.8489 6.61823 12.9375 6.83792 12.9375 7.1V8.5625L19.35 11.4125C19.775 11.6042 20.1146 11.8958 20.3687 12.2875C20.6229 12.6792 20.75 13.107 20.75 13.571C20.75 14.211 20.5276 14.755 20.0828 15.203C19.638 15.651 19.0979 15.875 18.4625 15.875H16.85V21.75H7.1375ZM5.5375 14H7.1375V13.025H16.85V14H18.4625C18.5875 14 18.6875 13.9542 18.7625 13.8625C18.8375 13.7708 18.875 13.6583 18.875 13.525C18.875 13.4313 18.85 13.3516 18.8 13.2859C18.75 13.2203 18.6843 13.1712 18.603 13.1387L12.0125 10.2125L5.38523 13.1387C5.30341 13.1712 5.23958 13.2229 5.19375 13.2937C5.14792 13.3646 5.125 13.4417 5.125 13.525C5.125 13.6583 5.1625 13.7708 5.2375 13.8625C5.3125 13.9542 5.4125 14 5.5375 14ZM9.0125 19.875H14.975V14.9H9.0125V19.875Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Heart.tsx b/components/Icons/Heart.tsx
index 49cbb1171..3f191732e 100644
--- a/components/Icons/Heart.tsx
+++ b/components/Icons/Heart.tsx
@@ -14,23 +14,10 @@ export default function HeartIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="24"
-        id="mask0_69_3298"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="24"
-        x="0"
-        y="0"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3298)">
-        <path
-          d="M12 20.0875C11.775 20.0875 11.5521 20.0479 11.3313 19.9687C11.1104 19.8896 10.9125 19.7666 10.7375 19.6L9.1625 18.1625C7.3625 16.5208 5.76042 14.9125 4.35625 13.3375C2.95208 11.7625 2.25 10.0416 2.25 8.17498C2.25 6.65816 2.75865 5.39145 3.77595 4.37485C4.79327 3.35827 6.06087 2.84998 7.57875 2.84998C8.43458 2.84998 9.24792 3.03539 10.0188 3.40623C10.7896 3.77706 11.45 4.29998 12 4.97498C12.5667 4.29998 13.231 3.77706 13.993 3.40623C14.755 3.03539 15.5657 2.84998 16.425 2.84998C17.9418 2.84998 19.2085 3.35827 20.2251 4.37485C21.2417 5.39145 21.75 6.65816 21.75 8.17498C21.75 10.0416 21.05 11.7646 19.65 13.3437C18.25 14.9229 16.6458 16.5291 14.8375 18.1625L13.2625 19.6C13.0875 19.7666 12.8896 19.8896 12.6687 19.9687C12.4479 20.0479 12.225 20.0875 12 20.0875ZM11.107 6.89753C10.6773 6.20749 10.1729 5.67289 9.59375 5.29373C9.01458 4.91456 8.33962 4.72498 7.56885 4.72498C6.5849 4.72498 5.76493 5.05206 5.10895 5.70623C4.45298 6.36039 4.125 7.18202 4.125 8.1711C4.125 9.0283 4.42917 9.93908 5.0375 10.9035C5.64583 11.8678 6.37083 12.8041 7.2125 13.7125C8.05417 14.6208 8.92083 15.4687 9.8125 16.2562C10.7042 17.0437 11.4333 17.6916 12 18.2C12.5667 17.6916 13.2958 17.0437 14.1875 16.2562C15.0792 15.4687 15.9458 14.6208 16.7875 13.7125C17.6292 12.8041 18.3542 11.8678 18.9625 10.9035C19.5708 9.93908 19.875 9.0283 19.875 8.1711C19.875 7.18202 19.547 6.36039 18.8911 5.70623C18.2351 5.05206 17.4151 4.72498 16.4311 4.72498C15.6604 4.72498 14.9833 4.91456 14.4 5.29373C13.8167 5.67289 13.3102 6.20749 12.8805 6.89753C12.7768 7.06583 12.6466 7.18956 12.4899 7.26873C12.3331 7.34789 12.1685 7.38748 11.9961 7.38748C11.8237 7.38748 11.6583 7.34789 11.5 7.26873C11.3417 7.18956 11.2107 7.06583 11.107 6.89753Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M12 20.0875C11.775 20.0875 11.5521 20.0479 11.3313 19.9687C11.1104 19.8896 10.9125 19.7666 10.7375 19.6L9.1625 18.1625C7.3625 16.5208 5.76042 14.9125 4.35625 13.3375C2.95208 11.7625 2.25 10.0416 2.25 8.17498C2.25 6.65816 2.75865 5.39145 3.77595 4.37485C4.79327 3.35827 6.06087 2.84998 7.57875 2.84998C8.43458 2.84998 9.24792 3.03539 10.0188 3.40623C10.7896 3.77706 11.45 4.29998 12 4.97498C12.5667 4.29998 13.231 3.77706 13.993 3.40623C14.755 3.03539 15.5657 2.84998 16.425 2.84998C17.9418 2.84998 19.2085 3.35827 20.2251 4.37485C21.2417 5.39145 21.75 6.65816 21.75 8.17498C21.75 10.0416 21.05 11.7646 19.65 13.3437C18.25 14.9229 16.6458 16.5291 14.8375 18.1625L13.2625 19.6C13.0875 19.7666 12.8896 19.8896 12.6687 19.9687C12.4479 20.0479 12.225 20.0875 12 20.0875ZM11.107 6.89753C10.6773 6.20749 10.1729 5.67289 9.59375 5.29373C9.01458 4.91456 8.33962 4.72498 7.56885 4.72498C6.5849 4.72498 5.76493 5.05206 5.10895 5.70623C4.45298 6.36039 4.125 7.18202 4.125 8.1711C4.125 9.0283 4.42917 9.93908 5.0375 10.9035C5.64583 11.8678 6.37083 12.8041 7.2125 13.7125C8.05417 14.6208 8.92083 15.4687 9.8125 16.2562C10.7042 17.0437 11.4333 17.6916 12 18.2C12.5667 17.6916 13.2958 17.0437 14.1875 16.2562C15.0792 15.4687 15.9458 14.6208 16.7875 13.7125C17.6292 12.8041 18.3542 11.8678 18.9625 10.9035C19.5708 9.93908 19.875 9.0283 19.875 8.1711C19.875 7.18202 19.547 6.36039 18.8911 5.70623C18.2351 5.05206 17.4151 4.72498 16.4311 4.72498C15.6604 4.72498 14.9833 4.91456 14.4 5.29373C13.8167 5.67289 13.3102 6.20749 12.8805 6.89753C12.7768 7.06583 12.6466 7.18956 12.4899 7.26873C12.3331 7.34789 12.1685 7.38748 11.9961 7.38748C11.8237 7.38748 11.6583 7.34789 11.5 7.26873C11.3417 7.18956 11.2107 7.06583 11.107 6.89753Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Heat.tsx b/components/Icons/Heat.tsx
index ef093e955..f2c2a4318 100644
--- a/components/Icons/Heat.tsx
+++ b/components/Icons/Heat.tsx
@@ -14,23 +14,10 @@ export default function HeatIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3462"
-        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_3462)">
-        <path
-          d="M13.25 20.4875C13.1583 20.5708 13.0583 20.6333 12.95 20.675C12.8417 20.7167 12.7271 20.7375 12.6063 20.7375C12.4854 20.7375 12.3629 20.7106 12.2386 20.6567C12.1144 20.6029 12.0057 20.5298 11.9125 20.4375C11.2505 19.7277 10.7621 19.0018 10.4473 18.2597C10.1324 17.5176 9.975 16.7352 9.975 15.9125C9.975 15.314 10.0625 14.6831 10.2375 14.0199C10.4125 13.3566 10.7208 12.4917 11.1625 11.425C11.5375 10.5167 11.7979 9.81043 11.9437 9.3063C12.0896 8.80217 12.1625 8.33523 12.1625 7.90548C12.1625 7.34349 12.0395 6.81942 11.7936 6.33327C11.5476 5.84714 11.1622 5.35688 10.6375 4.8625C10.5458 4.77083 10.4771 4.66667 10.4313 4.55C10.3854 4.43333 10.3625 4.3125 10.3625 4.1875C10.3625 4.0625 10.3833 3.94583 10.425 3.8375C10.4667 3.72917 10.5254 3.62917 10.6011 3.5375C10.692 3.44583 10.7973 3.375 10.9169 3.325C11.0364 3.275 11.16 3.25 11.2875 3.25C11.4042 3.25 11.5187 3.27083 11.6312 3.3125C11.7438 3.35417 11.8458 3.41667 11.9375 3.5C12.6455 4.16247 13.1726 4.85725 13.5185 5.58435C13.8645 6.31145 14.0375 7.08267 14.0375 7.898C14.0375 8.46873 13.9521 9.068 13.7812 9.6958C13.6104 10.3236 13.3168 11.1372 12.9005 12.1367C12.5002 13.1039 12.225 13.851 12.075 14.3781C11.925 14.9052 11.85 15.4076 11.85 15.8853C11.85 16.4618 11.9688 17.0167 12.2063 17.5501C12.4439 18.0834 12.8085 18.6209 13.3 19.1625C13.3833 19.2542 13.4458 19.3563 13.4875 19.4688C13.5292 19.5812 13.55 19.6979 13.55 19.8188C13.55 19.9396 13.525 20.0583 13.475 20.175C13.425 20.2917 13.35 20.3958 13.25 20.4875ZM17.9635 20.5C17.8712 20.5833 17.7729 20.6437 17.6687 20.6812C17.5646 20.7188 17.4521 20.7375 17.3313 20.7375C17.2104 20.7375 17.0879 20.7117 16.9636 20.6601C16.8394 20.6085 16.7307 20.5385 16.6375 20.45C15.9792 19.7417 15.4917 19.0177 15.175 18.278C14.8583 17.5384 14.7 16.7541 14.7 15.925C14.7 15.325 14.7875 14.6896 14.9625 14.0188C15.1375 13.3479 15.4458 12.4833 15.8875 11.425C16.2625 10.5167 16.5208 9.81458 16.6625 9.31875C16.8042 8.82292 16.875 8.36014 16.875 7.93042C16.875 7.36847 16.7542 6.83958 16.5125 6.34375C16.2708 5.84792 15.8875 5.35833 15.3625 4.875C15.2708 4.7804 15.2021 4.67398 15.1562 4.55575C15.1104 4.4375 15.0875 4.31532 15.0875 4.1892C15.0875 4.06307 15.1062 3.94792 15.1438 3.84375C15.1813 3.73958 15.2398 3.64167 15.3193 3.55C15.4148 3.45833 15.524 3.38542 15.6469 3.33125C15.7698 3.27708 15.8927 3.25 16.0156 3.25C16.1385 3.25 16.2542 3.27292 16.3625 3.31875C16.4708 3.36458 16.5708 3.42917 16.6625 3.5125C17.3708 4.17083 17.8958 4.86428 18.2375 5.59285C18.5792 6.32143 18.75 7.09048 18.75 7.9C18.75 8.46667 18.6667 9.06667 18.5 9.7C18.3333 10.3333 18.0417 11.15 17.625 12.15C17.225 13.125 16.95 13.8763 16.8 14.4038C16.65 14.9313 16.575 15.4259 16.575 15.8875C16.575 16.4708 16.6958 17.0333 16.9375 17.575C17.1792 18.1167 17.5458 18.65 18.0375 19.175C18.1208 19.2667 18.1812 19.3681 18.2188 19.4792C18.2563 19.5903 18.275 19.7014 18.275 19.8125C18.275 19.9458 18.25 20.0729 18.2 20.1938C18.15 20.3146 18.0712 20.4167 17.9635 20.5ZM8.5202 20.5C8.43173 20.5833 8.33333 20.6458 8.225 20.6875C8.11667 20.7292 8.00208 20.75 7.88125 20.75C7.76042 20.75 7.63788 20.7231 7.51363 20.6692C7.38939 20.6154 7.28068 20.5423 7.1875 20.45C6.52917 19.7417 6.04167 19.0177 5.725 18.278C5.40833 17.5384 5.25 16.7541 5.25 15.925C5.25 15.325 5.33958 14.6896 5.51875 14.0188C5.69792 13.3479 6.00417 12.4833 6.4375 11.425C6.8125 10.5167 7.07292 9.81458 7.21875 9.31875C7.36458 8.82292 7.4375 8.36014 7.4375 7.93042C7.4375 7.36847 7.31458 6.83958 7.06875 6.34375C6.82292 5.84792 6.44167 5.35833 5.925 4.875C5.825 4.78333 5.75 4.67903 5.7 4.5621C5.65 4.44517 5.625 4.32433 5.625 4.1996C5.625 4.07487 5.64583 3.95833 5.6875 3.85C5.72917 3.74167 5.79167 3.6375 5.875 3.5375C5.96667 3.44583 6.07228 3.375 6.19185 3.325C6.31142 3.275 6.43497 3.25 6.5625 3.25C6.67917 3.25 6.79375 3.27083 6.90625 3.3125C7.01875 3.35417 7.12083 3.41667 7.2125 3.5C7.92055 4.16445 8.44756 4.85727 8.79352 5.57845C9.13951 6.29963 9.3125 7.07348 9.3125 7.9C9.3125 8.4599 9.23125 9.04779 9.06875 9.66367C8.90625 10.2796 8.61667 11.1042 8.2 12.1375C7.8 13.0875 7.525 13.8292 7.375 14.3625C7.225 14.8958 7.15 15.4042 7.15 15.8875C7.15 16.4708 7.26667 17.0333 7.5 17.575C7.73333 18.1167 8.09583 18.65 8.5875 19.175C8.67083 19.2667 8.73125 19.3678 8.76875 19.4785C8.80625 19.5891 8.825 19.6997 8.825 19.8104C8.825 19.9368 8.8 20.0625 8.75 20.1875C8.7 20.3125 8.6234 20.4167 8.5202 20.5Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M13.25 20.4875C13.1583 20.5708 13.0583 20.6333 12.95 20.675C12.8417 20.7167 12.7271 20.7375 12.6063 20.7375C12.4854 20.7375 12.3629 20.7106 12.2386 20.6567C12.1144 20.6029 12.0057 20.5298 11.9125 20.4375C11.2505 19.7277 10.7621 19.0018 10.4473 18.2597C10.1324 17.5176 9.975 16.7352 9.975 15.9125C9.975 15.314 10.0625 14.6831 10.2375 14.0199C10.4125 13.3566 10.7208 12.4917 11.1625 11.425C11.5375 10.5167 11.7979 9.81043 11.9437 9.3063C12.0896 8.80217 12.1625 8.33523 12.1625 7.90548C12.1625 7.34349 12.0395 6.81942 11.7936 6.33327C11.5476 5.84714 11.1622 5.35688 10.6375 4.8625C10.5458 4.77083 10.4771 4.66667 10.4313 4.55C10.3854 4.43333 10.3625 4.3125 10.3625 4.1875C10.3625 4.0625 10.3833 3.94583 10.425 3.8375C10.4667 3.72917 10.5254 3.62917 10.6011 3.5375C10.692 3.44583 10.7973 3.375 10.9169 3.325C11.0364 3.275 11.16 3.25 11.2875 3.25C11.4042 3.25 11.5187 3.27083 11.6312 3.3125C11.7438 3.35417 11.8458 3.41667 11.9375 3.5C12.6455 4.16247 13.1726 4.85725 13.5185 5.58435C13.8645 6.31145 14.0375 7.08267 14.0375 7.898C14.0375 8.46873 13.9521 9.068 13.7812 9.6958C13.6104 10.3236 13.3168 11.1372 12.9005 12.1367C12.5002 13.1039 12.225 13.851 12.075 14.3781C11.925 14.9052 11.85 15.4076 11.85 15.8853C11.85 16.4618 11.9688 17.0167 12.2063 17.5501C12.4439 18.0834 12.8085 18.6209 13.3 19.1625C13.3833 19.2542 13.4458 19.3563 13.4875 19.4688C13.5292 19.5812 13.55 19.6979 13.55 19.8188C13.55 19.9396 13.525 20.0583 13.475 20.175C13.425 20.2917 13.35 20.3958 13.25 20.4875ZM17.9635 20.5C17.8712 20.5833 17.7729 20.6437 17.6687 20.6812C17.5646 20.7188 17.4521 20.7375 17.3313 20.7375C17.2104 20.7375 17.0879 20.7117 16.9636 20.6601C16.8394 20.6085 16.7307 20.5385 16.6375 20.45C15.9792 19.7417 15.4917 19.0177 15.175 18.278C14.8583 17.5384 14.7 16.7541 14.7 15.925C14.7 15.325 14.7875 14.6896 14.9625 14.0188C15.1375 13.3479 15.4458 12.4833 15.8875 11.425C16.2625 10.5167 16.5208 9.81458 16.6625 9.31875C16.8042 8.82292 16.875 8.36014 16.875 7.93042C16.875 7.36847 16.7542 6.83958 16.5125 6.34375C16.2708 5.84792 15.8875 5.35833 15.3625 4.875C15.2708 4.7804 15.2021 4.67398 15.1562 4.55575C15.1104 4.4375 15.0875 4.31532 15.0875 4.1892C15.0875 4.06307 15.1062 3.94792 15.1438 3.84375C15.1813 3.73958 15.2398 3.64167 15.3193 3.55C15.4148 3.45833 15.524 3.38542 15.6469 3.33125C15.7698 3.27708 15.8927 3.25 16.0156 3.25C16.1385 3.25 16.2542 3.27292 16.3625 3.31875C16.4708 3.36458 16.5708 3.42917 16.6625 3.5125C17.3708 4.17083 17.8958 4.86428 18.2375 5.59285C18.5792 6.32143 18.75 7.09048 18.75 7.9C18.75 8.46667 18.6667 9.06667 18.5 9.7C18.3333 10.3333 18.0417 11.15 17.625 12.15C17.225 13.125 16.95 13.8763 16.8 14.4038C16.65 14.9313 16.575 15.4259 16.575 15.8875C16.575 16.4708 16.6958 17.0333 16.9375 17.575C17.1792 18.1167 17.5458 18.65 18.0375 19.175C18.1208 19.2667 18.1812 19.3681 18.2188 19.4792C18.2563 19.5903 18.275 19.7014 18.275 19.8125C18.275 19.9458 18.25 20.0729 18.2 20.1938C18.15 20.3146 18.0712 20.4167 17.9635 20.5ZM8.5202 20.5C8.43173 20.5833 8.33333 20.6458 8.225 20.6875C8.11667 20.7292 8.00208 20.75 7.88125 20.75C7.76042 20.75 7.63788 20.7231 7.51363 20.6692C7.38939 20.6154 7.28068 20.5423 7.1875 20.45C6.52917 19.7417 6.04167 19.0177 5.725 18.278C5.40833 17.5384 5.25 16.7541 5.25 15.925C5.25 15.325 5.33958 14.6896 5.51875 14.0188C5.69792 13.3479 6.00417 12.4833 6.4375 11.425C6.8125 10.5167 7.07292 9.81458 7.21875 9.31875C7.36458 8.82292 7.4375 8.36014 7.4375 7.93042C7.4375 7.36847 7.31458 6.83958 7.06875 6.34375C6.82292 5.84792 6.44167 5.35833 5.925 4.875C5.825 4.78333 5.75 4.67903 5.7 4.5621C5.65 4.44517 5.625 4.32433 5.625 4.1996C5.625 4.07487 5.64583 3.95833 5.6875 3.85C5.72917 3.74167 5.79167 3.6375 5.875 3.5375C5.96667 3.44583 6.07228 3.375 6.19185 3.325C6.31142 3.275 6.43497 3.25 6.5625 3.25C6.67917 3.25 6.79375 3.27083 6.90625 3.3125C7.01875 3.35417 7.12083 3.41667 7.2125 3.5C7.92055 4.16445 8.44756 4.85727 8.79352 5.57845C9.13951 6.29963 9.3125 7.07348 9.3125 7.9C9.3125 8.4599 9.23125 9.04779 9.06875 9.66367C8.90625 10.2796 8.61667 11.1042 8.2 12.1375C7.8 13.0875 7.525 13.8292 7.375 14.3625C7.225 14.8958 7.15 15.4042 7.15 15.8875C7.15 16.4708 7.26667 17.0333 7.5 17.575C7.73333 18.1167 8.09583 18.65 8.5875 19.175C8.67083 19.2667 8.73125 19.3678 8.76875 19.4785C8.80625 19.5891 8.825 19.6997 8.825 19.8104C8.825 19.9368 8.8 20.0625 8.75 20.1875C8.7 20.3125 8.6234 20.4167 8.5202 20.5Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/House.tsx b/components/Icons/House.tsx
index 1ddcf0f74..2fa747d57 100644
--- a/components/Icons/House.tsx
+++ b/components/Icons/House.tsx
@@ -14,28 +14,12 @@ export default function HouseIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <g id="home">
-        <mask
-          id="mask0_4140_3155"
-          height="20"
-          maskUnits="userSpaceOnUse"
-          style={{ maskType: "alpha" }}
-          width="20"
-          x="0"
-          y="0"
-        >
-          <rect id="Bounding box" width="20" height="20" fill="#D9D9D9" />
-        </mask>
-        <g mask="url(#mask0_4140_3155)">
-          <path
-            id="Union"
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M8.94115 2.45616C9.5571 1.95928 10.4429 1.95928 11.0589 2.45616L18.1933 8.21144C18.5507 8.49973 18.6034 9.01907 18.311 9.37142C18.0186 9.72377 17.4919 9.7757 17.1345 9.48741L16.4095 8.9026V17.0924C16.4095 17.5477 16.0352 17.9168 15.5735 17.9168H4.42596C3.96421 17.9168 3.58989 17.5477 3.58989 17.0924V16.2681V8.90307L2.86551 9.48741C2.50814 9.7757 1.98141 9.72377 1.68901 9.37142C1.39662 9.01907 1.44929 8.49973 1.80666 8.21144L8.94115 2.45616ZM5.17626 7.62337C5.23117 7.73317 5.26202 7.85676 5.26202 7.98746V15.4438C5.26202 15.8991 5.63634 16.2681 6.09808 16.2681H7.07363V11.0476C7.07363 10.1371 7.82227 9.39897 8.74575 9.39897H11.2539C12.1774 9.39897 12.9261 10.1371 12.9261 11.0476V16.2681H13.9013C14.3631 16.2681 14.7374 15.8991 14.7374 15.4438V7.98746C14.7374 7.85663 14.7683 7.73292 14.8233 7.62304L10 3.73213L5.17626 7.62337ZM11.2539 16.2681V11.0476L8.74575 11.0476V16.2681H11.2539Z"
-            fill="#8F4350"
-          />
-        </g>
-      </g>
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M8.94115 2.45616C9.5571 1.95928 10.4429 1.95928 11.0589 2.45616L18.1933 8.21144C18.5507 8.49973 18.6034 9.01907 18.311 9.37142C18.0186 9.72377 17.4919 9.7757 17.1345 9.48741L16.4095 8.9026V17.0924C16.4095 17.5477 16.0352 17.9168 15.5735 17.9168H4.42596C3.96421 17.9168 3.58989 17.5477 3.58989 17.0924V16.2681V8.90307L2.86551 9.48741C2.50814 9.7757 1.98141 9.72377 1.68901 9.37142C1.39662 9.01907 1.44929 8.49973 1.80666 8.21144L8.94115 2.45616ZM5.17626 7.62337C5.23117 7.73317 5.26202 7.85676 5.26202 7.98746V15.4438C5.26202 15.8991 5.63634 16.2681 6.09808 16.2681H7.07363V11.0476C7.07363 10.1371 7.82227 9.39897 8.74575 9.39897H11.2539C12.1774 9.39897 12.9261 10.1371 12.9261 11.0476V16.2681H13.9013C14.3631 16.2681 14.7374 15.8991 14.7374 15.4438V7.98746C14.7374 7.85663 14.7683 7.73292 14.8233 7.62304L10 3.73213L5.17626 7.62337ZM11.2539 16.2681V11.0476L8.74575 11.0476V16.2681H11.2539Z"
+        fill="#8F4350"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Image.tsx b/components/Icons/Image.tsx
index 9fcfe4a71..aa0b875df 100644
--- a/components/Icons/Image.tsx
+++ b/components/Icons/Image.tsx
@@ -14,23 +14,10 @@ export default function ImageIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3274"
-        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_3274)">
-        <path
-          d="M5.09998 20.775C4.58434 20.775 4.14293 20.5914 3.77575 20.2242C3.40857 19.857 3.22498 19.4156 3.22498 18.9V5.09998C3.22498 4.58434 3.40857 4.14293 3.77575 3.77575C4.14293 3.40857 4.58434 3.22498 5.09998 3.22498H18.9C19.4156 3.22498 19.857 3.40857 20.2242 3.77575C20.5914 4.14293 20.775 4.58434 20.775 5.09998V18.9C20.775 19.4156 20.5914 19.857 20.2242 20.2242C19.857 20.5914 19.4156 20.775 18.9 20.775H5.09998ZM5.09998 18.9H18.9V5.09998H5.09998V18.9ZM7.13748 16.925H16.8826C17.0775 16.925 17.2208 16.8396 17.3125 16.6687C17.4041 16.4979 17.3875 16.3333 17.2625 16.175L14.575 12.6C14.4807 12.475 14.3551 12.4125 14.1981 12.4125C14.041 12.4125 13.9166 12.475 13.825 12.6L11.25 16.025L9.42498 13.6125C9.33074 13.4875 9.2051 13.425 9.04805 13.425C8.891 13.425 8.76664 13.4875 8.67498 13.6125L6.76588 16.1732C6.63861 16.3327 6.62185 16.4979 6.7156 16.6687C6.80935 16.8396 6.94998 16.925 7.13748 16.925ZM8.5007 9.93748C8.90022 9.93748 9.23956 9.79765 9.51873 9.518C9.79789 9.23833 9.93748 8.89875 9.93748 8.49925C9.93748 8.09973 9.79765 7.76039 9.518 7.48123C9.23833 7.20206 8.89875 7.06248 8.49925 7.06248C8.09973 7.06248 7.76039 7.2023 7.48123 7.48195C7.20206 7.76162 7.06248 8.1012 7.06248 8.5007C7.06248 8.90022 7.2023 9.23956 7.48195 9.51873C7.76162 9.79789 8.1012 9.93748 8.5007 9.93748Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M5.09998 20.775C4.58434 20.775 4.14293 20.5914 3.77575 20.2242C3.40857 19.857 3.22498 19.4156 3.22498 18.9V5.09998C3.22498 4.58434 3.40857 4.14293 3.77575 3.77575C4.14293 3.40857 4.58434 3.22498 5.09998 3.22498H18.9C19.4156 3.22498 19.857 3.40857 20.2242 3.77575C20.5914 4.14293 20.775 4.58434 20.775 5.09998V18.9C20.775 19.4156 20.5914 19.857 20.2242 20.2242C19.857 20.5914 19.4156 20.775 18.9 20.775H5.09998ZM5.09998 18.9H18.9V5.09998H5.09998V18.9ZM7.13748 16.925H16.8826C17.0775 16.925 17.2208 16.8396 17.3125 16.6687C17.4041 16.4979 17.3875 16.3333 17.2625 16.175L14.575 12.6C14.4807 12.475 14.3551 12.4125 14.1981 12.4125C14.041 12.4125 13.9166 12.475 13.825 12.6L11.25 16.025L9.42498 13.6125C9.33074 13.4875 9.2051 13.425 9.04805 13.425C8.891 13.425 8.76664 13.4875 8.67498 13.6125L6.76588 16.1732C6.63861 16.3327 6.62185 16.4979 6.7156 16.6687C6.80935 16.8396 6.94998 16.925 7.13748 16.925ZM8.5007 9.93748C8.90022 9.93748 9.23956 9.79765 9.51873 9.518C9.79789 9.23833 9.93748 8.89875 9.93748 8.49925C9.93748 8.09973 9.79765 7.76039 9.518 7.48123C9.23833 7.20206 8.89875 7.06248 8.49925 7.06248C8.09973 7.06248 7.76039 7.2023 7.48123 7.48195C7.20206 7.76162 7.06248 8.1012 7.06248 8.5007C7.06248 8.90022 7.2023 9.23956 7.48195 9.51873C7.76162 9.79789 8.1012 9.93748 8.5007 9.93748Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/InfoCircle.tsx b/components/Icons/InfoCircle.tsx
index f87f5d663..3d9bc82c1 100644
--- a/components/Icons/InfoCircle.tsx
+++ b/components/Icons/InfoCircle.tsx
@@ -18,23 +18,10 @@ export default function InfoCircleIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="17"
-        id="mask0_954_4761"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="16"
-        x="0"
-        y="0"
-      >
-        <rect y="0.5" width="16" height="16" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_954_4761)">
-        <path
-          d="M8.00833 11.75C8.18056 11.75 8.32778 11.6889 8.45 11.5667C8.57222 11.4444 8.63333 11.2972 8.63333 11.125V8.475C8.63333 8.30278 8.57222 8.15556 8.45 8.03333C8.32778 7.91111 8.18056 7.85 8.00833 7.85C7.83611 7.85 7.68889 7.91111 7.56667 8.03333C7.44444 8.15556 7.38333 8.30278 7.38333 8.475V11.125C7.38333 11.2972 7.44444 11.4444 7.56667 11.5667C7.68889 11.6889 7.83611 11.75 8.00833 11.75ZM7.99825 6.56667C8.17719 6.56667 8.32778 6.50614 8.45 6.38508C8.57222 6.26404 8.63333 6.11404 8.63333 5.93508C8.63333 5.75614 8.57281 5.60556 8.45175 5.48333C8.33071 5.36111 8.18071 5.3 8.00175 5.3C7.82281 5.3 7.67222 5.36053 7.55 5.48158C7.42778 5.60263 7.36667 5.75263 7.36667 5.93158C7.36667 6.11053 7.42719 6.26111 7.54825 6.38333C7.66929 6.50556 7.81929 6.56667 7.99825 6.56667ZM8 15C7.10103 15 6.25623 14.8291 5.46558 14.4873C4.67493 14.1455 3.98717 13.6816 3.4023 13.0956C2.81743 12.5097 2.35417 11.8217 2.0125 11.0319C1.67083 10.242 1.5 9.39806 1.5 8.5C1.5 7.60103 1.67091 6.75623 2.01272 5.96558C2.35453 5.17493 2.81842 4.48717 3.40438 3.9023C3.99035 3.31743 4.67826 2.85417 5.46812 2.5125C6.25798 2.17083 7.10194 2 8 2C8.89897 2 9.74377 2.17091 10.5344 2.51272C11.3251 2.85453 12.0128 3.31842 12.5977 3.90438C13.1826 4.49035 13.6458 5.17826 13.9875 5.96812C14.3292 6.75798 14.5 7.60194 14.5 8.5C14.5 9.39897 14.3291 10.2438 13.9873 11.0344C13.6455 11.8251 13.1816 12.5128 12.5956 13.0977C12.0097 13.6826 11.3217 14.1458 10.5319 14.4875C9.74202 14.8292 8.89806 15 8 15Z"
-          fill="#CD0921"
-        />
-      </g>
+      <path
+        d="M8.00833 11.75C8.18056 11.75 8.32778 11.6889 8.45 11.5667C8.57222 11.4444 8.63333 11.2972 8.63333 11.125V8.475C8.63333 8.30278 8.57222 8.15556 8.45 8.03333C8.32778 7.91111 8.18056 7.85 8.00833 7.85C7.83611 7.85 7.68889 7.91111 7.56667 8.03333C7.44444 8.15556 7.38333 8.30278 7.38333 8.475V11.125C7.38333 11.2972 7.44444 11.4444 7.56667 11.5667C7.68889 11.6889 7.83611 11.75 8.00833 11.75ZM7.99825 6.56667C8.17719 6.56667 8.32778 6.50614 8.45 6.38508C8.57222 6.26404 8.63333 6.11404 8.63333 5.93508C8.63333 5.75614 8.57281 5.60556 8.45175 5.48333C8.33071 5.36111 8.18071 5.3 8.00175 5.3C7.82281 5.3 7.67222 5.36053 7.55 5.48158C7.42778 5.60263 7.36667 5.75263 7.36667 5.93158C7.36667 6.11053 7.42719 6.26111 7.54825 6.38333C7.66929 6.50556 7.81929 6.56667 7.99825 6.56667ZM8 15C7.10103 15 6.25623 14.8291 5.46558 14.4873C4.67493 14.1455 3.98717 13.6816 3.4023 13.0956C2.81743 12.5097 2.35417 11.8217 2.0125 11.0319C1.67083 10.242 1.5 9.39806 1.5 8.5C1.5 7.60103 1.67091 6.75623 2.01272 5.96558C2.35453 5.17493 2.81842 4.48717 3.40438 3.9023C3.99035 3.31743 4.67826 2.85417 5.46812 2.5125C6.25798 2.17083 7.10194 2 8 2C8.89897 2 9.74377 2.17091 10.5344 2.51272C11.3251 2.85453 12.0128 3.31842 12.5977 3.90438C13.1826 4.49035 13.6458 5.17826 13.9875 5.96812C14.3292 6.75798 14.5 7.60194 14.5 8.5C14.5 9.39897 14.3291 10.2438 13.9873 11.0344C13.6455 11.8251 13.1816 12.5128 12.5956 13.0977C12.0097 13.6826 11.3217 14.1458 10.5319 14.4875C9.74202 14.8292 8.89806 15 8 15Z"
+        fill="#CD0921"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Iron.tsx b/components/Icons/Iron.tsx
index ac2ac4882..4f5964a90 100644
--- a/components/Icons/Iron.tsx
+++ b/components/Icons/Iron.tsx
@@ -14,23 +14,10 @@ export default function IronIcon({ className, color, ...props }: IconProps) {
       className={classNames}
       {...props}
     >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3453"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3453)">
-        <path
-          d="M4.125 15.875H14.9875V12.9375H6.125C5.575 12.9375 5.10417 13.1271 4.7125 13.5062C4.32083 13.8854 4.125 14.3462 4.125 14.8887V15.875ZM20.8125 6.25C21.0708 6.25 21.2917 6.34167 21.475 6.525C21.6583 6.70833 21.75 6.92917 21.75 7.1875C21.75 7.44583 21.6583 7.66667 21.475 7.85C21.2917 8.03333 21.0708 8.125 20.8125 8.125C20.5256 8.125 20.2852 8.22083 20.0911 8.4125C19.897 8.60417 19.8 8.83647 19.8 9.1094V12.9625C19.8 13.7576 19.5125 14.4335 18.9375 14.9901C18.3625 15.5467 17.6708 15.825 16.8625 15.825V16.8125C16.8625 17.0708 16.7708 17.2917 16.5875 17.475C16.4042 17.6583 16.1833 17.75 15.925 17.75H3.1875C2.92917 17.75 2.70833 17.6583 2.525 17.475C2.34167 17.2917 2.25 17.0708 2.25 16.8125V14.8879C2.25 13.8293 2.62708 12.9271 3.38125 12.1813C4.13542 11.4354 5.05 11.0625 6.125 11.0625H14.9875V10.0801C14.9875 9.80168 14.8875 9.56667 14.6875 9.375C14.4875 9.18333 14.2458 9.0875 13.9625 9.0875H10.0458C9.91528 9.0875 9.785 9.11667 9.655 9.175C9.525 9.23333 9.41667 9.30417 9.33 9.3875C9.24333 9.47083 9.14583 9.53542 9.0375 9.58125C8.92917 9.62708 8.80833 9.65 8.675 9.65C8.41667 9.65 8.19375 9.55833 8.00625 9.375C7.81875 9.19167 7.725 8.97083 7.725 8.7125C7.725 8.57917 7.75208 8.45417 7.80625 8.3375C7.86042 8.22083 7.92917 8.12083 8.0125 8.0375C8.27917 7.77917 8.58508 7.57708 8.93025 7.43125C9.2754 7.28542 9.64865 7.2125 10.05 7.2125H13.9625C14.7681 7.2125 15.4528 7.4908 16.0167 8.0474C16.5806 8.604 16.8625 9.27987 16.8625 10.075V13.95C17.1542 13.95 17.4042 13.8554 17.6125 13.6661C17.8208 13.4768 17.925 13.2423 17.925 12.9625V9.1125C17.925 8.31737 18.2057 7.6415 18.7672 7.0849C19.3287 6.5283 20.0104 6.25 20.8125 6.25Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M4.125 15.875H14.9875V12.9375H6.125C5.575 12.9375 5.10417 13.1271 4.7125 13.5062C4.32083 13.8854 4.125 14.3462 4.125 14.8887V15.875ZM20.8125 6.25C21.0708 6.25 21.2917 6.34167 21.475 6.525C21.6583 6.70833 21.75 6.92917 21.75 7.1875C21.75 7.44583 21.6583 7.66667 21.475 7.85C21.2917 8.03333 21.0708 8.125 20.8125 8.125C20.5256 8.125 20.2852 8.22083 20.0911 8.4125C19.897 8.60417 19.8 8.83647 19.8 9.1094V12.9625C19.8 13.7576 19.5125 14.4335 18.9375 14.9901C18.3625 15.5467 17.6708 15.825 16.8625 15.825V16.8125C16.8625 17.0708 16.7708 17.2917 16.5875 17.475C16.4042 17.6583 16.1833 17.75 15.925 17.75H3.1875C2.92917 17.75 2.70833 17.6583 2.525 17.475C2.34167 17.2917 2.25 17.0708 2.25 16.8125V14.8879C2.25 13.8293 2.62708 12.9271 3.38125 12.1813C4.13542 11.4354 5.05 11.0625 6.125 11.0625H14.9875V10.0801C14.9875 9.80168 14.8875 9.56667 14.6875 9.375C14.4875 9.18333 14.2458 9.0875 13.9625 9.0875H10.0458C9.91528 9.0875 9.785 9.11667 9.655 9.175C9.525 9.23333 9.41667 9.30417 9.33 9.3875C9.24333 9.47083 9.14583 9.53542 9.0375 9.58125C8.92917 9.62708 8.80833 9.65 8.675 9.65C8.41667 9.65 8.19375 9.55833 8.00625 9.375C7.81875 9.19167 7.725 8.97083 7.725 8.7125C7.725 8.57917 7.75208 8.45417 7.80625 8.3375C7.86042 8.22083 7.92917 8.12083 8.0125 8.0375C8.27917 7.77917 8.58508 7.57708 8.93025 7.43125C9.2754 7.28542 9.64865 7.2125 10.05 7.2125H13.9625C14.7681 7.2125 15.4528 7.4908 16.0167 8.0474C16.5806 8.604 16.8625 9.27987 16.8625 10.075V13.95C17.1542 13.95 17.4042 13.8554 17.6125 13.6661C17.8208 13.4768 17.925 13.2423 17.925 12.9625V9.1125C17.925 8.31737 18.2057 7.6415 18.7672 7.0849C19.3287 6.5283 20.0104 6.25 20.8125 6.25Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Kayaking.tsx b/components/Icons/Kayaking.tsx
index 1d4061a3a..1c5e61304 100644
--- a/components/Icons/Kayaking.tsx
+++ b/components/Icons/Kayaking.tsx
@@ -18,23 +18,10 @@ export default function KayakingIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3501"
-        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_3501)">
-        <path
-          d="M3 22.9374C2.74167 22.9374 2.52083 22.8458 2.3375 22.6624C2.15417 22.4791 2.0625 22.2583 2.0625 21.9999C2.0625 21.7416 2.15417 21.5208 2.3375 21.3374C2.52083 21.1541 2.74167 21.0624 3 21.0624C3.43333 21.0624 3.86458 20.9999 4.29375 20.8749C4.72292 20.7499 5.1375 20.5624 5.5375 20.3124C5.67083 20.2291 5.825 20.1874 6 20.1874C6.175 20.1874 6.32917 20.2291 6.4625 20.3124C6.8625 20.5624 7.27708 20.7499 7.70625 20.8749C8.13542 20.9999 8.56667 21.0624 9 21.0624C9.43333 21.0624 9.86875 20.9999 10.3063 20.8749C10.7438 20.7499 11.1583 20.5624 11.55 20.3124C11.6833 20.2291 11.8375 20.1874 12.0125 20.1874C12.1875 20.1874 12.3375 20.2291 12.4625 20.3124C12.8625 20.5624 13.2771 20.7499 13.7063 20.8749C14.1354 20.9999 14.5667 21.0624 15 21.0624C15.4333 21.0624 15.8688 20.9999 16.3063 20.8749C16.7438 20.7499 17.1583 20.5624 17.55 20.3124C17.675 20.2291 17.825 20.1874 18 20.1874C18.175 20.1874 18.325 20.2291 18.45 20.3124C18.8417 20.5624 19.2563 20.7499 19.6938 20.8749C20.1313 20.9999 20.5667 21.0624 21 21.0624C21.2583 21.0624 21.4792 21.1541 21.6625 21.3374C21.8458 21.5208 21.9375 21.7416 21.9375 21.9999C21.9375 22.2583 21.8458 22.4791 21.6625 22.6624C21.4792 22.8458 21.2583 22.9374 21 22.9374C20.4917 22.9374 19.9854 22.8687 19.4813 22.7312C18.9771 22.5937 18.4833 22.3833 18 22.0999C17.5167 22.3833 17.0229 22.5937 16.5188 22.7312C16.0146 22.8687 15.5083 22.9374 15 22.9374C14.4917 22.9374 13.9854 22.8687 13.4812 22.7312C12.9771 22.5937 12.4833 22.3833 12 22.0999C11.5167 22.3833 11.0229 22.5937 10.5188 22.7312C10.0146 22.8687 9.50833 22.9374 9 22.9374C8.49167 22.9374 7.98542 22.8687 7.48125 22.7312C6.97708 22.5937 6.48333 22.3833 6 22.0999C5.51667 22.3833 5.02292 22.5937 4.51875 22.7312C4.01458 22.8687 3.50833 22.9374 3 22.9374ZM12 9.44995C11.4583 9.44995 10.9979 9.26036 10.6188 8.8812C10.2396 8.50203 10.05 8.04161 10.05 7.49995C10.05 6.95828 10.2396 6.49786 10.6188 6.1187C10.9979 5.73953 11.4583 5.54995 12 5.54995C12.5417 5.54995 13.0021 5.73953 13.3813 6.1187C13.7604 6.49786 13.95 6.95828 13.95 7.49995C13.95 8.04161 13.7604 8.50203 13.3813 8.8812C13.0021 9.26036 12.5417 9.44995 12 9.44995ZM9 19.1749C8.55 19.1749 8.11875 19.0874 7.70625 18.9124C7.29375 18.7374 6.91667 18.5041 6.575 18.2124C6.40833 18.0708 6.21458 17.9979 5.99375 17.9937C5.77292 17.9895 5.57917 18.0583 5.4125 18.1999C5.24583 18.3333 5.07083 18.4583 4.8875 18.5749C4.70417 18.6916 4.50833 18.7916 4.3 18.8749C4.01667 18.8083 3.73542 18.7374 3.45625 18.6624C3.17708 18.5874 2.9 18.5041 2.625 18.4124C2.08333 18.2458 1.8125 17.9416 1.8125 17.4999C1.8125 17.0583 2.08333 16.7541 2.625 16.5874C3.34167 16.3541 4.09167 16.1437 4.875 15.9562C5.65833 15.7687 6.425 15.6083 7.175 15.4749L8.5375 11.2749C8.7125 10.7499 9.04167 10.3895 9.525 10.1937C10.0083 9.99786 10.475 10.0166 10.925 10.2499L13.5 11.5749L16.375 10.0499L18.0375 6.29995L17.675 5.32495C17.6417 5.20828 17.625 5.09161 17.625 4.97495C17.625 4.85828 17.65 4.74161 17.7 4.62495L18.4625 2.93745C18.5708 2.69578 18.7438 2.5312 18.9813 2.4437C19.2188 2.3562 19.4542 2.36245 19.6875 2.46245L21.0625 3.08745C21.3042 3.18745 21.4688 3.3562 21.5562 3.5937C21.6437 3.8312 21.6375 4.07078 21.5375 4.31245L20.7875 5.99995C20.7375 6.11661 20.6667 6.21661 20.575 6.29995C20.4833 6.38328 20.3792 6.44578 20.2625 6.48745L19.3 6.84995L15.5625 15.2999C16.5542 15.4166 17.5542 15.5895 18.5625 15.8187C19.5708 16.0479 20.5125 16.3041 21.3875 16.5874C21.9042 16.7541 22.1625 17.0583 22.1625 17.4999C22.1625 17.9416 21.9042 18.2458 21.3875 18.4124C21.1125 18.5041 20.8313 18.5874 20.5438 18.6624C20.2563 18.7374 19.975 18.8083 19.7 18.8749C19.4917 18.7916 19.2938 18.6937 19.1063 18.5812C18.9188 18.4687 18.7417 18.3416 18.575 18.1999C18.4083 18.0583 18.2167 17.9895 18 17.9937C17.7833 17.9979 17.5917 18.0708 17.425 18.2124C17.0833 18.5041 16.7063 18.7374 16.2937 18.9124C15.8812 19.0874 15.45 19.1749 15 19.1749C14.55 19.1749 14.1188 19.0874 13.7063 18.9124C13.2937 18.7374 12.9167 18.5041 12.575 18.2124C12.4083 18.0708 12.2167 17.9999 12 17.9999C11.7833 17.9999 11.5917 18.0708 11.425 18.2124C11.0833 18.5041 10.7063 18.7374 10.2937 18.9124C9.88125 19.0874 9.45 19.1749 9 19.1749ZM14.1125 15.1374L15.15 12.8124L13.5 13.6749L11.7125 12.7624L10.9625 15.0624H12C12.35 15.0624 12.7063 15.0666 13.0688 15.0749C13.4313 15.0833 13.7792 15.1041 14.1125 15.1374Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3 22.9374C2.74167 22.9374 2.52083 22.8458 2.3375 22.6624C2.15417 22.4791 2.0625 22.2583 2.0625 21.9999C2.0625 21.7416 2.15417 21.5208 2.3375 21.3374C2.52083 21.1541 2.74167 21.0624 3 21.0624C3.43333 21.0624 3.86458 20.9999 4.29375 20.8749C4.72292 20.7499 5.1375 20.5624 5.5375 20.3124C5.67083 20.2291 5.825 20.1874 6 20.1874C6.175 20.1874 6.32917 20.2291 6.4625 20.3124C6.8625 20.5624 7.27708 20.7499 7.70625 20.8749C8.13542 20.9999 8.56667 21.0624 9 21.0624C9.43333 21.0624 9.86875 20.9999 10.3063 20.8749C10.7438 20.7499 11.1583 20.5624 11.55 20.3124C11.6833 20.2291 11.8375 20.1874 12.0125 20.1874C12.1875 20.1874 12.3375 20.2291 12.4625 20.3124C12.8625 20.5624 13.2771 20.7499 13.7063 20.8749C14.1354 20.9999 14.5667 21.0624 15 21.0624C15.4333 21.0624 15.8688 20.9999 16.3063 20.8749C16.7438 20.7499 17.1583 20.5624 17.55 20.3124C17.675 20.2291 17.825 20.1874 18 20.1874C18.175 20.1874 18.325 20.2291 18.45 20.3124C18.8417 20.5624 19.2563 20.7499 19.6938 20.8749C20.1313 20.9999 20.5667 21.0624 21 21.0624C21.2583 21.0624 21.4792 21.1541 21.6625 21.3374C21.8458 21.5208 21.9375 21.7416 21.9375 21.9999C21.9375 22.2583 21.8458 22.4791 21.6625 22.6624C21.4792 22.8458 21.2583 22.9374 21 22.9374C20.4917 22.9374 19.9854 22.8687 19.4813 22.7312C18.9771 22.5937 18.4833 22.3833 18 22.0999C17.5167 22.3833 17.0229 22.5937 16.5188 22.7312C16.0146 22.8687 15.5083 22.9374 15 22.9374C14.4917 22.9374 13.9854 22.8687 13.4812 22.7312C12.9771 22.5937 12.4833 22.3833 12 22.0999C11.5167 22.3833 11.0229 22.5937 10.5188 22.7312C10.0146 22.8687 9.50833 22.9374 9 22.9374C8.49167 22.9374 7.98542 22.8687 7.48125 22.7312C6.97708 22.5937 6.48333 22.3833 6 22.0999C5.51667 22.3833 5.02292 22.5937 4.51875 22.7312C4.01458 22.8687 3.50833 22.9374 3 22.9374ZM12 9.44995C11.4583 9.44995 10.9979 9.26036 10.6188 8.8812C10.2396 8.50203 10.05 8.04161 10.05 7.49995C10.05 6.95828 10.2396 6.49786 10.6188 6.1187C10.9979 5.73953 11.4583 5.54995 12 5.54995C12.5417 5.54995 13.0021 5.73953 13.3813 6.1187C13.7604 6.49786 13.95 6.95828 13.95 7.49995C13.95 8.04161 13.7604 8.50203 13.3813 8.8812C13.0021 9.26036 12.5417 9.44995 12 9.44995ZM9 19.1749C8.55 19.1749 8.11875 19.0874 7.70625 18.9124C7.29375 18.7374 6.91667 18.5041 6.575 18.2124C6.40833 18.0708 6.21458 17.9979 5.99375 17.9937C5.77292 17.9895 5.57917 18.0583 5.4125 18.1999C5.24583 18.3333 5.07083 18.4583 4.8875 18.5749C4.70417 18.6916 4.50833 18.7916 4.3 18.8749C4.01667 18.8083 3.73542 18.7374 3.45625 18.6624C3.17708 18.5874 2.9 18.5041 2.625 18.4124C2.08333 18.2458 1.8125 17.9416 1.8125 17.4999C1.8125 17.0583 2.08333 16.7541 2.625 16.5874C3.34167 16.3541 4.09167 16.1437 4.875 15.9562C5.65833 15.7687 6.425 15.6083 7.175 15.4749L8.5375 11.2749C8.7125 10.7499 9.04167 10.3895 9.525 10.1937C10.0083 9.99786 10.475 10.0166 10.925 10.2499L13.5 11.5749L16.375 10.0499L18.0375 6.29995L17.675 5.32495C17.6417 5.20828 17.625 5.09161 17.625 4.97495C17.625 4.85828 17.65 4.74161 17.7 4.62495L18.4625 2.93745C18.5708 2.69578 18.7438 2.5312 18.9813 2.4437C19.2188 2.3562 19.4542 2.36245 19.6875 2.46245L21.0625 3.08745C21.3042 3.18745 21.4688 3.3562 21.5562 3.5937C21.6437 3.8312 21.6375 4.07078 21.5375 4.31245L20.7875 5.99995C20.7375 6.11661 20.6667 6.21661 20.575 6.29995C20.4833 6.38328 20.3792 6.44578 20.2625 6.48745L19.3 6.84995L15.5625 15.2999C16.5542 15.4166 17.5542 15.5895 18.5625 15.8187C19.5708 16.0479 20.5125 16.3041 21.3875 16.5874C21.9042 16.7541 22.1625 17.0583 22.1625 17.4999C22.1625 17.9416 21.9042 18.2458 21.3875 18.4124C21.1125 18.5041 20.8313 18.5874 20.5438 18.6624C20.2563 18.7374 19.975 18.8083 19.7 18.8749C19.4917 18.7916 19.2938 18.6937 19.1063 18.5812C18.9188 18.4687 18.7417 18.3416 18.575 18.1999C18.4083 18.0583 18.2167 17.9895 18 17.9937C17.7833 17.9979 17.5917 18.0708 17.425 18.2124C17.0833 18.5041 16.7063 18.7374 16.2937 18.9124C15.8812 19.0874 15.45 19.1749 15 19.1749C14.55 19.1749 14.1188 19.0874 13.7063 18.9124C13.2937 18.7374 12.9167 18.5041 12.575 18.2124C12.4083 18.0708 12.2167 17.9999 12 17.9999C11.7833 17.9999 11.5917 18.0708 11.425 18.2124C11.0833 18.5041 10.7063 18.7374 10.2937 18.9124C9.88125 19.0874 9.45 19.1749 9 19.1749ZM14.1125 15.1374L15.15 12.8124L13.5 13.6749L11.7125 12.7624L10.9625 15.0624H12C12.35 15.0624 12.7063 15.0666 13.0688 15.0749C13.4313 15.0833 13.7792 15.1041 14.1125 15.1374Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Kettle.tsx b/components/Icons/Kettle.tsx
index 28713719a..c75521398 100644
--- a/components/Icons/Kettle.tsx
+++ b/components/Icons/Kettle.tsx
@@ -14,23 +14,10 @@ export default function KettleIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3424"
-        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_3424)">
-        <path
-          d="M6.1875 17.0625V6.1L4.425 3.75C4.19167 3.44167 4.16082 3.11458 4.33245 2.76875C4.50408 2.42292 4.78493 2.25 5.175 2.25H15.7625C16.3411 2.25 16.8336 2.45328 17.2402 2.85983C17.6467 3.26638 17.85 3.75893 17.85 4.3375V5.1875H19.8875C20.4031 5.1875 20.8445 5.37109 21.2117 5.73828C21.5789 6.10546 21.7625 6.54687 21.7625 7.0625V12.125C21.7625 12.6406 21.5789 13.082 21.2117 13.4492C20.8445 13.8164 20.4031 14 19.8875 14H17.85V17.0625C17.85 17.5781 17.6664 18.0195 17.2992 18.3867C16.932 18.7539 16.4906 18.9375 15.975 18.9375H8.0625C7.54687 18.9375 7.10546 18.7539 6.73828 18.3867C6.37109 18.0195 6.1875 17.5781 6.1875 17.0625ZM8.0625 17.0625H15.975V4.125H7.05L8.0625 5.45V17.0625ZM17.85 12.125H19.8875V7.0625H17.85V12.125ZM13.6125 5.0625C13.2132 5.0625 12.8738 5.20104 12.5943 5.47813C12.3148 5.75521 12.175 6.09167 12.175 6.4875V14.7C12.175 15.0958 12.3148 15.4323 12.5945 15.7094C12.8741 15.9865 13.2137 16.125 13.6132 16.125C14.0127 16.125 14.35 15.9865 14.625 15.7094C14.9 15.4323 15.0375 15.0958 15.0375 14.7V6.4875C15.0375 6.09167 14.899 5.75521 14.6219 5.47813C14.3448 5.20104 14.0083 5.0625 13.6125 5.0625ZM4.1875 21.75C3.92917 21.75 3.70833 21.6583 3.525 21.475C3.34167 21.2917 3.25 21.0708 3.25 20.8125C3.25 20.5542 3.34167 20.3333 3.525 20.15C3.70833 19.9667 3.92917 19.875 4.1875 19.875H19.8125C20.0708 19.875 20.2917 19.9667 20.475 20.15C20.6583 20.3333 20.75 20.5542 20.75 20.8125C20.75 21.0708 20.6583 21.2917 20.475 21.475C20.2917 21.6583 20.0708 21.75 19.8125 21.75H4.1875Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M6.1875 17.0625V6.1L4.425 3.75C4.19167 3.44167 4.16082 3.11458 4.33245 2.76875C4.50408 2.42292 4.78493 2.25 5.175 2.25H15.7625C16.3411 2.25 16.8336 2.45328 17.2402 2.85983C17.6467 3.26638 17.85 3.75893 17.85 4.3375V5.1875H19.8875C20.4031 5.1875 20.8445 5.37109 21.2117 5.73828C21.5789 6.10546 21.7625 6.54687 21.7625 7.0625V12.125C21.7625 12.6406 21.5789 13.082 21.2117 13.4492C20.8445 13.8164 20.4031 14 19.8875 14H17.85V17.0625C17.85 17.5781 17.6664 18.0195 17.2992 18.3867C16.932 18.7539 16.4906 18.9375 15.975 18.9375H8.0625C7.54687 18.9375 7.10546 18.7539 6.73828 18.3867C6.37109 18.0195 6.1875 17.5781 6.1875 17.0625ZM8.0625 17.0625H15.975V4.125H7.05L8.0625 5.45V17.0625ZM17.85 12.125H19.8875V7.0625H17.85V12.125ZM13.6125 5.0625C13.2132 5.0625 12.8738 5.20104 12.5943 5.47813C12.3148 5.75521 12.175 6.09167 12.175 6.4875V14.7C12.175 15.0958 12.3148 15.4323 12.5945 15.7094C12.8741 15.9865 13.2137 16.125 13.6132 16.125C14.0127 16.125 14.35 15.9865 14.625 15.7094C14.9 15.4323 15.0375 15.0958 15.0375 14.7V6.4875C15.0375 6.09167 14.899 5.75521 14.6219 5.47813C14.3448 5.20104 14.0083 5.0625 13.6125 5.0625ZM4.1875 21.75C3.92917 21.75 3.70833 21.6583 3.525 21.475C3.34167 21.2917 3.25 21.0708 3.25 20.8125C3.25 20.5542 3.34167 20.3333 3.525 20.15C3.70833 19.9667 3.92917 19.875 4.1875 19.875H19.8125C20.0708 19.875 20.2917 19.9667 20.475 20.15C20.6583 20.3333 20.75 20.5542 20.75 20.8125C20.75 21.0708 20.6583 21.2917 20.475 21.475C20.2917 21.6583 20.0708 21.75 19.8125 21.75H4.1875Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/KingBed.tsx b/components/Icons/KingBed.tsx
index d4df0f225..5e0f0615d 100644
--- a/components/Icons/KingBed.tsx
+++ b/components/Icons/KingBed.tsx
@@ -14,14 +14,11 @@ export default function KingBedIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <g id="bed king">
-        <path
-          clipRule="evenodd"
-          fillRule="evenodd"
-          id="Shape"
-          d="M43.4073 15.8263C44.9964 17.3421 46 19.4474 46 22.2263V22.3947V22.4789V30.9C46 31.7421 45.2473 32.5 44.3273 32.5H42.2364C41.3164 32.5 40.5636 31.7421 40.5636 30.9V27.1105H5.52V30.9C5.52 31.7421 4.76727 32.5 3.84727 32.5H1.67273C0.752727 32.5 0 31.7421 0 30.9V22.3947C0 20.2053 0.501818 18.5211 1.25455 17.0895V17.0053V1.34211C1.25455 0.921053 1.67273 0.5 2.09091 0.5H42.5709C43.0727 0.5 43.4073 0.836842 43.4073 1.34211V15.8263ZM1.67273 21.5526H44.3273C44.0764 18.1842 42.0691 16.1632 39.0582 14.8158C38.9745 14.8158 38.8909 14.8158 38.8073 14.7316C34.4582 13.0474 28.1018 13.0474 22.1636 13.0474C10.5382 13.0474 2.17455 13.7211 1.67273 21.5526ZM5.93818 13.3V11.9526C5.93818 6.81579 11.2909 6.22632 13.6327 6.22632C15.8909 6.22632 20.9927 6.73158 21.3273 11.4474C15.8909 11.4474 10.12 11.5316 5.93818 13.3ZM23 11.3632V11.4474C28.1018 11.4474 33.8727 11.5316 38.3891 13.0474V11.3632C38.3891 6.22632 33.0364 5.63684 30.6945 5.63684C28.3527 5.63684 23 6.22632 23 11.3632ZM41.7345 2.18421V14.4789C41.2327 14.1421 40.6473 13.8895 40.0618 13.6368V11.2789C40.0618 6.73158 36.5491 3.95263 30.6945 3.95263C26.3455 3.95263 23.2509 5.46842 21.9964 8.16316C20.5745 5.97368 17.7309 4.71053 13.7164 4.71053C7.86182 4.71053 4.34909 7.40526 4.34909 12.0368V14.1421C3.84727 14.4789 3.42909 14.8158 3.01091 15.1526V2.18421H41.7345ZM1.67273 30.9H3.84727V27.1105H1.67273V30.9ZM1.67273 25.5105V23.1526H44.3273V25.5105H1.67273ZM42.1527 27.1105V30.9H44.3273V27.1105H42.1527Z"
-        />
-      </g>
+      <path
+        clipRule="evenodd"
+        fillRule="evenodd"
+        d="M43.4073 15.8263C44.9964 17.3421 46 19.4474 46 22.2263V22.3947V22.4789V30.9C46 31.7421 45.2473 32.5 44.3273 32.5H42.2364C41.3164 32.5 40.5636 31.7421 40.5636 30.9V27.1105H5.52V30.9C5.52 31.7421 4.76727 32.5 3.84727 32.5H1.67273C0.752727 32.5 0 31.7421 0 30.9V22.3947C0 20.2053 0.501818 18.5211 1.25455 17.0895V17.0053V1.34211C1.25455 0.921053 1.67273 0.5 2.09091 0.5H42.5709C43.0727 0.5 43.4073 0.836842 43.4073 1.34211V15.8263ZM1.67273 21.5526H44.3273C44.0764 18.1842 42.0691 16.1632 39.0582 14.8158C38.9745 14.8158 38.8909 14.8158 38.8073 14.7316C34.4582 13.0474 28.1018 13.0474 22.1636 13.0474C10.5382 13.0474 2.17455 13.7211 1.67273 21.5526ZM5.93818 13.3V11.9526C5.93818 6.81579 11.2909 6.22632 13.6327 6.22632C15.8909 6.22632 20.9927 6.73158 21.3273 11.4474C15.8909 11.4474 10.12 11.5316 5.93818 13.3ZM23 11.3632V11.4474C28.1018 11.4474 33.8727 11.5316 38.3891 13.0474V11.3632C38.3891 6.22632 33.0364 5.63684 30.6945 5.63684C28.3527 5.63684 23 6.22632 23 11.3632ZM41.7345 2.18421V14.4789C41.2327 14.1421 40.6473 13.8895 40.0618 13.6368V11.2789C40.0618 6.73158 36.5491 3.95263 30.6945 3.95263C26.3455 3.95263 23.2509 5.46842 21.9964 8.16316C20.5745 5.97368 17.7309 4.71053 13.7164 4.71053C7.86182 4.71053 4.34909 7.40526 4.34909 12.0368V14.1421C3.84727 14.4789 3.42909 14.8158 3.01091 15.1526V2.18421H41.7345ZM1.67273 30.9H3.84727V27.1105H1.67273V30.9ZM1.67273 25.5105V23.1526H44.3273V25.5105H1.67273ZM42.1527 27.1105V30.9H44.3273V27.1105H42.1527Z"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Lamp.tsx b/components/Icons/Lamp.tsx
index bde8af3dd..785a09dce 100644
--- a/components/Icons/Lamp.tsx
+++ b/components/Icons/Lamp.tsx
@@ -14,23 +14,10 @@ export default function LampIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3441"
-        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_3441)">
-        <path
-          d="M12 18.9375C11.7416 18.9375 11.5208 18.8458 11.3375 18.6625C11.1541 18.4792 11.0625 18.2583 11.0625 18V10.9375H5.99997C5.68937 10.9375 5.44089 10.8125 5.25452 10.5625C5.06816 10.3125 5.02081 10.0333 5.11247 9.725L7.07497 3.375C7.20041 2.98437 7.42776 2.66796 7.75705 2.42578C8.08631 2.18359 8.45479 2.0625 8.86247 2.0625H15.1375C15.5452 2.0625 15.9136 2.18359 16.2429 2.42578C16.5722 2.66796 16.7995 2.98437 16.925 3.375L18.8875 9.725C18.9791 10.0333 18.9318 10.3125 18.7454 10.5625C18.5591 10.8125 18.3106 10.9375 18 10.9375H12.9375V18C12.9375 18.2583 12.8458 18.4792 12.6625 18.6625C12.4791 18.8458 12.2583 18.9375 12 18.9375ZM7.26247 9.0625H16.7375L15.15 3.9375H8.84997L7.26247 9.0625ZM8.99997 21.9375C8.74164 21.9375 8.52081 21.8458 8.33747 21.6625C8.15414 21.4792 8.06247 21.2583 8.06247 21C8.06247 20.7417 8.15414 20.5208 8.33747 20.3375C8.52081 20.1542 8.74164 20.0625 8.99997 20.0625H15C15.2583 20.0625 15.4791 20.1542 15.6625 20.3375C15.8458 20.5208 15.9375 20.7417 15.9375 21C15.9375 21.2583 15.8458 21.4792 15.6625 21.6625C15.4791 21.8458 15.2583 21.9375 15 21.9375H8.99997Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M12 18.9375C11.7416 18.9375 11.5208 18.8458 11.3375 18.6625C11.1541 18.4792 11.0625 18.2583 11.0625 18V10.9375H5.99997C5.68937 10.9375 5.44089 10.8125 5.25452 10.5625C5.06816 10.3125 5.02081 10.0333 5.11247 9.725L7.07497 3.375C7.20041 2.98437 7.42776 2.66796 7.75705 2.42578C8.08631 2.18359 8.45479 2.0625 8.86247 2.0625H15.1375C15.5452 2.0625 15.9136 2.18359 16.2429 2.42578C16.5722 2.66796 16.7995 2.98437 16.925 3.375L18.8875 9.725C18.9791 10.0333 18.9318 10.3125 18.7454 10.5625C18.5591 10.8125 18.3106 10.9375 18 10.9375H12.9375V18C12.9375 18.2583 12.8458 18.4792 12.6625 18.6625C12.4791 18.8458 12.2583 18.9375 12 18.9375ZM7.26247 9.0625H16.7375L15.15 3.9375H8.84997L7.26247 9.0625ZM8.99997 21.9375C8.74164 21.9375 8.52081 21.8458 8.33747 21.6625C8.15414 21.4792 8.06247 21.2583 8.06247 21C8.06247 20.7417 8.15414 20.5208 8.33747 20.3375C8.52081 20.1542 8.74164 20.0625 8.99997 20.0625H15C15.2583 20.0625 15.4791 20.1542 15.6625 20.3375C15.8458 20.5208 15.9375 20.7417 15.9375 21C15.9375 21.2583 15.8458 21.4792 15.6625 21.6625C15.4791 21.8458 15.2583 21.9375 15 21.9375H8.99997Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/LaundryMachine.tsx b/components/Icons/LaundryMachine.tsx
index b4225197d..85f0bbb17 100644
--- a/components/Icons/LaundryMachine.tsx
+++ b/components/Icons/LaundryMachine.tsx
@@ -18,23 +18,10 @@ export default function LaundryMachineIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3471"
-        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_3471)">
-        <path
-          d="M6.1001 21.75C5.58446 21.75 5.14306 21.5664 4.77587 21.1992C4.40869 20.832 4.2251 20.3906 4.2251 19.875V4.125C4.2251 3.60937 4.40869 3.16796 4.77587 2.80078C5.14306 2.43359 5.58446 2.25 6.1001 2.25H17.9001C18.4157 2.25 18.8571 2.43359 19.2243 2.80078C19.5915 3.16796 19.7751 3.60937 19.7751 4.125V19.875C19.7751 20.3906 19.5915 20.832 19.2243 21.1992C18.8571 21.5664 18.4157 21.75 17.9001 21.75H6.1001ZM6.1001 19.875H17.9001V4.125H6.1001V19.875ZM11.9999 18.825C13.3417 18.825 14.4855 18.3521 15.4313 17.4064C16.3772 16.4607 16.8501 15.317 16.8501 13.9752C16.8501 12.6334 16.3772 11.4896 15.4315 10.5437C14.4858 9.59792 13.3421 9.125 12.0003 9.125C10.6585 9.125 9.51468 9.59786 8.56885 10.5436C7.62301 11.4893 7.1501 12.633 7.1501 13.9748C7.1501 15.3166 7.62296 16.4604 8.56867 17.4062C9.51439 18.3521 10.6581 18.825 11.9999 18.825ZM12.0235 17.1C11.6162 17.1 11.223 17.0229 10.8438 16.8688C10.4647 16.7146 10.1251 16.4917 9.8251 16.2L14.2251 11.8C14.5251 12.0957 14.7501 12.4342 14.9001 12.8155C15.0501 13.1968 15.1251 13.5911 15.1251 13.9984C15.1251 14.86 14.8236 15.5923 14.2205 16.1954C13.6174 16.7985 12.8851 17.1 12.0235 17.1ZM8.07247 7.025C8.34089 7.025 8.56676 6.93421 8.7501 6.75262C8.93343 6.57106 9.0251 6.34606 9.0251 6.07762C9.0251 5.80921 8.93431 5.58333 8.75272 5.4C8.57116 5.21667 8.34616 5.125 8.07772 5.125C7.80931 5.125 7.58343 5.21579 7.4001 5.39738C7.21676 5.57894 7.1251 5.80394 7.1251 6.07238C7.1251 6.34079 7.21589 6.56667 7.39747 6.75C7.57904 6.93333 7.80404 7.025 8.07247 7.025ZM10.9975 7.025C11.2659 7.025 11.4918 6.93421 11.6751 6.75262C11.8584 6.57106 11.9501 6.34606 11.9501 6.07762C11.9501 5.80921 11.8593 5.58333 11.6777 5.4C11.4962 5.21667 11.2712 5.125 11.0027 5.125C10.7343 5.125 10.5084 5.21579 10.3251 5.39738C10.1418 5.57894 10.0501 5.80394 10.0501 6.07238C10.0501 6.34079 10.1409 6.56667 10.3225 6.75C10.504 6.93333 10.729 7.025 10.9975 7.025Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M6.1001 21.75C5.58446 21.75 5.14306 21.5664 4.77587 21.1992C4.40869 20.832 4.2251 20.3906 4.2251 19.875V4.125C4.2251 3.60937 4.40869 3.16796 4.77587 2.80078C5.14306 2.43359 5.58446 2.25 6.1001 2.25H17.9001C18.4157 2.25 18.8571 2.43359 19.2243 2.80078C19.5915 3.16796 19.7751 3.60937 19.7751 4.125V19.875C19.7751 20.3906 19.5915 20.832 19.2243 21.1992C18.8571 21.5664 18.4157 21.75 17.9001 21.75H6.1001ZM6.1001 19.875H17.9001V4.125H6.1001V19.875ZM11.9999 18.825C13.3417 18.825 14.4855 18.3521 15.4313 17.4064C16.3772 16.4607 16.8501 15.317 16.8501 13.9752C16.8501 12.6334 16.3772 11.4896 15.4315 10.5437C14.4858 9.59792 13.3421 9.125 12.0003 9.125C10.6585 9.125 9.51468 9.59786 8.56885 10.5436C7.62301 11.4893 7.1501 12.633 7.1501 13.9748C7.1501 15.3166 7.62296 16.4604 8.56867 17.4062C9.51439 18.3521 10.6581 18.825 11.9999 18.825ZM12.0235 17.1C11.6162 17.1 11.223 17.0229 10.8438 16.8688C10.4647 16.7146 10.1251 16.4917 9.8251 16.2L14.2251 11.8C14.5251 12.0957 14.7501 12.4342 14.9001 12.8155C15.0501 13.1968 15.1251 13.5911 15.1251 13.9984C15.1251 14.86 14.8236 15.5923 14.2205 16.1954C13.6174 16.7985 12.8851 17.1 12.0235 17.1ZM8.07247 7.025C8.34089 7.025 8.56676 6.93421 8.7501 6.75262C8.93343 6.57106 9.0251 6.34606 9.0251 6.07762C9.0251 5.80921 8.93431 5.58333 8.75272 5.4C8.57116 5.21667 8.34616 5.125 8.07772 5.125C7.80931 5.125 7.58343 5.21579 7.4001 5.39738C7.21676 5.57894 7.1251 5.80394 7.1251 6.07238C7.1251 6.34079 7.21589 6.56667 7.39747 6.75C7.57904 6.93333 7.80404 7.025 8.07247 7.025ZM10.9975 7.025C11.2659 7.025 11.4918 6.93421 11.6751 6.75262C11.8584 6.57106 11.9501 6.34606 11.9501 6.07762C11.9501 5.80921 11.8593 5.58333 11.6777 5.4C11.4962 5.21667 11.2712 5.125 11.0027 5.125C10.7343 5.125 10.5084 5.21579 10.3251 5.39738C10.1418 5.57894 10.0501 5.80394 10.0501 6.07238C10.0501 6.34079 10.1409 6.56667 10.3225 6.75C10.504 6.93333 10.729 7.025 10.9975 7.025Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/LocalBar.tsx b/components/Icons/LocalBar.tsx
index 7a5b3bb51..cd6b2f5dc 100644
--- a/components/Icons/LocalBar.tsx
+++ b/components/Icons/LocalBar.tsx
@@ -18,23 +18,10 @@ export default function LocalBarIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3510"
-        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_3510)">
-        <path
-          d="M11.0625 18.95V13.875L3.68755 5.56248C3.57088 5.42914 3.47713 5.28539 3.4063 5.13123C3.33547 4.97706 3.30005 4.81248 3.30005 4.63748C3.30005 4.23748 3.43963 3.90206 3.7188 3.63123C3.99797 3.36039 4.33755 3.22498 4.73755 3.22498H19.2625C19.6625 3.22498 20.0021 3.36039 20.2813 3.63123C20.5605 3.90206 20.7 4.23748 20.7 4.63748C20.7 4.81248 20.6646 4.97706 20.5938 5.13123C20.523 5.28539 20.4292 5.42914 20.3125 5.56248L12.9375 13.875V18.95H16.875C17.1334 18.95 17.3542 19.0416 17.5375 19.225C17.7209 19.4083 17.8125 19.6291 17.8125 19.8875C17.8125 20.1458 17.7209 20.3666 17.5375 20.55C17.3542 20.7333 17.1334 20.825 16.875 20.825H7.12505C6.86672 20.825 6.64588 20.7333 6.46255 20.55C6.27922 20.3666 6.18755 20.1458 6.18755 19.8875C6.18755 19.6291 6.27922 19.4083 6.46255 19.225C6.64588 19.0416 6.86672 18.95 7.12505 18.95H11.0625ZM7.52505 7.07498H16.475L18.25 5.09998H5.75005L7.52505 7.07498ZM12 12.075L14.8125 8.94998H9.18755L12 12.075Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M11.0625 18.95V13.875L3.68755 5.56248C3.57088 5.42914 3.47713 5.28539 3.4063 5.13123C3.33547 4.97706 3.30005 4.81248 3.30005 4.63748C3.30005 4.23748 3.43963 3.90206 3.7188 3.63123C3.99797 3.36039 4.33755 3.22498 4.73755 3.22498H19.2625C19.6625 3.22498 20.0021 3.36039 20.2813 3.63123C20.5605 3.90206 20.7 4.23748 20.7 4.63748C20.7 4.81248 20.6646 4.97706 20.5938 5.13123C20.523 5.28539 20.4292 5.42914 20.3125 5.56248L12.9375 13.875V18.95H16.875C17.1334 18.95 17.3542 19.0416 17.5375 19.225C17.7209 19.4083 17.8125 19.6291 17.8125 19.8875C17.8125 20.1458 17.7209 20.3666 17.5375 20.55C17.3542 20.7333 17.1334 20.825 16.875 20.825H7.12505C6.86672 20.825 6.64588 20.7333 6.46255 20.55C6.27922 20.3666 6.18755 20.1458 6.18755 19.8875C6.18755 19.6291 6.27922 19.4083 6.46255 19.225C6.64588 19.0416 6.86672 18.95 7.12505 18.95H11.0625ZM7.52505 7.07498H16.475L18.25 5.09998H5.75005L7.52505 7.07498ZM12 12.075L14.8125 8.94998H9.18755L12 12.075Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Location.tsx b/components/Icons/Location.tsx
index b5d1d0e64..1b4eba611 100644
--- a/components/Icons/Location.tsx
+++ b/components/Icons/Location.tsx
@@ -18,23 +18,10 @@ export default function LocationIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="24"
-        id="mask0_4077_9668"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="24"
-        x="0"
-        y="0"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4077_9668)">
-        <path
-          d="M12 19.2752C13.9917 17.4169 15.4688 15.7356 16.4313 14.2314C17.3938 12.7273 17.875 11.396 17.875 10.2377C17.875 8.44603 17.3077 6.98145 16.1732 5.84395C15.0386 4.70645 13.6469 4.1377 11.9982 4.1377C10.3494 4.1377 8.95833 4.70645 7.825 5.84395C6.69167 6.98145 6.125 8.44603 6.125 10.2377C6.125 11.396 6.60625 12.7273 7.56875 14.2314C8.53125 15.7356 10.0083 17.4169 12 19.2752ZM12 21.1002C11.775 21.1002 11.5533 21.0606 11.3349 20.9814C11.1166 20.9023 10.9216 20.7835 10.75 20.6252C9.88333 19.8335 9.05833 19.0064 8.275 18.1439C7.49167 17.2814 6.80208 16.4064 6.20625 15.5189C5.61042 14.6314 5.13542 13.7419 4.78125 12.8502C4.42708 11.9585 4.25 11.0877 4.25 10.2377C4.25 7.8063 5.03125 5.86928 6.59375 4.42665C8.15625 2.98401 9.95833 2.2627 12 2.2627C14.0417 2.2627 15.8438 2.98401 17.4062 4.42665C18.9688 5.86928 19.75 7.8063 19.75 10.2377C19.75 11.0877 19.5729 11.9585 19.2188 12.8502C18.8646 13.7419 18.3896 14.6314 17.7937 15.5189C17.1979 16.4064 16.5083 17.2814 15.725 18.1439C14.9417 19.0064 14.1167 19.8335 13.25 20.6252C13.0784 20.7835 12.8834 20.9023 12.6651 20.9814C12.4467 21.0606 12.225 21.1002 12 21.1002ZM12.0006 11.9377C12.5335 11.9377 12.9896 11.7479 13.3688 11.3684C13.7479 10.9889 13.9375 10.5326 13.9375 9.99965C13.9375 9.46668 13.7477 9.01061 13.3682 8.63145C12.9887 8.25228 12.5324 8.0627 11.9995 8.0627C11.4665 8.0627 11.0104 8.25246 10.6312 8.63199C10.2521 9.01153 10.0625 9.46778 10.0625 10.0007C10.0625 10.5337 10.2523 10.9898 10.6318 11.3689C11.0113 11.7481 11.4676 11.9377 12.0006 11.9377Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M12 19.2752C13.9917 17.4169 15.4688 15.7356 16.4313 14.2314C17.3938 12.7273 17.875 11.396 17.875 10.2377C17.875 8.44603 17.3077 6.98145 16.1732 5.84395C15.0386 4.70645 13.6469 4.1377 11.9982 4.1377C10.3494 4.1377 8.95833 4.70645 7.825 5.84395C6.69167 6.98145 6.125 8.44603 6.125 10.2377C6.125 11.396 6.60625 12.7273 7.56875 14.2314C8.53125 15.7356 10.0083 17.4169 12 19.2752ZM12 21.1002C11.775 21.1002 11.5533 21.0606 11.3349 20.9814C11.1166 20.9023 10.9216 20.7835 10.75 20.6252C9.88333 19.8335 9.05833 19.0064 8.275 18.1439C7.49167 17.2814 6.80208 16.4064 6.20625 15.5189C5.61042 14.6314 5.13542 13.7419 4.78125 12.8502C4.42708 11.9585 4.25 11.0877 4.25 10.2377C4.25 7.8063 5.03125 5.86928 6.59375 4.42665C8.15625 2.98401 9.95833 2.2627 12 2.2627C14.0417 2.2627 15.8438 2.98401 17.4062 4.42665C18.9688 5.86928 19.75 7.8063 19.75 10.2377C19.75 11.0877 19.5729 11.9585 19.2188 12.8502C18.8646 13.7419 18.3896 14.6314 17.7937 15.5189C17.1979 16.4064 16.5083 17.2814 15.725 18.1439C14.9417 19.0064 14.1167 19.8335 13.25 20.6252C13.0784 20.7835 12.8834 20.9023 12.6651 20.9814C12.4467 21.0606 12.225 21.1002 12 21.1002ZM12.0006 11.9377C12.5335 11.9377 12.9896 11.7479 13.3688 11.3684C13.7479 10.9889 13.9375 10.5326 13.9375 9.99965C13.9375 9.46668 13.7477 9.01061 13.3682 8.63145C12.9887 8.25228 12.5324 8.0627 11.9995 8.0627C11.4665 8.0627 11.0104 8.25246 10.6312 8.63199C10.2521 9.01153 10.0625 9.46778 10.0625 10.0007C10.0625 10.5337 10.2523 10.9898 10.6318 11.3689C11.0113 11.7481 11.4676 11.9377 12.0006 11.9377Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Lock.tsx b/components/Icons/Lock.tsx
index ce38caa46..5a29f5f3b 100644
--- a/components/Icons/Lock.tsx
+++ b/components/Icons/Lock.tsx
@@ -14,23 +14,10 @@ export default function LockIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="24"
-        id="mask0_4077_9699"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="24"
-        x="0"
-        y="0"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4077_9699)">
-        <path
-          d="M6.10156 21.75C5.58593 21.75 5.14452 21.5664 4.77734 21.1992C4.41015 20.832 4.22656 20.3906 4.22656 19.875V10.025C4.22656 9.50937 4.41015 9.06796 4.77734 8.70078C5.14452 8.33359 5.58593 8.15 6.10156 8.15H7.17656V6.20522C7.17656 4.86007 7.64531 3.71875 8.58281 2.78125C9.52031 1.84375 10.6599 1.375 12.0016 1.375C13.3432 1.375 14.4828 1.84375 15.4203 2.78125C16.3578 3.71875 16.8266 4.86007 16.8266 6.20522V8.15H17.9016C18.4172 8.15 18.8586 8.33359 19.2258 8.70078C19.593 9.06796 19.7766 9.50937 19.7766 10.025V19.875C19.7766 20.3906 19.593 20.832 19.2258 21.1992C18.8586 21.5664 18.4172 21.75 17.9016 21.75H6.10156ZM6.10156 19.875H17.9016V10.025H6.10156V19.875ZM12.0016 16.875C12.5309 16.875 12.9841 16.6865 13.3611 16.3095C13.7381 15.9326 13.9266 15.4794 13.9266 14.95C13.9266 14.4206 13.7381 13.9674 13.3611 13.5905C12.9841 13.2135 12.5309 13.025 12.0016 13.025C11.4722 13.025 11.019 13.2135 10.642 13.5905C10.2651 13.9674 10.0766 14.4206 10.0766 14.95C10.0766 15.4794 10.2651 15.9326 10.642 16.3095C11.019 16.6865 11.4722 16.875 12.0016 16.875ZM9.05156 8.15H14.9516V6.19615C14.9516 5.38205 14.665 4.6875 14.092 4.1125C13.519 3.5375 12.8231 3.25 12.0045 3.25C11.1859 3.25 10.4891 3.53681 9.91406 4.11042C9.33906 4.68402 9.05156 5.38055 9.05156 6.2V8.15Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M6.10156 21.75C5.58593 21.75 5.14452 21.5664 4.77734 21.1992C4.41015 20.832 4.22656 20.3906 4.22656 19.875V10.025C4.22656 9.50937 4.41015 9.06796 4.77734 8.70078C5.14452 8.33359 5.58593 8.15 6.10156 8.15H7.17656V6.20522C7.17656 4.86007 7.64531 3.71875 8.58281 2.78125C9.52031 1.84375 10.6599 1.375 12.0016 1.375C13.3432 1.375 14.4828 1.84375 15.4203 2.78125C16.3578 3.71875 16.8266 4.86007 16.8266 6.20522V8.15H17.9016C18.4172 8.15 18.8586 8.33359 19.2258 8.70078C19.593 9.06796 19.7766 9.50937 19.7766 10.025V19.875C19.7766 20.3906 19.593 20.832 19.2258 21.1992C18.8586 21.5664 18.4172 21.75 17.9016 21.75H6.10156ZM6.10156 19.875H17.9016V10.025H6.10156V19.875ZM12.0016 16.875C12.5309 16.875 12.9841 16.6865 13.3611 16.3095C13.7381 15.9326 13.9266 15.4794 13.9266 14.95C13.9266 14.4206 13.7381 13.9674 13.3611 13.5905C12.9841 13.2135 12.5309 13.025 12.0016 13.025C11.4722 13.025 11.019 13.2135 10.642 13.5905C10.2651 13.9674 10.0766 14.4206 10.0766 14.95C10.0766 15.4794 10.2651 15.9326 10.642 16.3095C11.019 16.6865 11.4722 16.875 12.0016 16.875ZM9.05156 8.15H14.9516V6.19615C14.9516 5.38205 14.665 4.6875 14.092 4.1125C13.519 3.5375 12.8231 3.25 12.0045 3.25C11.1859 3.25 10.4891 3.53681 9.91406 4.11042C9.33906 4.68402 9.05156 5.38055 9.05156 6.2V8.15Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Map.tsx b/components/Icons/Map.tsx
index 9571db13b..e8b1b5727 100644
--- a/components/Icons/Map.tsx
+++ b/components/Icons/Map.tsx
@@ -14,23 +14,10 @@ export default function MapIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_4031_935"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="25"
-        height="25"
-      >
-        <rect x="0.5" y="0.194336" width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4031_935)">
-        <path
-          d="M15.5 21.1943L9.5 19.0943L4.85 20.8943C4.51667 21.0277 4.20833 20.9902 3.925 20.7818C3.64167 20.5735 3.5 20.2943 3.5 19.9443V5.94434C3.5 5.72767 3.5625 5.536 3.6875 5.36934C3.8125 5.20267 3.98333 5.07767 4.2 4.99434L9.5 3.19434L15.5 5.29434L20.15 3.49434C20.4833 3.361 20.7917 3.3985 21.075 3.60684C21.3583 3.81517 21.5 4.09434 21.5 4.44434V18.4443C21.5 18.661 21.4375 18.8527 21.3125 19.0193C21.1875 19.186 21.0167 19.311 20.8 19.3943L15.5 21.1943ZM14.5 18.7443V7.04434L10.5 5.64434V17.3443L14.5 18.7443ZM16.5 18.7443L19.5 17.7443V5.89434L16.5 7.04434V18.7443ZM5.5 18.4943L8.5 17.3443V5.64434L5.5 6.64434V18.4943Z"
-          fill="white"
-        />
-      </g>
+      <path
+        d="M15.5 21.1943L9.5 19.0943L4.85 20.8943C4.51667 21.0277 4.20833 20.9902 3.925 20.7818C3.64167 20.5735 3.5 20.2943 3.5 19.9443V5.94434C3.5 5.72767 3.5625 5.536 3.6875 5.36934C3.8125 5.20267 3.98333 5.07767 4.2 4.99434L9.5 3.19434L15.5 5.29434L20.15 3.49434C20.4833 3.361 20.7917 3.3985 21.075 3.60684C21.3583 3.81517 21.5 4.09434 21.5 4.44434V18.4443C21.5 18.661 21.4375 18.8527 21.3125 19.0193C21.1875 19.186 21.0167 19.311 20.8 19.3943L15.5 21.1943ZM14.5 18.7443V7.04434L10.5 5.64434V17.3443L14.5 18.7443ZM16.5 18.7443L19.5 17.7443V5.89434L16.5 7.04434V18.7443ZM5.5 18.4943L8.5 17.3443V5.64434L5.5 6.64434V18.4943Z"
+        fill="white"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Museum.tsx b/components/Icons/Museum.tsx
index d9a774908..5cbada97a 100644
--- a/components/Icons/Museum.tsx
+++ b/components/Icons/Museum.tsx
@@ -14,23 +14,10 @@ export default function MuseumIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_3958_408"
-        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_3958_408)">
-        <path
-          d="M2.5 21V19.1H4.4V10.55H2.5V8.65L12 2L21.5 8.65V10.55H19.6V19.1H21.5V21H2.5ZM8.2 17.2H10.1V13.4L12 16.25L13.9 13.4V17.2H15.8V10.55H13.9L12 13.4L10.1 10.55H8.2V17.2ZM17.7 19.1V8.3175L12 4.3275L6.3 8.3175V19.1H17.7Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M2.5 21V19.1H4.4V10.55H2.5V8.65L12 2L21.5 8.65V10.55H19.6V19.1H21.5V21H2.5ZM8.2 17.2H10.1V13.4L12 16.25L13.9 13.4V17.2H15.8V10.55H13.9L12 13.4L10.1 10.55H8.2V17.2ZM17.7 19.1V8.3175L12 4.3275L6.3 8.3175V19.1H17.7Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Nature.tsx b/components/Icons/Nature.tsx
index 4c48c377f..592620ab9 100644
--- a/components/Icons/Nature.tsx
+++ b/components/Icons/Nature.tsx
@@ -14,23 +14,10 @@ export default function NatureIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_4039_3271"
-        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_3271)">
-        <path
-          d="M5 22V20H11V16H9C7.61667 16 6.4375 15.5125 5.4625 14.5375C4.4875 13.5625 4 12.3833 4 11C4 10 4.275 9.07917 4.825 8.2375C5.375 7.39583 6.11667 6.78333 7.05 6.4C7.2 5.15 7.74583 4.10417 8.6875 3.2625C9.62917 2.42083 10.7333 2 12 2C13.2667 2 14.3708 2.42083 15.3125 3.2625C16.2542 4.10417 16.8 5.15 16.95 6.4C17.8833 6.78333 18.625 7.39583 19.175 8.2375C19.725 9.07917 20 10 20 11C20 12.3833 19.5125 13.5625 18.5375 14.5375C17.5625 15.5125 16.3833 16 15 16H13V20H19V22H5ZM9 14H15C15.8333 14 16.5417 13.7083 17.125 13.125C17.7083 12.5417 18 11.8333 18 11C18 10.4 17.8292 9.85 17.4875 9.35C17.1458 8.85 16.7 8.48333 16.15 8.25L15.1 7.8L14.95 6.65C14.85 5.9 14.5208 5.27083 13.9625 4.7625C13.4042 4.25417 12.75 4 12 4C11.25 4 10.5958 4.25417 10.0375 4.7625C9.47917 5.27083 9.15 5.9 9.05 6.65L8.9 7.8L7.85 8.25C7.3 8.48333 6.85417 8.85 6.5125 9.35C6.17083 9.85 6 10.4 6 11C6 11.8333 6.29167 12.5417 6.875 13.125C7.45833 13.7083 8.16667 14 9 14Z"
-          fill="#1C1B1F"
-        />
-      </g>
+      <path
+        d="M5 22V20H11V16H9C7.61667 16 6.4375 15.5125 5.4625 14.5375C4.4875 13.5625 4 12.3833 4 11C4 10 4.275 9.07917 4.825 8.2375C5.375 7.39583 6.11667 6.78333 7.05 6.4C7.2 5.15 7.74583 4.10417 8.6875 3.2625C9.62917 2.42083 10.7333 2 12 2C13.2667 2 14.3708 2.42083 15.3125 3.2625C16.2542 4.10417 16.8 5.15 16.95 6.4C17.8833 6.78333 18.625 7.39583 19.175 8.2375C19.725 9.07917 20 10 20 11C20 12.3833 19.5125 13.5625 18.5375 14.5375C17.5625 15.5125 16.3833 16 15 16H13V20H19V22H5ZM9 14H15C15.8333 14 16.5417 13.7083 17.125 13.125C17.7083 12.5417 18 11.8333 18 11C18 10.4 17.8292 9.85 17.4875 9.35C17.1458 8.85 16.7 8.48333 16.15 8.25L15.1 7.8L14.95 6.65C14.85 5.9 14.5208 5.27083 13.9625 4.7625C13.4042 4.25417 12.75 4 12 4C11.25 4 10.5958 4.25417 10.0375 4.7625C9.47917 5.27083 9.15 5.9 9.05 6.65L8.9 7.8L7.85 8.25C7.3 8.48333 6.85417 8.85 6.5125 9.35C6.17083 9.85 6 10.4 6 11C6 11.8333 6.29167 12.5417 6.875 13.125C7.45833 13.7083 8.16667 14 9 14Z"
+        fill="#1C1B1F"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Nightlife.tsx b/components/Icons/Nightlife.tsx
index 093099cb9..817f2ed5d 100644
--- a/components/Icons/Nightlife.tsx
+++ b/components/Icons/Nightlife.tsx
@@ -18,23 +18,10 @@ export default function NightlifeIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3488"
-        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_3488)">
-        <path
-          d="M7.06249 17.975V13.9L2.22499 6.64995C2.00833 6.34162 1.99166 6.02287 2.17499 5.6937C2.35833 5.36453 2.63749 5.19995 3.01249 5.19995H12.9875C13.3625 5.19995 13.6417 5.36453 13.825 5.6937C14.0083 6.02287 13.9917 6.34162 13.775 6.64995L8.93749 13.9V17.975H9.97499C10.2333 17.975 10.4542 18.0666 10.6375 18.25C10.8208 18.4333 10.9125 18.6541 10.9125 18.9125C10.9125 19.1708 10.8208 19.3916 10.6375 19.575C10.4542 19.7583 10.2333 19.85 9.97499 19.85H6.02499C5.76666 19.85 5.54583 19.7583 5.36249 19.575C5.17916 19.3916 5.08749 19.1708 5.08749 18.9125C5.08749 18.6541 5.17916 18.4333 5.36249 18.25C5.54583 18.0666 5.76666 17.975 6.02499 17.975H7.06249ZM5.93749 9.04995H10.0875L11.4625 7.07495H4.56249L5.93749 9.04995ZM15.8625 19.85C15.0542 19.85 14.3646 19.5645 13.7937 18.9937C13.2229 18.4229 12.9375 17.7333 12.9375 16.925C12.9375 16.1166 13.2229 15.427 13.7937 14.8562C14.3646 14.2854 15.0542 14 15.8625 14C16.0458 14 16.225 14.0145 16.4 14.0437C16.575 14.0729 16.7458 14.1333 16.9125 14.225V6.13745C16.9125 5.87912 17.0042 5.65828 17.1875 5.47495C17.3708 5.29162 17.5917 5.19995 17.85 5.19995H20.3125C20.7125 5.19995 21.05 5.33745 21.325 5.61245C21.6 5.88745 21.7375 6.22495 21.7375 6.62495C21.7375 7.02495 21.6 7.36245 21.325 7.63745C21.05 7.91245 20.7125 8.04995 20.3125 8.04995H18.7875V16.925C18.7875 17.7333 18.5021 18.4229 17.9312 18.9937C17.3604 19.5645 16.6708 19.85 15.8625 19.85Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M7.06249 17.975V13.9L2.22499 6.64995C2.00833 6.34162 1.99166 6.02287 2.17499 5.6937C2.35833 5.36453 2.63749 5.19995 3.01249 5.19995H12.9875C13.3625 5.19995 13.6417 5.36453 13.825 5.6937C14.0083 6.02287 13.9917 6.34162 13.775 6.64995L8.93749 13.9V17.975H9.97499C10.2333 17.975 10.4542 18.0666 10.6375 18.25C10.8208 18.4333 10.9125 18.6541 10.9125 18.9125C10.9125 19.1708 10.8208 19.3916 10.6375 19.575C10.4542 19.7583 10.2333 19.85 9.97499 19.85H6.02499C5.76666 19.85 5.54583 19.7583 5.36249 19.575C5.17916 19.3916 5.08749 19.1708 5.08749 18.9125C5.08749 18.6541 5.17916 18.4333 5.36249 18.25C5.54583 18.0666 5.76666 17.975 6.02499 17.975H7.06249ZM5.93749 9.04995H10.0875L11.4625 7.07495H4.56249L5.93749 9.04995ZM15.8625 19.85C15.0542 19.85 14.3646 19.5645 13.7937 18.9937C13.2229 18.4229 12.9375 17.7333 12.9375 16.925C12.9375 16.1166 13.2229 15.427 13.7937 14.8562C14.3646 14.2854 15.0542 14 15.8625 14C16.0458 14 16.225 14.0145 16.4 14.0437C16.575 14.0729 16.7458 14.1333 16.9125 14.225V6.13745C16.9125 5.87912 17.0042 5.65828 17.1875 5.47495C17.3708 5.29162 17.5917 5.19995 17.85 5.19995H20.3125C20.7125 5.19995 21.05 5.33745 21.325 5.61245C21.6 5.88745 21.7375 6.22495 21.7375 6.62495C21.7375 7.02495 21.6 7.36245 21.325 7.63745C21.05 7.91245 20.7125 8.04995 20.3125 8.04995H18.7875V16.925C18.7875 17.7333 18.5021 18.4229 17.9312 18.9937C17.3604 19.5645 16.6708 19.85 15.8625 19.85Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/NoBreakfast.tsx b/components/Icons/NoBreakfast.tsx
index c09af6616..063b5defe 100644
--- a/components/Icons/NoBreakfast.tsx
+++ b/components/Icons/NoBreakfast.tsx
@@ -18,23 +18,10 @@ export default function NoBreakfastIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        id="mask0_5171_21315"
-        style={{ maskType: "alpha" }}
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="32"
-        height="33"
-      >
-        <rect y="0.5" width="32" height="32" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_5171_21315)">
-        <path
-          d="M28.4824 25.3833L26.1824 23.0833L27.4991 10H15.0324L14.8991 8.9C14.8546 8.52223 14.9546 8.19445 15.1991 7.91667C15.4435 7.63889 15.7546 7.5 16.1324 7.5H21.2324V3.48334C21.2324 3.13889 21.3546 2.84445 21.5991 2.6C21.8435 2.35556 22.138 2.23334 22.4824 2.23334C22.8269 2.23334 23.1213 2.35556 23.3658 2.6C23.6102 2.84445 23.7324 3.13889 23.7324 3.48334V7.5H28.8824C29.2602 7.5 29.5741 7.63334 29.8241 7.9C30.0741 8.16667 30.1769 8.48889 30.1324 8.86667L28.4824 25.3833ZM26.3324 30.35L2.18242 6.21667C1.92687 5.96111 1.79909 5.66389 1.79909 5.325C1.79909 4.98612 1.92687 4.68889 2.18242 4.43334C2.43798 4.17778 2.7352 4.05 3.07409 4.05C3.41298 4.05 3.7102 4.17778 3.96576 4.43334L28.1158 28.5833C28.3713 28.8389 28.4991 29.1333 28.4991 29.4667C28.4991 29.8 28.3713 30.0944 28.1158 30.35C27.8602 30.6056 27.563 30.7333 27.2241 30.7333C26.8852 30.7333 26.588 30.6056 26.3324 30.35ZM2.98242 25.75C2.63798 25.75 2.34353 25.6278 2.09909 25.3833C1.85464 25.1389 1.73242 24.8444 1.73242 24.5C1.73242 24.1556 1.85464 23.8611 2.09909 23.6167C2.34353 23.3722 2.63798 23.25 2.98242 23.25H19.9491C20.2935 23.25 20.588 23.3722 20.8324 23.6167C21.0769 23.8611 21.1991 24.1556 21.1991 24.5C21.1991 24.8444 21.0769 25.1389 20.8324 25.3833C20.588 25.6278 20.2935 25.75 19.9491 25.75H2.98242ZM2.98242 30.8333C2.63798 30.8333 2.34353 30.7111 2.09909 30.4667C1.85464 30.2222 1.73242 29.9278 1.73242 29.5833C1.73242 29.2389 1.85464 28.9444 2.09909 28.7C2.34353 28.4556 2.63798 28.3333 2.98242 28.3333H19.9491C20.2935 28.3333 20.588 28.4556 20.8324 28.7C21.0769 28.9444 21.1991 29.2389 21.1991 29.5833C21.1991 29.9278 21.0769 30.2222 20.8324 30.4667C20.588 30.7111 20.2935 30.8333 19.9491 30.8333H2.98242ZM12.7491 13.2167V15.7167C12.538 15.6944 12.3241 15.675 12.1074 15.6583C11.8908 15.6417 11.6769 15.6333 11.4658 15.6333C10.1546 15.6333 8.91853 15.8444 7.75742 16.2667C6.59631 16.6889 5.69909 17.3333 5.06575 18.2H17.7324L20.2324 20.7H3.26576C2.86576 20.7 2.54076 20.55 2.29076 20.25C2.04076 19.95 1.95464 19.6 2.03242 19.2C2.25464 18.1111 2.68242 17.1806 3.31576 16.4083C3.94909 15.6361 4.69909 15.0056 5.56575 14.5167C6.43242 14.0278 7.37964 13.675 8.40742 13.4583C9.4352 13.2417 10.4546 13.1333 11.4658 13.1333C11.6769 13.1333 11.8908 13.1417 12.1074 13.1583C12.3241 13.175 12.538 13.1944 12.7491 13.2167Z"
-          fill="#787472"
-        />
-      </g>
+      <path
+        d="M28.4824 25.3833L26.1824 23.0833L27.4991 10H15.0324L14.8991 8.9C14.8546 8.52223 14.9546 8.19445 15.1991 7.91667C15.4435 7.63889 15.7546 7.5 16.1324 7.5H21.2324V3.48334C21.2324 3.13889 21.3546 2.84445 21.5991 2.6C21.8435 2.35556 22.138 2.23334 22.4824 2.23334C22.8269 2.23334 23.1213 2.35556 23.3658 2.6C23.6102 2.84445 23.7324 3.13889 23.7324 3.48334V7.5H28.8824C29.2602 7.5 29.5741 7.63334 29.8241 7.9C30.0741 8.16667 30.1769 8.48889 30.1324 8.86667L28.4824 25.3833ZM26.3324 30.35L2.18242 6.21667C1.92687 5.96111 1.79909 5.66389 1.79909 5.325C1.79909 4.98612 1.92687 4.68889 2.18242 4.43334C2.43798 4.17778 2.7352 4.05 3.07409 4.05C3.41298 4.05 3.7102 4.17778 3.96576 4.43334L28.1158 28.5833C28.3713 28.8389 28.4991 29.1333 28.4991 29.4667C28.4991 29.8 28.3713 30.0944 28.1158 30.35C27.8602 30.6056 27.563 30.7333 27.2241 30.7333C26.8852 30.7333 26.588 30.6056 26.3324 30.35ZM2.98242 25.75C2.63798 25.75 2.34353 25.6278 2.09909 25.3833C1.85464 25.1389 1.73242 24.8444 1.73242 24.5C1.73242 24.1556 1.85464 23.8611 2.09909 23.6167C2.34353 23.3722 2.63798 23.25 2.98242 23.25H19.9491C20.2935 23.25 20.588 23.3722 20.8324 23.6167C21.0769 23.8611 21.1991 24.1556 21.1991 24.5C21.1991 24.8444 21.0769 25.1389 20.8324 25.3833C20.588 25.6278 20.2935 25.75 19.9491 25.75H2.98242ZM2.98242 30.8333C2.63798 30.8333 2.34353 30.7111 2.09909 30.4667C1.85464 30.2222 1.73242 29.9278 1.73242 29.5833C1.73242 29.2389 1.85464 28.9444 2.09909 28.7C2.34353 28.4556 2.63798 28.3333 2.98242 28.3333H19.9491C20.2935 28.3333 20.588 28.4556 20.8324 28.7C21.0769 28.9444 21.1991 29.2389 21.1991 29.5833C21.1991 29.9278 21.0769 30.2222 20.8324 30.4667C20.588 30.7111 20.2935 30.8333 19.9491 30.8333H2.98242ZM12.7491 13.2167V15.7167C12.538 15.6944 12.3241 15.675 12.1074 15.6583C11.8908 15.6417 11.6769 15.6333 11.4658 15.6333C10.1546 15.6333 8.91853 15.8444 7.75742 16.2667C6.59631 16.6889 5.69909 17.3333 5.06575 18.2H17.7324L20.2324 20.7H3.26576C2.86576 20.7 2.54076 20.55 2.29076 20.25C2.04076 19.95 1.95464 19.6 2.03242 19.2C2.25464 18.1111 2.68242 17.1806 3.31576 16.4083C3.94909 15.6361 4.69909 15.0056 5.56575 14.5167C6.43242 14.0278 7.37964 13.675 8.40742 13.4583C9.4352 13.2417 10.4546 13.1333 11.4658 13.1333C11.6769 13.1333 11.8908 13.1417 12.1074 13.1583C12.3241 13.175 12.538 13.1944 12.7491 13.2167Z"
+        fill="#787472"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/NoSmoking.tsx b/components/Icons/NoSmoking.tsx
index bdaa7d3f3..9ca2be0de 100644
--- a/components/Icons/NoSmoking.tsx
+++ b/components/Icons/NoSmoking.tsx
@@ -18,23 +18,10 @@ export default function NoSmokingIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3437"
-        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_3437)">
-        <path
-          d="M3.6999 15.825C3.31795 15.825 2.9933 15.6912 2.72595 15.4236C2.45859 15.1559 2.3249 14.8309 2.3249 14.4486C2.3249 14.0662 2.45859 13.7417 2.72595 13.475C2.9933 13.2084 3.31795 13.075 3.6999 13.075H10.5499L1.7749 4.30005L3.0999 3.00005L21.0999 21L19.7999 22.325L13.2999 15.825H3.6999ZM18.5889 13.075C18.7879 13.075 18.952 13.14 19.0812 13.2698C19.2103 13.3997 19.2749 13.5639 19.2749 13.7625V15.1375C19.2749 15.3459 19.2136 15.5125 19.091 15.6375C18.9684 15.7625 18.8172 15.825 18.6374 15.825H18.5749L17.8999 15.15V13.7625C17.8999 13.5639 17.965 13.3997 18.0951 13.2698C18.2252 13.14 18.3898 13.075 18.5889 13.075ZM20.9639 13.075C21.1629 13.075 21.327 13.14 21.4562 13.27C21.5853 13.4 21.6499 13.5644 21.6499 13.7631V15.1394C21.6499 15.3382 21.5848 15.5021 21.4547 15.6313C21.3246 15.7605 21.16 15.825 20.961 15.825C20.7619 15.825 20.5978 15.7601 20.4687 15.6301C20.3395 15.5001 20.2749 15.3357 20.2749 15.1369V13.7607C20.2749 13.5619 20.34 13.398 20.4701 13.2688C20.6002 13.1396 20.7648 13.075 20.9639 13.075ZM15.8249 13.075H16.2374C16.436 13.075 16.6003 13.14 16.7301 13.2698C16.86 13.3997 16.9249 13.5639 16.9249 13.7625V14.175L15.8249 13.075ZM18.586 12.025C18.3869 12.025 18.2228 11.9601 18.0937 11.8302C17.9645 11.7004 17.8999 11.5362 17.8999 11.3375V10.75C17.8999 10.125 17.7132 9.63963 17.3397 9.2938C16.9662 8.94797 16.5196 8.77505 15.9999 8.77505H14.4499C13.5582 8.77505 12.8062 8.4646 12.1937 7.8437C11.5812 7.22281 11.2749 6.4666 11.2749 5.57505C11.2749 4.69172 11.5812 3.93755 12.1937 3.31255C12.8062 2.68755 13.5582 2.37505 14.4499 2.37505C14.6485 2.37505 14.8128 2.44012 14.9426 2.57025C15.0725 2.70038 15.1374 2.86497 15.1374 3.064C15.1374 3.26303 15.0725 3.42713 14.9426 3.5563C14.8128 3.68547 14.6485 3.75005 14.4499 3.75005C13.9582 3.75005 13.5353 3.92505 13.1812 4.27505C12.827 4.62505 12.6499 5.05838 12.6499 5.57505C12.6499 6.09172 12.827 6.52505 13.1812 6.87505C13.5353 7.22505 13.9582 7.40005 14.4499 7.40005H15.9999C16.8916 7.40005 17.6603 7.69172 18.3062 8.27505C18.952 8.85838 19.2749 9.58338 19.2749 10.45V11.3375C19.2749 11.5362 19.2098 11.7004 19.0797 11.8302C18.9496 11.9601 18.785 12.025 18.586 12.025ZM20.961 12.025C20.7619 12.025 20.5978 11.9601 20.4687 11.8302C20.3395 11.7004 20.2749 11.5362 20.2749 11.3375V9.82505C20.2749 8.73338 19.8964 7.80213 19.1393 7.0313C18.3822 6.26047 17.4441 5.87505 16.3249 5.87505C16.1263 5.87505 15.9621 5.80998 15.8322 5.67985C15.7023 5.54972 15.6374 5.38513 15.6374 5.1861C15.6374 4.98707 15.7023 4.82297 15.8322 4.6938C15.9621 4.56463 16.1263 4.50005 16.3249 4.50005C16.8182 4.50005 17.2456 4.31919 17.6073 3.95747C17.969 3.59577 18.1499 3.1683 18.1499 2.67505C18.1499 2.47643 18.215 2.3122 18.3451 2.18235C18.4752 2.05248 18.6398 1.98755 18.8389 1.98755C19.0379 1.98755 19.202 2.05248 19.3312 2.18235C19.4603 2.3122 19.5249 2.47643 19.5249 2.67505C19.5249 3.14172 19.4332 3.5688 19.2499 3.9563C19.0666 4.3438 18.8249 4.68972 18.5249 4.99407C19.4332 5.38972 20.1812 6.02088 20.7687 6.88755C21.3562 7.75422 21.6499 8.73338 21.6499 9.82505V11.3375C21.6499 11.5362 21.5848 11.7004 21.4547 11.8302C21.3246 11.9601 21.16 12.025 20.961 12.025Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.6999 15.825C3.31795 15.825 2.9933 15.6912 2.72595 15.4236C2.45859 15.1559 2.3249 14.8309 2.3249 14.4486C2.3249 14.0662 2.45859 13.7417 2.72595 13.475C2.9933 13.2084 3.31795 13.075 3.6999 13.075H10.5499L1.7749 4.30005L3.0999 3.00005L21.0999 21L19.7999 22.325L13.2999 15.825H3.6999ZM18.5889 13.075C18.7879 13.075 18.952 13.14 19.0812 13.2698C19.2103 13.3997 19.2749 13.5639 19.2749 13.7625V15.1375C19.2749 15.3459 19.2136 15.5125 19.091 15.6375C18.9684 15.7625 18.8172 15.825 18.6374 15.825H18.5749L17.8999 15.15V13.7625C17.8999 13.5639 17.965 13.3997 18.0951 13.2698C18.2252 13.14 18.3898 13.075 18.5889 13.075ZM20.9639 13.075C21.1629 13.075 21.327 13.14 21.4562 13.27C21.5853 13.4 21.6499 13.5644 21.6499 13.7631V15.1394C21.6499 15.3382 21.5848 15.5021 21.4547 15.6313C21.3246 15.7605 21.16 15.825 20.961 15.825C20.7619 15.825 20.5978 15.7601 20.4687 15.6301C20.3395 15.5001 20.2749 15.3357 20.2749 15.1369V13.7607C20.2749 13.5619 20.34 13.398 20.4701 13.2688C20.6002 13.1396 20.7648 13.075 20.9639 13.075ZM15.8249 13.075H16.2374C16.436 13.075 16.6003 13.14 16.7301 13.2698C16.86 13.3997 16.9249 13.5639 16.9249 13.7625V14.175L15.8249 13.075ZM18.586 12.025C18.3869 12.025 18.2228 11.9601 18.0937 11.8302C17.9645 11.7004 17.8999 11.5362 17.8999 11.3375V10.75C17.8999 10.125 17.7132 9.63963 17.3397 9.2938C16.9662 8.94797 16.5196 8.77505 15.9999 8.77505H14.4499C13.5582 8.77505 12.8062 8.4646 12.1937 7.8437C11.5812 7.22281 11.2749 6.4666 11.2749 5.57505C11.2749 4.69172 11.5812 3.93755 12.1937 3.31255C12.8062 2.68755 13.5582 2.37505 14.4499 2.37505C14.6485 2.37505 14.8128 2.44012 14.9426 2.57025C15.0725 2.70038 15.1374 2.86497 15.1374 3.064C15.1374 3.26303 15.0725 3.42713 14.9426 3.5563C14.8128 3.68547 14.6485 3.75005 14.4499 3.75005C13.9582 3.75005 13.5353 3.92505 13.1812 4.27505C12.827 4.62505 12.6499 5.05838 12.6499 5.57505C12.6499 6.09172 12.827 6.52505 13.1812 6.87505C13.5353 7.22505 13.9582 7.40005 14.4499 7.40005H15.9999C16.8916 7.40005 17.6603 7.69172 18.3062 8.27505C18.952 8.85838 19.2749 9.58338 19.2749 10.45V11.3375C19.2749 11.5362 19.2098 11.7004 19.0797 11.8302C18.9496 11.9601 18.785 12.025 18.586 12.025ZM20.961 12.025C20.7619 12.025 20.5978 11.9601 20.4687 11.8302C20.3395 11.7004 20.2749 11.5362 20.2749 11.3375V9.82505C20.2749 8.73338 19.8964 7.80213 19.1393 7.0313C18.3822 6.26047 17.4441 5.87505 16.3249 5.87505C16.1263 5.87505 15.9621 5.80998 15.8322 5.67985C15.7023 5.54972 15.6374 5.38513 15.6374 5.1861C15.6374 4.98707 15.7023 4.82297 15.8322 4.6938C15.9621 4.56463 16.1263 4.50005 16.3249 4.50005C16.8182 4.50005 17.2456 4.31919 17.6073 3.95747C17.969 3.59577 18.1499 3.1683 18.1499 2.67505C18.1499 2.47643 18.215 2.3122 18.3451 2.18235C18.4752 2.05248 18.6398 1.98755 18.8389 1.98755C19.0379 1.98755 19.202 2.05248 19.3312 2.18235C19.4603 2.3122 19.5249 2.47643 19.5249 2.67505C19.5249 3.14172 19.4332 3.5688 19.2499 3.9563C19.0666 4.3438 18.8249 4.68972 18.5249 4.99407C19.4332 5.38972 20.1812 6.02088 20.7687 6.88755C21.3562 7.75422 21.6499 8.73338 21.6499 9.82505V11.3375C21.6499 11.5362 21.5848 11.7004 21.4547 11.8302C21.3246 11.9601 21.16 12.025 20.961 12.025Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/OutdoorFurniture.tsx b/components/Icons/OutdoorFurniture.tsx
index 3ddac9f38..d0cdb78f3 100644
--- a/components/Icons/OutdoorFurniture.tsx
+++ b/components/Icons/OutdoorFurniture.tsx
@@ -18,23 +18,10 @@ export default function OutdoorFurnitureIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_81_883"
-        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_883)">
-        <path
-          d="M11.0625 20.8625V9.00002H3.77497C3.54164 9.00002 3.39164 8.89169 3.32497 8.67502C3.25831 8.45836 3.32081 8.28336 3.51247 8.15002L11.4625 2.57502C11.6291 2.45836 11.8083 2.40002 12 2.40002C12.1916 2.40002 12.3708 2.45836 12.5375 2.57502L20.4875 8.15002C20.6791 8.28336 20.7416 8.45836 20.675 8.67502C20.6083 8.89169 20.4583 9.00002 20.225 9.00002H12.9375V20.8625C12.9375 21.1209 12.8458 21.3417 12.6625 21.525C12.4791 21.7084 12.2583 21.8 12 21.8C11.7416 21.8 11.5208 21.7084 11.3375 21.525C11.1541 21.3417 11.0625 21.1209 11.0625 20.8625ZM3.17497 20.8625V16.675L2.56247 13.2875C2.52081 13.0292 2.57289 12.7959 2.71872 12.5875C2.86456 12.3792 3.06664 12.2542 3.32497 12.2125C3.57497 12.1709 3.80206 12.2209 4.00622 12.3625C4.21039 12.5042 4.33747 12.7 4.38747 12.95L4.97497 15.975H8.06247C8.32081 15.975 8.54164 16.0667 8.72497 16.25C8.90831 16.4334 8.99997 16.6542 8.99997 16.9125V20.8625C8.99997 21.1209 8.90831 21.3417 8.72497 21.525C8.54164 21.7084 8.32081 21.8 8.06247 21.8C7.80414 21.8 7.58331 21.7084 7.39997 21.525C7.21664 21.3417 7.12497 21.1209 7.12497 20.8625V17.85H5.04997V20.8625C5.04997 21.1209 4.95831 21.3417 4.77497 21.525C4.59164 21.7084 4.37081 21.8 4.11247 21.8C3.85414 21.8 3.63331 21.7084 3.44997 21.525C3.26664 21.3417 3.17497 21.1209 3.17497 20.8625ZM15 20.8625V16.9125C15 16.6542 15.0916 16.4334 15.275 16.25C15.4583 16.0667 15.6791 15.975 15.9375 15.975H19.025L19.6125 12.95C19.6625 12.7 19.7896 12.5042 19.9937 12.3625C20.1979 12.2209 20.4291 12.1709 20.6875 12.2125C20.9458 12.2542 21.1458 12.3792 21.2875 12.5875C21.4291 12.7959 21.4791 13.0292 21.4375 13.2875L20.825 16.675V20.8625C20.825 21.1209 20.7333 21.3417 20.55 21.525C20.3666 21.7084 20.1458 21.8 19.8875 21.8C19.6291 21.8 19.4083 21.7084 19.225 21.525C19.0416 21.3417 18.95 21.1209 18.95 20.8625V17.85H16.875V20.8625C16.875 21.1209 16.7833 21.3417 16.6 21.525C16.4166 21.7084 16.1958 21.8 15.9375 21.8C15.6791 21.8 15.4583 21.7084 15.275 21.525C15.0916 21.3417 15 21.1209 15 20.8625ZM8.24997 7.12502H15.75L12 4.50002L8.24997 7.12502Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M11.0625 20.8625V9.00002H3.77497C3.54164 9.00002 3.39164 8.89169 3.32497 8.67502C3.25831 8.45836 3.32081 8.28336 3.51247 8.15002L11.4625 2.57502C11.6291 2.45836 11.8083 2.40002 12 2.40002C12.1916 2.40002 12.3708 2.45836 12.5375 2.57502L20.4875 8.15002C20.6791 8.28336 20.7416 8.45836 20.675 8.67502C20.6083 8.89169 20.4583 9.00002 20.225 9.00002H12.9375V20.8625C12.9375 21.1209 12.8458 21.3417 12.6625 21.525C12.4791 21.7084 12.2583 21.8 12 21.8C11.7416 21.8 11.5208 21.7084 11.3375 21.525C11.1541 21.3417 11.0625 21.1209 11.0625 20.8625ZM3.17497 20.8625V16.675L2.56247 13.2875C2.52081 13.0292 2.57289 12.7959 2.71872 12.5875C2.86456 12.3792 3.06664 12.2542 3.32497 12.2125C3.57497 12.1709 3.80206 12.2209 4.00622 12.3625C4.21039 12.5042 4.33747 12.7 4.38747 12.95L4.97497 15.975H8.06247C8.32081 15.975 8.54164 16.0667 8.72497 16.25C8.90831 16.4334 8.99997 16.6542 8.99997 16.9125V20.8625C8.99997 21.1209 8.90831 21.3417 8.72497 21.525C8.54164 21.7084 8.32081 21.8 8.06247 21.8C7.80414 21.8 7.58331 21.7084 7.39997 21.525C7.21664 21.3417 7.12497 21.1209 7.12497 20.8625V17.85H5.04997V20.8625C5.04997 21.1209 4.95831 21.3417 4.77497 21.525C4.59164 21.7084 4.37081 21.8 4.11247 21.8C3.85414 21.8 3.63331 21.7084 3.44997 21.525C3.26664 21.3417 3.17497 21.1209 3.17497 20.8625ZM15 20.8625V16.9125C15 16.6542 15.0916 16.4334 15.275 16.25C15.4583 16.0667 15.6791 15.975 15.9375 15.975H19.025L19.6125 12.95C19.6625 12.7 19.7896 12.5042 19.9937 12.3625C20.1979 12.2209 20.4291 12.1709 20.6875 12.2125C20.9458 12.2542 21.1458 12.3792 21.2875 12.5875C21.4291 12.7959 21.4791 13.0292 21.4375 13.2875L20.825 16.675V20.8625C20.825 21.1209 20.7333 21.3417 20.55 21.525C20.3666 21.7084 20.1458 21.8 19.8875 21.8C19.6291 21.8 19.4083 21.7084 19.225 21.525C19.0416 21.3417 18.95 21.1209 18.95 20.8625V17.85H16.875V20.8625C16.875 21.1209 16.7833 21.3417 16.6 21.525C16.4166 21.7084 16.1958 21.8 15.9375 21.8C15.6791 21.8 15.4583 21.7084 15.275 21.525C15.0916 21.3417 15 21.1209 15 20.8625ZM8.24997 7.12502H15.75L12 4.50002L8.24997 7.12502Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Parking.tsx b/components/Icons/Parking.tsx
index 3680757e4..cbcf30927 100644
--- a/components/Icons/Parking.tsx
+++ b/components/Icons/Parking.tsx
@@ -14,23 +14,10 @@ export default function ParkingIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        id="mask0_554_11891"
-        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_11891)">
-        <path
-          d="M9.94995 14.9V18.875C9.94995 19.3906 9.76625 19.832 9.39885 20.1992C9.03143 20.5664 8.58977 20.75 8.07385 20.75C7.55792 20.75 7.11662 20.5664 6.74995 20.1992C6.38328 19.832 6.19995 19.3906 6.19995 18.875V5.125C6.19995 4.60937 6.38354 4.16796 6.75073 3.80078C7.11791 3.43359 7.55932 3.25 8.07495 3.25H13C14.6 3.25 15.9666 3.82083 17.1 4.9625C18.2333 6.10417 18.8 7.475 18.8 9.075C18.8 10.675 18.2333 12.0458 17.1 13.1875C15.9666 14.3292 14.6 14.9 13 14.9H9.94995ZM9.94995 11.15H13.075C13.6456 11.15 14.1341 10.9468 14.5404 10.5405C14.9468 10.1341 15.15 9.64562 15.15 9.075C15.15 8.50438 14.9468 8.01589 14.5404 7.60952C14.1341 7.20317 13.6456 7 13.075 7H9.94995V11.15Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M9.94995 14.9V18.875C9.94995 19.3906 9.76625 19.832 9.39885 20.1992C9.03143 20.5664 8.58977 20.75 8.07385 20.75C7.55792 20.75 7.11662 20.5664 6.74995 20.1992C6.38328 19.832 6.19995 19.3906 6.19995 18.875V5.125C6.19995 4.60937 6.38354 4.16796 6.75073 3.80078C7.11791 3.43359 7.55932 3.25 8.07495 3.25H13C14.6 3.25 15.9666 3.82083 17.1 4.9625C18.2333 6.10417 18.8 7.475 18.8 9.075C18.8 10.675 18.2333 12.0458 17.1 13.1875C15.9666 14.3292 14.6 14.9 13 14.9H9.94995ZM9.94995 11.15H13.075C13.6456 11.15 14.1341 10.9468 14.5404 10.5405C14.9468 10.1341 15.15 9.64562 15.15 9.075C15.15 8.50438 14.9468 8.01589 14.5404 7.60952C14.1341 7.20317 13.6456 7 13.075 7H9.94995V11.15Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/People2.tsx b/components/Icons/People2.tsx
index df5319f33..55f16de36 100644
--- a/components/Icons/People2.tsx
+++ b/components/Icons/People2.tsx
@@ -14,23 +14,10 @@ export default function People2Icon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        id="mask0_75_294"
-        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_75_294)">
-        <path
-          d="M1 20V17.2C1 16.6333 1.14583 16.1125 1.4375 15.6375C1.72917 15.1625 2.11667 14.8 2.6 14.55C3.63333 14.0333 4.68333 13.6458 5.75 13.3875C6.81667 13.1292 7.9 13 9 13C10.1 13 11.1833 13.1292 12.25 13.3875C13.3167 13.6458 14.3667 14.0333 15.4 14.55C15.8833 14.8 16.2708 15.1625 16.5625 15.6375C16.8542 16.1125 17 16.6333 17 17.2V20H1ZM19 20V17C19 16.2667 18.7958 15.5625 18.3875 14.8875C17.9792 14.2125 17.4 13.6333 16.65 13.15C17.5 13.25 18.3 13.4208 19.05 13.6625C19.8 13.9042 20.5 14.2 21.15 14.55C21.75 14.8833 22.2083 15.2542 22.525 15.6625C22.8417 16.0708 23 16.5167 23 17V20H19ZM9 12C7.9 12 6.95833 11.6083 6.175 10.825C5.39167 10.0417 5 9.1 5 8C5 6.9 5.39167 5.95833 6.175 5.175C6.95833 4.39167 7.9 4 9 4C10.1 4 11.0417 4.39167 11.825 5.175C12.6083 5.95833 13 6.9 13 8C13 9.1 12.6083 10.0417 11.825 10.825C11.0417 11.6083 10.1 12 9 12ZM19 8C19 9.1 18.6083 10.0417 17.825 10.825C17.0417 11.6083 16.1 12 15 12C14.8167 12 14.5833 11.9792 14.3 11.9375C14.0167 11.8958 13.7833 11.85 13.6 11.8C14.05 11.2667 14.3958 10.675 14.6375 10.025C14.8792 9.375 15 8.7 15 8C15 7.3 14.8792 6.625 14.6375 5.975C14.3958 5.325 14.05 4.73333 13.6 4.2C13.8333 4.11667 14.0667 4.0625 14.3 4.0375C14.5333 4.0125 14.7667 4 15 4C16.1 4 17.0417 4.39167 17.825 5.175C18.6083 5.95833 19 6.9 19 8ZM3 18H15V17.2C15 17.0167 14.9542 16.85 14.8625 16.7C14.7708 16.55 14.65 16.4333 14.5 16.35C13.6 15.9 12.6917 15.5625 11.775 15.3375C10.8583 15.1125 9.93333 15 9 15C8.06667 15 7.14167 15.1125 6.225 15.3375C5.30833 15.5625 4.4 15.9 3.5 16.35C3.35 16.4333 3.22917 16.55 3.1375 16.7C3.04583 16.85 3 17.0167 3 17.2V18ZM9 10C9.55 10 10.0208 9.80417 10.4125 9.4125C10.8042 9.02083 11 8.55 11 8C11 7.45 10.8042 6.97917 10.4125 6.5875C10.0208 6.19583 9.55 6 9 6C8.45 6 7.97917 6.19583 7.5875 6.5875C7.19583 6.97917 7 7.45 7 8C7 8.55 7.19583 9.02083 7.5875 9.4125C7.97917 9.80417 8.45 10 9 10Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M1 20V17.2C1 16.6333 1.14583 16.1125 1.4375 15.6375C1.72917 15.1625 2.11667 14.8 2.6 14.55C3.63333 14.0333 4.68333 13.6458 5.75 13.3875C6.81667 13.1292 7.9 13 9 13C10.1 13 11.1833 13.1292 12.25 13.3875C13.3167 13.6458 14.3667 14.0333 15.4 14.55C15.8833 14.8 16.2708 15.1625 16.5625 15.6375C16.8542 16.1125 17 16.6333 17 17.2V20H1ZM19 20V17C19 16.2667 18.7958 15.5625 18.3875 14.8875C17.9792 14.2125 17.4 13.6333 16.65 13.15C17.5 13.25 18.3 13.4208 19.05 13.6625C19.8 13.9042 20.5 14.2 21.15 14.55C21.75 14.8833 22.2083 15.2542 22.525 15.6625C22.8417 16.0708 23 16.5167 23 17V20H19ZM9 12C7.9 12 6.95833 11.6083 6.175 10.825C5.39167 10.0417 5 9.1 5 8C5 6.9 5.39167 5.95833 6.175 5.175C6.95833 4.39167 7.9 4 9 4C10.1 4 11.0417 4.39167 11.825 5.175C12.6083 5.95833 13 6.9 13 8C13 9.1 12.6083 10.0417 11.825 10.825C11.0417 11.6083 10.1 12 9 12ZM19 8C19 9.1 18.6083 10.0417 17.825 10.825C17.0417 11.6083 16.1 12 15 12C14.8167 12 14.5833 11.9792 14.3 11.9375C14.0167 11.8958 13.7833 11.85 13.6 11.8C14.05 11.2667 14.3958 10.675 14.6375 10.025C14.8792 9.375 15 8.7 15 8C15 7.3 14.8792 6.625 14.6375 5.975C14.3958 5.325 14.05 4.73333 13.6 4.2C13.8333 4.11667 14.0667 4.0625 14.3 4.0375C14.5333 4.0125 14.7667 4 15 4C16.1 4 17.0417 4.39167 17.825 5.175C18.6083 5.95833 19 6.9 19 8ZM3 18H15V17.2C15 17.0167 14.9542 16.85 14.8625 16.7C14.7708 16.55 14.65 16.4333 14.5 16.35C13.6 15.9 12.6917 15.5625 11.775 15.3375C10.8583 15.1125 9.93333 15 9 15C8.06667 15 7.14167 15.1125 6.225 15.3375C5.30833 15.5625 4.4 15.9 3.5 16.35C3.35 16.4333 3.22917 16.55 3.1375 16.7C3.04583 16.85 3 17.0167 3 17.2V18ZM9 10C9.55 10 10.0208 9.80417 10.4125 9.4125C10.8042 9.02083 11 8.55 11 8C11 7.45 10.8042 6.97917 10.4125 6.5875C10.0208 6.19583 9.55 6 9 6C8.45 6 7.97917 6.19583 7.5875 6.5875C7.19583 6.97917 7 7.45 7 8C7 8.55 7.19583 9.02083 7.5875 9.4125C7.97917 9.80417 8.45 10 9 10Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Person.tsx b/components/Icons/Person.tsx
index bc2452ac4..5f2671194 100644
--- a/components/Icons/Person.tsx
+++ b/components/Icons/Person.tsx
@@ -14,23 +14,10 @@ export default function PersonIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3302"
-        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_3302)">
-        <path
-          d="M12 12.025C10.925 12.025 10.0104 11.6479 9.25623 10.8938C8.50206 10.1396 8.12498 9.22503 8.12498 8.15002C8.12498 7.07502 8.50206 6.16044 9.25623 5.40627C10.0104 4.65211 10.925 4.27502 12 4.27502C13.075 4.27502 13.9896 4.65211 14.7437 5.40627C15.4979 6.16044 15.875 7.07502 15.875 8.15002C15.875 9.22503 15.4979 10.1396 14.7437 10.8938C13.9896 11.6479 13.075 12.025 12 12.025ZM4.22498 17.8V17.0243C4.22498 16.4748 4.36456 15.9729 4.64373 15.5188C4.92289 15.0646 5.30016 14.7166 5.77553 14.4748C6.79183 13.9749 7.81873 13.5979 8.85623 13.3438C9.89373 13.0896 10.9416 12.9625 12 12.9625C13.0583 12.9625 14.1062 13.0896 15.1437 13.3438C16.1812 13.5979 17.2081 13.9749 18.2244 14.4748C18.6998 14.7166 19.0771 15.0646 19.3562 15.5188C19.6354 15.9729 19.775 16.4748 19.775 17.0243V17.8C19.775 18.3157 19.5914 18.7571 19.2242 19.1243C18.857 19.4914 18.4156 19.675 17.9 19.675H6.09998C5.58434 19.675 5.14293 19.4914 4.77575 19.1243C4.40857 18.7571 4.22498 18.3157 4.22498 17.8ZM6.09998 17.8H17.9V17.025C17.9 16.8385 17.8541 16.669 17.7625 16.5164C17.6708 16.3638 17.5458 16.2459 17.3875 16.1625C16.4958 15.7209 15.6027 15.3896 14.7081 15.1688C13.8135 14.9479 12.9108 14.8375 12 14.8375C11.0833 14.8375 10.1791 14.9479 9.28748 15.1688C8.39581 15.3896 7.50414 15.7209 6.61248 16.1625C6.45414 16.2459 6.32914 16.3638 6.23748 16.5164C6.14581 16.669 6.09998 16.8385 6.09998 17.025V17.8ZM12 10.15C12.55 10.15 13.0208 9.95419 13.4125 9.56252C13.8041 9.17086 14 8.70003 14 8.15002C14 7.60002 13.8041 7.12919 13.4125 6.73752C13.0208 6.34586 12.55 6.15002 12 6.15002C11.45 6.15002 10.9791 6.34586 10.5875 6.73752C10.1958 7.12919 9.99998 7.60002 9.99998 8.15002C9.99998 8.70003 10.1958 9.17086 10.5875 9.56252C10.9791 9.95419 11.45 10.15 12 10.15Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M12 12.025C10.925 12.025 10.0104 11.6479 9.25623 10.8938C8.50206 10.1396 8.12498 9.22503 8.12498 8.15002C8.12498 7.07502 8.50206 6.16044 9.25623 5.40627C10.0104 4.65211 10.925 4.27502 12 4.27502C13.075 4.27502 13.9896 4.65211 14.7437 5.40627C15.4979 6.16044 15.875 7.07502 15.875 8.15002C15.875 9.22503 15.4979 10.1396 14.7437 10.8938C13.9896 11.6479 13.075 12.025 12 12.025ZM4.22498 17.8V17.0243C4.22498 16.4748 4.36456 15.9729 4.64373 15.5188C4.92289 15.0646 5.30016 14.7166 5.77553 14.4748C6.79183 13.9749 7.81873 13.5979 8.85623 13.3438C9.89373 13.0896 10.9416 12.9625 12 12.9625C13.0583 12.9625 14.1062 13.0896 15.1437 13.3438C16.1812 13.5979 17.2081 13.9749 18.2244 14.4748C18.6998 14.7166 19.0771 15.0646 19.3562 15.5188C19.6354 15.9729 19.775 16.4748 19.775 17.0243V17.8C19.775 18.3157 19.5914 18.7571 19.2242 19.1243C18.857 19.4914 18.4156 19.675 17.9 19.675H6.09998C5.58434 19.675 5.14293 19.4914 4.77575 19.1243C4.40857 18.7571 4.22498 18.3157 4.22498 17.8ZM6.09998 17.8H17.9V17.025C17.9 16.8385 17.8541 16.669 17.7625 16.5164C17.6708 16.3638 17.5458 16.2459 17.3875 16.1625C16.4958 15.7209 15.6027 15.3896 14.7081 15.1688C13.8135 14.9479 12.9108 14.8375 12 14.8375C11.0833 14.8375 10.1791 14.9479 9.28748 15.1688C8.39581 15.3896 7.50414 15.7209 6.61248 16.1625C6.45414 16.2459 6.32914 16.3638 6.23748 16.5164C6.14581 16.669 6.09998 16.8385 6.09998 17.025V17.8ZM12 10.15C12.55 10.15 13.0208 9.95419 13.4125 9.56252C13.8041 9.17086 14 8.70003 14 8.15002C14 7.60002 13.8041 7.12919 13.4125 6.73752C13.0208 6.34586 12.55 6.15002 12 6.15002C11.45 6.15002 10.9791 6.34586 10.5875 6.73752C10.1958 7.12919 9.99998 7.60002 9.99998 8.15002C9.99998 8.70003 10.1958 9.17086 10.5875 9.56252C10.9791 9.95419 11.45 10.15 12 10.15Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Pets.tsx b/components/Icons/Pets.tsx
index db832a5af..e5e475b2e 100644
--- a/components/Icons/Pets.tsx
+++ b/components/Icons/Pets.tsx
@@ -14,23 +14,10 @@ export default function PetsIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_554_11943"
-        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_11943)">
-        <path
-          d="M4.6251 12.05C3.95843 12.05 3.39176 11.8166 2.9251 11.35C2.45843 10.8833 2.2251 10.3166 2.2251 9.64995C2.2251 8.98328 2.45843 8.41662 2.9251 7.94995C3.39176 7.48328 3.95843 7.24995 4.6251 7.24995C5.29176 7.24995 5.85843 7.48328 6.3251 7.94995C6.79176 8.41662 7.0251 8.98328 7.0251 9.64995C7.0251 10.3166 6.79176 10.8833 6.3251 11.35C5.85843 11.8166 5.29176 12.05 4.6251 12.05ZM9.0501 8.12495C8.38343 8.12495 7.81676 7.89162 7.3501 7.42495C6.88343 6.95828 6.6501 6.39162 6.6501 5.72495C6.6501 5.05828 6.88343 4.49162 7.3501 4.02495C7.81676 3.55828 8.38343 3.32495 9.0501 3.32495C9.71676 3.32495 10.2834 3.55828 10.7501 4.02495C11.2168 4.49162 11.4501 5.05828 11.4501 5.72495C11.4501 6.39162 11.2168 6.95828 10.7501 7.42495C10.2834 7.89162 9.71676 8.12495 9.0501 8.12495ZM14.9751 8.12495C14.3084 8.12495 13.7418 7.89162 13.2751 7.42495C12.8084 6.95828 12.5751 6.39162 12.5751 5.72495C12.5751 5.05828 12.8084 4.49162 13.2751 4.02495C13.7418 3.55828 14.3084 3.32495 14.9751 3.32495C15.6418 3.32495 16.2084 3.55828 16.6751 4.02495C17.1418 4.49162 17.3751 5.05828 17.3751 5.72495C17.3751 6.39162 17.1418 6.95828 16.6751 7.42495C16.2084 7.89162 15.6418 8.12495 14.9751 8.12495ZM19.4001 12.05C18.7334 12.05 18.1668 11.8166 17.7001 11.35C17.2334 10.8833 17.0001 10.3166 17.0001 9.64995C17.0001 8.98328 17.2334 8.41662 17.7001 7.94995C18.1668 7.48328 18.7334 7.24995 19.4001 7.24995C20.0668 7.24995 20.6334 7.48328 21.1001 7.94995C21.5668 8.41662 21.8001 8.98328 21.8001 9.64995C21.8001 10.3166 21.5668 10.8833 21.1001 11.35C20.6334 11.8166 20.0668 12.05 19.4001 12.05ZM6.7559 21.925C6.0187 21.925 5.40426 21.6474 4.9126 21.0922C4.42093 20.537 4.1751 19.8813 4.1751 19.125C4.1751 18.2666 4.4626 17.5187 5.0376 16.8812C5.6126 16.2437 6.19176 15.615 6.7751 14.995C7.25843 14.4893 7.6751 13.9387 8.0251 13.3432C8.3751 12.7477 8.78343 12.1833 9.2501 11.65C9.60843 11.2416 10.0188 10.8979 10.4813 10.6187C10.9438 10.3395 11.4506 10.2 12.0015 10.2C12.5524 10.2 13.0628 10.3333 13.5327 10.6C14.0026 10.8666 14.4168 11.2083 14.7751 11.625C15.2418 12.15 15.6522 12.7125 16.0063 13.3125C16.3605 13.9125 16.7755 14.4753 17.2513 15.001C17.8255 15.6253 18.4022 16.2541 18.9813 16.8875C19.5605 17.5208 19.8501 18.2666 19.8501 19.125C19.8501 19.8813 19.6043 20.537 19.1126 21.0922C18.6209 21.6474 18.0073 21.925 17.2718 21.925C16.3892 21.925 15.5147 21.85 14.6484 21.7C13.7822 21.55 12.9077 21.475 12.0251 21.475C11.1334 21.475 10.2535 21.55 9.38522 21.7C8.51697 21.85 7.64053 21.925 6.7559 21.925Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M4.6251 12.05C3.95843 12.05 3.39176 11.8166 2.9251 11.35C2.45843 10.8833 2.2251 10.3166 2.2251 9.64995C2.2251 8.98328 2.45843 8.41662 2.9251 7.94995C3.39176 7.48328 3.95843 7.24995 4.6251 7.24995C5.29176 7.24995 5.85843 7.48328 6.3251 7.94995C6.79176 8.41662 7.0251 8.98328 7.0251 9.64995C7.0251 10.3166 6.79176 10.8833 6.3251 11.35C5.85843 11.8166 5.29176 12.05 4.6251 12.05ZM9.0501 8.12495C8.38343 8.12495 7.81676 7.89162 7.3501 7.42495C6.88343 6.95828 6.6501 6.39162 6.6501 5.72495C6.6501 5.05828 6.88343 4.49162 7.3501 4.02495C7.81676 3.55828 8.38343 3.32495 9.0501 3.32495C9.71676 3.32495 10.2834 3.55828 10.7501 4.02495C11.2168 4.49162 11.4501 5.05828 11.4501 5.72495C11.4501 6.39162 11.2168 6.95828 10.7501 7.42495C10.2834 7.89162 9.71676 8.12495 9.0501 8.12495ZM14.9751 8.12495C14.3084 8.12495 13.7418 7.89162 13.2751 7.42495C12.8084 6.95828 12.5751 6.39162 12.5751 5.72495C12.5751 5.05828 12.8084 4.49162 13.2751 4.02495C13.7418 3.55828 14.3084 3.32495 14.9751 3.32495C15.6418 3.32495 16.2084 3.55828 16.6751 4.02495C17.1418 4.49162 17.3751 5.05828 17.3751 5.72495C17.3751 6.39162 17.1418 6.95828 16.6751 7.42495C16.2084 7.89162 15.6418 8.12495 14.9751 8.12495ZM19.4001 12.05C18.7334 12.05 18.1668 11.8166 17.7001 11.35C17.2334 10.8833 17.0001 10.3166 17.0001 9.64995C17.0001 8.98328 17.2334 8.41662 17.7001 7.94995C18.1668 7.48328 18.7334 7.24995 19.4001 7.24995C20.0668 7.24995 20.6334 7.48328 21.1001 7.94995C21.5668 8.41662 21.8001 8.98328 21.8001 9.64995C21.8001 10.3166 21.5668 10.8833 21.1001 11.35C20.6334 11.8166 20.0668 12.05 19.4001 12.05ZM6.7559 21.925C6.0187 21.925 5.40426 21.6474 4.9126 21.0922C4.42093 20.537 4.1751 19.8813 4.1751 19.125C4.1751 18.2666 4.4626 17.5187 5.0376 16.8812C5.6126 16.2437 6.19176 15.615 6.7751 14.995C7.25843 14.4893 7.6751 13.9387 8.0251 13.3432C8.3751 12.7477 8.78343 12.1833 9.2501 11.65C9.60843 11.2416 10.0188 10.8979 10.4813 10.6187C10.9438 10.3395 11.4506 10.2 12.0015 10.2C12.5524 10.2 13.0628 10.3333 13.5327 10.6C14.0026 10.8666 14.4168 11.2083 14.7751 11.625C15.2418 12.15 15.6522 12.7125 16.0063 13.3125C16.3605 13.9125 16.7755 14.4753 17.2513 15.001C17.8255 15.6253 18.4022 16.2541 18.9813 16.8875C19.5605 17.5208 19.8501 18.2666 19.8501 19.125C19.8501 19.8813 19.6043 20.537 19.1126 21.0922C18.6209 21.6474 18.0073 21.925 17.2718 21.925C16.3892 21.925 15.5147 21.85 14.6484 21.7C13.7822 21.55 12.9077 21.475 12.0251 21.475C11.1334 21.475 10.2535 21.55 9.38522 21.7C8.51697 21.85 7.64053 21.925 6.7559 21.925Z"
+        fill="#787472"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Phone.tsx b/components/Icons/Phone.tsx
index 1dd1c960e..a63adc769 100644
--- a/components/Icons/Phone.tsx
+++ b/components/Icons/Phone.tsx
@@ -20,23 +20,10 @@ export default function PhoneIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="24"
-        id="mask0_4077_9677"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="24"
-        x="0"
-        y="0"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4077_9677)">
-        <path
-          d="M19.725 20.75C17.725 20.75 15.7375 20.3063 13.7625 19.4188C11.7875 18.5313 9.9875 17.2708 8.3625 15.6375C6.72917 14.0125 5.46875 12.2125 4.58125 10.2375C3.69375 8.2625 3.25 6.2734 3.25 4.2702C3.25 3.98173 3.34762 3.73958 3.54285 3.54375C3.7381 3.34792 3.98215 3.25 4.275 3.25H8.15C8.38333 3.25 8.58542 3.32292 8.75625 3.46875C8.92708 3.61458 9.03333 3.8 9.075 4.025L9.725 7.425C9.75833 7.65 9.74792 7.85208 9.69375 8.03125C9.63958 8.21042 9.55 8.36667 9.425 8.5L7.0625 10.9C7.40417 11.5167 7.79766 12.1082 8.24297 12.6747C8.68829 13.2412 9.17813 13.7871 9.7125 14.3125C10.2125 14.8125 10.7438 15.2833 11.3063 15.725C11.8688 16.1667 12.4667 16.575 13.1 16.95L15.475 14.6C15.6167 14.4583 15.7833 14.3583 15.975 14.3C16.1667 14.2417 16.3667 14.225 16.575 14.25L19.95 14.925C20.1833 14.9833 20.375 15.1013 20.525 15.2788C20.675 15.4564 20.75 15.6552 20.75 15.875V19.725C20.75 20.0179 20.6524 20.2619 20.4572 20.4572C20.2619 20.6524 20.0179 20.75 19.725 20.75ZM6.1625 9.125L7.8125 7.475L7.375 5.125H5.1625C5.22917 5.79167 5.34167 6.4625 5.5 7.1375C5.65833 7.8125 5.87917 8.475 6.1625 9.125ZM14.8625 17.825C15.5042 18.1083 16.1625 18.3333 16.8375 18.5C17.5125 18.6667 18.1917 18.775 18.875 18.825V16.625L16.575 16.1375L14.8625 17.825Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M19.725 20.75C17.725 20.75 15.7375 20.3063 13.7625 19.4188C11.7875 18.5313 9.9875 17.2708 8.3625 15.6375C6.72917 14.0125 5.46875 12.2125 4.58125 10.2375C3.69375 8.2625 3.25 6.2734 3.25 4.2702C3.25 3.98173 3.34762 3.73958 3.54285 3.54375C3.7381 3.34792 3.98215 3.25 4.275 3.25H8.15C8.38333 3.25 8.58542 3.32292 8.75625 3.46875C8.92708 3.61458 9.03333 3.8 9.075 4.025L9.725 7.425C9.75833 7.65 9.74792 7.85208 9.69375 8.03125C9.63958 8.21042 9.55 8.36667 9.425 8.5L7.0625 10.9C7.40417 11.5167 7.79766 12.1082 8.24297 12.6747C8.68829 13.2412 9.17813 13.7871 9.7125 14.3125C10.2125 14.8125 10.7438 15.2833 11.3063 15.725C11.8688 16.1667 12.4667 16.575 13.1 16.95L15.475 14.6C15.6167 14.4583 15.7833 14.3583 15.975 14.3C16.1667 14.2417 16.3667 14.225 16.575 14.25L19.95 14.925C20.1833 14.9833 20.375 15.1013 20.525 15.2788C20.675 15.4564 20.75 15.6552 20.75 15.875V19.725C20.75 20.0179 20.6524 20.2619 20.4572 20.4572C20.2619 20.6524 20.0179 20.75 19.725 20.75ZM6.1625 9.125L7.8125 7.475L7.375 5.125H5.1625C5.22917 5.79167 5.34167 6.4625 5.5 7.1375C5.65833 7.8125 5.87917 8.475 6.1625 9.125ZM14.8625 17.825C15.5042 18.1083 16.1625 18.3333 16.8375 18.5C17.5125 18.6667 18.1917 18.775 18.875 18.825V16.625L16.575 16.1375L14.8625 17.825Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/PlusCircle.tsx b/components/Icons/PlusCircle.tsx
index aa2c40afb..3f391672a 100644
--- a/components/Icons/PlusCircle.tsx
+++ b/components/Icons/PlusCircle.tsx
@@ -18,23 +18,10 @@ export default function PlusCircleIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        height="24"
-        id="mask0_4077_9708"
-        maskUnits="userSpaceOnUse"
-        style={{ maskType: "alpha" }}
-        width="24"
-        x="0"
-        y="0"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4077_9708)">
-        <path
-          d="M11.075 12.95V15.9375C11.075 16.1958 11.1667 16.4167 11.35 16.6C11.5333 16.7833 11.7542 16.875 12.0125 16.875C12.2708 16.875 12.4917 16.7833 12.675 16.6C12.8583 16.4167 12.95 16.1958 12.95 15.9375V12.95H15.9375C16.1958 12.95 16.4167 12.8583 16.6 12.675C16.7833 12.4917 16.875 12.2708 16.875 12.0125C16.875 11.7542 16.7833 11.5333 16.6 11.35C16.4167 11.1667 16.1958 11.075 15.9375 11.075H12.95V8.0625C12.95 7.80417 12.8583 7.58333 12.675 7.4C12.4917 7.21667 12.2708 7.125 12.0125 7.125C11.7542 7.125 11.5333 7.21667 11.35 7.4C11.1667 7.58333 11.075 7.80417 11.075 8.0625V11.075H8.0625C7.80417 11.075 7.58333 11.1667 7.4 11.35C7.21667 11.5333 7.125 11.7542 7.125 12.0125C7.125 12.2708 7.21667 12.4917 7.4 12.675C7.58333 12.8583 7.80417 12.95 8.0625 12.95H11.075ZM12 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.75ZM12 19.875C14.1917 19.875 16.0521 19.1104 17.5813 17.5813C19.1104 16.0521 19.875 14.1917 19.875 12C19.875 9.80833 19.1104 7.94792 17.5813 6.41875C16.0521 4.88958 14.1917 4.125 12 4.125C9.80833 4.125 7.94792 4.88958 6.41875 6.41875C4.88958 7.94792 4.125 9.80833 4.125 12C4.125 14.1917 4.88958 16.0521 6.41875 17.5813C7.94792 19.1104 9.80833 19.875 12 19.875Z"
-          fill="#CD0921"
-        />
-      </g>
+      <path
+        d="M11.075 12.95V15.9375C11.075 16.1958 11.1667 16.4167 11.35 16.6C11.5333 16.7833 11.7542 16.875 12.0125 16.875C12.2708 16.875 12.4917 16.7833 12.675 16.6C12.8583 16.4167 12.95 16.1958 12.95 15.9375V12.95H15.9375C16.1958 12.95 16.4167 12.8583 16.6 12.675C16.7833 12.4917 16.875 12.2708 16.875 12.0125C16.875 11.7542 16.7833 11.5333 16.6 11.35C16.4167 11.1667 16.1958 11.075 15.9375 11.075H12.95V8.0625C12.95 7.80417 12.8583 7.58333 12.675 7.4C12.4917 7.21667 12.2708 7.125 12.0125 7.125C11.7542 7.125 11.5333 7.21667 11.35 7.4C11.1667 7.58333 11.075 7.80417 11.075 8.0625V11.075H8.0625C7.80417 11.075 7.58333 11.1667 7.4 11.35C7.21667 11.5333 7.125 11.7542 7.125 12.0125C7.125 12.2708 7.21667 12.4917 7.4 12.675C7.58333 12.8583 7.80417 12.95 8.0625 12.95H11.075ZM12 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.75ZM12 19.875C14.1917 19.875 16.0521 19.1104 17.5813 17.5813C19.1104 16.0521 19.875 14.1917 19.875 12C19.875 9.80833 19.1104 7.94792 17.5813 6.41875C16.0521 4.88958 14.1917 4.125 12 4.125C9.80833 4.125 7.94792 4.88958 6.41875 6.41875C4.88958 7.94792 4.125 9.80833 4.125 12C4.125 14.1917 4.88958 16.0521 6.41875 17.5813C7.94792 19.1104 9.80833 19.875 12 19.875Z"
+        fill="#CD0921"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/PriceTag.tsx b/components/Icons/PriceTag.tsx
index d91e28900..fd735a1d3 100644
--- a/components/Icons/PriceTag.tsx
+++ b/components/Icons/PriceTag.tsx
@@ -18,23 +18,10 @@ export default function PriceTagIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3241"
-        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_3241)">
-        <path
-          d="M14.15 21.2C13.7833 21.5667 13.3375 21.75 12.8125 21.75C12.2875 21.75 11.8417 21.5667 11.475 21.2L2.825 12.525C2.6493 12.3529 2.50955 12.1494 2.40575 11.9146C2.30192 11.6799 2.25 11.4333 2.25 11.175V4.125C2.25 3.60937 2.43359 3.16796 2.80077 2.80078C3.16796 2.43359 3.60937 2.25 4.125 2.25H11.175C11.4372 2.25 11.684 2.29792 11.9154 2.39375C12.1468 2.48958 12.35 2.625 12.525 2.8L21.2 11.4875C21.5667 11.8542 21.75 12.2979 21.75 12.8188C21.75 13.3396 21.5667 13.7833 21.2 14.15L14.15 21.2ZM12.8375 19.875L19.8625 12.825L11.175 4.125H4.125V11.175L12.8375 19.875ZM6.5875 8C6.98333 8 7.31979 7.86146 7.59688 7.58437C7.87396 7.30729 8.0125 6.97083 8.0125 6.575C8.0125 6.17917 7.87396 5.84271 7.59688 5.56562C7.31979 5.28854 6.98333 5.15 6.5875 5.15C6.19167 5.15 5.85521 5.28854 5.57812 5.56562C5.30104 5.84271 5.1625 6.17917 5.1625 6.575C5.1625 6.97083 5.30104 7.30729 5.57812 7.58437C5.85521 7.86146 6.19167 8 6.5875 8Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M14.15 21.2C13.7833 21.5667 13.3375 21.75 12.8125 21.75C12.2875 21.75 11.8417 21.5667 11.475 21.2L2.825 12.525C2.6493 12.3529 2.50955 12.1494 2.40575 11.9146C2.30192 11.6799 2.25 11.4333 2.25 11.175V4.125C2.25 3.60937 2.43359 3.16796 2.80077 2.80078C3.16796 2.43359 3.60937 2.25 4.125 2.25H11.175C11.4372 2.25 11.684 2.29792 11.9154 2.39375C12.1468 2.48958 12.35 2.625 12.525 2.8L21.2 11.4875C21.5667 11.8542 21.75 12.2979 21.75 12.8188C21.75 13.3396 21.5667 13.7833 21.2 14.15L14.15 21.2ZM12.8375 19.875L19.8625 12.825L11.175 4.125H4.125V11.175L12.8375 19.875ZM6.5875 8C6.98333 8 7.31979 7.86146 7.59688 7.58437C7.87396 7.30729 8.0125 6.97083 8.0125 6.575C8.0125 6.17917 7.87396 5.84271 7.59688 5.56562C7.31979 5.28854 6.98333 5.15 6.5875 5.15C6.19167 5.15 5.85521 5.28854 5.57812 5.56562C5.30104 5.84271 5.1625 6.17917 5.1625 6.575C5.1625 6.97083 5.30104 7.30729 5.57812 7.58437C5.85521 7.86146 6.19167 8 6.5875 8Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Printer.tsx b/components/Icons/Printer.tsx
index d703940da..e82696d37 100644
--- a/components/Icons/Printer.tsx
+++ b/components/Icons/Printer.tsx
@@ -14,23 +14,10 @@ export default function PrinterIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_6955_9062"
-        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_9062)">
-        <path
-          d="M7.20964 17.3127C6.77994 17.3127 6.4121 17.1598 6.10611 16.8538C5.80013 16.5478 5.64714 16.1799 5.64714 15.7502V14.0419H3.98047C3.55077 14.0419 3.18293 13.8889 2.87695 13.5829C2.57096 13.2769 2.41797 12.9091 2.41797 12.4794V9.14608C2.41797 8.47941 2.64887 7.91691 3.11068 7.45858C3.57248 7.00024 4.13325 6.77108 4.79297 6.77108H16.2096C16.8763 6.77108 17.4388 7.00024 17.8971 7.45858C18.3555 7.91691 18.5846 8.47941 18.5846 9.14608V12.4794C18.5846 12.9091 18.4316 13.2769 18.1257 13.5829C17.8197 13.8889 17.4518 14.0419 17.0221 14.0419H15.3555V15.7502C15.3555 16.1799 15.2025 16.5478 14.8965 16.8538C14.5905 17.1598 14.2227 17.3127 13.793 17.3127H7.20964ZM3.98047 12.4794H5.64714V12.4169C5.64714 11.9872 5.80013 11.6194 6.10611 11.3134C6.4121 11.0074 6.77994 10.8544 7.20964 10.8544H13.793C14.2227 10.8544 14.5905 11.0074 14.8965 11.3134C15.2025 11.6194 15.3555 11.9872 15.3555 12.4169V12.4794H17.0221V9.14608C17.0221 8.91587 16.944 8.7229 16.7878 8.56718C16.6316 8.41145 16.438 8.33358 16.207 8.33358H4.79564C4.56469 8.33358 4.37109 8.41145 4.21484 8.56718C4.05859 8.7229 3.98047 8.91587 3.98047 9.14608V12.4794ZM13.793 6.77108V4.31274H7.20964V6.77108H5.64714V4.31274C5.64714 3.88305 5.80013 3.51521 6.10611 3.20922C6.4121 2.90324 6.77994 2.75024 7.20964 2.75024H13.793C14.2227 2.75024 14.5905 2.90324 14.8965 3.20922C15.2025 3.51521 15.3555 3.88305 15.3555 4.31274V6.77108H13.793ZM15.3971 10.344C15.6124 10.344 15.7964 10.2676 15.9492 10.1148C16.102 9.96205 16.1784 9.77802 16.1784 9.56274C16.1784 9.34747 16.102 9.16344 15.9492 9.01066C15.7964 8.85788 15.6124 8.78149 15.3971 8.78149C15.1819 8.78149 14.9978 8.85788 14.8451 9.01066C14.6923 9.16344 14.6159 9.34747 14.6159 9.56274C14.6159 9.77802 14.6923 9.96205 14.8451 10.1148C14.9978 10.2676 15.1819 10.344 15.3971 10.344ZM13.793 15.7502V12.4169H7.20964V15.7502H13.793Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M7.20964 17.3127C6.77994 17.3127 6.4121 17.1598 6.10611 16.8538C5.80013 16.5478 5.64714 16.1799 5.64714 15.7502V14.0419H3.98047C3.55077 14.0419 3.18293 13.8889 2.87695 13.5829C2.57096 13.2769 2.41797 12.9091 2.41797 12.4794V9.14608C2.41797 8.47941 2.64887 7.91691 3.11068 7.45858C3.57248 7.00024 4.13325 6.77108 4.79297 6.77108H16.2096C16.8763 6.77108 17.4388 7.00024 17.8971 7.45858C18.3555 7.91691 18.5846 8.47941 18.5846 9.14608V12.4794C18.5846 12.9091 18.4316 13.2769 18.1257 13.5829C17.8197 13.8889 17.4518 14.0419 17.0221 14.0419H15.3555V15.7502C15.3555 16.1799 15.2025 16.5478 14.8965 16.8538C14.5905 17.1598 14.2227 17.3127 13.793 17.3127H7.20964ZM3.98047 12.4794H5.64714V12.4169C5.64714 11.9872 5.80013 11.6194 6.10611 11.3134C6.4121 11.0074 6.77994 10.8544 7.20964 10.8544H13.793C14.2227 10.8544 14.5905 11.0074 14.8965 11.3134C15.2025 11.6194 15.3555 11.9872 15.3555 12.4169V12.4794H17.0221V9.14608C17.0221 8.91587 16.944 8.7229 16.7878 8.56718C16.6316 8.41145 16.438 8.33358 16.207 8.33358H4.79564C4.56469 8.33358 4.37109 8.41145 4.21484 8.56718C4.05859 8.7229 3.98047 8.91587 3.98047 9.14608V12.4794ZM13.793 6.77108V4.31274H7.20964V6.77108H5.64714V4.31274C5.64714 3.88305 5.80013 3.51521 6.10611 3.20922C6.4121 2.90324 6.77994 2.75024 7.20964 2.75024H13.793C14.2227 2.75024 14.5905 2.90324 14.8965 3.20922C15.2025 3.51521 15.3555 3.88305 15.3555 4.31274V6.77108H13.793ZM15.3971 10.344C15.6124 10.344 15.7964 10.2676 15.9492 10.1148C16.102 9.96205 16.1784 9.77802 16.1784 9.56274C16.1784 9.34747 16.102 9.16344 15.9492 9.01066C15.7964 8.85788 15.6124 8.78149 15.3971 8.78149C15.1819 8.78149 14.9978 8.85788 14.8451 9.01066C14.6923 9.16344 14.6159 9.34747 14.6159 9.56274C14.6159 9.77802 14.6923 9.96205 14.8451 10.1148C14.9978 10.2676 15.1819 10.344 15.3971 10.344ZM13.793 15.7502V12.4169H7.20964V15.7502H13.793Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Restaurant.tsx b/components/Icons/Restaurant.tsx
index 4ac06eb32..8fe36e0e6 100644
--- a/components/Icons/Restaurant.tsx
+++ b/components/Icons/Restaurant.tsx
@@ -18,23 +18,10 @@ export default function RestaurantIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_554_11957"
-        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_11957)">
-        <path
-          d="M11.9626 13.3501L5.15008 20.1376C4.96675 20.3209 4.748 20.4146 4.49383 20.4188C4.23966 20.423 4.01675 20.3292 3.82508 20.1376C3.64175 19.9542 3.55008 19.7334 3.55008 19.4751C3.55008 19.2167 3.64175 18.9959 3.82508 18.8126L13.2626 9.40006C12.9626 8.70007 12.9188 7.92298 13.1313 7.06881C13.3438 6.21465 13.8042 5.44173 14.5126 4.75007C15.3542 3.9084 16.3063 3.40632 17.3688 3.24382C18.4313 3.08132 19.2959 3.3334 19.9626 4.00007C20.6292 4.66673 20.8813 5.53131 20.7188 6.59381C20.5563 7.65631 20.0542 8.6084 19.2126 9.45007C18.5209 10.1584 17.748 10.6188 16.8938 10.8313C16.0397 11.0438 15.2626 11.0001 14.5626 10.7001L13.2876 12.0001L20.1126 18.8251C20.2876 19.0001 20.3772 19.2146 20.3813 19.4688C20.3855 19.723 20.2959 19.9459 20.1126 20.1376C19.9376 20.3209 19.7209 20.4126 19.4626 20.4126C19.2042 20.4126 18.9834 20.3209 18.8001 20.1376L11.9626 13.3501ZM7.38758 12.3751L4.46258 9.45007C3.77925 8.76673 3.35008 7.9084 3.17508 6.87506C3.00008 5.84173 3.20425 4.91673 3.78758 4.10007C3.96258 3.8584 4.19383 3.72715 4.48133 3.70632C4.76883 3.68548 5.01258 3.77923 5.21258 3.98757L10.4876 9.30007L7.38758 12.3751Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M11.9626 13.3501L5.15008 20.1376C4.96675 20.3209 4.748 20.4146 4.49383 20.4188C4.23966 20.423 4.01675 20.3292 3.82508 20.1376C3.64175 19.9542 3.55008 19.7334 3.55008 19.4751C3.55008 19.2167 3.64175 18.9959 3.82508 18.8126L13.2626 9.40006C12.9626 8.70007 12.9188 7.92298 13.1313 7.06881C13.3438 6.21465 13.8042 5.44173 14.5126 4.75007C15.3542 3.9084 16.3063 3.40632 17.3688 3.24382C18.4313 3.08132 19.2959 3.3334 19.9626 4.00007C20.6292 4.66673 20.8813 5.53131 20.7188 6.59381C20.5563 7.65631 20.0542 8.6084 19.2126 9.45007C18.5209 10.1584 17.748 10.6188 16.8938 10.8313C16.0397 11.0438 15.2626 11.0001 14.5626 10.7001L13.2876 12.0001L20.1126 18.8251C20.2876 19.0001 20.3772 19.2146 20.3813 19.4688C20.3855 19.723 20.2959 19.9459 20.1126 20.1376C19.9376 20.3209 19.7209 20.4126 19.4626 20.4126C19.2042 20.4126 18.9834 20.3209 18.8001 20.1376L11.9626 13.3501ZM7.38758 12.3751L4.46258 9.45007C3.77925 8.76673 3.35008 7.9084 3.17508 6.87506C3.00008 5.84173 3.20425 4.91673 3.78758 4.10007C3.96258 3.8584 4.19383 3.72715 4.48133 3.70632C4.76883 3.68548 5.01258 3.77923 5.21258 3.98757L10.4876 9.30007L7.38758 12.3751Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/RoomService.tsx b/components/Icons/RoomService.tsx
index 00aadd7d0..b472c7e2a 100644
--- a/components/Icons/RoomService.tsx
+++ b/components/Icons/RoomService.tsx
@@ -18,23 +18,10 @@ export default function RoomServiceIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3469"
-        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_3469)">
-        <path
-          d="M3.23755 18.6875C2.97922 18.6875 2.75838 18.5959 2.57505 18.4125C2.39172 18.2292 2.30005 18.0084 2.30005 17.75C2.30005 17.4917 2.39172 17.2709 2.57505 17.0875C2.75838 16.9042 2.97922 16.8125 3.23755 16.8125H20.775C21.0334 16.8125 21.2542 16.9042 21.4375 17.0875C21.6209 17.2709 21.7125 17.4917 21.7125 17.75C21.7125 18.0084 21.6209 18.2292 21.4375 18.4125C21.2542 18.5959 21.0334 18.6875 20.775 18.6875H3.23755ZM3.23755 15.875V14.9625C3.23755 12.8852 3.88338 11.0513 5.17505 9.46077C6.46672 7.87029 8.11672 6.86255 10.125 6.43755V6.17505C10.125 5.65942 10.3087 5.21801 10.6761 4.85082C11.0436 4.48364 11.4852 4.30005 12.0011 4.30005C12.5171 4.30005 12.9584 4.48364 13.325 4.85082C13.6917 5.21801 13.875 5.65942 13.875 6.17505V6.43755C15.9 6.86255 17.5563 7.87029 18.8438 9.46077C20.1313 11.0513 20.775 12.8852 20.775 14.9625V15.875H3.23755ZM5.16255 14H18.85C18.6167 12.3 17.8515 10.8896 16.5544 9.7688C15.2573 8.64797 13.7386 8.08755 11.9981 8.08755C10.2577 8.08755 8.7438 8.64797 7.4563 9.7688C6.1688 10.8896 5.40422 12.3 5.16255 14Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.23755 18.6875C2.97922 18.6875 2.75838 18.5959 2.57505 18.4125C2.39172 18.2292 2.30005 18.0084 2.30005 17.75C2.30005 17.4917 2.39172 17.2709 2.57505 17.0875C2.75838 16.9042 2.97922 16.8125 3.23755 16.8125H20.775C21.0334 16.8125 21.2542 16.9042 21.4375 17.0875C21.6209 17.2709 21.7125 17.4917 21.7125 17.75C21.7125 18.0084 21.6209 18.2292 21.4375 18.4125C21.2542 18.5959 21.0334 18.6875 20.775 18.6875H3.23755ZM3.23755 15.875V14.9625C3.23755 12.8852 3.88338 11.0513 5.17505 9.46077C6.46672 7.87029 8.11672 6.86255 10.125 6.43755V6.17505C10.125 5.65942 10.3087 5.21801 10.6761 4.85082C11.0436 4.48364 11.4852 4.30005 12.0011 4.30005C12.5171 4.30005 12.9584 4.48364 13.325 4.85082C13.6917 5.21801 13.875 5.65942 13.875 6.17505V6.43755C15.9 6.86255 17.5563 7.87029 18.8438 9.46077C20.1313 11.0513 20.775 12.8852 20.775 14.9625V15.875H3.23755ZM5.16255 14H18.85C18.6167 12.3 17.8515 10.8896 16.5544 9.7688C15.2573 8.64797 13.7386 8.08755 11.9981 8.08755C10.2577 8.08755 8.7438 8.64797 7.4563 9.7688C6.1688 10.8896 5.40422 12.3 5.16255 14Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/SafetyBox.tsx b/components/Icons/SafetyBox.tsx
index 2b79a063f..7dc9e9590 100644
--- a/components/Icons/SafetyBox.tsx
+++ b/components/Icons/SafetyBox.tsx
@@ -18,29 +18,16 @@ export default function SafetyBoxIcon({
       className={classNames}
       {...props}
     >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_82_314"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_82_314)">
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M4.875 18.55C4.35937 18.55 3.91796 18.3664 3.55078 17.9992C3.18359 17.632 3 17.1906 3 16.675V4.875C3 4.35937 3.18359 3.91796 3.55078 3.55078C3.91796 3.18359 4.35937 3 4.875 3H18.675C19.1906 3 19.632 3.18359 19.9992 3.55078C20.3664 3.91796 20.55 4.35937 20.55 4.875V16.675C20.55 17.1906 20.3664 17.632 19.9992 17.9992C19.632 18.3664 19.1906 18.55 18.675 18.55V19.5875C18.675 19.8458 18.5833 20.0667 18.4 20.25C18.2167 20.4333 17.9958 20.525 17.7375 20.525C17.4792 20.525 17.2583 20.4333 17.075 20.25C16.8917 20.0667 16.8 19.8458 16.8 19.5875V18.55H6.75V19.5875C6.75 19.8458 6.65833 20.0667 6.475 20.25C6.29167 20.4333 6.07083 20.525 5.8125 20.525C5.55417 20.525 5.33333 20.4333 5.15 20.25C4.96667 20.0667 4.875 19.8458 4.875 19.5875V18.55ZM4.875 4.875V16.675H18.675V14.275H17.675C17.4167 14.275 17.1958 14.1834 17.0125 14C16.8292 13.8167 16.7375 13.5959 16.7375 13.3375C16.7375 13.0792 16.8292 12.8584 17.0125 12.675C17.1958 12.4917 17.4167 12.4 17.675 12.4H18.675V9.15002H17.675C17.4167 9.15002 17.1958 9.05836 17.0125 8.87502C16.8292 8.69169 16.7375 8.47086 16.7375 8.21252C16.7375 7.95419 16.8292 7.73336 17.0125 7.55002C17.1958 7.36669 17.4167 7.27502 17.675 7.27502H18.675V4.875H4.875Z"
-          fill="#26201E"
-        />
-        <path
-          d="M13.2845 11.2845C13.6615 10.9076 13.85 10.4544 13.85 9.925C13.85 9.39562 13.6615 8.94244 13.2845 8.56548C12.9076 8.18849 12.4544 8 11.925 8C11.3956 8 10.9424 8.18849 10.5655 8.56548C10.1885 8.94244 10 9.39562 10 9.925C10 10.4544 10.1885 10.9076 10.5655 11.2845C10.7069 11.426 10.8419 11.5315 11.0049 11.6199V12.6375C11.0049 12.8959 11.0965 13.1167 11.2799 13.3C11.4632 13.4834 11.684 13.575 11.9424 13.575C12.2007 13.575 12.4215 13.4834 12.6049 13.3C12.7882 13.1167 12.8799 12.8959 12.8799 12.6375V11.6C13.0318 11.514 13.1516 11.4175 13.2845 11.2845Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M4.875 18.55C4.35937 18.55 3.91796 18.3664 3.55078 17.9992C3.18359 17.632 3 17.1906 3 16.675V4.875C3 4.35937 3.18359 3.91796 3.55078 3.55078C3.91796 3.18359 4.35937 3 4.875 3H18.675C19.1906 3 19.632 3.18359 19.9992 3.55078C20.3664 3.91796 20.55 4.35937 20.55 4.875V16.675C20.55 17.1906 20.3664 17.632 19.9992 17.9992C19.632 18.3664 19.1906 18.55 18.675 18.55V19.5875C18.675 19.8458 18.5833 20.0667 18.4 20.25C18.2167 20.4333 17.9958 20.525 17.7375 20.525C17.4792 20.525 17.2583 20.4333 17.075 20.25C16.8917 20.0667 16.8 19.8458 16.8 19.5875V18.55H6.75V19.5875C6.75 19.8458 6.65833 20.0667 6.475 20.25C6.29167 20.4333 6.07083 20.525 5.8125 20.525C5.55417 20.525 5.33333 20.4333 5.15 20.25C4.96667 20.0667 4.875 19.8458 4.875 19.5875V18.55ZM4.875 4.875V16.675H18.675V14.275H17.675C17.4167 14.275 17.1958 14.1834 17.0125 14C16.8292 13.8167 16.7375 13.5959 16.7375 13.3375C16.7375 13.0792 16.8292 12.8584 17.0125 12.675C17.1958 12.4917 17.4167 12.4 17.675 12.4H18.675V9.15002H17.675C17.4167 9.15002 17.1958 9.05836 17.0125 8.87502C16.8292 8.69169 16.7375 8.47086 16.7375 8.21252C16.7375 7.95419 16.8292 7.73336 17.0125 7.55002C17.1958 7.36669 17.4167 7.27502 17.675 7.27502H18.675V4.875H4.875Z"
+        fill="#26201E"
+      />
+      <path
+        d="M13.2845 11.2845C13.6615 10.9076 13.85 10.4544 13.85 9.925C13.85 9.39562 13.6615 8.94244 13.2845 8.56548C12.9076 8.18849 12.4544 8 11.925 8C11.3956 8 10.9424 8.18849 10.5655 8.56548C10.1885 8.94244 10 9.39562 10 9.925C10 10.4544 10.1885 10.9076 10.5655 11.2845C10.7069 11.426 10.8419 11.5315 11.0049 11.6199V12.6375C11.0049 12.8959 11.0965 13.1167 11.2799 13.3C11.4632 13.4834 11.684 13.575 11.9424 13.575C12.2007 13.575 12.4215 13.4834 12.6049 13.3C12.7882 13.1167 12.8799 12.8959 12.8799 12.6375V11.6C13.0318 11.514 13.1516 11.4175 13.2845 11.2845Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Sauna.tsx b/components/Icons/Sauna.tsx
index 13288f6d9..f5535c270 100644
--- a/components/Icons/Sauna.tsx
+++ b/components/Icons/Sauna.tsx
@@ -14,23 +14,10 @@ export default function SaunaIcon({ className, color, ...props }: IconProps) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        id="mask0_83_359"
-        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_83_359)">
-        <path
-          d="M4 22C3.45 22 2.97917 21.8042 2.5875 21.4125C2.19583 21.0208 2 20.55 2 20V4C2 3.45 2.19583 2.97917 2.5875 2.5875C2.97917 2.19583 3.45 2 4 2H20C20.55 2 21.0208 2.19583 21.4125 2.5875C21.8042 2.97917 22 3.45 22 4V20C22 20.55 21.8042 21.0208 21.4125 21.4125C21.0208 21.8042 20.55 22 20 22H4ZM4 16V20H6V18H5V16H4ZM4 14H5C5 13.7167 5.09583 13.4792 5.2875 13.2875C5.47917 13.0958 5.71667 13 6 13V10.5C6 10.0833 6.14583 9.72917 6.4375 9.4375C6.72917 9.14583 7.08333 9 7.5 9H9.5C9.91667 9 10.2708 9.14583 10.5625 9.4375C10.8542 9.72917 11 10.0833 11 10.5V13C11.2833 13 11.5208 13.0958 11.7125 13.2875C11.9042 13.4792 12 13.7167 12 14H20V4H4V14ZM6.5 16.5H10.5V14.5H6.5V16.5ZM8.5 8C8.08333 8 7.72917 7.85417 7.4375 7.5625C7.14583 7.27083 7 6.91667 7 6.5C7 6.08333 7.14583 5.72917 7.4375 5.4375C7.72917 5.14583 8.08333 5 8.5 5C8.91667 5 9.27083 5.14583 9.5625 5.4375C9.85417 5.72917 10 6.08333 10 6.5C10 6.91667 9.85417 7.27083 9.5625 7.5625C9.27083 7.85417 8.91667 8 8.5 8ZM8 20H9V18H8V20ZM11 20H20V16H12V18H11V20ZM12.25 10C12.2833 9.78333 12.3042 9.62083 12.3125 9.5125C12.3208 9.40417 12.325 9.29167 12.325 9.175C12.325 8.99167 12.2875 8.81667 12.2125 8.65C12.1375 8.48333 11.9833 8.25833 11.75 7.975C11.5 7.65833 11.3125 7.34167 11.1875 7.025C11.0625 6.70833 11 6.38333 11 6.05C11 5.91667 11.0083 5.77917 11.025 5.6375L11.1 5H12.6C12.5667 5.18333 12.5417 5.35417 12.525 5.5125C12.5083 5.67083 12.5 5.85 12.5 6.05C12.5 6.23333 12.5375 6.4125 12.6125 6.5875C12.6875 6.7625 12.8167 6.95 13 7.15C13.3 7.51667 13.5167 7.8625 13.65 8.1875C13.7833 8.5125 13.85 8.84167 13.85 9.175C13.85 9.35833 13.8417 9.50833 13.825 9.625C13.8083 9.74167 13.7833 9.86667 13.75 10H12.25ZM14.75 10C14.7833 9.78333 14.8042 9.62083 14.8125 9.5125C14.8208 9.40417 14.825 9.29167 14.825 9.175C14.825 8.99167 14.7875 8.81667 14.7125 8.65C14.6375 8.48333 14.4833 8.25833 14.25 7.975C14 7.65833 13.8125 7.34167 13.6875 7.025C13.5625 6.70833 13.5 6.38333 13.5 6.05C13.5 5.91667 13.5083 5.77917 13.525 5.6375L13.6 5H15.1C15.0667 5.18333 15.0417 5.35417 15.025 5.5125C15.0083 5.67083 15 5.85 15 6.05C15 6.23333 15.0375 6.4125 15.1125 6.5875C15.1875 6.7625 15.3167 6.95 15.5 7.15C15.8 7.51667 16.0167 7.8625 16.15 8.1875C16.2833 8.5125 16.35 8.84167 16.35 9.175C16.35 9.35833 16.3417 9.50833 16.325 9.625C16.3083 9.74167 16.2833 9.86667 16.25 10H14.75ZM17.3 10C17.3333 9.78333 17.3542 9.62083 17.3625 9.5125C17.3708 9.40417 17.375 9.29167 17.375 9.175C17.375 8.99167 17.3375 8.81667 17.2625 8.65C17.1875 8.48333 17.0333 8.25833 16.8 7.975C16.55 7.65833 16.3625 7.34167 16.2375 7.025C16.1125 6.70833 16.05 6.38333 16.05 6.05C16.05 5.91667 16.0583 5.77917 16.075 5.6375L16.15 5H17.65C17.6167 5.18333 17.5917 5.35417 17.575 5.5125C17.5583 5.67083 17.55 5.85 17.55 6.05C17.55 6.23333 17.5875 6.4125 17.6625 6.5875C17.7375 6.7625 17.8667 6.95 18.05 7.15C18.35 7.51667 18.5667 7.8625 18.7 8.1875C18.8333 8.5125 18.9 8.84167 18.9 9.175C18.9 9.35833 18.8917 9.50833 18.875 9.625C18.8583 9.74167 18.8333 9.86667 18.8 10H17.3Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M4 22C3.45 22 2.97917 21.8042 2.5875 21.4125C2.19583 21.0208 2 20.55 2 20V4C2 3.45 2.19583 2.97917 2.5875 2.5875C2.97917 2.19583 3.45 2 4 2H20C20.55 2 21.0208 2.19583 21.4125 2.5875C21.8042 2.97917 22 3.45 22 4V20C22 20.55 21.8042 21.0208 21.4125 21.4125C21.0208 21.8042 20.55 22 20 22H4ZM4 16V20H6V18H5V16H4ZM4 14H5C5 13.7167 5.09583 13.4792 5.2875 13.2875C5.47917 13.0958 5.71667 13 6 13V10.5C6 10.0833 6.14583 9.72917 6.4375 9.4375C6.72917 9.14583 7.08333 9 7.5 9H9.5C9.91667 9 10.2708 9.14583 10.5625 9.4375C10.8542 9.72917 11 10.0833 11 10.5V13C11.2833 13 11.5208 13.0958 11.7125 13.2875C11.9042 13.4792 12 13.7167 12 14H20V4H4V14ZM6.5 16.5H10.5V14.5H6.5V16.5ZM8.5 8C8.08333 8 7.72917 7.85417 7.4375 7.5625C7.14583 7.27083 7 6.91667 7 6.5C7 6.08333 7.14583 5.72917 7.4375 5.4375C7.72917 5.14583 8.08333 5 8.5 5C8.91667 5 9.27083 5.14583 9.5625 5.4375C9.85417 5.72917 10 6.08333 10 6.5C10 6.91667 9.85417 7.27083 9.5625 7.5625C9.27083 7.85417 8.91667 8 8.5 8ZM8 20H9V18H8V20ZM11 20H20V16H12V18H11V20ZM12.25 10C12.2833 9.78333 12.3042 9.62083 12.3125 9.5125C12.3208 9.40417 12.325 9.29167 12.325 9.175C12.325 8.99167 12.2875 8.81667 12.2125 8.65C12.1375 8.48333 11.9833 8.25833 11.75 7.975C11.5 7.65833 11.3125 7.34167 11.1875 7.025C11.0625 6.70833 11 6.38333 11 6.05C11 5.91667 11.0083 5.77917 11.025 5.6375L11.1 5H12.6C12.5667 5.18333 12.5417 5.35417 12.525 5.5125C12.5083 5.67083 12.5 5.85 12.5 6.05C12.5 6.23333 12.5375 6.4125 12.6125 6.5875C12.6875 6.7625 12.8167 6.95 13 7.15C13.3 7.51667 13.5167 7.8625 13.65 8.1875C13.7833 8.5125 13.85 8.84167 13.85 9.175C13.85 9.35833 13.8417 9.50833 13.825 9.625C13.8083 9.74167 13.7833 9.86667 13.75 10H12.25ZM14.75 10C14.7833 9.78333 14.8042 9.62083 14.8125 9.5125C14.8208 9.40417 14.825 9.29167 14.825 9.175C14.825 8.99167 14.7875 8.81667 14.7125 8.65C14.6375 8.48333 14.4833 8.25833 14.25 7.975C14 7.65833 13.8125 7.34167 13.6875 7.025C13.5625 6.70833 13.5 6.38333 13.5 6.05C13.5 5.91667 13.5083 5.77917 13.525 5.6375L13.6 5H15.1C15.0667 5.18333 15.0417 5.35417 15.025 5.5125C15.0083 5.67083 15 5.85 15 6.05C15 6.23333 15.0375 6.4125 15.1125 6.5875C15.1875 6.7625 15.3167 6.95 15.5 7.15C15.8 7.51667 16.0167 7.8625 16.15 8.1875C16.2833 8.5125 16.35 8.84167 16.35 9.175C16.35 9.35833 16.3417 9.50833 16.325 9.625C16.3083 9.74167 16.2833 9.86667 16.25 10H14.75ZM17.3 10C17.3333 9.78333 17.3542 9.62083 17.3625 9.5125C17.3708 9.40417 17.375 9.29167 17.375 9.175C17.375 8.99167 17.3375 8.81667 17.2625 8.65C17.1875 8.48333 17.0333 8.25833 16.8 7.975C16.55 7.65833 16.3625 7.34167 16.2375 7.025C16.1125 6.70833 16.05 6.38333 16.05 6.05C16.05 5.91667 16.0583 5.77917 16.075 5.6375L16.15 5H17.65C17.6167 5.18333 17.5917 5.35417 17.575 5.5125C17.5583 5.67083 17.55 5.85 17.55 6.05C17.55 6.23333 17.5875 6.4125 17.6625 6.5875C17.7375 6.7625 17.8667 6.95 18.05 7.15C18.35 7.51667 18.5667 7.8625 18.7 8.1875C18.8333 8.5125 18.9 8.84167 18.9 9.175C18.9 9.35833 18.8917 9.50833 18.875 9.625C18.8583 9.74167 18.8333 9.86667 18.8 10H17.3Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Search.tsx b/components/Icons/Search.tsx
index aa9f15e52..a849ffcbe 100644
--- a/components/Icons/Search.tsx
+++ b/components/Icons/Search.tsx
@@ -14,23 +14,10 @@ export default function SearchIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3280"
-        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_3280)">
-        <path
-          d="M9.54147 15.85C7.77261 15.85 6.27557 15.2379 5.05035 14.0137C3.82513 12.7894 3.21252 11.2936 3.21252 9.52616C3.21252 7.75873 3.82464 6.26251 5.04887 5.03751C6.27311 3.81251 7.76894 3.20001 9.53637 3.20001C11.3038 3.20001 12.8 3.81262 14.025 5.03784C15.25 6.26305 15.8625 7.7601 15.8625 9.52896C15.8625 10.243 15.75 10.9229 15.525 11.5688C15.3 12.2146 14.9917 12.7833 14.6 13.275L20.1404 18.8035C20.3218 18.9845 20.4125 19.2042 20.4125 19.4625C20.4125 19.7208 20.3209 19.9417 20.1375 20.125C19.9542 20.3083 19.7334 20.4 19.475 20.4C19.2167 20.4 18.9969 20.3094 18.8156 20.1283L13.279 14.5875C12.7847 14.9875 12.2167 15.2979 11.575 15.5188C10.9334 15.7396 10.2555 15.85 9.54147 15.85ZM9.53752 13.975C10.7792 13.975 11.8313 13.5438 12.6938 12.6813C13.5563 11.8188 13.9875 10.7667 13.9875 9.52501C13.9875 8.28335 13.5563 7.23126 12.6938 6.36876C11.8313 5.50626 10.7792 5.07501 9.53752 5.07501C8.29586 5.07501 7.24377 5.50626 6.38127 6.36876C5.51877 7.23126 5.08752 8.28335 5.08752 9.52501C5.08752 10.7667 5.51877 11.8188 6.38127 12.6813C7.24377 13.5438 8.29586 13.975 9.53752 13.975Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M9.54147 15.85C7.77261 15.85 6.27557 15.2379 5.05035 14.0137C3.82513 12.7894 3.21252 11.2936 3.21252 9.52616C3.21252 7.75873 3.82464 6.26251 5.04887 5.03751C6.27311 3.81251 7.76894 3.20001 9.53637 3.20001C11.3038 3.20001 12.8 3.81262 14.025 5.03784C15.25 6.26305 15.8625 7.7601 15.8625 9.52896C15.8625 10.243 15.75 10.9229 15.525 11.5688C15.3 12.2146 14.9917 12.7833 14.6 13.275L20.1404 18.8035C20.3218 18.9845 20.4125 19.2042 20.4125 19.4625C20.4125 19.7208 20.3209 19.9417 20.1375 20.125C19.9542 20.3083 19.7334 20.4 19.475 20.4C19.2167 20.4 18.9969 20.3094 18.8156 20.1283L13.279 14.5875C12.7847 14.9875 12.2167 15.2979 11.575 15.5188C10.9334 15.7396 10.2555 15.85 9.54147 15.85ZM9.53752 13.975C10.7792 13.975 11.8313 13.5438 12.6938 12.6813C13.5563 11.8188 13.9875 10.7667 13.9875 9.52501C13.9875 8.28335 13.5563 7.23126 12.6938 6.36876C11.8313 5.50626 10.7792 5.07501 9.53752 5.07501C8.29586 5.07501 7.24377 5.50626 6.38127 6.36876C5.51877 7.23126 5.08752 8.28335 5.08752 9.52501C5.08752 10.7667 5.51877 11.8188 6.38127 12.6813C7.24377 13.5438 8.29586 13.975 9.53752 13.975Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Service.tsx b/components/Icons/Service.tsx
index 1f91f7cd8..9ebb97d6a 100644
--- a/components/Icons/Service.tsx
+++ b/components/Icons/Service.tsx
@@ -14,23 +14,10 @@ export default function ServiceIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_2291_1682"
-        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_1682)">
-        <path
-          d="M15.792 18.3337C14.0559 18.3337 12.3406 17.9552 10.6462 17.1982C8.95171 16.4413 7.41005 15.3684 6.02116 13.9795C4.63227 12.5906 3.55935 11.0489 2.80241 9.35449C2.04546 7.66005 1.66699 5.94477 1.66699 4.20866C1.66699 3.95866 1.75033 3.75033 1.91699 3.58366C2.08366 3.41699 2.29199 3.33366 2.54199 3.33366H5.91699C6.11144 3.33366 6.28505 3.39963 6.43783 3.53158C6.5906 3.66352 6.68088 3.81977 6.70866 4.00033L7.25033 6.91699C7.2781 7.13921 7.27116 7.32671 7.22949 7.47949C7.18783 7.63227 7.11144 7.76421 7.00033 7.87533L4.97949 9.91699C5.25727 10.4309 5.58713 10.9274 5.96908 11.4066C6.35102 11.8857 6.77116 12.3475 7.22949 12.792C7.66005 13.2225 8.11144 13.6219 8.58366 13.9899C9.05588 14.358 9.55588 14.6948 10.0837 15.0003L12.042 13.042C12.167 12.917 12.3302 12.8232 12.5316 12.7607C12.733 12.6982 12.9309 12.6809 13.1253 12.7087L16.0003 13.292C16.1948 13.3475 16.3545 13.4482 16.4795 13.5941C16.6045 13.7399 16.667 13.9031 16.667 14.0837V17.4587C16.667 17.7087 16.5837 17.917 16.417 18.0837C16.2503 18.2503 16.042 18.3337 15.792 18.3337ZM4.18783 8.33366L5.56283 6.95866L5.20866 5.00033H3.35449C3.42394 5.56977 3.52116 6.13227 3.64616 6.68783C3.77116 7.24338 3.95171 7.79199 4.18783 8.33366ZM11.6462 15.792C12.1878 16.0281 12.7399 16.2156 13.3024 16.3545C13.8649 16.4934 14.4309 16.5837 15.0003 16.6253V14.792L13.042 14.3962L11.6462 15.792ZM14.167 10.0003C13.0142 10.0003 12.0316 9.59408 11.2191 8.78158C10.4066 7.96908 10.0003 6.98644 10.0003 5.83366C10.0003 4.68088 10.4066 3.69824 11.2191 2.88574C12.0316 2.07324 13.0142 1.66699 14.167 1.66699C15.3198 1.66699 16.3024 2.07324 17.1149 2.88574C17.9274 3.69824 18.3337 4.68088 18.3337 5.83366C18.3337 6.98644 17.9274 7.96908 17.1149 8.78158C16.3024 9.59408 15.3198 10.0003 14.167 10.0003ZM13.7503 8.33366H14.5837V5.00033H13.7503V8.33366ZM14.167 4.16699C14.2781 4.16699 14.3753 4.12533 14.4587 4.04199C14.542 3.95866 14.5837 3.86144 14.5837 3.75033C14.5837 3.63921 14.542 3.54199 14.4587 3.45866C14.3753 3.37533 14.2781 3.33366 14.167 3.33366C14.0559 3.33366 13.9587 3.37533 13.8753 3.45866C13.792 3.54199 13.7503 3.63921 13.7503 3.75033C13.7503 3.86144 13.792 3.95866 13.8753 4.04199C13.9587 4.12533 14.0559 4.16699 14.167 4.16699Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M15.792 18.3337C14.0559 18.3337 12.3406 17.9552 10.6462 17.1982C8.95171 16.4413 7.41005 15.3684 6.02116 13.9795C4.63227 12.5906 3.55935 11.0489 2.80241 9.35449C2.04546 7.66005 1.66699 5.94477 1.66699 4.20866C1.66699 3.95866 1.75033 3.75033 1.91699 3.58366C2.08366 3.41699 2.29199 3.33366 2.54199 3.33366H5.91699C6.11144 3.33366 6.28505 3.39963 6.43783 3.53158C6.5906 3.66352 6.68088 3.81977 6.70866 4.00033L7.25033 6.91699C7.2781 7.13921 7.27116 7.32671 7.22949 7.47949C7.18783 7.63227 7.11144 7.76421 7.00033 7.87533L4.97949 9.91699C5.25727 10.4309 5.58713 10.9274 5.96908 11.4066C6.35102 11.8857 6.77116 12.3475 7.22949 12.792C7.66005 13.2225 8.11144 13.6219 8.58366 13.9899C9.05588 14.358 9.55588 14.6948 10.0837 15.0003L12.042 13.042C12.167 12.917 12.3302 12.8232 12.5316 12.7607C12.733 12.6982 12.9309 12.6809 13.1253 12.7087L16.0003 13.292C16.1948 13.3475 16.3545 13.4482 16.4795 13.5941C16.6045 13.7399 16.667 13.9031 16.667 14.0837V17.4587C16.667 17.7087 16.5837 17.917 16.417 18.0837C16.2503 18.2503 16.042 18.3337 15.792 18.3337ZM4.18783 8.33366L5.56283 6.95866L5.20866 5.00033H3.35449C3.42394 5.56977 3.52116 6.13227 3.64616 6.68783C3.77116 7.24338 3.95171 7.79199 4.18783 8.33366ZM11.6462 15.792C12.1878 16.0281 12.7399 16.2156 13.3024 16.3545C13.8649 16.4934 14.4309 16.5837 15.0003 16.6253V14.792L13.042 14.3962L11.6462 15.792ZM14.167 10.0003C13.0142 10.0003 12.0316 9.59408 11.2191 8.78158C10.4066 7.96908 10.0003 6.98644 10.0003 5.83366C10.0003 4.68088 10.4066 3.69824 11.2191 2.88574C12.0316 2.07324 13.0142 1.66699 14.167 1.66699C15.3198 1.66699 16.3024 2.07324 17.1149 2.88574C17.9274 3.69824 18.3337 4.68088 18.3337 5.83366C18.3337 6.98644 17.9274 7.96908 17.1149 8.78158C16.3024 9.59408 15.3198 10.0003 14.167 10.0003ZM13.7503 8.33366H14.5837V5.00033H13.7503V8.33366ZM14.167 4.16699C14.2781 4.16699 14.3753 4.12533 14.4587 4.04199C14.542 3.95866 14.5837 3.86144 14.5837 3.75033C14.5837 3.63921 14.542 3.54199 14.4587 3.45866C14.3753 3.37533 14.2781 3.33366 14.167 3.33366C14.0559 3.33366 13.9587 3.37533 13.8753 3.45866C13.792 3.54199 13.7503 3.63921 13.7503 3.75033C13.7503 3.86144 13.792 3.95866 13.8753 4.04199C13.9587 4.12533 14.0559 4.16699 14.167 4.16699Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Shopping.tsx b/components/Icons/Shopping.tsx
index 87b1da6b2..d427f3a38 100644
--- a/components/Icons/Shopping.tsx
+++ b/components/Icons/Shopping.tsx
@@ -18,23 +18,10 @@ export default function ShoppingIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3482"
-        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_3482)">
-        <path
-          d="M6.125 21.75C5.60937 21.75 5.16796 21.5664 4.80078 21.1992C4.43359 20.832 4.25 20.3906 4.25 19.875V8.05C4.25 7.53437 4.43359 7.09296 4.80078 6.72578C5.16796 6.35859 5.60937 6.175 6.125 6.175H8.0625C8.0625 5.09167 8.4481 4.16667 9.2193 3.4C9.9905 2.63333 10.9176 2.25 12.0006 2.25C13.0835 2.25 14.0104 2.63433 14.7812 3.40298C15.5521 4.17161 15.9375 5.09562 15.9375 6.175H17.875C18.3906 6.175 18.832 6.35859 19.1992 6.72578C19.5664 7.09296 19.75 7.53437 19.75 8.05V19.875C19.75 20.3906 19.5664 20.832 19.1992 21.1992C18.832 21.5664 18.3906 21.75 17.875 21.75H6.125ZM6.125 19.875H17.875V8.05H15.9375V10.1125C15.9375 10.3708 15.8458 10.5917 15.6625 10.775C15.4792 10.9583 15.2583 11.05 15 11.05C14.7417 11.05 14.5208 10.9583 14.3375 10.775C14.1542 10.5917 14.0625 10.3708 14.0625 10.1125V8.05H9.9375V10.1125C9.9375 10.3708 9.84583 10.5917 9.6625 10.775C9.47917 10.9583 9.25833 11.05 9 11.05C8.74167 11.05 8.52083 10.9583 8.3375 10.775C8.15417 10.5917 8.0625 10.3708 8.0625 10.1125V8.05H6.125V19.875ZM9.9375 6.175H14.0625C14.0625 5.60833 13.8606 5.125 13.4568 4.725C13.053 4.325 12.5676 4.125 12.0006 4.125C11.4335 4.125 10.9479 4.32573 10.5438 4.7272C10.1396 5.12865 9.9375 5.61125 9.9375 6.175Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M6.125 21.75C5.60937 21.75 5.16796 21.5664 4.80078 21.1992C4.43359 20.832 4.25 20.3906 4.25 19.875V8.05C4.25 7.53437 4.43359 7.09296 4.80078 6.72578C5.16796 6.35859 5.60937 6.175 6.125 6.175H8.0625C8.0625 5.09167 8.4481 4.16667 9.2193 3.4C9.9905 2.63333 10.9176 2.25 12.0006 2.25C13.0835 2.25 14.0104 2.63433 14.7812 3.40298C15.5521 4.17161 15.9375 5.09562 15.9375 6.175H17.875C18.3906 6.175 18.832 6.35859 19.1992 6.72578C19.5664 7.09296 19.75 7.53437 19.75 8.05V19.875C19.75 20.3906 19.5664 20.832 19.1992 21.1992C18.832 21.5664 18.3906 21.75 17.875 21.75H6.125ZM6.125 19.875H17.875V8.05H15.9375V10.1125C15.9375 10.3708 15.8458 10.5917 15.6625 10.775C15.4792 10.9583 15.2583 11.05 15 11.05C14.7417 11.05 14.5208 10.9583 14.3375 10.775C14.1542 10.5917 14.0625 10.3708 14.0625 10.1125V8.05H9.9375V10.1125C9.9375 10.3708 9.84583 10.5917 9.6625 10.775C9.47917 10.9583 9.25833 11.05 9 11.05C8.74167 11.05 8.52083 10.9583 8.3375 10.775C8.15417 10.5917 8.0625 10.3708 8.0625 10.1125V8.05H6.125V19.875ZM9.9375 6.175H14.0625C14.0625 5.60833 13.8606 5.125 13.4568 4.725C13.053 4.325 12.5676 4.125 12.0006 4.125C11.4335 4.125 10.9479 4.32573 10.5438 4.7272C10.1396 5.12865 9.9375 5.61125 9.9375 6.175Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Shower.tsx b/components/Icons/Shower.tsx
index 432b5f346..0f54c4829 100644
--- a/components/Icons/Shower.tsx
+++ b/components/Icons/Shower.tsx
@@ -14,23 +14,10 @@ export default function ShowerIcon({ className, color, ...props }: IconProps) {
       className={classNames}
       {...props}
     >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3474"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3474)">
-        <path
-          d="M8.02495 17.7625C7.75828 17.7625 7.53537 17.6709 7.3562 17.4875C7.17703 17.3042 7.08745 17.0834 7.08745 16.825C7.08745 16.5667 7.17703 16.3459 7.3562 16.1625C7.53537 15.9792 7.75828 15.8875 8.02495 15.8875C8.28328 15.8875 8.50412 15.9792 8.68745 16.1625C8.87078 16.3459 8.96245 16.5667 8.96245 16.825C8.96245 17.0834 8.87078 17.3042 8.68745 17.4875C8.50412 17.6709 8.28328 17.7625 8.02495 17.7625ZM12 17.7625C11.7416 17.7625 11.5208 17.6709 11.3375 17.4875C11.1541 17.3042 11.0625 17.0834 11.0625 16.825C11.0625 16.5667 11.1541 16.3459 11.3375 16.1625C11.5208 15.9792 11.7416 15.8875 12 15.8875C12.2666 15.8875 12.4895 15.9792 12.6687 16.1625C12.8479 16.3459 12.9375 16.5667 12.9375 16.825C12.9375 17.0834 12.8479 17.3042 12.6687 17.4875C12.4895 17.6709 12.2666 17.7625 12 17.7625ZM16 17.7625C15.7416 17.7625 15.5208 17.6709 15.3375 17.4875C15.1541 17.3042 15.0625 17.0834 15.0625 16.825C15.0625 16.5667 15.1541 16.3459 15.3375 16.1625C15.5208 15.9792 15.7416 15.8875 16 15.8875C16.2666 15.8875 16.4895 15.9792 16.6687 16.1625C16.8479 16.3459 16.9375 16.5667 16.9375 16.825C16.9375 17.0834 16.8479 17.3042 16.6687 17.4875C16.4895 17.6709 16.2666 17.7625 16 17.7625ZM6.13745 14.0125C5.87912 14.0125 5.65828 13.9209 5.47495 13.7375C5.29162 13.5542 5.19995 13.3334 5.19995 13.075V12.1375C5.19995 10.4209 5.7562 8.92713 6.8687 7.6563C7.9812 6.38547 9.37912 5.64172 11.0625 5.42505V4.30005C11.0625 4.04172 11.1541 3.82088 11.3375 3.63755C11.5208 3.45422 11.7416 3.36255 12 3.36255C12.2583 3.36255 12.4791 3.45422 12.6625 3.63755C12.8458 3.82088 12.9375 4.04172 12.9375 4.30005V5.42505C14.6291 5.64172 16.0291 6.38547 17.1375 7.6563C18.2458 8.92713 18.8 10.4209 18.8 12.1375V13.075C18.8 13.3334 18.7083 13.5542 18.525 13.7375C18.3416 13.9209 18.1208 14.0125 17.8625 14.0125H6.13745ZM7.07495 12.1375H16.925C16.925 10.7709 16.4458 9.60838 15.4875 8.65005C14.5291 7.69172 13.3666 7.21255 12 7.21255C10.6416 7.21255 9.4812 7.69172 8.5187 8.65005C7.5562 9.60838 7.07495 10.7709 7.07495 12.1375ZM8.02495 20.575C7.75828 20.575 7.53537 20.4834 7.3562 20.3C7.17703 20.1167 7.08745 19.8959 7.08745 19.6375C7.08745 19.3792 7.17703 19.1584 7.3562 18.975C7.53537 18.7917 7.75828 18.7 8.02495 18.7C8.28328 18.7 8.50412 18.7917 8.68745 18.975C8.87078 19.1584 8.96245 19.3792 8.96245 19.6375C8.96245 19.8959 8.87078 20.1167 8.68745 20.3C8.50412 20.4834 8.28328 20.575 8.02495 20.575ZM12 20.575C11.7416 20.575 11.5208 20.4834 11.3375 20.3C11.1541 20.1167 11.0625 19.8959 11.0625 19.6375C11.0625 19.3792 11.1541 19.1584 11.3375 18.975C11.5208 18.7917 11.7416 18.7 12 18.7C12.2666 18.7 12.4895 18.7917 12.6687 18.975C12.8479 19.1584 12.9375 19.3792 12.9375 19.6375C12.9375 19.8959 12.8479 20.1167 12.6687 20.3C12.4895 20.4834 12.2666 20.575 12 20.575ZM16 20.575C15.7416 20.575 15.5208 20.4834 15.3375 20.3C15.1541 20.1167 15.0625 19.8959 15.0625 19.6375C15.0625 19.3792 15.1541 19.1584 15.3375 18.975C15.5208 18.7917 15.7416 18.7 16 18.7C16.2666 18.7 16.4895 18.7917 16.6687 18.975C16.8479 19.1584 16.9375 19.3792 16.9375 19.6375C16.9375 19.8959 16.8479 20.1167 16.6687 20.3C16.4895 20.4834 16.2666 20.575 16 20.575Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M8.02495 17.7625C7.75828 17.7625 7.53537 17.6709 7.3562 17.4875C7.17703 17.3042 7.08745 17.0834 7.08745 16.825C7.08745 16.5667 7.17703 16.3459 7.3562 16.1625C7.53537 15.9792 7.75828 15.8875 8.02495 15.8875C8.28328 15.8875 8.50412 15.9792 8.68745 16.1625C8.87078 16.3459 8.96245 16.5667 8.96245 16.825C8.96245 17.0834 8.87078 17.3042 8.68745 17.4875C8.50412 17.6709 8.28328 17.7625 8.02495 17.7625ZM12 17.7625C11.7416 17.7625 11.5208 17.6709 11.3375 17.4875C11.1541 17.3042 11.0625 17.0834 11.0625 16.825C11.0625 16.5667 11.1541 16.3459 11.3375 16.1625C11.5208 15.9792 11.7416 15.8875 12 15.8875C12.2666 15.8875 12.4895 15.9792 12.6687 16.1625C12.8479 16.3459 12.9375 16.5667 12.9375 16.825C12.9375 17.0834 12.8479 17.3042 12.6687 17.4875C12.4895 17.6709 12.2666 17.7625 12 17.7625ZM16 17.7625C15.7416 17.7625 15.5208 17.6709 15.3375 17.4875C15.1541 17.3042 15.0625 17.0834 15.0625 16.825C15.0625 16.5667 15.1541 16.3459 15.3375 16.1625C15.5208 15.9792 15.7416 15.8875 16 15.8875C16.2666 15.8875 16.4895 15.9792 16.6687 16.1625C16.8479 16.3459 16.9375 16.5667 16.9375 16.825C16.9375 17.0834 16.8479 17.3042 16.6687 17.4875C16.4895 17.6709 16.2666 17.7625 16 17.7625ZM6.13745 14.0125C5.87912 14.0125 5.65828 13.9209 5.47495 13.7375C5.29162 13.5542 5.19995 13.3334 5.19995 13.075V12.1375C5.19995 10.4209 5.7562 8.92713 6.8687 7.6563C7.9812 6.38547 9.37912 5.64172 11.0625 5.42505V4.30005C11.0625 4.04172 11.1541 3.82088 11.3375 3.63755C11.5208 3.45422 11.7416 3.36255 12 3.36255C12.2583 3.36255 12.4791 3.45422 12.6625 3.63755C12.8458 3.82088 12.9375 4.04172 12.9375 4.30005V5.42505C14.6291 5.64172 16.0291 6.38547 17.1375 7.6563C18.2458 8.92713 18.8 10.4209 18.8 12.1375V13.075C18.8 13.3334 18.7083 13.5542 18.525 13.7375C18.3416 13.9209 18.1208 14.0125 17.8625 14.0125H6.13745ZM7.07495 12.1375H16.925C16.925 10.7709 16.4458 9.60838 15.4875 8.65005C14.5291 7.69172 13.3666 7.21255 12 7.21255C10.6416 7.21255 9.4812 7.69172 8.5187 8.65005C7.5562 9.60838 7.07495 10.7709 7.07495 12.1375ZM8.02495 20.575C7.75828 20.575 7.53537 20.4834 7.3562 20.3C7.17703 20.1167 7.08745 19.8959 7.08745 19.6375C7.08745 19.3792 7.17703 19.1584 7.3562 18.975C7.53537 18.7917 7.75828 18.7 8.02495 18.7C8.28328 18.7 8.50412 18.7917 8.68745 18.975C8.87078 19.1584 8.96245 19.3792 8.96245 19.6375C8.96245 19.8959 8.87078 20.1167 8.68745 20.3C8.50412 20.4834 8.28328 20.575 8.02495 20.575ZM12 20.575C11.7416 20.575 11.5208 20.4834 11.3375 20.3C11.1541 20.1167 11.0625 19.8959 11.0625 19.6375C11.0625 19.3792 11.1541 19.1584 11.3375 18.975C11.5208 18.7917 11.7416 18.7 12 18.7C12.2666 18.7 12.4895 18.7917 12.6687 18.975C12.8479 19.1584 12.9375 19.3792 12.9375 19.6375C12.9375 19.8959 12.8479 20.1167 12.6687 20.3C12.4895 20.4834 12.2666 20.575 12 20.575ZM16 20.575C15.7416 20.575 15.5208 20.4834 15.3375 20.3C15.1541 20.1167 15.0625 19.8959 15.0625 19.6375C15.0625 19.3792 15.1541 19.1584 15.3375 18.975C15.5208 18.7917 15.7416 18.7 16 18.7C16.2666 18.7 16.4895 18.7917 16.6687 18.975C16.8479 19.1584 16.9375 19.3792 16.9375 19.6375C16.9375 19.8959 16.8479 20.1167 16.6687 20.3C16.4895 20.4834 16.2666 20.575 16 20.575Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Skateboarding.tsx b/components/Icons/Skateboarding.tsx
index 6c0106ff3..a94dd0ff2 100644
--- a/components/Icons/Skateboarding.tsx
+++ b/components/Icons/Skateboarding.tsx
@@ -18,23 +18,10 @@ export default function SkateboardingIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3737"
-        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_3737)">
-        <path
-          d="M7.24998 24C7.04998 24 6.87498 23.925 6.72498 23.775C6.57498 23.625 6.49998 23.4501 6.49998 23.25C6.49998 23.05 6.57498 22.875 6.72498 22.725C6.87498 22.5751 7.04998 22.5 7.24998 22.5C7.44998 22.5 7.62498 22.5751 7.77498 22.725C7.92498 22.875 7.99998 23.05 7.99998 23.25C7.99998 23.4501 7.92498 23.625 7.77498 23.775C7.62498 23.925 7.44998 24 7.24998 24ZM15.75 24C15.55 24 15.375 23.925 15.225 23.775C15.075 23.625 15 23.4501 15 23.25C15 23.05 15.075 22.875 15.225 22.725C15.375 22.5751 15.55 22.5 15.75 22.5C15.95 22.5 16.125 22.5751 16.275 22.725C16.425 22.875 16.5 23.05 16.5 23.25C16.5 23.4501 16.425 23.625 16.275 23.775C16.125 23.925 15.95 24 15.75 24ZM6.74998 21.9375C6.01664 21.9375 5.33956 21.7771 4.71873 21.4563C4.09789 21.1355 3.58331 20.7042 3.17498 20.1625C3.13331 20.0875 3.09998 20.0188 3.07498 19.9563C3.04998 19.8938 3.03748 19.8251 3.03748 19.75C3.03748 19.5667 3.09998 19.4063 3.22498 19.2688C3.34998 19.1313 3.51664 19.0625 3.72498 19.0625C3.84164 19.0625 3.94373 19.0855 4.03123 19.1313C4.11873 19.1771 4.19998 19.2459 4.27498 19.3375C4.48331 19.6209 4.74373 19.8625 5.05623 20.0625C5.36873 20.2626 5.70831 20.4084 6.07498 20.5L9.24998 16.6625L7.83748 12.4875C7.77081 12.2709 7.75414 12.0188 7.78748 11.7313C7.82081 11.4438 7.90831 11.1875 8.04998 10.9625L10.5625 6.93755H8.06248L6.66248 9.17505C6.52081 9.39172 6.32706 9.5313 6.08123 9.5938C5.83539 9.6563 5.60414 9.61672 5.38748 9.47505C5.17081 9.33338 5.03123 9.13547 4.96873 8.8813C4.90623 8.62713 4.94581 8.39172 5.08748 8.17505L6.76248 5.50005C6.84581 5.35838 6.95623 5.25005 7.09373 5.17505C7.23123 5.10005 7.38331 5.06255 7.54998 5.06255H12.7C13.1333 5.06255 13.4833 5.18338 13.75 5.42505C14.0166 5.66672 14.1958 5.89172 14.2875 6.10005L14.8125 7.30005C15.1041 7.97505 15.5312 8.55005 16.0937 9.02505C16.6562 9.50005 17.3041 9.81672 18.0375 9.97505C18.2958 10.0334 18.5104 10.1542 18.6812 10.3375C18.8521 10.5209 18.9375 10.7417 18.9375 11C18.9375 11.2584 18.85 11.475 18.675 11.65C18.5 11.825 18.2875 11.8959 18.0375 11.8625C17.0791 11.7209 16.2062 11.3813 15.4187 10.8438C14.6312 10.3063 13.9833 9.63755 13.475 8.83755L11.5875 11.8375L15.5 14.2625C15.6416 14.3459 15.75 14.4563 15.825 14.5938C15.9 14.7313 15.9375 14.8834 15.9375 15.05V20.5625H16.275C16.775 20.5625 17.2375 20.4521 17.6625 20.2313C18.0875 20.0105 18.4416 19.7125 18.725 19.3375C18.8 19.2459 18.8812 19.1771 18.9687 19.1313C19.0562 19.0855 19.1583 19.0625 19.275 19.0625C19.475 19.0625 19.6396 19.1313 19.7687 19.2688C19.8979 19.4063 19.9625 19.5667 19.9625 19.75C19.9625 19.8251 19.95 19.8938 19.925 19.9563C19.9 20.0188 19.8666 20.0875 19.825 20.1625C19.4166 20.7042 18.9062 21.1355 18.2937 21.4563C17.6812 21.7771 17.0083 21.9375 16.275 21.9375H6.74998ZM8.46248 20.5625H14.0625V15.8625L10.3125 13.5L11.275 16.5C11.325 16.65 11.3354 16.8042 11.3062 16.9625C11.2771 17.1209 11.2083 17.2625 11.1 17.3875L8.46248 20.5625ZM15 4.95005C14.4583 4.95005 13.9979 4.76047 13.6187 4.3813C13.2396 4.00213 13.05 3.54172 13.05 3.00005C13.05 2.45838 13.2396 1.99797 13.6187 1.6188C13.9979 1.23963 14.4583 1.05005 15 1.05005C15.5416 1.05005 16.0021 1.23963 16.3812 1.6188C16.7604 1.99797 16.95 2.45838 16.95 3.00005C16.95 3.54172 16.7604 4.00213 16.3812 4.3813C16.0021 4.76047 15.5416 4.95005 15 4.95005Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M7.24998 24C7.04998 24 6.87498 23.925 6.72498 23.775C6.57498 23.625 6.49998 23.4501 6.49998 23.25C6.49998 23.05 6.57498 22.875 6.72498 22.725C6.87498 22.5751 7.04998 22.5 7.24998 22.5C7.44998 22.5 7.62498 22.5751 7.77498 22.725C7.92498 22.875 7.99998 23.05 7.99998 23.25C7.99998 23.4501 7.92498 23.625 7.77498 23.775C7.62498 23.925 7.44998 24 7.24998 24ZM15.75 24C15.55 24 15.375 23.925 15.225 23.775C15.075 23.625 15 23.4501 15 23.25C15 23.05 15.075 22.875 15.225 22.725C15.375 22.5751 15.55 22.5 15.75 22.5C15.95 22.5 16.125 22.5751 16.275 22.725C16.425 22.875 16.5 23.05 16.5 23.25C16.5 23.4501 16.425 23.625 16.275 23.775C16.125 23.925 15.95 24 15.75 24ZM6.74998 21.9375C6.01664 21.9375 5.33956 21.7771 4.71873 21.4563C4.09789 21.1355 3.58331 20.7042 3.17498 20.1625C3.13331 20.0875 3.09998 20.0188 3.07498 19.9563C3.04998 19.8938 3.03748 19.8251 3.03748 19.75C3.03748 19.5667 3.09998 19.4063 3.22498 19.2688C3.34998 19.1313 3.51664 19.0625 3.72498 19.0625C3.84164 19.0625 3.94373 19.0855 4.03123 19.1313C4.11873 19.1771 4.19998 19.2459 4.27498 19.3375C4.48331 19.6209 4.74373 19.8625 5.05623 20.0625C5.36873 20.2626 5.70831 20.4084 6.07498 20.5L9.24998 16.6625L7.83748 12.4875C7.77081 12.2709 7.75414 12.0188 7.78748 11.7313C7.82081 11.4438 7.90831 11.1875 8.04998 10.9625L10.5625 6.93755H8.06248L6.66248 9.17505C6.52081 9.39172 6.32706 9.5313 6.08123 9.5938C5.83539 9.6563 5.60414 9.61672 5.38748 9.47505C5.17081 9.33338 5.03123 9.13547 4.96873 8.8813C4.90623 8.62713 4.94581 8.39172 5.08748 8.17505L6.76248 5.50005C6.84581 5.35838 6.95623 5.25005 7.09373 5.17505C7.23123 5.10005 7.38331 5.06255 7.54998 5.06255H12.7C13.1333 5.06255 13.4833 5.18338 13.75 5.42505C14.0166 5.66672 14.1958 5.89172 14.2875 6.10005L14.8125 7.30005C15.1041 7.97505 15.5312 8.55005 16.0937 9.02505C16.6562 9.50005 17.3041 9.81672 18.0375 9.97505C18.2958 10.0334 18.5104 10.1542 18.6812 10.3375C18.8521 10.5209 18.9375 10.7417 18.9375 11C18.9375 11.2584 18.85 11.475 18.675 11.65C18.5 11.825 18.2875 11.8959 18.0375 11.8625C17.0791 11.7209 16.2062 11.3813 15.4187 10.8438C14.6312 10.3063 13.9833 9.63755 13.475 8.83755L11.5875 11.8375L15.5 14.2625C15.6416 14.3459 15.75 14.4563 15.825 14.5938C15.9 14.7313 15.9375 14.8834 15.9375 15.05V20.5625H16.275C16.775 20.5625 17.2375 20.4521 17.6625 20.2313C18.0875 20.0105 18.4416 19.7125 18.725 19.3375C18.8 19.2459 18.8812 19.1771 18.9687 19.1313C19.0562 19.0855 19.1583 19.0625 19.275 19.0625C19.475 19.0625 19.6396 19.1313 19.7687 19.2688C19.8979 19.4063 19.9625 19.5667 19.9625 19.75C19.9625 19.8251 19.95 19.8938 19.925 19.9563C19.9 20.0188 19.8666 20.0875 19.825 20.1625C19.4166 20.7042 18.9062 21.1355 18.2937 21.4563C17.6812 21.7771 17.0083 21.9375 16.275 21.9375H6.74998ZM8.46248 20.5625H14.0625V15.8625L10.3125 13.5L11.275 16.5C11.325 16.65 11.3354 16.8042 11.3062 16.9625C11.2771 17.1209 11.2083 17.2625 11.1 17.3875L8.46248 20.5625ZM15 4.95005C14.4583 4.95005 13.9979 4.76047 13.6187 4.3813C13.2396 4.00213 13.05 3.54172 13.05 3.00005C13.05 2.45838 13.2396 1.99797 13.6187 1.6188C13.9979 1.23963 14.4583 1.05005 15 1.05005C15.5416 1.05005 16.0021 1.23963 16.3812 1.6188C16.7604 1.99797 16.95 2.45838 16.95 3.00005C16.95 3.54172 16.7604 4.00213 16.3812 4.3813C16.0021 4.76047 15.5416 4.95005 15 4.95005Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Smoking.tsx b/components/Icons/Smoking.tsx
index 58c30abce..e382ccc34 100644
--- a/components/Icons/Smoking.tsx
+++ b/components/Icons/Smoking.tsx
@@ -14,23 +14,10 @@ export default function SmokingIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3438"
-        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_3438)">
-        <path
-          d="M3.69995 18.725C3.318 18.725 2.99335 18.5912 2.726 18.3236C2.45863 18.0559 2.32495 17.7309 2.32495 17.3486C2.32495 16.9662 2.45863 16.6417 2.726 16.3751C2.99335 16.1084 3.318 15.975 3.69995 15.975H16.2125C16.4111 15.975 16.5753 16.04 16.7052 16.17C16.835 16.3 16.9 16.4644 16.9 16.6631V18.0394C16.9 18.2382 16.835 18.4021 16.7052 18.5313C16.5753 18.6605 16.4111 18.725 16.2125 18.725H3.69995ZM18.586 18.725C18.387 18.725 18.2229 18.6601 18.0937 18.5301C17.9645 18.4001 17.9 18.2357 17.9 18.037V16.6607C17.9 16.4619 17.965 16.298 18.0952 16.1688C18.2253 16.0396 18.3899 15.975 18.5889 15.975C18.7879 15.975 18.952 16.04 19.0812 16.17C19.2104 16.3 19.275 16.4644 19.275 16.6631V18.0394C19.275 18.2382 19.2099 18.4021 19.0798 18.5313C18.9496 18.6605 18.785 18.725 18.586 18.725ZM20.961 18.725C20.762 18.725 20.5979 18.6601 20.4687 18.5301C20.3395 18.4001 20.275 18.2357 20.275 18.037V16.6607C20.275 16.4619 20.34 16.298 20.4702 16.1688C20.6003 16.0396 20.7649 15.975 20.9639 15.975C21.1629 15.975 21.327 16.04 21.4562 16.17C21.5854 16.3 21.65 16.4644 21.65 16.6631V18.0394C21.65 18.2382 21.5849 18.4021 21.4548 18.5313C21.3246 18.6605 21.16 18.725 20.961 18.725ZM18.586 14.975C18.387 14.975 18.2229 14.9101 18.0937 14.7803C17.9645 14.6504 17.9 14.4862 17.9 14.2875V13.7C17.9 13.075 17.7083 12.5896 17.325 12.2438C16.9416 11.898 16.4916 11.725 15.975 11.725H14.45C13.5584 11.725 12.8022 11.4105 12.1813 10.7813C11.5604 10.1521 11.25 9.3938 11.25 8.5063C11.25 7.6188 11.5604 6.86672 12.1813 6.25005C12.8022 5.63338 13.5584 5.32505 14.45 5.32505C14.6486 5.32505 14.8128 5.39012 14.9427 5.52025C15.0725 5.65038 15.1375 5.81497 15.1375 6.014C15.1375 6.21303 15.0725 6.37713 14.9427 6.5063C14.8128 6.63547 14.6486 6.70005 14.45 6.70005C13.9567 6.70005 13.5292 6.8701 13.1675 7.2102C12.8058 7.55028 12.625 7.97945 12.625 8.4977C12.625 9.01593 12.8056 9.45422 13.1669 9.81255C13.5281 10.1709 13.9551 10.35 14.4478 10.35H15.975C16.8677 10.35 17.6409 10.6417 18.2945 11.225C18.9481 11.8084 19.275 12.5334 19.275 13.4001V14.2875C19.275 14.4862 19.2099 14.6504 19.0798 14.7803C18.9496 14.9101 18.785 14.975 18.586 14.975ZM20.961 14.975C20.762 14.975 20.5979 14.9101 20.4687 14.7803C20.3395 14.6504 20.275 14.4862 20.275 14.2875V12.75C20.275 11.6584 19.9 10.7313 19.15 9.9688C18.4 9.2063 17.4666 8.82505 16.35 8.82505C16.1513 8.82505 15.9871 8.75998 15.8573 8.62985C15.7274 8.49972 15.6625 8.33513 15.6625 8.1361C15.6625 7.93707 15.7274 7.77297 15.8573 7.6438C15.9871 7.51463 16.1513 7.45005 16.35 7.45005C16.8416 7.45005 17.2645 7.26919 17.6187 6.90747C17.9729 6.54577 18.15 6.1183 18.15 5.62505C18.15 5.12505 17.9729 4.69588 17.6187 4.33755C17.2645 3.97922 16.8416 3.80005 16.35 3.80005C16.1513 3.80005 15.9871 3.73498 15.8573 3.60485C15.7274 3.47472 15.6625 3.31013 15.6625 3.1111C15.6625 2.91207 15.7274 2.74797 15.8573 2.6188C15.9871 2.48963 16.1513 2.42505 16.35 2.42505C17.2416 2.42505 17.9937 2.73609 18.6062 3.35817C19.2187 3.98026 19.525 4.73792 19.525 5.63117C19.525 6.09376 19.4375 6.5188 19.2625 6.9063C19.0875 7.2938 18.85 7.63972 18.55 7.94407C19.4583 8.33972 20.202 8.96672 20.7812 9.82505C21.3604 10.6834 21.65 11.6584 21.65 12.75V14.2875C21.65 14.4862 21.5849 14.6504 21.4548 14.7803C21.3246 14.9101 21.16 14.975 20.961 14.975Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.69995 18.725C3.318 18.725 2.99335 18.5912 2.726 18.3236C2.45863 18.0559 2.32495 17.7309 2.32495 17.3486C2.32495 16.9662 2.45863 16.6417 2.726 16.3751C2.99335 16.1084 3.318 15.975 3.69995 15.975H16.2125C16.4111 15.975 16.5753 16.04 16.7052 16.17C16.835 16.3 16.9 16.4644 16.9 16.6631V18.0394C16.9 18.2382 16.835 18.4021 16.7052 18.5313C16.5753 18.6605 16.4111 18.725 16.2125 18.725H3.69995ZM18.586 18.725C18.387 18.725 18.2229 18.6601 18.0937 18.5301C17.9645 18.4001 17.9 18.2357 17.9 18.037V16.6607C17.9 16.4619 17.965 16.298 18.0952 16.1688C18.2253 16.0396 18.3899 15.975 18.5889 15.975C18.7879 15.975 18.952 16.04 19.0812 16.17C19.2104 16.3 19.275 16.4644 19.275 16.6631V18.0394C19.275 18.2382 19.2099 18.4021 19.0798 18.5313C18.9496 18.6605 18.785 18.725 18.586 18.725ZM20.961 18.725C20.762 18.725 20.5979 18.6601 20.4687 18.5301C20.3395 18.4001 20.275 18.2357 20.275 18.037V16.6607C20.275 16.4619 20.34 16.298 20.4702 16.1688C20.6003 16.0396 20.7649 15.975 20.9639 15.975C21.1629 15.975 21.327 16.04 21.4562 16.17C21.5854 16.3 21.65 16.4644 21.65 16.6631V18.0394C21.65 18.2382 21.5849 18.4021 21.4548 18.5313C21.3246 18.6605 21.16 18.725 20.961 18.725ZM18.586 14.975C18.387 14.975 18.2229 14.9101 18.0937 14.7803C17.9645 14.6504 17.9 14.4862 17.9 14.2875V13.7C17.9 13.075 17.7083 12.5896 17.325 12.2438C16.9416 11.898 16.4916 11.725 15.975 11.725H14.45C13.5584 11.725 12.8022 11.4105 12.1813 10.7813C11.5604 10.1521 11.25 9.3938 11.25 8.5063C11.25 7.6188 11.5604 6.86672 12.1813 6.25005C12.8022 5.63338 13.5584 5.32505 14.45 5.32505C14.6486 5.32505 14.8128 5.39012 14.9427 5.52025C15.0725 5.65038 15.1375 5.81497 15.1375 6.014C15.1375 6.21303 15.0725 6.37713 14.9427 6.5063C14.8128 6.63547 14.6486 6.70005 14.45 6.70005C13.9567 6.70005 13.5292 6.8701 13.1675 7.2102C12.8058 7.55028 12.625 7.97945 12.625 8.4977C12.625 9.01593 12.8056 9.45422 13.1669 9.81255C13.5281 10.1709 13.9551 10.35 14.4478 10.35H15.975C16.8677 10.35 17.6409 10.6417 18.2945 11.225C18.9481 11.8084 19.275 12.5334 19.275 13.4001V14.2875C19.275 14.4862 19.2099 14.6504 19.0798 14.7803C18.9496 14.9101 18.785 14.975 18.586 14.975ZM20.961 14.975C20.762 14.975 20.5979 14.9101 20.4687 14.7803C20.3395 14.6504 20.275 14.4862 20.275 14.2875V12.75C20.275 11.6584 19.9 10.7313 19.15 9.9688C18.4 9.2063 17.4666 8.82505 16.35 8.82505C16.1513 8.82505 15.9871 8.75998 15.8573 8.62985C15.7274 8.49972 15.6625 8.33513 15.6625 8.1361C15.6625 7.93707 15.7274 7.77297 15.8573 7.6438C15.9871 7.51463 16.1513 7.45005 16.35 7.45005C16.8416 7.45005 17.2645 7.26919 17.6187 6.90747C17.9729 6.54577 18.15 6.1183 18.15 5.62505C18.15 5.12505 17.9729 4.69588 17.6187 4.33755C17.2645 3.97922 16.8416 3.80005 16.35 3.80005C16.1513 3.80005 15.9871 3.73498 15.8573 3.60485C15.7274 3.47472 15.6625 3.31013 15.6625 3.1111C15.6625 2.91207 15.7274 2.74797 15.8573 2.6188C15.9871 2.48963 16.1513 2.42505 16.35 2.42505C17.2416 2.42505 17.9937 2.73609 18.6062 3.35817C19.2187 3.98026 19.525 4.73792 19.525 5.63117C19.525 6.09376 19.4375 6.5188 19.2625 6.9063C19.0875 7.2938 18.85 7.63972 18.55 7.94407C19.4583 8.33972 20.202 8.96672 20.7812 9.82505C21.3604 10.6834 21.65 11.6584 21.65 12.75V14.2875C21.65 14.4862 21.5849 14.6504 21.4548 14.7803C21.3246 14.9101 21.16 14.975 20.961 14.975Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Spa.tsx b/components/Icons/Spa.tsx
index f3141a4e4..7cc26f820 100644
--- a/components/Icons/Spa.tsx
+++ b/components/Icons/Spa.tsx
@@ -14,23 +14,10 @@ export default function SpaIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3443"
-        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_3443)">
-        <path
-          d="M12.0013 4.97502C11.7254 4.97502 11.4938 4.88172 11.3063 4.6951C11.1188 4.50847 11.025 4.27722 11.025 4.00135C11.025 3.72547 11.1183 3.49377 11.3049 3.30627C11.4916 3.11877 11.7228 3.02502 11.9987 3.02502C12.2746 3.02502 12.5062 3.11833 12.6937 3.30495C12.8812 3.49158 12.975 3.72283 12.975 3.9987C12.975 4.27458 12.8817 4.50627 12.6951 4.69377C12.5084 4.88127 12.2772 4.97502 12.0013 4.97502ZM12.0013 1.97502C11.7254 1.97502 11.4938 1.88172 11.3063 1.6951C11.1188 1.50847 11.025 1.27722 11.025 1.00135C11.025 0.725466 11.1183 0.493774 11.3049 0.306274C11.4916 0.118774 11.7228 0.0250244 11.9987 0.0250244C12.2746 0.0250244 12.5062 0.118333 12.6937 0.30495C12.8812 0.491583 12.975 0.722833 12.975 0.9987C12.975 1.27458 12.8817 1.50627 12.6951 1.69377C12.5084 1.88127 12.2772 1.97502 12.0013 1.97502ZM8.4125 21.9375C7.3625 21.3042 6.54583 20.4604 5.9625 19.4063C5.37917 18.3521 5.07917 17.2167 5.0625 16C5.07083 14.65 5.43333 13.4104 6.15 12.2813C6.86667 11.1521 7.8375 10.2959 9.0625 9.71252V7.00002C9.0625 6.74169 9.15417 6.52086 9.3375 6.33752C9.52083 6.15419 9.74167 6.06252 10 6.06252H14C14.2583 6.06252 14.4792 6.15419 14.6625 6.33752C14.8458 6.52086 14.9375 6.74169 14.9375 7.00002V9.71252C16.1458 10.2959 17.1104 11.1521 17.8313 12.2813C18.5521 13.4104 18.9208 14.65 18.9375 16C18.9292 17.2167 18.6292 18.3521 18.0375 19.4063C17.4458 20.4604 16.6292 21.3042 15.5875 21.9375H8.4125ZM8.97152 20.0625H15.0285C15.6678 19.5792 16.1667 18.9834 16.525 18.275C16.8833 17.5667 17.0625 16.8076 17.0625 15.9977C17.0625 15.0192 16.8042 14.1207 16.2875 13.3024C15.7708 12.4842 15.0667 11.8625 14.175 11.4375L13.0625 10.9125V7.93752H10.9375V10.9125L9.825 11.4375C8.93005 11.86 8.22506 12.481 7.71003 13.3005C7.19501 14.1201 6.9375 15.0199 6.9375 16C6.9375 16.8084 7.11667 17.5667 7.475 18.275C7.83333 18.9834 8.33218 19.5792 8.97152 20.0625ZM7.00133 2.97502C6.72544 2.97502 6.49375 2.88172 6.30625 2.6951C6.11875 2.50847 6.025 2.27722 6.025 2.00135C6.025 1.72547 6.11831 1.49377 6.30493 1.30627C6.49156 1.11877 6.72281 1.02502 6.99867 1.02502C7.27456 1.02502 7.50625 1.11833 7.69375 1.30495C7.88125 1.49158 7.975 1.72283 7.975 1.9987C7.975 2.27458 7.88169 2.50627 7.69508 2.69377C7.50844 2.88127 7.27719 2.97502 7.00133 2.97502ZM17.0013 2.97502C16.7254 2.97502 16.4938 2.88172 16.3063 2.6951C16.1188 2.50847 16.025 2.27722 16.025 2.00135C16.025 1.72547 16.1183 1.49377 16.3049 1.30627C16.4916 1.11877 16.7228 1.02502 16.9987 1.02502C17.2746 1.02502 17.5063 1.11833 17.6938 1.30495C17.8813 1.49158 17.975 1.72283 17.975 1.9987C17.975 2.27458 17.8817 2.50627 17.6951 2.69377C17.5084 2.88127 17.2772 2.97502 17.0013 2.97502ZM9.00133 4.97502C8.72544 4.97502 8.49375 4.88172 8.30625 4.6951C8.11875 4.50847 8.025 4.27722 8.025 4.00135C8.025 3.72547 8.11831 3.49377 8.30492 3.30627C8.49156 3.11877 8.72281 3.02502 8.99867 3.02502C9.27456 3.02502 9.50625 3.11833 9.69375 3.30495C9.88125 3.49158 9.975 3.72283 9.975 3.9987C9.975 4.27458 9.88169 4.50627 9.69508 4.69377C9.50844 4.88127 9.27719 4.97502 9.00133 4.97502ZM15.0013 4.97502C14.7254 4.97502 14.4938 4.88172 14.3063 4.6951C14.1188 4.50847 14.025 4.27722 14.025 4.00135C14.025 3.72547 14.1183 3.49377 14.3049 3.30627C14.4916 3.11877 14.7228 3.02502 14.9987 3.02502C15.2746 3.02502 15.5063 3.11833 15.6938 3.30495C15.8813 3.49158 15.975 3.72283 15.975 3.9987C15.975 4.27458 15.8817 4.50627 15.6951 4.69377C15.5084 4.88127 15.2772 4.97502 15.0013 4.97502Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M12.0013 4.97502C11.7254 4.97502 11.4938 4.88172 11.3063 4.6951C11.1188 4.50847 11.025 4.27722 11.025 4.00135C11.025 3.72547 11.1183 3.49377 11.3049 3.30627C11.4916 3.11877 11.7228 3.02502 11.9987 3.02502C12.2746 3.02502 12.5062 3.11833 12.6937 3.30495C12.8812 3.49158 12.975 3.72283 12.975 3.9987C12.975 4.27458 12.8817 4.50627 12.6951 4.69377C12.5084 4.88127 12.2772 4.97502 12.0013 4.97502ZM12.0013 1.97502C11.7254 1.97502 11.4938 1.88172 11.3063 1.6951C11.1188 1.50847 11.025 1.27722 11.025 1.00135C11.025 0.725466 11.1183 0.493774 11.3049 0.306274C11.4916 0.118774 11.7228 0.0250244 11.9987 0.0250244C12.2746 0.0250244 12.5062 0.118333 12.6937 0.30495C12.8812 0.491583 12.975 0.722833 12.975 0.9987C12.975 1.27458 12.8817 1.50627 12.6951 1.69377C12.5084 1.88127 12.2772 1.97502 12.0013 1.97502ZM8.4125 21.9375C7.3625 21.3042 6.54583 20.4604 5.9625 19.4063C5.37917 18.3521 5.07917 17.2167 5.0625 16C5.07083 14.65 5.43333 13.4104 6.15 12.2813C6.86667 11.1521 7.8375 10.2959 9.0625 9.71252V7.00002C9.0625 6.74169 9.15417 6.52086 9.3375 6.33752C9.52083 6.15419 9.74167 6.06252 10 6.06252H14C14.2583 6.06252 14.4792 6.15419 14.6625 6.33752C14.8458 6.52086 14.9375 6.74169 14.9375 7.00002V9.71252C16.1458 10.2959 17.1104 11.1521 17.8313 12.2813C18.5521 13.4104 18.9208 14.65 18.9375 16C18.9292 17.2167 18.6292 18.3521 18.0375 19.4063C17.4458 20.4604 16.6292 21.3042 15.5875 21.9375H8.4125ZM8.97152 20.0625H15.0285C15.6678 19.5792 16.1667 18.9834 16.525 18.275C16.8833 17.5667 17.0625 16.8076 17.0625 15.9977C17.0625 15.0192 16.8042 14.1207 16.2875 13.3024C15.7708 12.4842 15.0667 11.8625 14.175 11.4375L13.0625 10.9125V7.93752H10.9375V10.9125L9.825 11.4375C8.93005 11.86 8.22506 12.481 7.71003 13.3005C7.19501 14.1201 6.9375 15.0199 6.9375 16C6.9375 16.8084 7.11667 17.5667 7.475 18.275C7.83333 18.9834 8.33218 19.5792 8.97152 20.0625ZM7.00133 2.97502C6.72544 2.97502 6.49375 2.88172 6.30625 2.6951C6.11875 2.50847 6.025 2.27722 6.025 2.00135C6.025 1.72547 6.11831 1.49377 6.30493 1.30627C6.49156 1.11877 6.72281 1.02502 6.99867 1.02502C7.27456 1.02502 7.50625 1.11833 7.69375 1.30495C7.88125 1.49158 7.975 1.72283 7.975 1.9987C7.975 2.27458 7.88169 2.50627 7.69508 2.69377C7.50844 2.88127 7.27719 2.97502 7.00133 2.97502ZM17.0013 2.97502C16.7254 2.97502 16.4938 2.88172 16.3063 2.6951C16.1188 2.50847 16.025 2.27722 16.025 2.00135C16.025 1.72547 16.1183 1.49377 16.3049 1.30627C16.4916 1.11877 16.7228 1.02502 16.9987 1.02502C17.2746 1.02502 17.5063 1.11833 17.6938 1.30495C17.8813 1.49158 17.975 1.72283 17.975 1.9987C17.975 2.27458 17.8817 2.50627 17.6951 2.69377C17.5084 2.88127 17.2772 2.97502 17.0013 2.97502ZM9.00133 4.97502C8.72544 4.97502 8.49375 4.88172 8.30625 4.6951C8.11875 4.50847 8.025 4.27722 8.025 4.00135C8.025 3.72547 8.11831 3.49377 8.30492 3.30627C8.49156 3.11877 8.72281 3.02502 8.99867 3.02502C9.27456 3.02502 9.50625 3.11833 9.69375 3.30495C9.88125 3.49158 9.975 3.72283 9.975 3.9987C9.975 4.27458 9.88169 4.50627 9.69508 4.69377C9.50844 4.88127 9.27719 4.97502 9.00133 4.97502ZM15.0013 4.97502C14.7254 4.97502 14.4938 4.88172 14.3063 4.6951C14.1188 4.50847 14.025 4.27722 14.025 4.00135C14.025 3.72547 14.1183 3.49377 14.3049 3.30627C14.4916 3.11877 14.7228 3.02502 14.9987 3.02502C15.2746 3.02502 15.5063 3.11833 15.6938 3.30495C15.8813 3.49158 15.975 3.72283 15.975 3.9987C15.975 4.27458 15.8817 4.50627 15.6951 4.69377C15.5084 4.88127 15.2772 4.97502 15.0013 4.97502Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/StarFilled.tsx b/components/Icons/StarFilled.tsx
index 4e96f47d9..300924a37 100644
--- a/components/Icons/StarFilled.tsx
+++ b/components/Icons/StarFilled.tsx
@@ -18,23 +18,10 @@ export default function StarFilledIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3249"
-        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_3249)">
-        <path
-          d="M11.9999 17.5625L7.81244 20.0875C7.63744 20.1958 7.45619 20.2417 7.26869 20.225C7.08119 20.2083 6.91661 20.1458 6.77494 20.0375C6.63328 19.9292 6.52494 19.7917 6.44994 19.625C6.37494 19.4583 6.36244 19.275 6.41244 19.075L7.52494 14.3125L3.82494 11.1125C3.66661 10.9708 3.56661 10.8104 3.52494 10.6312C3.48328 10.4521 3.49161 10.2792 3.54994 10.1125C3.60828 9.94583 3.70619 9.80417 3.84369 9.6875C3.98119 9.57083 4.15411 9.5 4.36244 9.475L9.23744 9.05L11.1374 4.5625C11.2208 4.37083 11.3416 4.22917 11.4999 4.1375C11.6583 4.04583 11.8249 4 11.9999 4C12.1749 4 12.3416 4.04583 12.4999 4.1375C12.6583 4.22917 12.7791 4.37083 12.8624 4.5625L14.7624 9.05L19.6374 9.475C19.8458 9.5 20.0187 9.57083 20.1562 9.6875C20.2937 9.80417 20.3916 9.94583 20.4499 10.1125C20.5083 10.2792 20.5166 10.4521 20.4749 10.6312C20.4333 10.8104 20.3333 10.9708 20.1749 11.1125L16.4749 14.3125L17.5874 19.075C17.6374 19.275 17.6249 19.4583 17.5499 19.625C17.4749 19.7917 17.3666 19.9292 17.2249 20.0375C17.0833 20.1458 16.9187 20.2083 16.7312 20.225C16.5437 20.2417 16.3624 20.1958 16.1874 20.0875L11.9999 17.5625Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M11.9999 17.5625L7.81244 20.0875C7.63744 20.1958 7.45619 20.2417 7.26869 20.225C7.08119 20.2083 6.91661 20.1458 6.77494 20.0375C6.63328 19.9292 6.52494 19.7917 6.44994 19.625C6.37494 19.4583 6.36244 19.275 6.41244 19.075L7.52494 14.3125L3.82494 11.1125C3.66661 10.9708 3.56661 10.8104 3.52494 10.6312C3.48328 10.4521 3.49161 10.2792 3.54994 10.1125C3.60828 9.94583 3.70619 9.80417 3.84369 9.6875C3.98119 9.57083 4.15411 9.5 4.36244 9.475L9.23744 9.05L11.1374 4.5625C11.2208 4.37083 11.3416 4.22917 11.4999 4.1375C11.6583 4.04583 11.8249 4 11.9999 4C12.1749 4 12.3416 4.04583 12.4999 4.1375C12.6583 4.22917 12.7791 4.37083 12.8624 4.5625L14.7624 9.05L19.6374 9.475C19.8458 9.5 20.0187 9.57083 20.1562 9.6875C20.2937 9.80417 20.3916 9.94583 20.4499 10.1125C20.5083 10.2792 20.5166 10.4521 20.4749 10.6312C20.4333 10.8104 20.3333 10.9708 20.1749 11.1125L16.4749 14.3125L17.5874 19.075C17.6374 19.275 17.6249 19.4583 17.5499 19.625C17.4749 19.7917 17.3666 19.9292 17.2249 20.0375C17.0833 20.1458 16.9187 20.2083 16.7312 20.225C16.5437 20.2417 16.3624 20.1958 16.1874 20.0875L11.9999 17.5625Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Street.tsx b/components/Icons/Street.tsx
index 414df197c..b2b0c2dfb 100644
--- a/components/Icons/Street.tsx
+++ b/components/Icons/Street.tsx
@@ -14,23 +14,10 @@ export default function StreetIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_4039_3305"
-        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_3305)">
-        <path
-          d="M4 20V4H6V20H4ZM11 20V16H13V20H11ZM18 20V4H20V20H18ZM11 14V10H13V14H11ZM11 8V4H13V8H11Z"
-          fill="#1C1B1F"
-        />
-      </g>
+      <path
+        d="M4 20V4H6V20H4ZM11 20V16H13V20H11ZM18 20V4H20V20H18ZM11 14V10H13V14H11ZM11 8V4H13V8H11Z"
+        fill="#1C1B1F"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Swim.tsx b/components/Icons/Swim.tsx
index abd2bd29a..534bb2068 100644
--- a/components/Icons/Swim.tsx
+++ b/components/Icons/Swim.tsx
@@ -14,23 +14,10 @@ export default function SwimIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3465"
-        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_3465)">
-        <path
-          d="M12 19.85C11.4 19.85 10.9333 20.0125 10.6 20.3375C10.2666 20.6625 9.64162 20.825 8.72495 20.825C7.80828 20.825 7.18328 20.6625 6.84995 20.3375C6.51662 20.0125 6.04995 19.85 5.44995 19.85C4.96662 19.85 4.58953 19.9584 4.3187 20.175C4.04787 20.3917 3.65968 20.5667 3.15413 20.7C2.90134 20.7667 2.67912 20.7141 2.48745 20.5422C2.29578 20.3704 2.19995 20.1516 2.19995 19.886C2.19995 19.6204 2.29162 19.3917 2.47495 19.2C2.65828 19.0084 2.87078 18.85 3.11245 18.725C3.39578 18.5834 3.69683 18.423 4.01558 18.2438C4.33433 18.0646 4.81245 17.975 5.44995 17.975C6.36662 17.975 6.99162 18.1375 7.32495 18.4625C7.65828 18.7875 8.12495 18.95 8.72495 18.95C9.32495 18.95 9.79162 18.7875 10.125 18.4625C10.4583 18.1375 11.0833 17.975 12 17.975C12.9166 17.975 13.5416 18.1375 13.875 18.4625C14.2083 18.7875 14.675 18.95 15.275 18.95C15.875 18.95 16.3416 18.7875 16.675 18.4625C17.0083 18.1375 17.6333 17.975 18.55 17.975C19.1875 17.975 19.6656 18.0646 19.9843 18.2438C20.3031 18.423 20.6041 18.5834 20.8875 18.725C21.1291 18.85 21.3416 19.0093 21.525 19.2027C21.7083 19.3962 21.8 19.6244 21.8 19.8875C21.8 20.1506 21.7034 20.3685 21.5103 20.5411C21.3172 20.7137 21.0971 20.7667 20.85 20.7C20.3416 20.5667 19.952 20.3917 19.6812 20.175C19.4104 19.9584 19.0333 19.85 18.55 19.85C17.95 19.85 17.4833 20.0125 17.15 20.3375C16.8166 20.6625 16.1916 20.825 15.275 20.825C14.3583 20.825 13.7333 20.6625 13.4 20.3375C13.0666 20.0125 12.6 19.85 12 19.85ZM12 15.4C11.3833 15.4 10.9187 15.5625 10.6062 15.8875C10.2937 16.2125 9.66662 16.375 8.72495 16.375C7.78328 16.375 7.15103 16.2125 6.8282 15.8875C6.50537 15.5625 6.04595 15.4 5.44995 15.4C4.96662 15.4 4.58953 15.5084 4.3187 15.725C4.04787 15.9417 3.65968 16.1167 3.15413 16.25C2.90134 16.3167 2.67912 16.2641 2.48745 16.0922C2.29578 15.9204 2.19995 15.7016 2.19995 15.436C2.19995 15.1704 2.29162 14.9417 2.47495 14.75C2.65828 14.5584 2.87078 14.4 3.11245 14.275C3.39578 14.1334 3.69683 13.973 4.01558 13.7938C4.33433 13.6146 4.81245 13.525 5.44995 13.525C6.36662 13.525 6.9937 13.6875 7.3312 14.0125C7.6687 14.3375 8.13328 14.5 8.72495 14.5C9.32495 14.5 9.79162 14.3375 10.125 14.0125C10.4583 13.6875 11.0833 13.525 12 13.525C12.9166 13.525 13.5416 13.6875 13.875 14.0125C14.2083 14.3375 14.675 14.5 15.275 14.5C15.875 14.5 16.3416 14.3375 16.675 14.0125C17.0083 13.6875 17.6333 13.525 18.55 13.525C19.1875 13.525 19.6656 13.6146 19.9843 13.7938C20.3031 13.973 20.6041 14.1334 20.8875 14.275C21.1291 14.4 21.3416 14.5593 21.525 14.7527C21.7083 14.9462 21.8 15.1744 21.8 15.4375C21.8 15.7006 21.7034 15.9185 21.5103 16.0911C21.3172 16.2637 21.0971 16.3167 20.85 16.25C20.3416 16.1167 19.952 15.9417 19.6812 15.725C19.4104 15.5084 19.0333 15.4 18.55 15.4C17.95 15.4 17.4895 15.5625 17.1687 15.8875C16.8479 16.2125 16.2166 16.375 15.275 16.375C14.354 16.375 13.728 16.2125 13.3968 15.8875C13.0656 15.5625 12.6 15.4 12 15.4ZM7.07495 11.375L10.3375 8.11255L9.26245 7.03755C8.85412 6.62922 8.43166 6.30955 7.99508 6.07855C7.55848 5.84753 7.0601 5.6922 6.49995 5.61255C6.18328 5.56255 5.91245 5.41871 5.68745 5.18102C5.46245 4.94336 5.34995 4.66607 5.34995 4.34917C5.34995 4.01642 5.4687 3.73755 5.7062 3.51255C5.9437 3.28755 6.22078 3.19172 6.53745 3.22505C7.41363 3.30625 8.16812 3.48894 8.8009 3.77312C9.4337 4.05731 10.0584 4.50795 10.675 5.12505L16.925 11.375C16.6666 11.5417 16.4125 11.6792 16.1625 11.7875C15.9125 11.8959 15.6186 11.95 15.2809 11.95C14.7019 11.95 14.2401 11.7834 13.8955 11.45C13.5508 11.1167 12.919 10.95 12 10.95C11.0809 10.95 10.4491 11.1167 10.1044 11.45C9.75978 11.7834 9.29798 11.95 8.71903 11.95C8.38131 11.95 8.08745 11.8959 7.83745 11.7875C7.58745 11.6792 7.33328 11.5417 7.07495 11.375ZM16.6 3.17505C17.279 3.17505 17.8529 3.41309 18.3217 3.88917C18.7905 4.36526 19.025 4.93414 19.025 5.59582C19.025 6.27364 18.7905 6.84797 18.3217 7.3188C17.8529 7.78963 17.279 8.02505 16.6 8.02505C15.921 8.02505 15.347 7.79024 14.8782 7.32062C14.4094 6.85099 14.175 6.27611 14.175 5.59597C14.175 4.93202 14.4094 4.36255 14.8782 3.88755C15.347 3.41255 15.921 3.17505 16.6 3.17505Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M12 19.85C11.4 19.85 10.9333 20.0125 10.6 20.3375C10.2666 20.6625 9.64162 20.825 8.72495 20.825C7.80828 20.825 7.18328 20.6625 6.84995 20.3375C6.51662 20.0125 6.04995 19.85 5.44995 19.85C4.96662 19.85 4.58953 19.9584 4.3187 20.175C4.04787 20.3917 3.65968 20.5667 3.15413 20.7C2.90134 20.7667 2.67912 20.7141 2.48745 20.5422C2.29578 20.3704 2.19995 20.1516 2.19995 19.886C2.19995 19.6204 2.29162 19.3917 2.47495 19.2C2.65828 19.0084 2.87078 18.85 3.11245 18.725C3.39578 18.5834 3.69683 18.423 4.01558 18.2438C4.33433 18.0646 4.81245 17.975 5.44995 17.975C6.36662 17.975 6.99162 18.1375 7.32495 18.4625C7.65828 18.7875 8.12495 18.95 8.72495 18.95C9.32495 18.95 9.79162 18.7875 10.125 18.4625C10.4583 18.1375 11.0833 17.975 12 17.975C12.9166 17.975 13.5416 18.1375 13.875 18.4625C14.2083 18.7875 14.675 18.95 15.275 18.95C15.875 18.95 16.3416 18.7875 16.675 18.4625C17.0083 18.1375 17.6333 17.975 18.55 17.975C19.1875 17.975 19.6656 18.0646 19.9843 18.2438C20.3031 18.423 20.6041 18.5834 20.8875 18.725C21.1291 18.85 21.3416 19.0093 21.525 19.2027C21.7083 19.3962 21.8 19.6244 21.8 19.8875C21.8 20.1506 21.7034 20.3685 21.5103 20.5411C21.3172 20.7137 21.0971 20.7667 20.85 20.7C20.3416 20.5667 19.952 20.3917 19.6812 20.175C19.4104 19.9584 19.0333 19.85 18.55 19.85C17.95 19.85 17.4833 20.0125 17.15 20.3375C16.8166 20.6625 16.1916 20.825 15.275 20.825C14.3583 20.825 13.7333 20.6625 13.4 20.3375C13.0666 20.0125 12.6 19.85 12 19.85ZM12 15.4C11.3833 15.4 10.9187 15.5625 10.6062 15.8875C10.2937 16.2125 9.66662 16.375 8.72495 16.375C7.78328 16.375 7.15103 16.2125 6.8282 15.8875C6.50537 15.5625 6.04595 15.4 5.44995 15.4C4.96662 15.4 4.58953 15.5084 4.3187 15.725C4.04787 15.9417 3.65968 16.1167 3.15413 16.25C2.90134 16.3167 2.67912 16.2641 2.48745 16.0922C2.29578 15.9204 2.19995 15.7016 2.19995 15.436C2.19995 15.1704 2.29162 14.9417 2.47495 14.75C2.65828 14.5584 2.87078 14.4 3.11245 14.275C3.39578 14.1334 3.69683 13.973 4.01558 13.7938C4.33433 13.6146 4.81245 13.525 5.44995 13.525C6.36662 13.525 6.9937 13.6875 7.3312 14.0125C7.6687 14.3375 8.13328 14.5 8.72495 14.5C9.32495 14.5 9.79162 14.3375 10.125 14.0125C10.4583 13.6875 11.0833 13.525 12 13.525C12.9166 13.525 13.5416 13.6875 13.875 14.0125C14.2083 14.3375 14.675 14.5 15.275 14.5C15.875 14.5 16.3416 14.3375 16.675 14.0125C17.0083 13.6875 17.6333 13.525 18.55 13.525C19.1875 13.525 19.6656 13.6146 19.9843 13.7938C20.3031 13.973 20.6041 14.1334 20.8875 14.275C21.1291 14.4 21.3416 14.5593 21.525 14.7527C21.7083 14.9462 21.8 15.1744 21.8 15.4375C21.8 15.7006 21.7034 15.9185 21.5103 16.0911C21.3172 16.2637 21.0971 16.3167 20.85 16.25C20.3416 16.1167 19.952 15.9417 19.6812 15.725C19.4104 15.5084 19.0333 15.4 18.55 15.4C17.95 15.4 17.4895 15.5625 17.1687 15.8875C16.8479 16.2125 16.2166 16.375 15.275 16.375C14.354 16.375 13.728 16.2125 13.3968 15.8875C13.0656 15.5625 12.6 15.4 12 15.4ZM7.07495 11.375L10.3375 8.11255L9.26245 7.03755C8.85412 6.62922 8.43166 6.30955 7.99508 6.07855C7.55848 5.84753 7.0601 5.6922 6.49995 5.61255C6.18328 5.56255 5.91245 5.41871 5.68745 5.18102C5.46245 4.94336 5.34995 4.66607 5.34995 4.34917C5.34995 4.01642 5.4687 3.73755 5.7062 3.51255C5.9437 3.28755 6.22078 3.19172 6.53745 3.22505C7.41363 3.30625 8.16812 3.48894 8.8009 3.77312C9.4337 4.05731 10.0584 4.50795 10.675 5.12505L16.925 11.375C16.6666 11.5417 16.4125 11.6792 16.1625 11.7875C15.9125 11.8959 15.6186 11.95 15.2809 11.95C14.7019 11.95 14.2401 11.7834 13.8955 11.45C13.5508 11.1167 12.919 10.95 12 10.95C11.0809 10.95 10.4491 11.1167 10.1044 11.45C9.75978 11.7834 9.29798 11.95 8.71903 11.95C8.38131 11.95 8.08745 11.8959 7.83745 11.7875C7.58745 11.6792 7.33328 11.5417 7.07495 11.375ZM16.6 3.17505C17.279 3.17505 17.8529 3.41309 18.3217 3.88917C18.7905 4.36526 19.025 4.93414 19.025 5.59582C19.025 6.27364 18.7905 6.84797 18.3217 7.3188C17.8529 7.78963 17.279 8.02505 16.6 8.02505C15.921 8.02505 15.347 7.79024 14.8782 7.32062C14.4094 6.85099 14.175 6.27611 14.175 5.59597C14.175 4.93202 14.4094 4.36255 14.8782 3.88755C15.347 3.41255 15.921 3.17505 16.6 3.17505Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Thermostat.tsx b/components/Icons/Thermostat.tsx
index 2fd3ebe97..490f2f042 100644
--- a/components/Icons/Thermostat.tsx
+++ b/components/Icons/Thermostat.tsx
@@ -18,23 +18,10 @@ export default function ThermostatIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3477"
-        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_3477)">
-        <path
-          d="M12 21.75C10.6584 21.75 9.5188 21.2812 8.5813 20.3438C7.6438 19.4062 7.17505 18.267 7.17505 16.9258C7.17505 16.1503 7.34797 15.4208 7.6938 14.7375C8.03963 14.0542 8.52505 13.4833 9.15005 13.025V5.1C9.15005 4.30833 9.42713 3.63542 9.9813 3.08125C10.5355 2.52708 11.2084 2.25 12 2.25C12.7917 2.25 13.4646 2.52708 14.0188 3.08125C14.573 3.63542 14.85 4.30833 14.85 5.1V13.025C15.475 13.4833 15.9605 14.0542 16.3063 14.7375C16.6521 15.4208 16.825 16.1503 16.825 16.9258C16.825 18.267 16.3563 19.4062 15.4188 20.3438C14.4813 21.2812 13.3417 21.75 12 21.75ZM11.025 11.05H12.975V10.025H12V9.04375H12.975V7.08125H12V6.1H12.975V5.1C12.975 4.82375 12.8817 4.59219 12.6951 4.40533C12.5085 4.21844 12.2772 4.125 12.0014 4.125C11.7255 4.125 11.4938 4.21844 11.3063 4.40533C11.1188 4.59219 11.025 4.82375 11.025 5.1V11.05Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M12 21.75C10.6584 21.75 9.5188 21.2812 8.5813 20.3438C7.6438 19.4062 7.17505 18.267 7.17505 16.9258C7.17505 16.1503 7.34797 15.4208 7.6938 14.7375C8.03963 14.0542 8.52505 13.4833 9.15005 13.025V5.1C9.15005 4.30833 9.42713 3.63542 9.9813 3.08125C10.5355 2.52708 11.2084 2.25 12 2.25C12.7917 2.25 13.4646 2.52708 14.0188 3.08125C14.573 3.63542 14.85 4.30833 14.85 5.1V13.025C15.475 13.4833 15.9605 14.0542 16.3063 14.7375C16.6521 15.4208 16.825 16.1503 16.825 16.9258C16.825 18.267 16.3563 19.4062 15.4188 20.3438C14.4813 21.2812 13.3417 21.75 12 21.75ZM11.025 11.05H12.975V10.025H12V9.04375H12.975V7.08125H12V6.1H12.975V5.1C12.975 4.82375 12.8817 4.59219 12.6951 4.40533C12.5085 4.21844 12.2772 4.125 12.0014 4.125C11.7255 4.125 11.4938 4.21844 11.3063 4.40533C11.1188 4.59219 11.025 4.82375 11.025 5.1V11.05Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Train.tsx b/components/Icons/Train.tsx
index 79fae85f4..b892a9064 100644
--- a/components/Icons/Train.tsx
+++ b/components/Icons/Train.tsx
@@ -14,23 +14,10 @@ export default function TrainIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_71_1020"
-        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_1020)">
-        <path
-          d="M4.22498 15.425V6.1C4.22498 5.25 4.43956 4.57292 4.86873 4.06875C5.29789 3.56458 5.87081 3.17917 6.58748 2.9125C7.30414 2.64583 8.13123 2.46875 9.06873 2.38125C10.0062 2.29375 10.9833 2.25 12 2.25C13.0666 2.25 14.0729 2.29375 15.0187 2.38125C15.9646 2.46875 16.7896 2.64583 17.4937 2.9125C18.1979 3.17917 18.7541 3.56458 19.1625 4.06875C19.5708 4.57292 19.775 5.25 19.775 6.1V15.425C19.775 16.3833 19.4521 17.1854 18.8062 17.8313C18.1604 18.4771 17.3583 18.8 16.4 18.8L16.9375 19.3375C17.1958 19.5958 17.2541 19.8917 17.1125 20.225C16.9708 20.5583 16.7166 20.725 16.35 20.725C16.2416 20.725 16.1396 20.7063 16.0437 20.6688C15.9479 20.6313 15.8583 20.5708 15.775 20.4875L14.0875 18.8H9.91248L8.22498 20.4875C8.14164 20.5708 8.05206 20.6313 7.95623 20.6688C7.86039 20.7063 7.75831 20.725 7.64998 20.725C7.29164 20.725 7.03956 20.5583 6.89373 20.225C6.74789 19.8917 6.80414 19.5958 7.06248 19.3375L7.59998 18.8C6.64164 18.8 5.83956 18.4771 5.19373 17.8313C4.54789 17.1854 4.22498 16.3833 4.22498 15.425ZM12 4.125C10.2583 4.125 8.96456 4.22708 8.11873 4.43125C7.27289 4.63542 6.71664 4.875 6.44998 5.15H17.6C17.3583 4.85833 16.8125 4.61458 15.9625 4.41875C15.1125 4.22292 13.7916 4.125 12 4.125ZM6.09998 10.125H11.075V7.025H6.09998V10.125ZM12.95 10.125H17.9V7.025H12.95V10.125ZM8.54998 15.875C8.96664 15.875 9.30831 15.7417 9.57498 15.475C9.84164 15.2083 9.97498 14.8667 9.97498 14.45C9.97498 14.0333 9.84164 13.6917 9.57498 13.425C9.30831 13.1583 8.96664 13.025 8.54998 13.025C8.13331 13.025 7.79164 13.1583 7.52498 13.425C7.25831 13.6917 7.12498 14.0333 7.12498 14.45C7.12498 14.8667 7.25831 15.2083 7.52498 15.475C7.79164 15.7417 8.13331 15.875 8.54998 15.875ZM15.45 15.875C15.8666 15.875 16.2083 15.7417 16.475 15.475C16.7416 15.2083 16.875 14.8667 16.875 14.45C16.875 14.0333 16.7416 13.6917 16.475 13.425C16.2083 13.1583 15.8666 13.025 15.45 13.025C15.0333 13.025 14.6916 13.1583 14.425 13.425C14.1583 13.6917 14.025 14.0333 14.025 14.45C14.025 14.8667 14.1583 15.2083 14.425 15.475C14.6916 15.7417 15.0333 15.875 15.45 15.875ZM7.59998 16.925H16.4C16.8333 16.925 17.1916 16.7833 17.475 16.5C17.7583 16.2167 17.9 15.8583 17.9 15.425V12H6.09998V15.425C6.09998 15.8583 6.24164 16.2167 6.52498 16.5C6.80831 16.7833 7.16664 16.925 7.59998 16.925Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M4.22498 15.425V6.1C4.22498 5.25 4.43956 4.57292 4.86873 4.06875C5.29789 3.56458 5.87081 3.17917 6.58748 2.9125C7.30414 2.64583 8.13123 2.46875 9.06873 2.38125C10.0062 2.29375 10.9833 2.25 12 2.25C13.0666 2.25 14.0729 2.29375 15.0187 2.38125C15.9646 2.46875 16.7896 2.64583 17.4937 2.9125C18.1979 3.17917 18.7541 3.56458 19.1625 4.06875C19.5708 4.57292 19.775 5.25 19.775 6.1V15.425C19.775 16.3833 19.4521 17.1854 18.8062 17.8313C18.1604 18.4771 17.3583 18.8 16.4 18.8L16.9375 19.3375C17.1958 19.5958 17.2541 19.8917 17.1125 20.225C16.9708 20.5583 16.7166 20.725 16.35 20.725C16.2416 20.725 16.1396 20.7063 16.0437 20.6688C15.9479 20.6313 15.8583 20.5708 15.775 20.4875L14.0875 18.8H9.91248L8.22498 20.4875C8.14164 20.5708 8.05206 20.6313 7.95623 20.6688C7.86039 20.7063 7.75831 20.725 7.64998 20.725C7.29164 20.725 7.03956 20.5583 6.89373 20.225C6.74789 19.8917 6.80414 19.5958 7.06248 19.3375L7.59998 18.8C6.64164 18.8 5.83956 18.4771 5.19373 17.8313C4.54789 17.1854 4.22498 16.3833 4.22498 15.425ZM12 4.125C10.2583 4.125 8.96456 4.22708 8.11873 4.43125C7.27289 4.63542 6.71664 4.875 6.44998 5.15H17.6C17.3583 4.85833 16.8125 4.61458 15.9625 4.41875C15.1125 4.22292 13.7916 4.125 12 4.125ZM6.09998 10.125H11.075V7.025H6.09998V10.125ZM12.95 10.125H17.9V7.025H12.95V10.125ZM8.54998 15.875C8.96664 15.875 9.30831 15.7417 9.57498 15.475C9.84164 15.2083 9.97498 14.8667 9.97498 14.45C9.97498 14.0333 9.84164 13.6917 9.57498 13.425C9.30831 13.1583 8.96664 13.025 8.54998 13.025C8.13331 13.025 7.79164 13.1583 7.52498 13.425C7.25831 13.6917 7.12498 14.0333 7.12498 14.45C7.12498 14.8667 7.25831 15.2083 7.52498 15.475C7.79164 15.7417 8.13331 15.875 8.54998 15.875ZM15.45 15.875C15.8666 15.875 16.2083 15.7417 16.475 15.475C16.7416 15.2083 16.875 14.8667 16.875 14.45C16.875 14.0333 16.7416 13.6917 16.475 13.425C16.2083 13.1583 15.8666 13.025 15.45 13.025C15.0333 13.025 14.6916 13.1583 14.425 13.425C14.1583 13.6917 14.025 14.0333 14.025 14.45C14.025 14.8667 14.1583 15.2083 14.425 15.475C14.6916 15.7417 15.0333 15.875 15.45 15.875ZM7.59998 16.925H16.4C16.8333 16.925 17.1916 16.7833 17.475 16.5C17.7583 16.2167 17.9 15.8583 17.9 15.425V12H6.09998V15.425C6.09998 15.8583 6.24164 16.2167 6.52498 16.5C6.80831 16.7833 7.16664 16.925 7.59998 16.925Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/TripAdvisor.tsx b/components/Icons/TripAdvisor.tsx
index a1fc6d416..0b58ca839 100644
--- a/components/Icons/TripAdvisor.tsx
+++ b/components/Icons/TripAdvisor.tsx
@@ -18,25 +18,12 @@ export default function TripAdvisorIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        id="mask0_3856_6685"
-        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_3856_6685)">
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M9.05211 12.7618C9.05211 13.6531 8.29824 14.3757 7.3683 14.3757C6.43836 14.3757 5.68449 13.6531 5.68449 12.7618C5.68449 11.8705 6.43836 11.148 7.3683 11.148C8.29809 11.1473 9.05234 11.8692 9.05299 12.7604V12.7618H9.05211ZM16.8618 11.148C15.9318 11.148 15.1779 11.8705 15.1779 12.7618C15.1779 13.6531 15.9318 14.3757 16.8618 14.3757C17.7917 14.3757 18.5456 13.6531 18.5456 12.7618C18.5456 11.8705 17.7917 11.148 16.8618 11.148ZM16.8618 15.8404C15.0878 15.8404 13.6497 14.4621 13.6497 12.7618C13.6497 11.0615 15.0878 9.6832 16.8618 9.6832C18.6357 9.6832 20.0738 11.0615 20.0738 12.7618C20.0738 14.4621 18.6357 15.8404 16.8618 15.8404ZM12.1165 12.673C12.1165 10.6472 10.5782 8.90887 8.55158 8.16488C10.833 7.25401 13.3994 7.25401 15.6808 8.16488C13.6536 8.90915 12.1165 10.6472 12.1165 12.673ZM7.36919 15.8404C5.59524 15.8404 4.15717 14.4621 4.15717 12.7618C4.15717 11.0615 5.59524 9.6832 7.36919 9.6832C9.14313 9.6832 10.5812 11.0615 10.5812 12.7618C10.5812 14.4621 9.14313 15.8404 7.36919 15.8404ZM20.0619 9.39966L21.615 7.78013H18.1719C14.5206 5.39849 9.72128 5.39849 6.06994 7.78013H2.61802L4.17108 9.39966C2.2302 11.0885 2.08519 13.9656 3.84718 15.8258C5.60917 17.6862 8.61095 17.8251 10.5518 16.1363C10.5663 16.1237 10.5805 16.1111 10.5948 16.0984L12.1165 17.6862L13.6373 16.1004C14.5135 16.8807 15.6657 17.3138 16.8618 17.3122C19.483 17.3122 21.61 15.2753 21.61 12.7629C21.6119 11.4828 21.0497 10.2613 20.0619 9.39966Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M9.05211 12.7618C9.05211 13.6531 8.29824 14.3757 7.3683 14.3757C6.43836 14.3757 5.68449 13.6531 5.68449 12.7618C5.68449 11.8705 6.43836 11.148 7.3683 11.148C8.29809 11.1473 9.05234 11.8692 9.05299 12.7604V12.7618H9.05211ZM16.8618 11.148C15.9318 11.148 15.1779 11.8705 15.1779 12.7618C15.1779 13.6531 15.9318 14.3757 16.8618 14.3757C17.7917 14.3757 18.5456 13.6531 18.5456 12.7618C18.5456 11.8705 17.7917 11.148 16.8618 11.148ZM16.8618 15.8404C15.0878 15.8404 13.6497 14.4621 13.6497 12.7618C13.6497 11.0615 15.0878 9.6832 16.8618 9.6832C18.6357 9.6832 20.0738 11.0615 20.0738 12.7618C20.0738 14.4621 18.6357 15.8404 16.8618 15.8404ZM12.1165 12.673C12.1165 10.6472 10.5782 8.90887 8.55158 8.16488C10.833 7.25401 13.3994 7.25401 15.6808 8.16488C13.6536 8.90915 12.1165 10.6472 12.1165 12.673ZM7.36919 15.8404C5.59524 15.8404 4.15717 14.4621 4.15717 12.7618C4.15717 11.0615 5.59524 9.6832 7.36919 9.6832C9.14313 9.6832 10.5812 11.0615 10.5812 12.7618C10.5812 14.4621 9.14313 15.8404 7.36919 15.8404ZM20.0619 9.39966L21.615 7.78013H18.1719C14.5206 5.39849 9.72128 5.39849 6.06994 7.78013H2.61802L4.17108 9.39966C2.2302 11.0885 2.08519 13.9656 3.84718 15.8258C5.60917 17.6862 8.61095 17.8251 10.5518 16.1363C10.5663 16.1237 10.5805 16.1111 10.5948 16.0984L12.1165 17.6862L13.6373 16.1004C14.5135 16.8807 15.6657 17.3138 16.8618 17.3122C19.483 17.3122 21.61 15.2753 21.61 12.7629C21.6119 11.4828 21.0497 10.2613 20.0619 9.39966Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Tshirt.tsx b/components/Icons/Tshirt.tsx
index e6643725b..4d92d2418 100644
--- a/components/Icons/Tshirt.tsx
+++ b/components/Icons/Tshirt.tsx
@@ -14,23 +14,10 @@ export default function TshirtIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3467"
-        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_3467)">
-        <path
-          d="M6.20005 10.8L5.15005 11.4C4.92505 11.5333 4.6813 11.5646 4.4188 11.4937C4.1563 11.4229 3.95838 11.275 3.82505 11.05L1.92505 7.72498C1.79171 7.49998 1.76046 7.26039 1.8313 7.00623C1.90213 6.75206 2.05005 6.55831 2.27505 6.42498L7.85005 3.22498H9.52505C9.67505 3.22498 9.79588 3.27081 9.88755 3.36248C9.97921 3.45414 10.025 3.57498 10.025 3.72498V4.19998C10.025 4.74998 10.2167 5.21664 10.6 5.59998C10.9834 5.98331 11.45 6.17498 12 6.17498C12.55 6.17498 13.0167 5.98331 13.4 5.59998C13.7834 5.21664 13.975 4.74998 13.975 4.19998V3.72498C13.975 3.57498 14.0209 3.45414 14.1125 3.36248C14.2042 3.27081 14.325 3.22498 14.475 3.22498H16.15L21.725 6.42498C21.95 6.55831 22.098 6.75206 22.1688 7.00623C22.2396 7.26039 22.2084 7.49998 22.075 7.72498L20.175 11.05C20.0417 11.275 19.8459 11.4208 19.5875 11.4875C19.3292 11.5541 19.0834 11.5208 18.85 11.3875L17.8 10.8125V19.8C17.8 20.0666 17.7042 20.2958 17.5125 20.4875C17.3209 20.6791 17.0917 20.775 16.825 20.775H7.17505C6.90838 20.775 6.67921 20.6791 6.48755 20.4875C6.29588 20.2958 6.20005 20.0666 6.20005 19.8V10.8ZM8.07505 7.67498V18.9H15.925V7.67498L18.975 9.34998L20.025 7.62498L15.775 5.14998H15.725C15.5 5.99998 15.05 6.69581 14.375 7.23748C13.7 7.77914 12.9084 8.04998 12 8.04998C11.0917 8.04998 10.3 7.77914 9.62505 7.23748C8.95005 6.69581 8.50005 5.99998 8.27505 5.14998H8.22505L3.97505 7.62498L5.02505 9.34998L8.07505 7.67498Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M6.20005 10.8L5.15005 11.4C4.92505 11.5333 4.6813 11.5646 4.4188 11.4937C4.1563 11.4229 3.95838 11.275 3.82505 11.05L1.92505 7.72498C1.79171 7.49998 1.76046 7.26039 1.8313 7.00623C1.90213 6.75206 2.05005 6.55831 2.27505 6.42498L7.85005 3.22498H9.52505C9.67505 3.22498 9.79588 3.27081 9.88755 3.36248C9.97921 3.45414 10.025 3.57498 10.025 3.72498V4.19998C10.025 4.74998 10.2167 5.21664 10.6 5.59998C10.9834 5.98331 11.45 6.17498 12 6.17498C12.55 6.17498 13.0167 5.98331 13.4 5.59998C13.7834 5.21664 13.975 4.74998 13.975 4.19998V3.72498C13.975 3.57498 14.0209 3.45414 14.1125 3.36248C14.2042 3.27081 14.325 3.22498 14.475 3.22498H16.15L21.725 6.42498C21.95 6.55831 22.098 6.75206 22.1688 7.00623C22.2396 7.26039 22.2084 7.49998 22.075 7.72498L20.175 11.05C20.0417 11.275 19.8459 11.4208 19.5875 11.4875C19.3292 11.5541 19.0834 11.5208 18.85 11.3875L17.8 10.8125V19.8C17.8 20.0666 17.7042 20.2958 17.5125 20.4875C17.3209 20.6791 17.0917 20.775 16.825 20.775H7.17505C6.90838 20.775 6.67921 20.6791 6.48755 20.4875C6.29588 20.2958 6.20005 20.0666 6.20005 19.8V10.8ZM8.07505 7.67498V18.9H15.925V7.67498L18.975 9.34998L20.025 7.62498L15.775 5.14998H15.725C15.5 5.99998 15.05 6.69581 14.375 7.23748C13.7 7.77914 12.9084 8.04998 12 8.04998C11.0917 8.04998 10.3 7.77914 9.62505 7.23748C8.95005 6.69581 8.50005 5.99998 8.27505 5.14998H8.22505L3.97505 7.62498L5.02505 9.34998L8.07505 7.67498Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/TshirtWash.tsx b/components/Icons/TshirtWash.tsx
index 7b952490f..58dea52a8 100644
--- a/components/Icons/TshirtWash.tsx
+++ b/components/Icons/TshirtWash.tsx
@@ -18,23 +18,10 @@ export default function TshirtWashIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_554_11981"
-        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_11981)">
-        <path
-          d="M4.85 9.3875L7.9375 7.675V13.425C7.6125 13.4583 7.29375 13.5104 6.98125 13.5813C6.66875 13.6521 6.3625 13.75 6.0625 13.875V10.875L4.95 11.475C4.725 11.6 4.48958 11.6271 4.24375 11.5563C3.99791 11.4854 3.8125 11.3417 3.6875 11.125L1.6875 7.625C1.55416 7.4 1.52291 7.16458 1.59375 6.91875C1.66458 6.67292 1.8125 6.48333 2.0375 6.35L7.0875 3.4375C7.2625 3.3375 7.44583 3.25 7.6375 3.175C7.82916 3.1 8.02916 3.0625 8.2375 3.0625C8.4625 3.0625 8.65833 3.125 8.825 3.25C8.99166 3.375 9.11666 3.5375 9.2 3.7375C9.45833 4.37917 9.79583 4.92708 10.2125 5.38125C10.6292 5.83542 11.225 6.0625 12 6.0625C12.775 6.0625 13.3708 5.83542 13.7875 5.38125C14.2042 4.92708 14.5417 4.37917 14.8 3.7375C14.8833 3.5375 15.0125 3.375 15.1875 3.25C15.3625 3.125 15.5625 3.0625 15.7875 3.0625C15.9958 3.0625 16.1917 3.1 16.375 3.175C16.5583 3.25 16.7375 3.3375 16.9125 3.4375L21.975 6.35C22.2 6.48333 22.3458 6.67292 22.4125 6.91875C22.4792 7.16458 22.4458 7.4 22.3125 7.625L20.3125 11.125C20.1875 11.3417 20.0021 11.4854 19.7562 11.5563C19.5104 11.6271 19.275 11.6 19.05 11.475L17.9375 10.875V15.8L16.3875 17.1375C16.3375 17.1792 16.2875 17.2167 16.2375 17.25C16.1875 17.2833 16.1292 17.3125 16.0625 17.3375V7.675L19.15 9.3875L20.2125 7.525L16.275 5.2375C15.8667 6.0625 15.2792 6.71875 14.5125 7.20625C13.7458 7.69375 12.9083 7.9375 12 7.9375C11.1 7.9375 10.2667 7.69375 9.5 7.20625C8.73333 6.71875 8.14166 6.0625 7.725 5.2375L3.7625 7.525L4.85 9.3875ZM4.05 18.3875C3.875 18.1875 3.8 17.9583 3.825 17.7C3.85 17.4417 3.9625 17.225 4.1625 17.05L5.5625 15.85C5.94583 15.5167 6.38333 15.2646 6.875 15.0938C7.36666 14.9229 7.86666 14.8375 8.375 14.8375C8.88333 14.8375 9.37916 14.9229 9.8625 15.0938C10.3458 15.2646 10.7792 15.5167 11.1625 15.85L14.0625 18.325C14.2792 18.5 14.525 18.6333 14.8 18.725C15.075 18.8167 15.3583 18.8625 15.65 18.8625C15.9417 18.8625 16.2229 18.8188 16.4937 18.7313C16.7646 18.6438 17.0042 18.5083 17.2125 18.325L18.6125 17.1125C18.8125 16.9375 19.0417 16.8604 19.3 16.8813C19.5583 16.9021 19.775 17.0125 19.95 17.2125C20.125 17.4125 20.2 17.6417 20.175 17.9C20.15 18.1583 20.0375 18.375 19.8375 18.55L18.4375 19.75C18.0542 20.0833 17.6208 20.3313 17.1375 20.4938C16.6542 20.6563 16.1583 20.7375 15.65 20.7375C15.1417 20.7375 14.6417 20.6563 14.15 20.4938C13.6583 20.3313 13.2208 20.0833 12.8375 19.75L9.9375 17.275C9.72916 17.1 9.48958 16.9667 9.21875 16.875C8.94791 16.7833 8.66666 16.7375 8.375 16.7375C8.08333 16.7375 7.8 16.7833 7.525 16.875C7.25 16.9667 7.00416 17.1 6.7875 17.275L5.3625 18.475C5.1625 18.6417 4.9375 18.7188 4.6875 18.7063C4.4375 18.6938 4.225 18.5875 4.05 18.3875Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M4.85 9.3875L7.9375 7.675V13.425C7.6125 13.4583 7.29375 13.5104 6.98125 13.5813C6.66875 13.6521 6.3625 13.75 6.0625 13.875V10.875L4.95 11.475C4.725 11.6 4.48958 11.6271 4.24375 11.5563C3.99791 11.4854 3.8125 11.3417 3.6875 11.125L1.6875 7.625C1.55416 7.4 1.52291 7.16458 1.59375 6.91875C1.66458 6.67292 1.8125 6.48333 2.0375 6.35L7.0875 3.4375C7.2625 3.3375 7.44583 3.25 7.6375 3.175C7.82916 3.1 8.02916 3.0625 8.2375 3.0625C8.4625 3.0625 8.65833 3.125 8.825 3.25C8.99166 3.375 9.11666 3.5375 9.2 3.7375C9.45833 4.37917 9.79583 4.92708 10.2125 5.38125C10.6292 5.83542 11.225 6.0625 12 6.0625C12.775 6.0625 13.3708 5.83542 13.7875 5.38125C14.2042 4.92708 14.5417 4.37917 14.8 3.7375C14.8833 3.5375 15.0125 3.375 15.1875 3.25C15.3625 3.125 15.5625 3.0625 15.7875 3.0625C15.9958 3.0625 16.1917 3.1 16.375 3.175C16.5583 3.25 16.7375 3.3375 16.9125 3.4375L21.975 6.35C22.2 6.48333 22.3458 6.67292 22.4125 6.91875C22.4792 7.16458 22.4458 7.4 22.3125 7.625L20.3125 11.125C20.1875 11.3417 20.0021 11.4854 19.7562 11.5563C19.5104 11.6271 19.275 11.6 19.05 11.475L17.9375 10.875V15.8L16.3875 17.1375C16.3375 17.1792 16.2875 17.2167 16.2375 17.25C16.1875 17.2833 16.1292 17.3125 16.0625 17.3375V7.675L19.15 9.3875L20.2125 7.525L16.275 5.2375C15.8667 6.0625 15.2792 6.71875 14.5125 7.20625C13.7458 7.69375 12.9083 7.9375 12 7.9375C11.1 7.9375 10.2667 7.69375 9.5 7.20625C8.73333 6.71875 8.14166 6.0625 7.725 5.2375L3.7625 7.525L4.85 9.3875ZM4.05 18.3875C3.875 18.1875 3.8 17.9583 3.825 17.7C3.85 17.4417 3.9625 17.225 4.1625 17.05L5.5625 15.85C5.94583 15.5167 6.38333 15.2646 6.875 15.0938C7.36666 14.9229 7.86666 14.8375 8.375 14.8375C8.88333 14.8375 9.37916 14.9229 9.8625 15.0938C10.3458 15.2646 10.7792 15.5167 11.1625 15.85L14.0625 18.325C14.2792 18.5 14.525 18.6333 14.8 18.725C15.075 18.8167 15.3583 18.8625 15.65 18.8625C15.9417 18.8625 16.2229 18.8188 16.4937 18.7313C16.7646 18.6438 17.0042 18.5083 17.2125 18.325L18.6125 17.1125C18.8125 16.9375 19.0417 16.8604 19.3 16.8813C19.5583 16.9021 19.775 17.0125 19.95 17.2125C20.125 17.4125 20.2 17.6417 20.175 17.9C20.15 18.1583 20.0375 18.375 19.8375 18.55L18.4375 19.75C18.0542 20.0833 17.6208 20.3313 17.1375 20.4938C16.6542 20.6563 16.1583 20.7375 15.65 20.7375C15.1417 20.7375 14.6417 20.6563 14.15 20.4938C13.6583 20.3313 13.2208 20.0833 12.8375 19.75L9.9375 17.275C9.72916 17.1 9.48958 16.9667 9.21875 16.875C8.94791 16.7833 8.66666 16.7375 8.375 16.7375C8.08333 16.7375 7.8 16.7833 7.525 16.875C7.25 16.9667 7.00416 17.1 6.7875 17.275L5.3625 18.475C5.1625 18.6417 4.9375 18.7188 4.6875 18.7063C4.4375 18.6938 4.225 18.5875 4.05 18.3875Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/TvCasting.tsx b/components/Icons/TvCasting.tsx
index ea6e7b90d..5169f41bf 100644
--- a/components/Icons/TvCasting.tsx
+++ b/components/Icons/TvCasting.tsx
@@ -18,23 +18,10 @@ export default function TvCastingIcon({
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_69_3746"
-        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_3746)">
-        <path
-          d="M5.1375 15.9125H7.05C7.04167 15.3875 6.85208 14.9396 6.48125 14.5687C6.11042 14.1979 5.6625 14.0083 5.1375 14V15.9125ZM8.525 15.9125H9.9C9.9 14.5949 9.43566 13.4717 8.50697 12.543C7.57827 11.6143 6.45512 11.15 5.1375 11.15V12.525C6.07917 12.5333 6.87917 12.8646 7.5375 13.5187C8.19583 14.1729 8.525 14.9708 8.525 15.9125ZM11.375 15.9125H12.75C12.75 14.8658 12.5518 13.8785 12.1553 12.9507C11.7588 12.023 11.2156 11.2141 10.5257 10.5243C9.83584 9.83437 9.02702 9.29118 8.09925 8.8947C7.17147 8.49822 6.18422 8.29998 5.1375 8.29998V9.67783C6.8675 9.67783 8.33958 10.2836 9.55375 11.4952C10.7679 12.7067 11.375 14.1791 11.375 15.9125ZM4.125 18.8C3.60937 18.8 3.16796 18.6164 2.80077 18.2492C2.43359 17.882 2.25 17.4406 2.25 16.925V5.09998C2.25 4.58434 2.43359 4.14293 2.80077 3.77575C3.16796 3.40857 3.60937 3.22498 4.125 3.22498H19.875C20.3906 3.22498 20.832 3.40857 21.1992 3.77575C21.5664 4.14293 21.75 4.58434 21.75 5.09998V16.925C21.75 17.4406 21.5664 17.882 21.1992 18.2492C20.832 18.6164 20.3906 18.8 19.875 18.8H15.85V19.8375C15.85 20.0958 15.7583 20.3166 15.575 20.5C15.3917 20.6833 15.1708 20.775 14.9125 20.775H9.0875C8.82917 20.775 8.60833 20.6833 8.425 20.5C8.24167 20.3166 8.15 20.0958 8.15 19.8375V18.8H4.125ZM4.125 16.925H19.875V5.09998H4.125V16.925Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M5.1375 15.9125H7.05C7.04167 15.3875 6.85208 14.9396 6.48125 14.5687C6.11042 14.1979 5.6625 14.0083 5.1375 14V15.9125ZM8.525 15.9125H9.9C9.9 14.5949 9.43566 13.4717 8.50697 12.543C7.57827 11.6143 6.45512 11.15 5.1375 11.15V12.525C6.07917 12.5333 6.87917 12.8646 7.5375 13.5187C8.19583 14.1729 8.525 14.9708 8.525 15.9125ZM11.375 15.9125H12.75C12.75 14.8658 12.5518 13.8785 12.1553 12.9507C11.7588 12.023 11.2156 11.2141 10.5257 10.5243C9.83584 9.83437 9.02702 9.29118 8.09925 8.8947C7.17147 8.49822 6.18422 8.29998 5.1375 8.29998V9.67783C6.8675 9.67783 8.33958 10.2836 9.55375 11.4952C10.7679 12.7067 11.375 14.1791 11.375 15.9125ZM4.125 18.8C3.60937 18.8 3.16796 18.6164 2.80077 18.2492C2.43359 17.882 2.25 17.4406 2.25 16.925V5.09998C2.25 4.58434 2.43359 4.14293 2.80077 3.77575C3.16796 3.40857 3.60937 3.22498 4.125 3.22498H19.875C20.3906 3.22498 20.832 3.40857 21.1992 3.77575C21.5664 4.14293 21.75 4.58434 21.75 5.09998V16.925C21.75 17.4406 21.5664 17.882 21.1992 18.2492C20.832 18.6164 20.3906 18.8 19.875 18.8H15.85V19.8375C15.85 20.0958 15.7583 20.3166 15.575 20.5C15.3917 20.6833 15.1708 20.775 14.9125 20.775H9.0875C8.82917 20.775 8.60833 20.6833 8.425 20.5C8.24167 20.3166 8.15 20.0958 8.15 19.8375V18.8H4.125ZM4.125 16.925H19.875V5.09998H4.125V16.925Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/WarningTriangle.tsx b/components/Icons/WarningTriangle.tsx
index 78d47d60a..cc4ebb766 100644
--- a/components/Icons/WarningTriangle.tsx
+++ b/components/Icons/WarningTriangle.tsx
@@ -18,23 +18,10 @@ export default function WarningTriangleIcon({
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <mask
-        id="mask0_1756_2606"
-        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_2606)">
-        <path
-          d="M2.95563 20.775C2.7768 20.775 2.61564 20.7315 2.47216 20.6444C2.32869 20.5573 2.2171 20.4425 2.13738 20.3C2.05405 20.1583 2.0103 20.0063 2.00613 19.8438C2.00196 19.6813 2.04571 19.5208 2.13738 19.3625L11.1874 3.75001C11.279 3.59167 11.3986 3.47501 11.546 3.40001C11.6934 3.32501 11.8447 3.28751 11.9999 3.28751C12.155 3.28751 12.3063 3.32501 12.4538 3.40001C12.6012 3.47501 12.7207 3.59167 12.8124 3.75001L21.8624 19.3625C21.954 19.5208 21.9978 19.6813 21.9936 19.8438C21.9895 20.0063 21.9457 20.1583 21.8624 20.3C21.779 20.4417 21.6663 20.5563 21.524 20.6438C21.3818 20.7313 21.2237 20.775 21.0499 20.775H2.95563ZM11.9973 17.875C12.2657 17.875 12.4915 17.7842 12.6749 17.6026C12.8582 17.4211 12.9499 17.1961 12.9499 16.9276C12.9499 16.6592 12.8591 16.4333 12.6775 16.25C12.4959 16.0667 12.2709 15.975 12.0025 15.975C11.7341 15.975 11.5082 16.0658 11.3249 16.2474C11.1415 16.4289 11.0499 16.6539 11.0499 16.9224C11.0499 17.1908 11.1407 17.4167 11.3223 17.6C11.5038 17.7833 11.7288 17.875 11.9973 17.875ZM12.0124 15C12.2707 15 12.4915 14.9083 12.6749 14.725C12.8582 14.5417 12.9499 14.3208 12.9499 14.0625V11.0125C12.9499 10.7542 12.8582 10.5333 12.6749 10.35C12.4915 10.1667 12.2707 10.075 12.0124 10.075C11.754 10.075 11.5332 10.1667 11.3499 10.35C11.1665 10.5333 11.0749 10.7542 11.0749 11.0125V14.0625C11.0749 14.3208 11.1665 14.5417 11.3499 14.725C11.5332 14.9083 11.754 15 12.0124 15Z"
-          fill="white"
-        />
-      </g>
+      <path
+        d="M2.95563 20.775C2.7768 20.775 2.61564 20.7315 2.47216 20.6444C2.32869 20.5573 2.2171 20.4425 2.13738 20.3C2.05405 20.1583 2.0103 20.0063 2.00613 19.8438C2.00196 19.6813 2.04571 19.5208 2.13738 19.3625L11.1874 3.75001C11.279 3.59167 11.3986 3.47501 11.546 3.40001C11.6934 3.32501 11.8447 3.28751 11.9999 3.28751C12.155 3.28751 12.3063 3.32501 12.4538 3.40001C12.6012 3.47501 12.7207 3.59167 12.8124 3.75001L21.8624 19.3625C21.954 19.5208 21.9978 19.6813 21.9936 19.8438C21.9895 20.0063 21.9457 20.1583 21.8624 20.3C21.779 20.4417 21.6663 20.5563 21.524 20.6438C21.3818 20.7313 21.2237 20.775 21.0499 20.775H2.95563ZM11.9973 17.875C12.2657 17.875 12.4915 17.7842 12.6749 17.6026C12.8582 17.4211 12.9499 17.1961 12.9499 16.9276C12.9499 16.6592 12.8591 16.4333 12.6775 16.25C12.4959 16.0667 12.2709 15.975 12.0025 15.975C11.7341 15.975 11.5082 16.0658 11.3249 16.2474C11.1415 16.4289 11.0499 16.6539 11.0499 16.9224C11.0499 17.1908 11.1407 17.4167 11.3223 17.6C11.5038 17.7833 11.7288 17.875 11.9973 17.875ZM12.0124 15C12.2707 15 12.4915 14.9083 12.6749 14.725C12.8582 14.5417 12.9499 14.3208 12.9499 14.0625V11.0125C12.9499 10.7542 12.8582 10.5333 12.6749 10.35C12.4915 10.1667 12.2707 10.075 12.0124 10.075C11.754 10.075 11.5332 10.1667 11.3499 10.35C11.1665 10.5333 11.0749 10.7542 11.0749 11.0125V14.0625C11.0749 14.3208 11.1665 14.5417 11.3499 14.725C11.5332 14.9083 11.754 15 12.0124 15Z"
+        fill="white"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Wheelchair.tsx b/components/Icons/Wheelchair.tsx
new file mode 100644
index 000000000..991951761
--- /dev/null
+++ b/components/Icons/Wheelchair.tsx
@@ -0,0 +1,40 @@
+import { iconVariants } from "./variants"
+
+import type { IconProps } from "@/types/components/icon"
+
+export default function WheelchairIcon({
+  className,
+  color,
+  ...props
+}: IconProps) {
+  const classNames = iconVariants({ className, color })
+  return (
+    <svg
+      className={classNames}
+      width="16"
+      height="16"
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <mask
+        id="mask0_7488_25219"
+        style={{ maskType: "alpha" }}
+        maskUnits="userSpaceOnUse"
+        x="0"
+        y="0"
+        width="16"
+        height="16"
+      >
+        <rect width="16" height="16" fill="#D9D9D9" />
+      </mask>
+      <g mask="url(#mask0_7488_25219)">
+        <path
+          d="M5.41602 14.5C4.51046 14.5 3.7424 14.1847 3.11185 13.5541C2.48129 12.9236 2.16602 12.1555 2.16602 11.25C2.16602 10.3444 2.48129 9.57636 3.11185 8.94581C3.7424 8.31525 4.51324 7.99998 5.42435 7.99998V9.24998C4.86324 9.24998 4.38824 9.44442 3.99935 9.83331C3.61046 10.2222 3.41602 10.6944 3.41602 11.25C3.41602 11.8055 3.61046 12.2778 3.99935 12.6666C4.38824 13.0555 4.86046 13.25 5.41602 13.25C5.97157 13.25 6.44379 13.0541 6.83268 12.6625C7.22157 12.2708 7.41602 11.7916 7.41602 11.225H8.66602C8.66602 12.1416 8.35074 12.9166 7.72018 13.55C7.08963 14.1833 6.32157 14.5 5.41602 14.5ZM7.38268 10.6C6.89379 10.6 6.52018 10.3944 6.26185 9.98331C6.00352 9.5722 5.97157 9.14442 6.16602 8.69998L7.36602 6.03331H5.84935L5.64935 6.54998C5.59379 6.70553 5.49102 6.82081 5.34102 6.89581C5.19102 6.97081 5.03546 6.98053 4.87435 6.92498C4.70213 6.86942 4.57574 6.76109 4.49518 6.59998C4.41463 6.43886 4.40768 6.2722 4.47435 6.09998L4.68268 5.54998C4.77713 5.30553 4.92852 5.11664 5.13685 4.98331C5.34518 4.84998 5.5799 4.78331 5.84102 4.78331H9.21601C9.69379 4.78331 10.0618 4.97914 10.3202 5.37081C10.5785 5.76248 10.6105 6.17775 10.416 6.61664L9.31602 9.03331H11.2827C11.6438 9.03331 11.9507 9.1597 12.2035 9.41248C12.4563 9.66525 12.5827 9.9722 12.5827 10.3333V13.2083C12.5827 13.3805 12.5216 13.5278 12.3993 13.65C12.2771 13.7722 12.1299 13.8333 11.9577 13.8333C11.7855 13.8333 11.6382 13.7722 11.516 13.65C11.3938 13.5278 11.3327 13.3805 11.3327 13.2083V10.6H7.38268ZM10.5493 4.44998C10.1882 4.44998 9.88129 4.32359 9.62852 4.07081C9.37574 3.81803 9.24935 3.51109 9.24935 3.14998C9.24935 2.78886 9.37574 2.48192 9.62852 2.22914C9.88129 1.97636 10.1882 1.84998 10.5493 1.84998C10.9105 1.84998 11.2174 1.97636 11.4702 2.22914C11.723 2.48192 11.8493 2.78886 11.8493 3.14998C11.8493 3.51109 11.723 3.81803 11.4702 4.07081C11.2174 4.32359 10.9105 4.44998 10.5493 4.44998Z"
+          fill="#787472"
+        />
+      </g>
+    </svg>
+  )
+}
diff --git a/components/Icons/Wifi.tsx b/components/Icons/Wifi.tsx
index 80d2d1000..594bbe660 100644
--- a/components/Icons/Wifi.tsx
+++ b/components/Icons/Wifi.tsx
@@ -14,23 +14,10 @@ export default function BarIcon({ className, color, ...props }: IconProps) {
       fill="none"
       {...props}
     >
-      <mask
-        id="mask0_554_11965"
-        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_11965)">
-        <path
-          d="M11.9999 20.6875C11.3332 20.6875 10.7707 20.4584 10.3124 20C9.85406 19.5417 9.62489 18.9792 9.62489 18.3125C9.62489 17.6459 9.85406 17.0834 10.3124 16.625C10.7707 16.1667 11.3332 15.9375 11.9999 15.9375C12.6666 15.9375 13.2291 16.1667 13.6874 16.625C14.1457 17.0834 14.3749 17.6459 14.3749 18.3125C14.3749 18.9792 14.1457 19.5417 13.6874 20C13.2291 20.4584 12.6666 20.6875 11.9999 20.6875ZM11.9999 10.05C13.2249 10.05 14.3853 10.2459 15.4811 10.6375C16.577 11.0292 17.5707 11.5709 18.4624 12.2625C18.7707 12.5042 18.9332 12.8125 18.9499 13.1875C18.9666 13.5625 18.8332 13.8917 18.5499 14.175C18.2832 14.4417 17.9561 14.5813 17.5686 14.5938C17.1811 14.6063 16.8332 14.5 16.5249 14.275C15.8916 13.825 15.1916 13.4771 14.4249 13.2313C13.6582 12.9855 12.8499 12.8625 11.9999 12.8625C11.1499 12.8625 10.3416 12.9855 9.57489 13.2313C8.80822 13.4771 8.10822 13.825 7.47489 14.275C7.16655 14.5 6.81864 14.6042 6.43114 14.5875C6.04364 14.5709 5.71655 14.4292 5.44989 14.1625C5.17489 13.8792 5.04364 13.55 5.05614 13.175C5.06864 12.8 5.22905 12.4917 5.53739 12.25C6.42905 11.5584 7.42281 11.0188 8.51864 10.6313C9.61447 10.2438 10.7749 10.05 11.9999 10.05ZM11.9999 4.42505C13.9999 4.42505 15.8874 4.75838 17.6624 5.42505C19.4374 6.09172 21.0291 7.02922 22.4374 8.23755C22.7457 8.49588 22.9061 8.8188 22.9186 9.2063C22.9311 9.5938 22.7999 9.92505 22.5249 10.2C22.2582 10.4667 21.9291 10.6042 21.5374 10.6125C21.1457 10.6209 20.7957 10.5 20.4874 10.25C19.3124 9.29172 18.0082 8.55005 16.5749 8.02505C15.1416 7.50005 13.6166 7.23755 11.9999 7.23755C10.3832 7.23755 8.85822 7.50005 7.42489 8.02505C5.99155 8.55005 4.68739 9.29172 3.51239 10.25C3.20405 10.5 2.85405 10.6209 2.46239 10.6125C2.07072 10.6042 1.74155 10.4667 1.47489 10.2C1.19989 9.92505 1.06864 9.5938 1.08114 9.2063C1.09364 8.8188 1.25405 8.49588 1.56239 8.23755C2.97072 7.02922 4.56239 6.09172 6.33739 5.42505C8.11239 4.75838 9.99989 4.42505 11.9999 4.42505Z"
-          fill="#4D001B"
-        />
-      </g>
+      <path
+        d="M11.9999 20.6875C11.3332 20.6875 10.7707 20.4584 10.3124 20C9.85406 19.5417 9.62489 18.9792 9.62489 18.3125C9.62489 17.6459 9.85406 17.0834 10.3124 16.625C10.7707 16.1667 11.3332 15.9375 11.9999 15.9375C12.6666 15.9375 13.2291 16.1667 13.6874 16.625C14.1457 17.0834 14.3749 17.6459 14.3749 18.3125C14.3749 18.9792 14.1457 19.5417 13.6874 20C13.2291 20.4584 12.6666 20.6875 11.9999 20.6875ZM11.9999 10.05C13.2249 10.05 14.3853 10.2459 15.4811 10.6375C16.577 11.0292 17.5707 11.5709 18.4624 12.2625C18.7707 12.5042 18.9332 12.8125 18.9499 13.1875C18.9666 13.5625 18.8332 13.8917 18.5499 14.175C18.2832 14.4417 17.9561 14.5813 17.5686 14.5938C17.1811 14.6063 16.8332 14.5 16.5249 14.275C15.8916 13.825 15.1916 13.4771 14.4249 13.2313C13.6582 12.9855 12.8499 12.8625 11.9999 12.8625C11.1499 12.8625 10.3416 12.9855 9.57489 13.2313C8.80822 13.4771 8.10822 13.825 7.47489 14.275C7.16655 14.5 6.81864 14.6042 6.43114 14.5875C6.04364 14.5709 5.71655 14.4292 5.44989 14.1625C5.17489 13.8792 5.04364 13.55 5.05614 13.175C5.06864 12.8 5.22905 12.4917 5.53739 12.25C6.42905 11.5584 7.42281 11.0188 8.51864 10.6313C9.61447 10.2438 10.7749 10.05 11.9999 10.05ZM11.9999 4.42505C13.9999 4.42505 15.8874 4.75838 17.6624 5.42505C19.4374 6.09172 21.0291 7.02922 22.4374 8.23755C22.7457 8.49588 22.9061 8.8188 22.9186 9.2063C22.9311 9.5938 22.7999 9.92505 22.5249 10.2C22.2582 10.4667 21.9291 10.6042 21.5374 10.6125C21.1457 10.6209 20.7957 10.5 20.4874 10.25C19.3124 9.29172 18.0082 8.55005 16.5749 8.02505C15.1416 7.50005 13.6166 7.23755 11.9999 7.23755C10.3832 7.23755 8.85822 7.50005 7.42489 8.02505C5.99155 8.55005 4.68739 9.29172 3.51239 10.25C3.20405 10.5 2.85405 10.6209 2.46239 10.6125C2.07072 10.6042 1.74155 10.4667 1.47489 10.2C1.19989 9.92505 1.06864 9.5938 1.08114 9.2063C1.09364 8.8188 1.25405 8.49588 1.56239 8.23755C2.97072 7.02922 4.56239 6.09172 6.33739 5.42505C8.11239 4.75838 9.99989 4.42505 11.9999 4.42505Z"
+        fill="#4D001B"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/WindowCurtainsAlt.tsx b/components/Icons/WindowCurtainsAlt.tsx
index f32529566..6fe6dce4c 100644
--- a/components/Icons/WindowCurtainsAlt.tsx
+++ b/components/Icons/WindowCurtainsAlt.tsx
@@ -18,23 +18,10 @@ export default function WindowCurtainsAltIcon({
       className={classNames}
       {...props}
     >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3395"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3395)">
-        <path
-          d="M4.0625 19.0625V4.9375C4.0625 4.42187 4.24609 3.98046 4.61328 3.61328C4.98046 3.24609 5.42187 3.0625 5.9375 3.0625H18.0625C18.5781 3.0625 19.0195 3.24609 19.3867 3.61328C19.7539 3.98046 19.9375 4.42187 19.9375 4.9375V19.0625H21C21.2583 19.0625 21.4792 19.1542 21.6625 19.3375C21.8458 19.5208 21.9375 19.7417 21.9375 20C21.9375 20.2583 21.8458 20.4792 21.6625 20.6625C21.4792 20.8458 21.2583 20.9375 21 20.9375H3C2.74167 20.9375 2.52083 20.8458 2.3375 20.6625C2.15417 20.4792 2.0625 20.2583 2.0625 20C2.0625 19.7417 2.15417 19.5208 2.3375 19.3375C2.52083 19.1542 2.74167 19.0625 3 19.0625H4.0625ZM5.9375 19.0625H9.0625V4.9375H5.9375V19.0625ZM10.9375 19.0625H13.0625V4.9375H10.9375V19.0625ZM14.9375 19.0625H18.0625V4.9375H14.9375V19.0625Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M4.0625 19.0625V4.9375C4.0625 4.42187 4.24609 3.98046 4.61328 3.61328C4.98046 3.24609 5.42187 3.0625 5.9375 3.0625H18.0625C18.5781 3.0625 19.0195 3.24609 19.3867 3.61328C19.7539 3.98046 19.9375 4.42187 19.9375 4.9375V19.0625H21C21.2583 19.0625 21.4792 19.1542 21.6625 19.3375C21.8458 19.5208 21.9375 19.7417 21.9375 20C21.9375 20.2583 21.8458 20.4792 21.6625 20.6625C21.4792 20.8458 21.2583 20.9375 21 20.9375H3C2.74167 20.9375 2.52083 20.8458 2.3375 20.6625C2.15417 20.4792 2.0625 20.2583 2.0625 20C2.0625 19.7417 2.15417 19.5208 2.3375 19.3375C2.52083 19.1542 2.74167 19.0625 3 19.0625H4.0625ZM5.9375 19.0625H9.0625V4.9375H5.9375V19.0625ZM10.9375 19.0625H13.0625V4.9375H10.9375V19.0625ZM14.9375 19.0625H18.0625V4.9375H14.9375V19.0625Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/WindowNotAvailable.tsx b/components/Icons/WindowNotAvailable.tsx
index f064e146d..9e938c1e9 100644
--- a/components/Icons/WindowNotAvailable.tsx
+++ b/components/Icons/WindowNotAvailable.tsx
@@ -18,35 +18,22 @@ export default function WindowNotAvailableIcon({
       className={classNames}
       {...props}
     >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_4398_1753"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4398_1753)">
-        <path
-          d="M3.12638 4.26255L10.8139 11.95L13.6889 14.8625L15.0264 16.2L16.3764 17.5125L19.9264 21.05C20.1097 21.2334 20.3285 21.325 20.5826 21.325C20.8368 21.325 21.0555 21.2334 21.2389 21.05C21.4222 20.8667 21.5118 20.648 21.5076 20.3938C21.5035 20.1396 21.4139 19.925 21.2389 19.75L4.43888 2.95005C4.25555 2.76672 4.0368 2.67505 3.78263 2.67505C3.52846 2.67505 3.30971 2.76672 3.12638 2.95005C2.94305 3.13338 2.85346 3.35422 2.85763 3.61255C2.8618 3.87088 2.95138 4.08755 3.12638 4.26255Z"
-          fill="#26201E"
-        />
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M5.95054 4.46519C5.52518 4.49131 5.15729 4.65958 4.84687 4.97C4.50793 5.30894 4.33846 5.71639 4.33846 6.19236V19.2308H3.35769C3.11923 19.2308 2.91539 19.3154 2.74616 19.4847C2.57692 19.6539 2.49231 19.8577 2.49231 20.0962C2.49231 20.3347 2.57692 20.5385 2.74616 20.7077C2.91539 20.877 3.11923 20.9616 3.35769 20.9616H19.9731C20.2115 20.9616 20.4154 20.877 20.5846 20.7077C20.7538 20.5385 20.8385 20.3347 20.8385 20.0962C20.8385 19.8577 20.7538 19.6539 20.5846 19.4847C20.4154 19.3154 20.2115 19.2308 19.9731 19.2308H18.9923V17.5049L18.4182 16.9328L17.2615 15.8083V19.2308H13.5577C13.6808 18.1385 14.0423 17.0366 14.6423 15.9251C14.9739 15.3107 15.389 14.8168 15.8874 14.4433L15.4619 14.0178L14.6843 13.2301C13.938 13.84 13.3356 14.6095 12.8769 15.5385C12.2769 16.7539 11.9231 17.9847 11.8154 19.2308H11.5154C11.4077 17.9847 11.0538 16.7539 10.4538 15.5385C9.85385 14.3231 9.00769 13.3808 7.91539 12.7116C9.00769 12.0424 9.85385 11.1001 10.4538 9.88467C10.557 9.67565 10.6529 9.46617 10.7416 9.25623L9.3933 7.90796C9.21395 8.4372 8.98001 8.96913 8.69149 9.50374C8.08947 10.6192 7.21539 11.3385 6.06923 11.6616V6.19236H7.6777L5.95054 4.46519ZM9.78462 19.2308H6.06923V13.7731C7.21539 14.0962 8.09039 14.8135 8.69423 15.9251C9.29808 17.0366 9.66154 18.1385 9.78462 19.2308Z"
-          fill="#26201E"
-        />
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M11.4051 7.03227L8.83444 4.46159H17.2615C17.7375 4.46159 18.145 4.63106 18.4839 4.97C18.8228 5.30894 18.9923 5.71639 18.9923 6.19236V14.6195L12.0659 7.69308C11.9423 7.19534 11.8588 6.6951 11.8154 6.19236H11.5154C11.4911 6.47311 11.4544 6.75308 11.4051 7.03227ZM13.5462 6.19236H17.2615V11.6616C16.1154 11.3385 15.2404 10.6193 14.6365 9.5039C14.0327 8.38852 13.6692 7.28467 13.5462 6.19236Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.12638 4.26255L10.8139 11.95L13.6889 14.8625L15.0264 16.2L16.3764 17.5125L19.9264 21.05C20.1097 21.2334 20.3285 21.325 20.5826 21.325C20.8368 21.325 21.0555 21.2334 21.2389 21.05C21.4222 20.8667 21.5118 20.648 21.5076 20.3938C21.5035 20.1396 21.4139 19.925 21.2389 19.75L4.43888 2.95005C4.25555 2.76672 4.0368 2.67505 3.78263 2.67505C3.52846 2.67505 3.30971 2.76672 3.12638 2.95005C2.94305 3.13338 2.85346 3.35422 2.85763 3.61255C2.8618 3.87088 2.95138 4.08755 3.12638 4.26255Z"
+        fill="#26201E"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M5.95054 4.46519C5.52518 4.49131 5.15729 4.65958 4.84687 4.97C4.50793 5.30894 4.33846 5.71639 4.33846 6.19236V19.2308H3.35769C3.11923 19.2308 2.91539 19.3154 2.74616 19.4847C2.57692 19.6539 2.49231 19.8577 2.49231 20.0962C2.49231 20.3347 2.57692 20.5385 2.74616 20.7077C2.91539 20.877 3.11923 20.9616 3.35769 20.9616H19.9731C20.2115 20.9616 20.4154 20.877 20.5846 20.7077C20.7538 20.5385 20.8385 20.3347 20.8385 20.0962C20.8385 19.8577 20.7538 19.6539 20.5846 19.4847C20.4154 19.3154 20.2115 19.2308 19.9731 19.2308H18.9923V17.5049L18.4182 16.9328L17.2615 15.8083V19.2308H13.5577C13.6808 18.1385 14.0423 17.0366 14.6423 15.9251C14.9739 15.3107 15.389 14.8168 15.8874 14.4433L15.4619 14.0178L14.6843 13.2301C13.938 13.84 13.3356 14.6095 12.8769 15.5385C12.2769 16.7539 11.9231 17.9847 11.8154 19.2308H11.5154C11.4077 17.9847 11.0538 16.7539 10.4538 15.5385C9.85385 14.3231 9.00769 13.3808 7.91539 12.7116C9.00769 12.0424 9.85385 11.1001 10.4538 9.88467C10.557 9.67565 10.6529 9.46617 10.7416 9.25623L9.3933 7.90796C9.21395 8.4372 8.98001 8.96913 8.69149 9.50374C8.08947 10.6192 7.21539 11.3385 6.06923 11.6616V6.19236H7.6777L5.95054 4.46519ZM9.78462 19.2308H6.06923V13.7731C7.21539 14.0962 8.09039 14.8135 8.69423 15.9251C9.29808 17.0366 9.66154 18.1385 9.78462 19.2308Z"
+        fill="#26201E"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M11.4051 7.03227L8.83444 4.46159H17.2615C17.7375 4.46159 18.145 4.63106 18.4839 4.97C18.8228 5.30894 18.9923 5.71639 18.9923 6.19236V14.6195L12.0659 7.69308C11.9423 7.19534 11.8588 6.6951 11.8154 6.19236H11.5154C11.4911 6.47311 11.4544 6.75308 11.4051 7.03227ZM13.5462 6.19236H17.2615V11.6616C16.1154 11.3385 15.2404 10.6193 14.6365 9.5039C14.0327 8.38852 13.6692 7.28467 13.5462 6.19236Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/WineBar.tsx b/components/Icons/WineBar.tsx
index a0ae499d1..1140d4ee6 100644
--- a/components/Icons/WineBar.tsx
+++ b/components/Icons/WineBar.tsx
@@ -14,23 +14,10 @@ export default function WineBarIcon({ className, color, ...props }: IconProps) {
       className={classNames}
       {...props}
     >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_69_3753"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_69_3753)">
-        <path
-          d="M11.0625 19.0625V14.85C9.62917 14.6083 8.4375 13.9437 7.4875 12.8562C6.5375 11.7688 6.0625 10.4833 6.0625 9V4C6.0625 3.74167 6.15417 3.52083 6.3375 3.3375C6.52083 3.15417 6.74167 3.0625 7 3.0625H17C17.2583 3.0625 17.4792 3.15417 17.6625 3.3375C17.8458 3.52083 17.9375 3.74167 17.9375 4V9C17.9375 10.4833 17.4625 11.7688 16.5125 12.8562C15.5625 13.9437 14.3708 14.6083 12.9375 14.85V19.0625H15C15.2583 19.0625 15.4792 19.1542 15.6625 19.3375C15.8458 19.5208 15.9375 19.7417 15.9375 20C15.9375 20.2583 15.8458 20.4792 15.6625 20.6625C15.4792 20.8458 15.2583 20.9375 15 20.9375H9C8.74167 20.9375 8.52083 20.8458 8.3375 20.6625C8.15417 20.4792 8.0625 20.2583 8.0625 20C8.0625 19.7417 8.15417 19.5208 8.3375 19.3375C8.52083 19.1542 8.74167 19.0625 9 19.0625H11.0625ZM12 13.0625C12.9417 13.0625 13.7729 12.7688 14.4938 12.1813C15.2146 11.5938 15.6917 10.8458 15.925 9.9375H8.075C8.31667 10.8458 8.79583 11.5938 9.5125 12.1813C10.2292 12.7688 11.0583 13.0625 12 13.0625ZM7.9375 8.0625H16.0625V4.9375H7.9375V8.0625Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M11.0625 19.0625V14.85C9.62917 14.6083 8.4375 13.9437 7.4875 12.8562C6.5375 11.7688 6.0625 10.4833 6.0625 9V4C6.0625 3.74167 6.15417 3.52083 6.3375 3.3375C6.52083 3.15417 6.74167 3.0625 7 3.0625H17C17.2583 3.0625 17.4792 3.15417 17.6625 3.3375C17.8458 3.52083 17.9375 3.74167 17.9375 4V9C17.9375 10.4833 17.4625 11.7688 16.5125 12.8562C15.5625 13.9437 14.3708 14.6083 12.9375 14.85V19.0625H15C15.2583 19.0625 15.4792 19.1542 15.6625 19.3375C15.8458 19.5208 15.9375 19.7417 15.9375 20C15.9375 20.2583 15.8458 20.4792 15.6625 20.6625C15.4792 20.8458 15.2583 20.9375 15 20.9375H9C8.74167 20.9375 8.52083 20.8458 8.3375 20.6625C8.15417 20.4792 8.0625 20.2583 8.0625 20C8.0625 19.7417 8.15417 19.5208 8.3375 19.3375C8.52083 19.1542 8.74167 19.0625 9 19.0625H11.0625ZM12 13.0625C12.9417 13.0625 13.7729 12.7688 14.4938 12.1813C15.2146 11.5938 15.6917 10.8458 15.925 9.9375H8.075C8.31667 10.8458 8.79583 11.5938 9.5125 12.1813C10.2292 12.7688 11.0583 13.0625 12 13.0625ZM7.9375 8.0625H16.0625V4.9375H7.9375V8.0625Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/WoodFloor.tsx b/components/Icons/WoodFloor.tsx
index e7eaa4f35..1f57c69ad 100644
--- a/components/Icons/WoodFloor.tsx
+++ b/components/Icons/WoodFloor.tsx
@@ -18,67 +18,54 @@ export default function WoodFloorIcon({
       className={classNames}
       {...props}
     >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_81_934"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_81_934)">
-        <path
-          d="M3.93297 21C3.67588 21 3.45612 20.9083 3.27367 20.725C3.09122 20.5417 3 20.3208 3 20.0625C3 19.8042 3.09122 19.5833 3.27367 19.4C3.45612 19.2167 3.67588 19.125 3.93297 19.125H10.0283C10.2854 19.125 10.5052 19.2167 10.6876 19.4C10.8701 19.5833 10.9613 19.8042 10.9613 20.0625C10.9613 20.3208 10.8701 20.5417 10.6876 20.725C10.5052 20.9083 10.2854 21 10.0283 21H3.93297Z"
-          fill="#26201E"
-        />
-        <path
-          d="M3.93296 17.5C3.67588 17.5 3.45612 17.4083 3.27367 17.225C3.09122 17.0417 3 16.8208 3 16.5625C3 16.3042 3.09122 16.0833 3.27367 15.9C3.45612 15.7167 3.67588 15.625 3.93296 15.625H10.0283C10.2854 15.625 10.5052 15.7167 10.6876 15.9C10.8701 16.0833 10.9613 16.3042 10.9613 16.5625C10.9613 16.8208 10.8701 17.0417 10.6876 17.225C10.5052 17.4083 10.2854 17.5 10.0283 17.5H3.93296Z"
-          fill="#26201E"
-        />
-        <path
-          d="M3.93297 13.9688C3.67588 13.9688 3.45612 13.8771 3.27367 13.6938C3.09122 13.5104 3 13.2896 3 13.0312C3 12.7729 3.09122 12.5521 3.27367 12.3688C3.45612 12.1854 3.67588 12.0938 3.93297 12.0938H10.0283C10.2854 12.0938 10.5052 12.1854 10.6876 12.3688C10.8701 12.5521 10.9613 12.7729 10.9613 13.0312C10.9613 13.2896 10.8701 13.5104 10.6876 13.6938C10.5052 13.8771 10.2854 13.9688 10.0283 13.9688H3.93297Z"
-          fill="#26201E"
-        />
-        <path
-          d="M11.8321 10.0625C11.8321 10.3208 11.7408 10.5417 11.5584 10.725C11.376 10.9083 11.1562 11 10.8991 11C10.642 11 10.4223 10.9083 10.2398 10.725C10.0574 10.5417 9.96614 10.3208 9.96614 10.0625V3.9375C9.96614 3.67917 10.0574 3.45833 10.2398 3.275C10.4223 3.09167 10.642 3 10.8991 3C11.1562 3 11.376 3.09167 11.5584 3.275C11.7408 3.45833 11.8321 3.67917 11.8321 3.9375V10.0625Z"
-          fill="#26201E"
-        />
-        <path
-          d="M8.36593 10.0625C8.36593 10.3208 8.27471 10.5417 8.09226 10.725C7.90981 10.9083 7.69005 11 7.43297 11C7.17588 11 6.95612 10.9083 6.77367 10.725C6.59122 10.5417 6.5 10.3208 6.5 10.0625V3.9375C6.5 3.67917 6.59122 3.45833 6.77367 3.275C6.95612 3.09167 7.17588 3 7.43297 3C7.69005 3 7.90981 3.09167 8.09226 3.275C8.27471 3.45833 8.36593 3.67917 8.36593 3.9375V10.0625Z"
-          fill="#26201E"
-        />
-        <path
-          d="M4.86593 10.0625C4.86593 10.3208 4.77471 10.5417 4.59226 10.725C4.40981 10.9083 4.19005 11 3.93297 11C3.67588 11 3.45612 10.9083 3.27367 10.725C3.09122 10.5417 3 10.3208 3 10.0625V3.9375C3 3.67917 3.09122 3.45833 3.27367 3.275C3.45612 3.09167 3.67588 3 3.93297 3C4.19005 3 4.40981 3.09167 4.59226 3.275C4.77471 3.45833 4.86593 3.67917 4.86593 3.9375V10.0625Z"
-          fill="#26201E"
-        />
-        <path
-          d="M20.067 3C20.3241 3 20.5439 3.09167 20.7263 3.275C20.9088 3.45833 21 3.67917 21 3.9375C21 4.19583 20.9088 4.41667 20.7263 4.6C20.5439 4.78333 20.3241 4.875 20.067 4.875H13.933C13.6759 4.875 13.4561 4.78333 13.2737 4.6C13.0912 4.41667 13 4.19583 13 3.9375C13 3.67917 13.0912 3.45833 13.2737 3.275C13.4561 3.09167 13.6759 3 13.933 3H20.067Z"
-          fill="#26201E"
-        />
-        <path
-          d="M20.067 6.5C20.3241 6.5 20.5439 6.59167 20.7263 6.775C20.9088 6.95833 21 7.17917 21 7.4375C21 7.69583 20.9088 7.91667 20.7263 8.1C20.5439 8.28333 20.3241 8.375 20.067 8.375H13.933C13.6759 8.375 13.4561 8.28333 13.2737 8.1C13.0912 7.91667 13 7.69583 13 7.4375C13 7.17917 13.0912 6.95833 13.2737 6.775C13.4561 6.59167 13.6759 6.5 13.933 6.5H20.067Z"
-          fill="#26201E"
-        />
-        <path
-          d="M12.1679 13.9375C12.1679 13.6792 12.2592 13.4583 12.4416 13.275C12.624 13.0917 12.8438 13 13.1009 13C13.358 13 13.5777 13.0917 13.7602 13.275C13.9426 13.4583 14.0339 13.6792 14.0339 13.9375V20.0312C14.0339 20.2896 13.9426 20.5104 13.7602 20.6938C13.5777 20.8771 13.358 20.9688 13.1009 20.9688C12.8438 20.9688 12.624 20.8771 12.4416 20.6938C12.2592 20.5104 12.1679 20.2896 12.1679 20.0312V13.9375Z"
-          fill="#26201E"
-        />
-        <path
-          d="M15.6341 13.9688C15.6341 13.7104 15.7253 13.4896 15.9077 13.3062C16.0902 13.1229 16.31 13.0312 16.567 13.0312C16.8241 13.0312 17.0439 13.1229 17.2263 13.3062C17.4088 13.4896 17.5 13.7104 17.5 13.9688V20.0625C17.5 20.3208 17.4088 20.5417 17.2263 20.725C17.0439 20.9083 16.8241 21 16.567 21C16.31 21 16.0902 20.9083 15.9077 20.725C15.7253 20.5417 15.6341 20.3208 15.6341 20.0625V13.9688Z"
-          fill="#26201E"
-        />
-        <path
-          d="M19.1341 13.9375C19.1341 13.6792 19.2253 13.4583 19.4077 13.275C19.5902 13.0917 19.81 13 20.067 13C20.3241 13 20.5439 13.0917 20.7263 13.275C20.9088 13.4583 21 13.6792 21 13.9375V20.0312C21 20.2896 20.9088 20.5104 20.7263 20.6938C20.5439 20.8771 20.3241 20.9688 20.067 20.9688C19.81 20.9688 19.5902 20.8771 19.4077 20.6938C19.2253 20.5104 19.1341 20.2896 19.1341 20.0312V13.9375Z"
-          fill="#26201E"
-        />
-        <path
-          d="M20.067 10C20.3241 10 20.5439 10.0917 20.7263 10.275C20.9088 10.4583 21 10.6792 21 10.9375C21 11.1958 20.9088 11.4167 20.7263 11.6C20.5439 11.7833 20.3241 11.875 20.067 11.875H13.933C13.6759 11.875 13.4561 11.7833 13.2737 11.6C13.0912 11.4167 13 11.1958 13 10.9375C13 10.6792 13.0912 10.4583 13.2737 10.275C13.4561 10.0917 13.6759 10 13.933 10H20.067Z"
-          fill="#26201E"
-        />
-      </g>
+      <path
+        d="M3.93297 21C3.67588 21 3.45612 20.9083 3.27367 20.725C3.09122 20.5417 3 20.3208 3 20.0625C3 19.8042 3.09122 19.5833 3.27367 19.4C3.45612 19.2167 3.67588 19.125 3.93297 19.125H10.0283C10.2854 19.125 10.5052 19.2167 10.6876 19.4C10.8701 19.5833 10.9613 19.8042 10.9613 20.0625C10.9613 20.3208 10.8701 20.5417 10.6876 20.725C10.5052 20.9083 10.2854 21 10.0283 21H3.93297Z"
+        fill="#26201E"
+      />
+      <path
+        d="M3.93296 17.5C3.67588 17.5 3.45612 17.4083 3.27367 17.225C3.09122 17.0417 3 16.8208 3 16.5625C3 16.3042 3.09122 16.0833 3.27367 15.9C3.45612 15.7167 3.67588 15.625 3.93296 15.625H10.0283C10.2854 15.625 10.5052 15.7167 10.6876 15.9C10.8701 16.0833 10.9613 16.3042 10.9613 16.5625C10.9613 16.8208 10.8701 17.0417 10.6876 17.225C10.5052 17.4083 10.2854 17.5 10.0283 17.5H3.93296Z"
+        fill="#26201E"
+      />
+      <path
+        d="M3.93297 13.9688C3.67588 13.9688 3.45612 13.8771 3.27367 13.6938C3.09122 13.5104 3 13.2896 3 13.0312C3 12.7729 3.09122 12.5521 3.27367 12.3688C3.45612 12.1854 3.67588 12.0938 3.93297 12.0938H10.0283C10.2854 12.0938 10.5052 12.1854 10.6876 12.3688C10.8701 12.5521 10.9613 12.7729 10.9613 13.0312C10.9613 13.2896 10.8701 13.5104 10.6876 13.6938C10.5052 13.8771 10.2854 13.9688 10.0283 13.9688H3.93297Z"
+        fill="#26201E"
+      />
+      <path
+        d="M11.8321 10.0625C11.8321 10.3208 11.7408 10.5417 11.5584 10.725C11.376 10.9083 11.1562 11 10.8991 11C10.642 11 10.4223 10.9083 10.2398 10.725C10.0574 10.5417 9.96614 10.3208 9.96614 10.0625V3.9375C9.96614 3.67917 10.0574 3.45833 10.2398 3.275C10.4223 3.09167 10.642 3 10.8991 3C11.1562 3 11.376 3.09167 11.5584 3.275C11.7408 3.45833 11.8321 3.67917 11.8321 3.9375V10.0625Z"
+        fill="#26201E"
+      />
+      <path
+        d="M8.36593 10.0625C8.36593 10.3208 8.27471 10.5417 8.09226 10.725C7.90981 10.9083 7.69005 11 7.43297 11C7.17588 11 6.95612 10.9083 6.77367 10.725C6.59122 10.5417 6.5 10.3208 6.5 10.0625V3.9375C6.5 3.67917 6.59122 3.45833 6.77367 3.275C6.95612 3.09167 7.17588 3 7.43297 3C7.69005 3 7.90981 3.09167 8.09226 3.275C8.27471 3.45833 8.36593 3.67917 8.36593 3.9375V10.0625Z"
+        fill="#26201E"
+      />
+      <path
+        d="M4.86593 10.0625C4.86593 10.3208 4.77471 10.5417 4.59226 10.725C4.40981 10.9083 4.19005 11 3.93297 11C3.67588 11 3.45612 10.9083 3.27367 10.725C3.09122 10.5417 3 10.3208 3 10.0625V3.9375C3 3.67917 3.09122 3.45833 3.27367 3.275C3.45612 3.09167 3.67588 3 3.93297 3C4.19005 3 4.40981 3.09167 4.59226 3.275C4.77471 3.45833 4.86593 3.67917 4.86593 3.9375V10.0625Z"
+        fill="#26201E"
+      />
+      <path
+        d="M20.067 3C20.3241 3 20.5439 3.09167 20.7263 3.275C20.9088 3.45833 21 3.67917 21 3.9375C21 4.19583 20.9088 4.41667 20.7263 4.6C20.5439 4.78333 20.3241 4.875 20.067 4.875H13.933C13.6759 4.875 13.4561 4.78333 13.2737 4.6C13.0912 4.41667 13 4.19583 13 3.9375C13 3.67917 13.0912 3.45833 13.2737 3.275C13.4561 3.09167 13.6759 3 13.933 3H20.067Z"
+        fill="#26201E"
+      />
+      <path
+        d="M20.067 6.5C20.3241 6.5 20.5439 6.59167 20.7263 6.775C20.9088 6.95833 21 7.17917 21 7.4375C21 7.69583 20.9088 7.91667 20.7263 8.1C20.5439 8.28333 20.3241 8.375 20.067 8.375H13.933C13.6759 8.375 13.4561 8.28333 13.2737 8.1C13.0912 7.91667 13 7.69583 13 7.4375C13 7.17917 13.0912 6.95833 13.2737 6.775C13.4561 6.59167 13.6759 6.5 13.933 6.5H20.067Z"
+        fill="#26201E"
+      />
+      <path
+        d="M12.1679 13.9375C12.1679 13.6792 12.2592 13.4583 12.4416 13.275C12.624 13.0917 12.8438 13 13.1009 13C13.358 13 13.5777 13.0917 13.7602 13.275C13.9426 13.4583 14.0339 13.6792 14.0339 13.9375V20.0312C14.0339 20.2896 13.9426 20.5104 13.7602 20.6938C13.5777 20.8771 13.358 20.9688 13.1009 20.9688C12.8438 20.9688 12.624 20.8771 12.4416 20.6938C12.2592 20.5104 12.1679 20.2896 12.1679 20.0312V13.9375Z"
+        fill="#26201E"
+      />
+      <path
+        d="M15.6341 13.9688C15.6341 13.7104 15.7253 13.4896 15.9077 13.3062C16.0902 13.1229 16.31 13.0312 16.567 13.0312C16.8241 13.0312 17.0439 13.1229 17.2263 13.3062C17.4088 13.4896 17.5 13.7104 17.5 13.9688V20.0625C17.5 20.3208 17.4088 20.5417 17.2263 20.725C17.0439 20.9083 16.8241 21 16.567 21C16.31 21 16.0902 20.9083 15.9077 20.725C15.7253 20.5417 15.6341 20.3208 15.6341 20.0625V13.9688Z"
+        fill="#26201E"
+      />
+      <path
+        d="M19.1341 13.9375C19.1341 13.6792 19.2253 13.4583 19.4077 13.275C19.5902 13.0917 19.81 13 20.067 13C20.3241 13 20.5439 13.0917 20.7263 13.275C20.9088 13.4583 21 13.6792 21 13.9375V20.0312C21 20.2896 20.9088 20.5104 20.7263 20.6938C20.5439 20.8771 20.3241 20.9688 20.067 20.9688C19.81 20.9688 19.5902 20.8771 19.4077 20.6938C19.2253 20.5104 19.1341 20.2896 19.1341 20.0312V13.9375Z"
+        fill="#26201E"
+      />
+      <path
+        d="M20.067 10C20.3241 10 20.5439 10.0917 20.7263 10.275C20.9088 10.4583 21 10.6792 21 10.9375C21 11.1958 20.9088 11.4167 20.7263 11.6C20.5439 11.7833 20.3241 11.875 20.067 11.875H13.933C13.6759 11.875 13.4561 11.7833 13.2737 11.6C13.0912 11.4167 13 11.1958 13 10.9375C13 10.6792 13.0912 10.4583 13.2737 10.275C13.4561 10.0917 13.6759 10 13.933 10H20.067Z"
+        fill="#26201E"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/Yard.tsx b/components/Icons/Yard.tsx
index 9e853b4b0..19c0bd09b 100644
--- a/components/Icons/Yard.tsx
+++ b/components/Icons/Yard.tsx
@@ -14,23 +14,10 @@ export default function YardIcon({ className, color, ...props }: IconProps) {
       className={classNames}
       {...props}
     >
-      <mask
-        style={{ maskType: "alpha" }}
-        id="mask0_4039_3234"
-        maskUnits="userSpaceOnUse"
-        x="0"
-        y="0"
-        width="24"
-        height="24"
-      >
-        <rect width="24" height="24" fill="#D9D9D9" />
-      </mask>
-      <g mask="url(#mask0_4039_3234)">
-        <path
-          d="M12 19C12 17.3333 11.4167 15.9167 10.25 14.75C9.08333 13.5833 7.66667 13 6 13C6 14.6667 6.58333 16.0833 7.75 17.25C8.91667 18.4167 10.3333 19 12 19ZM12 13.95C12.4333 13.95 12.8 13.8 13.1 13.5C13.4 13.2 13.55 12.8333 13.55 12.4V12.25C13.6833 12.35 13.8208 12.425 13.9625 12.475C14.1042 12.525 14.2667 12.55 14.45 12.55C14.8833 12.55 15.25 12.4 15.55 12.1C15.85 11.8 16 11.4333 16 11C16 10.6667 15.9208 10.375 15.7625 10.125C15.6042 9.875 15.3833 9.7 15.1 9.6C15.3833 9.5 15.6042 9.325 15.7625 9.075C15.9208 8.825 16 8.53333 16 8.2C16 7.76667 15.85 7.4 15.55 7.1C15.25 6.8 14.8833 6.65 14.45 6.65C14.2667 6.65 14.1042 6.675 13.9625 6.725C13.8208 6.775 13.6833 6.85 13.55 6.95V6.8C13.55 6.36667 13.4 6 13.1 5.7C12.8 5.4 12.4333 5.25 12 5.25C11.5667 5.25 11.2 5.4 10.9 5.7C10.6 6 10.45 6.36667 10.45 6.8V6.95C10.3167 6.85 10.1792 6.775 10.0375 6.725C9.89583 6.675 9.73333 6.65 9.55 6.65C9.11667 6.65 8.75 6.8 8.45 7.1C8.15 7.4 8 7.76667 8 8.2C8 8.53333 8.07917 8.825 8.2375 9.075C8.39583 9.325 8.61667 9.5 8.9 9.6C8.61667 9.7 8.39583 9.875 8.2375 10.125C8.07917 10.375 8 10.6667 8 11C8 11.4333 8.15 11.8 8.45 12.1C8.75 12.4 9.11667 12.55 9.55 12.55C9.73333 12.55 9.89583 12.525 10.0375 12.475C10.1792 12.425 10.3167 12.35 10.45 12.25V12.4C10.45 12.8333 10.6 13.2 10.9 13.5C11.2 13.8 11.5667 13.95 12 13.95ZM12 11.15C11.5667 11.15 11.2 11.0042 10.9 10.7125C10.6 10.4208 10.45 10.05 10.45 9.6C10.45 9.16667 10.6 8.8 10.9 8.5C11.2 8.2 11.5667 8.05 12 8.05C12.4333 8.05 12.8 8.2 13.1 8.5C13.4 8.8 13.55 9.16667 13.55 9.6C13.55 10.05 13.4 10.4208 13.1 10.7125C12.8 11.0042 12.4333 11.15 12 11.15ZM12 19C13.6667 19 15.0833 18.4167 16.25 17.25C17.4167 16.0833 18 14.6667 18 13C16.3333 13 14.9167 13.5833 13.75 14.75C12.5833 15.9167 12 17.3333 12 19ZM4 22C3.45 22 2.97917 21.8042 2.5875 21.4125C2.19583 21.0208 2 20.55 2 20V4C2 3.45 2.19583 2.97917 2.5875 2.5875C2.97917 2.19583 3.45 2 4 2H20C20.55 2 21.0208 2.19583 21.4125 2.5875C21.8042 2.97917 22 3.45 22 4V20C22 20.55 21.8042 21.0208 21.4125 21.4125C21.0208 21.8042 20.55 22 20 22H4ZM4 20H20V4H4V20Z"
-          fill="#1C1B1F"
-        />
-      </g>
+      <path
+        d="M12 19C12 17.3333 11.4167 15.9167 10.25 14.75C9.08333 13.5833 7.66667 13 6 13C6 14.6667 6.58333 16.0833 7.75 17.25C8.91667 18.4167 10.3333 19 12 19ZM12 13.95C12.4333 13.95 12.8 13.8 13.1 13.5C13.4 13.2 13.55 12.8333 13.55 12.4V12.25C13.6833 12.35 13.8208 12.425 13.9625 12.475C14.1042 12.525 14.2667 12.55 14.45 12.55C14.8833 12.55 15.25 12.4 15.55 12.1C15.85 11.8 16 11.4333 16 11C16 10.6667 15.9208 10.375 15.7625 10.125C15.6042 9.875 15.3833 9.7 15.1 9.6C15.3833 9.5 15.6042 9.325 15.7625 9.075C15.9208 8.825 16 8.53333 16 8.2C16 7.76667 15.85 7.4 15.55 7.1C15.25 6.8 14.8833 6.65 14.45 6.65C14.2667 6.65 14.1042 6.675 13.9625 6.725C13.8208 6.775 13.6833 6.85 13.55 6.95V6.8C13.55 6.36667 13.4 6 13.1 5.7C12.8 5.4 12.4333 5.25 12 5.25C11.5667 5.25 11.2 5.4 10.9 5.7C10.6 6 10.45 6.36667 10.45 6.8V6.95C10.3167 6.85 10.1792 6.775 10.0375 6.725C9.89583 6.675 9.73333 6.65 9.55 6.65C9.11667 6.65 8.75 6.8 8.45 7.1C8.15 7.4 8 7.76667 8 8.2C8 8.53333 8.07917 8.825 8.2375 9.075C8.39583 9.325 8.61667 9.5 8.9 9.6C8.61667 9.7 8.39583 9.875 8.2375 10.125C8.07917 10.375 8 10.6667 8 11C8 11.4333 8.15 11.8 8.45 12.1C8.75 12.4 9.11667 12.55 9.55 12.55C9.73333 12.55 9.89583 12.525 10.0375 12.475C10.1792 12.425 10.3167 12.35 10.45 12.25V12.4C10.45 12.8333 10.6 13.2 10.9 13.5C11.2 13.8 11.5667 13.95 12 13.95ZM12 11.15C11.5667 11.15 11.2 11.0042 10.9 10.7125C10.6 10.4208 10.45 10.05 10.45 9.6C10.45 9.16667 10.6 8.8 10.9 8.5C11.2 8.2 11.5667 8.05 12 8.05C12.4333 8.05 12.8 8.2 13.1 8.5C13.4 8.8 13.55 9.16667 13.55 9.6C13.55 10.05 13.4 10.4208 13.1 10.7125C12.8 11.0042 12.4333 11.15 12 11.15ZM12 19C13.6667 19 15.0833 18.4167 16.25 17.25C17.4167 16.0833 18 14.6667 18 13C16.3333 13 14.9167 13.5833 13.75 14.75C12.5833 15.9167 12 17.3333 12 19ZM4 22C3.45 22 2.97917 21.8042 2.5875 21.4125C2.19583 21.0208 2 20.55 2 20V4C2 3.45 2.19583 2.97917 2.5875 2.5875C2.97917 2.19583 3.45 2 4 2H20C20.55 2 21.0208 2.19583 21.4125 2.5875C21.8042 2.97917 22 3.45 22 4V20C22 20.55 21.8042 21.0208 21.4125 21.4125C21.0208 21.8042 20.55 22 20 22H4ZM4 20H20V4H4V20Z"
+        fill="#1C1B1F"
+      />
     </svg>
   )
 }
diff --git a/components/Icons/icon.module.css b/components/Icons/icon.module.css
index ec5a15fd4..68ace50b3 100644
--- a/components/Icons/icon.module.css
+++ b/components/Icons/icon.module.css
@@ -76,3 +76,8 @@
 .baseButtonTextOnFillNormal * {
   fill: var(--Base-Button-Text-On-Fill-Normal);
 }
+
+.disabled,
+.disabled * {
+  fill: var(--Base-Text-Disabled);
+}
diff --git a/components/Icons/index.tsx b/components/Icons/index.tsx
index fc7407ce8..ce23296fe 100644
--- a/components/Icons/index.tsx
+++ b/components/Icons/index.tsx
@@ -4,6 +4,7 @@ export { default as AccessibilityIcon } from "./Accessibility"
 export { default as AccountCircleIcon } from "./AccountCircle"
 export { default as AirIcon } from "./Air"
 export { default as AirplaneIcon } from "./Airplane"
+export { default as AllergyIcon } from "./Allergy"
 export { default as ArrowRightIcon } from "./ArrowRight"
 export { default as BarIcon } from "./Bar"
 export { default as BathtubIcon } from "./Bathtub"
@@ -111,6 +112,7 @@ export { default as TshirtIcon } from "./Tshirt"
 export { default as TshirtWashIcon } from "./TshirtWash"
 export { default as TvCastingIcon } from "./TvCasting"
 export { default as WarningTriangle } from "./WarningTriangle"
+export { default as WheelchairIcon } from "./Wheelchair"
 export { default as WifiIcon } from "./Wifi"
 export { default as WindowCurtainsAltIcon } from "./WindowCurtainsAlt"
 export { default as WindowNotAvailableIcon } from "./WindowNotAvailable"
diff --git a/components/Icons/variants.ts b/components/Icons/variants.ts
index d319c466e..09d69364f 100644
--- a/components/Icons/variants.ts
+++ b/components/Icons/variants.ts
@@ -20,6 +20,7 @@ const config = {
       white: styles.white,
       uiTextHighContrast: styles.uiTextHighContrast,
       uiTextMediumContrast: styles.uiTextMediumContrast,
+      disabled: styles.disabled,
     },
   },
   defaultVariants: {
diff --git a/components/JsonToHtml/renderOptions.tsx b/components/JsonToHtml/renderOptions.tsx
index 219981529..2ce1afbec 100644
--- a/components/JsonToHtml/renderOptions.tsx
+++ b/components/JsonToHtml/renderOptions.tsx
@@ -42,6 +42,17 @@ import type {
 import { RTEMarkType } from "@/types/transitionTypes/rte/node"
 import type { RenderOptions } from "@/types/transitionTypes/rte/option"
 
+function noNestedLinksOrReferences(node: RTENode) {
+  if ("type" in node) {
+    if (node.type === RTETypeEnum.reference) {
+      return node.children
+    } else if (node.type === RTETypeEnum.a) {
+      return node.children
+    }
+  }
+  return node
+}
+
 function extractPossibleAttributes(attrs: Attributes | undefined) {
   if (!attrs) return {}
   const props: Record<string, any> = {}
@@ -82,7 +93,13 @@ export const renderOptions: RenderOptions = {
           variant="underscored"
           color="burgundy"
         >
-          {next(node.children, embeds, fullRenderOptions)}
+          {next(
+            // Sometimes editors happen to nest a reference inside a link and vice versa.
+            // In that case use the outermost link, i.e. ignore nested links.
+            node.children.flatMap(noNestedLinksOrReferences),
+            embeds,
+            fullRenderOptions
+          )}
         </Link>
       )
     }
@@ -340,28 +357,22 @@ export const renderOptions: RenderOptions = {
         ) {
           // If entry is not an ImageContainer, it is a page and we return it as a link
           const props = extractPossibleAttributes(node.attrs)
-          let href = ""
-          if (entry?.node.__typename === ContentEnum.blocks.AccountPage) {
-            href = removeMultipleSlashes(
-              `/${entry.node.system.locale}${entry.node.url}`
-            )
-          } else {
-            href =
-              entry.node?.web?.original_url ||
-              removeMultipleSlashes(
-                `/${entry.node.system.locale}${entry.node.url}`
-              )
-          }
 
           return (
             <Link
               {...props}
-              href={href}
+              href={entry.node.url}
               key={node.uid}
               variant="underscored"
               color="burgundy"
             >
-              {next(node.children, embeds, fullRenderOptions)}
+              {next(
+                // Sometimes editors happen to nest a reference inside a link and vice versa.
+                // In that case use the outermost link, i.e. ignore nested links.
+                node.children.flatMap(noNestedLinksOrReferences),
+                embeds,
+                fullRenderOptions
+              )}
             </Link>
           )
         }
diff --git a/components/LanguageSwitcher/LanguageSwitcherContainer/index.tsx b/components/LanguageSwitcher/LanguageSwitcherContainer/index.tsx
index ada415172..0eafafa29 100644
--- a/components/LanguageSwitcher/LanguageSwitcherContainer/index.tsx
+++ b/components/LanguageSwitcher/LanguageSwitcherContainer/index.tsx
@@ -35,10 +35,12 @@ export default function LanguageSwitcherContainer({
             onClick={() => toggleDropdown(position)}
           >
             <ChevronLeftIcon color="red" />
-            <Subtitle type="one">
-              {intl.formatMessage({
-                id: "Main menu",
-              })}
+            <Subtitle type="one" asChild>
+              <span>
+                {intl.formatMessage({
+                  id: "Main menu",
+                })}
+              </span>
             </Subtitle>
           </button>
         </div>
@@ -53,7 +55,7 @@ export default function LanguageSwitcherContainer({
             })}
             onClick={() => toggleDropdown(position)}
           >
-            <span className={styles.bar}></span>
+            <span className={styles.bar} />
           </button>
         </div>
       ) : null}
diff --git a/components/Lightbox/FullView.tsx b/components/Lightbox/FullView.tsx
index 5541d365b..360b7a276 100644
--- a/components/Lightbox/FullView.tsx
+++ b/components/Lightbox/FullView.tsx
@@ -40,7 +40,7 @@ export default function FullView({
       <div className={styles.fullViewImageContainer}>
         <AnimatePresence initial={false} custom={currentIndex}>
           <motion.div
-            key={image.url}
+            key={image.imageSizes.medium}
             custom={currentIndex}
             initial={{ opacity: 0, x: 300 }}
             animate={{ opacity: 1, x: 0 }}
@@ -49,14 +49,16 @@ export default function FullView({
             className={styles.fullViewImage}
           >
             <Image
-              alt={image.alt}
+              alt={image.metaData.altText}
               fill
-              src={image.url}
+              src={image.imageSizes.medium}
               style={{ objectFit: "cover" }}
             />
 
             <div className={styles.fullViewFooter}>
-              {image.title && <Body color="white">{image.title}</Body>}
+              {image.metaData.title && (
+                <Body color="white">{image.metaData.title}</Body>
+              )}
             </div>
           </motion.div>
         </AnimatePresence>
diff --git a/components/Lightbox/Gallery.tsx b/components/Lightbox/Gallery.tsx
index 23149d3de..578cc961e 100644
--- a/components/Lightbox/Gallery.tsx
+++ b/components/Lightbox/Gallery.tsx
@@ -20,7 +20,7 @@ export default function Gallery({
   selectedImage,
 }: GalleryProps) {
   const mainImage = selectedImage || images[0]
-  const mainImageIndex = images.findIndex((img) => img.url === mainImage.url)
+  const mainImageIndex = images.findIndex((img) => img === mainImage)
 
   function getThumbImages() {
     const thumbs = []
@@ -55,16 +55,18 @@ export default function Gallery({
       {/* Desktop Gallery */}
       <div className={styles.desktopGallery}>
         <div className={styles.galleryHeader}>
-          {mainImage.title && (
+          {mainImage.metaData.title && (
             <div className={styles.imageCaption}>
-              <Caption color="textMediumContrast">{mainImage.title}</Caption>
+              <Caption color="textMediumContrast">
+                {mainImage.metaData.title}
+              </Caption>
             </div>
           )}
         </div>
         <div className={styles.mainImageWrapper}>
           <AnimatePresence initial={false} mode="wait">
             <motion.div
-              key={mainImage.url}
+              key={mainImage.imageSizes.medium}
               className={styles.mainImageContainer}
               initial={{ opacity: 0, x: 300 }}
               animate={{ opacity: 1, x: 0 }}
@@ -72,10 +74,10 @@ export default function Gallery({
               transition={{ duration: 0.3 }}
             >
               <Image
-                src={mainImage.url}
-                alt={mainImage.alt}
-                layout="fill"
-                objectFit="cover"
+                src={mainImage.imageSizes.medium}
+                alt={mainImage.metaData.altText}
+                fill
+                className={styles.image}
                 onClick={onImageClick}
               />
             </motion.div>
@@ -100,7 +102,7 @@ export default function Gallery({
           <AnimatePresence initial={false}>
             {getThumbImages().map((image, index) => (
               <motion.div
-                key={image.url}
+                key={image.imageSizes.tiny}
                 className={styles.thumbnailContainer}
                 onClick={() => onSelectImage(image)}
                 initial={{ opacity: 0, x: 50 }}
@@ -109,10 +111,10 @@ export default function Gallery({
                 transition={{ duration: 0.2, delay: index * 0.05 }}
               >
                 <Image
-                  src={image.url}
-                  alt={image.alt}
-                  layout="fill"
-                  objectFit="cover"
+                  src={image.imageSizes.tiny}
+                  alt={image.metaData.altText}
+                  fill
+                  className={styles.image}
                 />
               </motion.div>
             ))}
@@ -139,7 +141,7 @@ export default function Gallery({
           <div className={styles.thumbnailGrid}>
             {images.map((image, index) => (
               <motion.div
-                key={image.url}
+                key={image.imageSizes.small}
                 className={`${styles.thumbnailContainer} ${index % 3 === 0 ? styles.fullWidthImage : ""}`}
                 onClick={() => {
                   onSelectImage(image)
@@ -150,10 +152,10 @@ export default function Gallery({
                 transition={{ duration: 0.3, delay: index * 0.05 }}
               >
                 <Image
-                  src={image.url}
-                  alt={image.alt}
-                  layout="fill"
-                  objectFit="cover"
+                  src={image.imageSizes.small}
+                  alt={image.metaData.altText}
+                  fill
+                  className={styles.image}
                 />
               </motion.div>
             ))}
diff --git a/components/Lightbox/Lightbox.module.css b/components/Lightbox/Lightbox.module.css
index ae46b5a0e..c98745601 100644
--- a/components/Lightbox/Lightbox.module.css
+++ b/components/Lightbox/Lightbox.module.css
@@ -184,6 +184,25 @@
   max-width: 548px;
 }
 
+.image {
+  object-fit: cover;
+}
+
+@media (min-width: 768px) and (max-width: 1367px) {
+  .fullViewContainer {
+    grid-template-columns: 1fr;
+    justify-items: center;
+    padding: var(--Spacing-x5);
+  }
+
+  .fullViewImageContainer {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    max-height: 35rem;
+  }
+}
+
 @media (min-width: 1367px) {
   .mobileGallery,
   .thumbnailGrid {
diff --git a/components/Lightbox/index.tsx b/components/Lightbox/index.tsx
index f76063848..e9e5d8fa1 100644
--- a/components/Lightbox/index.tsx
+++ b/components/Lightbox/index.tsx
@@ -97,7 +97,7 @@ export default function Lightbox({
                       onClose={() => setIsOpen(false)}
                       onSelectImage={(image) => {
                         setSelectedImageIndex(
-                          images.findIndex((img) => img.url === image.url)
+                          images.findIndex((img) => img === image)
                         )
                       }}
                       onImageClick={() => setIsFullView(true)}
diff --git a/components/Sidebar/JoinLoyalty/Contact/contact.module.css b/components/Sidebar/JoinLoyalty/Contact/contact.module.css
index 72127e707..59827194c 100644
--- a/components/Sidebar/JoinLoyalty/Contact/contact.module.css
+++ b/components/Sidebar/JoinLoyalty/Contact/contact.module.css
@@ -4,8 +4,8 @@
   flex-direction: column;
   gap: var(--Spacing-x2);
   justify-content: center;
-  padding-top: var(--Spacing-x2);
   align-items: center;
+  padding-top: var(--Spacing-x5);
 }
 
 .contact {
@@ -21,6 +21,7 @@
 @media screen and (min-width: 1367px) {
   .contactContainer {
     align-items: start;
+    padding-top: var(--Spacing-x2);
   }
 
   .contact > div {
diff --git a/components/Sidebar/JoinLoyalty/ReadMore/index.tsx b/components/Sidebar/JoinLoyalty/ReadMore/index.tsx
new file mode 100644
index 000000000..8890c4172
--- /dev/null
+++ b/components/Sidebar/JoinLoyalty/ReadMore/index.tsx
@@ -0,0 +1,49 @@
+import { faq, membershipTermsAndConditions } from "@/constants/currentWebHrefs"
+
+import ArrowRight from "@/components/Icons/ArrowRight"
+import Link from "@/components/TempDesignSystem/Link"
+import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
+import { getIntl } from "@/i18n"
+import { getLang } from "@/i18n/serverContext"
+
+import styles from "./readMore.module.css"
+
+export default async function ReadMore() {
+  const [intl, lang] = await Promise.all([getIntl(), getLang()])
+
+  const links = [
+    {
+      href: faq[lang],
+      text: intl.formatMessage({ id: "FAQ" }),
+    },
+    {
+      href: membershipTermsAndConditions[lang],
+      text: intl.formatMessage({ id: "Membership terms and conditions" }),
+    },
+  ]
+
+  return (
+    <article className={styles.wrapper}>
+      <Subtitle>{intl.formatMessage({ id: "Read more" })}</Subtitle>
+      <div className={styles.links}>
+        {links.map((link) => (
+          <Link
+            key={link.text}
+            size="small"
+            className={styles.link}
+            color="burgundy"
+            href={link.href}
+          >
+            <ArrowRight
+              color="burgundy"
+              className={styles.icon}
+              height="20"
+              width="20"
+            />
+            {link.text}
+          </Link>
+        ))}
+      </div>
+    </article>
+  )
+}
diff --git a/components/Sidebar/JoinLoyalty/ReadMore/readMore.module.css b/components/Sidebar/JoinLoyalty/ReadMore/readMore.module.css
new file mode 100644
index 000000000..c7b103996
--- /dev/null
+++ b/components/Sidebar/JoinLoyalty/ReadMore/readMore.module.css
@@ -0,0 +1,27 @@
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: var(--Spacing-x2);
+}
+
+.links {
+  display: grid;
+  gap: var(--Spacing-x-one-and-half);
+  justify-items: center;
+}
+
+.link {
+  display: flex;
+  align-items: center;
+}
+
+@media screen and (min-width: 1367px) {
+  .wrapper {
+    align-items: start;
+  }
+
+  .links {
+    justify-items: start;
+  }
+}
diff --git a/components/Sidebar/JoinLoyalty/index.tsx b/components/Sidebar/JoinLoyalty/index.tsx
index 13b3a91c5..3e353551f 100644
--- a/components/Sidebar/JoinLoyalty/index.tsx
+++ b/components/Sidebar/JoinLoyalty/index.tsx
@@ -10,6 +10,7 @@ import Title from "@/components/TempDesignSystem/Text/Title"
 import { getIntl } from "@/i18n"
 
 import Contact from "./Contact"
+import ReadMore from "./ReadMore"
 
 import styles from "./joinLoyalty.module.css"
 
@@ -18,15 +19,15 @@ import type { JoinLoyaltyContactProps } from "@/types/components/sidebar/joinLoy
 export default async function JoinLoyaltyContact({
   block,
 }: JoinLoyaltyContactProps) {
-  const intl = await getIntl()
-  const user = await getName()
+  const [intl, user] = await Promise.all([getIntl(), getName()])
 
   // Check if we have user, that means we are logged in.
   if (user) {
     return null
   }
+
   return (
-    <section>
+    <section className={styles.joinLoyaltyContainer}>
       <article className={styles.wrapper}>
         <Title as="h4" level="h3" textTransform="capitalize">
           {block.title}
@@ -70,6 +71,7 @@ export default async function JoinLoyaltyContact({
         </section>
       </article>
       {block.contact ? <Contact contactBlock={block.contact} /> : null}
+      <ReadMore />
     </section>
   )
 }
diff --git a/components/Sidebar/JoinLoyalty/joinLoyalty.module.css b/components/Sidebar/JoinLoyalty/joinLoyalty.module.css
index 8ff913bce..7e85c29bd 100644
--- a/components/Sidebar/JoinLoyalty/joinLoyalty.module.css
+++ b/components/Sidebar/JoinLoyalty/joinLoyalty.module.css
@@ -1,7 +1,11 @@
+.joinLoyaltyContainer {
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x5);
+}
 .wrapper {
   display: grid;
   gap: var(--Spacing-x3);
-  padding-bottom: var(--Spacing-x5);
   padding-top: var(--Spacing-x4);
   justify-items: center;
 }
diff --git a/components/TempDesignSystem/Checkbox/checkbox.module.css b/components/TempDesignSystem/Checkbox/checkbox.module.css
deleted file mode 100644
index c831ba525..000000000
--- a/components/TempDesignSystem/Checkbox/checkbox.module.css
+++ /dev/null
@@ -1,40 +0,0 @@
-.container {
-  display: flex;
-  flex-direction: column;
-  color: var(--text-color);
-}
-
-.container[data-selected] .checkbox {
-  border: none;
-  background: var(--UI-Input-Controls-Fill-Selected);
-}
-
-.checkboxContainer {
-  display: flex;
-  align-items: flex-start;
-  gap: var(--Spacing-x-one-and-half);
-}
-
-.checkbox {
-  width: 24px;
-  height: 24px;
-  min-width: 24px;
-  background-color: var(--UI-Input-Controls-Surface-Normal);
-  border: 2px solid var(--UI-Input-Controls-Border-Normal);
-  border-radius: var(--Corner-radius-Small);
-  transition: all 200ms;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: all 200ms;
-  forced-color-adjust: none;
-  cursor: pointer;
-}
-
-.error {
-  align-items: center;
-  color: var(--Scandic-Red-60);
-  display: flex;
-  gap: var(--Spacing-x-half);
-  margin-top: var(--Spacing-x1);
-}
diff --git a/components/TempDesignSystem/Checkbox/checkbox.ts b/components/TempDesignSystem/Checkbox/checkbox.ts
deleted file mode 100644
index 8588b7401..000000000
--- a/components/TempDesignSystem/Checkbox/checkbox.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { RegisterOptions } from "react-hook-form"
-
-export interface CheckboxProps
-  extends React.InputHTMLAttributes<HTMLInputElement> {
-  name: string
-  registerOptions?: RegisterOptions
-}
diff --git a/components/TempDesignSystem/Checkbox/index.tsx b/components/TempDesignSystem/Checkbox/index.tsx
deleted file mode 100644
index fde1742ff..000000000
--- a/components/TempDesignSystem/Checkbox/index.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Checkbox as AriaCheckbox } from "react-aria-components"
-import { useController, useFormContext } from "react-hook-form"
-
-import { InfoCircleIcon } from "@/components/Icons"
-import CheckIcon from "@/components/Icons/Check"
-import Caption from "@/components/TempDesignSystem/Text/Caption"
-
-import { CheckboxProps } from "./checkbox"
-
-import styles from "./checkbox.module.css"
-
-export default function Checkbox({
-  name,
-  children,
-  registerOptions,
-}: React.PropsWithChildren<CheckboxProps>) {
-  const { control } = useFormContext()
-  const { field, fieldState } = useController({
-    control,
-    name,
-    rules: registerOptions,
-  })
-
-  return (
-    <AriaCheckbox
-      className={styles.container}
-      isSelected={field.value}
-      onChange={field.onChange}
-      data-testid={name}
-    >
-      {({ isSelected }) => (
-        <>
-          <div className={styles.checkboxContainer}>
-            <div className={styles.checkbox}>
-              {isSelected && <CheckIcon color="white" />}
-            </div>
-            {children}
-          </div>
-          {children && fieldState.error ? (
-            <Caption className={styles.error}>
-              <InfoCircleIcon color="red" />
-              {fieldState.error.message}
-            </Caption>
-          ) : null}
-        </>
-      )}
-    </AriaCheckbox>
-  )
-}
diff --git a/components/TempDesignSystem/Form/Checkbox/checkbox.module.css b/components/TempDesignSystem/Form/Checkbox/checkbox.module.css
index 99077e212..2e924b226 100644
--- a/components/TempDesignSystem/Form/Checkbox/checkbox.module.css
+++ b/components/TempDesignSystem/Form/Checkbox/checkbox.module.css
@@ -16,7 +16,7 @@
 
 .checkboxContainer {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
   gap: var(--Spacing-x-one-and-half);
 }
 
diff --git a/components/TempDesignSystem/Form/ChoiceCard/_Card/card.module.css b/components/TempDesignSystem/Form/ChoiceCard/_Card/card.module.css
index 1044596f6..fa7d6d13a 100644
--- a/components/TempDesignSystem/Form/ChoiceCard/_Card/card.module.css
+++ b/components/TempDesignSystem/Form/ChoiceCard/_Card/card.module.css
@@ -70,3 +70,7 @@
 .listItem:nth-of-type(n + 2) {
   margin-top: var(--Spacing-x-quarter);
 }
+
+.highlight {
+  color: var(--Scandic-Brand-Scandic-Red);
+}
diff --git a/components/TempDesignSystem/Form/ChoiceCard/_Card/card.ts b/components/TempDesignSystem/Form/ChoiceCard/_Card/card.ts
index d1a961150..145116409 100644
--- a/components/TempDesignSystem/Form/ChoiceCard/_Card/card.ts
+++ b/components/TempDesignSystem/Form/ChoiceCard/_Card/card.ts
@@ -34,3 +34,12 @@ export type CheckboxProps =
 export type RadioProps =
   | Omit<ListCardProps, "type">
   | Omit<TextCardProps, "type">
+
+export interface ListProps extends Pick<ListCardProps, "declined"> {
+  list?: ListCardProps["list"]
+}
+
+export interface SubtitleProps
+  extends Pick<BaseCardProps, "highlightSubtitle" | "subtitle"> {}
+
+export interface TextProps extends Pick<TextCardProps, "text"> {}
diff --git a/components/TempDesignSystem/Form/ChoiceCard/_Card/index.tsx b/components/TempDesignSystem/Form/ChoiceCard/_Card/index.tsx
index c57d56cc4..2a3faf57b 100644
--- a/components/TempDesignSystem/Form/ChoiceCard/_Card/index.tsx
+++ b/components/TempDesignSystem/Form/ChoiceCard/_Card/index.tsx
@@ -2,16 +2,16 @@
 
 import { useFormContext } from "react-hook-form"
 
-import { CheckIcon, CloseIcon, HeartIcon } from "@/components/Icons"
+import { CheckIcon, CloseIcon } from "@/components/Icons"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 import Footnote from "@/components/TempDesignSystem/Text/Footnote"
 
 import styles from "./card.module.css"
 
-import type { CardProps } from "./card"
+import type { CardProps, ListProps, SubtitleProps, TextProps } from "./card"
 
 export default function Card({
-  Icon = HeartIcon,
+  Icon,
   iconHeight = 32,
   iconWidth = 32,
   declined = false,
@@ -26,56 +26,79 @@ export default function Card({
   value,
 }: CardProps) {
   const { register } = useFormContext()
-
   return (
     <label className={styles.label} data-declined={declined} tabIndex={0}>
-      <Caption className={styles.title} type="label" uppercase>
+      <Caption className={styles.title} color="burgundy" type="label" uppercase>
         {title}
       </Caption>
-      {subtitle ? (
-        <Caption
-          className={styles.subtitle}
-          color={highlightSubtitle ? "baseTextAccent" : "uiTextHighContrast"}
-          type="regular"
-        >
-          {subtitle}
-        </Caption>
-      ) : null}
-      <Icon
-        className={styles.icon}
-        color="uiTextHighContrast"
-        height={iconHeight}
-        width={iconWidth}
-      />
-      {list
-        ? list.map((listItem) => (
-            <span key={listItem.title} className={styles.listItem}>
-              {declined ? (
-                <CloseIcon
-                  color="uiTextMediumContrast"
-                  height={20}
-                  width={20}
-                />
-              ) : (
-                <CheckIcon color="baseIconLowContrast" height={20} width={20} />
-              )}
-              <Footnote color="uiTextMediumContrast">{listItem.title}</Footnote>
-            </span>
-          ))
-        : null}
-      {text ? (
-        <Footnote className={styles.text} color="uiTextMediumContrast">
-          {text}
-        </Footnote>
+      <Subtitle highlightSubtitle={highlightSubtitle} subtitle={subtitle} />
+      {Icon ? (
+        <Icon
+          className={styles.icon}
+          color="uiTextHighContrast"
+          height={iconHeight}
+          width={iconWidth}
+        />
       ) : null}
+      <List declined={declined} list={list} />
+      <Text text={text} />
       <input
+        {...register(name)}
         aria-hidden
         id={id || name}
         hidden
         type={type}
         value={value}
-        {...register(name)}
       />
     </label>
   )
 }
+
+function List({ declined, list }: ListProps) {
+  if (!list) {
+    return null
+  }
+
+  return list.map((listItem) => (
+    <span key={listItem.title} className={styles.listItem}>
+      {declined ? (
+        <CloseIcon color="uiTextMediumContrast" height={20} width={20} />
+      ) : (
+        <CheckIcon color="baseIconLowContrast" height={20} width={20} />
+      )}
+      <Footnote color="uiTextMediumContrast">{listItem.title}</Footnote>
+    </span>
+  ))
+}
+
+function Subtitle({ highlightSubtitle, subtitle }: SubtitleProps) {
+  if (!subtitle) {
+    return null
+  }
+
+  return (
+    <Caption
+      className={styles.subtitle}
+      color={highlightSubtitle ? "baseTextAccent" : "uiTextMediumContrast"}
+      type="label"
+      uppercase
+    >
+      {subtitle}
+    </Caption>
+  )
+}
+
+function Text({ text }: TextProps) {
+  if (!text) {
+    return null
+  }
+  return (
+    <Footnote className={styles.text} color="uiTextMediumContrast">
+      {text}
+    </Footnote>
+  )
+}
+
+export function Highlight({ children }: React.PropsWithChildren) {
+  return <span className={styles.highlight}>{children}</span>
+}
diff --git a/components/TempDesignSystem/Form/FilterChip/Checkbox.tsx b/components/TempDesignSystem/Form/FilterChip/Checkbox.tsx
new file mode 100644
index 000000000..c2697d560
--- /dev/null
+++ b/components/TempDesignSystem/Form/FilterChip/Checkbox.tsx
@@ -0,0 +1,7 @@
+import Chip from "./_Chip"
+
+import type { FilterChipCheckboxProps } from "@/types/components/form/filterChip"
+
+export default function CheckboxChip(props: FilterChipCheckboxProps) {
+  return <Chip {...props} type="checkbox" />
+}
diff --git a/components/TempDesignSystem/Form/FilterChip/_Chip/chip.module.css b/components/TempDesignSystem/Form/FilterChip/_Chip/chip.module.css
new file mode 100644
index 000000000..44fa78a14
--- /dev/null
+++ b/components/TempDesignSystem/Form/FilterChip/_Chip/chip.module.css
@@ -0,0 +1,37 @@
+.label {
+  display: flex;
+  align-items: center;
+  gap: var(--Spacing-x-half);
+  padding: var(--Spacing-x1) var(--Spacing-x-one-and-half);
+  border: 1px solid var(--Base-Border-Subtle);
+  border-radius: var(--Corner-radius-Small);
+  background-color: var(--Base-Surface-Secondary-light-Normal);
+  cursor: pointer;
+}
+
+.label[data-selected="true"],
+.label[data-selected="true"]:hover {
+  background-color: var(--Primary-Light-Surface-Normal);
+  border-color: var(--Base-Border-Hover);
+}
+
+.label:hover {
+  background-color: var(--Base-Surface-Primary-light-Hover-alt);
+  border-color: var(--Base-Border-Subtle);
+}
+
+.label[data-disabled="true"] {
+  background-color: var(--Base-Button-Primary-Fill-Disabled);
+  border-color: var(--Base-Button-Primary-Fill-Disabled);
+  cursor: not-allowed;
+}
+
+.caption {
+  display: none;
+}
+
+@media (min-width: 768px) {
+  .caption {
+    display: block;
+  }
+}
diff --git a/components/TempDesignSystem/Form/FilterChip/_Chip/index.tsx b/components/TempDesignSystem/Form/FilterChip/_Chip/index.tsx
new file mode 100644
index 000000000..528469df1
--- /dev/null
+++ b/components/TempDesignSystem/Form/FilterChip/_Chip/index.tsx
@@ -0,0 +1,57 @@
+import { useMemo } from "react"
+import { useFormContext } from "react-hook-form"
+
+import { HeartIcon } from "@/components/Icons"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+
+import styles from "./chip.module.css"
+
+import { FilterChipProps } from "@/types/components/form/filterChip"
+
+export default function FilterChip({
+  Icon = HeartIcon,
+  iconHeight = 20,
+  iconWidth = 20,
+  id,
+  name,
+  label,
+  type,
+  value,
+  selected,
+  disabled,
+}: FilterChipProps) {
+  const { register } = useFormContext()
+
+  const color = useMemo(() => {
+    if (selected) return "burgundy"
+    if (disabled) return "disabled"
+    return "uiTextPlaceholder"
+  }, [selected, disabled])
+
+  return (
+    <label
+      className={styles.label}
+      data-selected={selected}
+      data-disabled={disabled}
+    >
+      <Icon
+        className={styles.icon}
+        color={color}
+        height={iconHeight}
+        width={iconWidth}
+      />
+      <Caption type="bold" color={color} className={styles.caption}>
+        {label}
+      </Caption>
+      <input
+        aria-hidden
+        id={id || name}
+        hidden
+        type={type}
+        value={value}
+        disabled={disabled}
+        {...register(name)}
+      />
+    </label>
+  )
+}
diff --git a/components/TempDesignSystem/Form/Phone/index.tsx b/components/TempDesignSystem/Form/Phone/index.tsx
index d27e31986..ffe66a67e 100644
--- a/components/TempDesignSystem/Form/Phone/index.tsx
+++ b/components/TempDesignSystem/Form/Phone/index.tsx
@@ -91,7 +91,7 @@ export default function Phone({
             <Label required={!!registerOptions.required} size="small">
               {formatMessage({ id: "Country code" })}
             </Label>
-            <div className={styles.selectContainer}>
+            <span className={styles.selectContainer}>
               {props.children}
               <Body asChild fontOnly>
                 <DialCodePreview
@@ -106,7 +106,7 @@ export default function Phone({
                 height={18}
                 width={18}
               />
-            </div>
+            </span>
           </button>
         )}
       />
diff --git a/components/TempDesignSystem/Select/index.tsx b/components/TempDesignSystem/Select/index.tsx
index 64f3fc335..5575dbd33 100644
--- a/components/TempDesignSystem/Select/index.tsx
+++ b/components/TempDesignSystem/Select/index.tsx
@@ -34,6 +34,7 @@ export default function Select({
   required = false,
   tabIndex,
   value,
+  maxHeight,
 }: SelectProps) {
   const [rootDiv, setRootDiv] = useState<SelectPortalContainer>(undefined)
 
@@ -60,12 +61,12 @@ export default function Select({
       >
         <Body asChild fontOnly>
           <Button className={styles.input} data-testid={name}>
-            <div className={styles.inputContentWrapper} tabIndex={tabIndex}>
+            <span className={styles.inputContentWrapper} tabIndex={tabIndex}>
               <Label required={required} size="small">
                 {label}
               </Label>
               <SelectValue />
-            </div>
+            </span>
             <SelectChevron />
           </Button>
         </Body>
@@ -81,6 +82,7 @@ export default function Select({
              * on the container as well as to not overflow it at any time.
              */
             UNSTABLE_portalContainer={rootDiv}
+            maxHeight={maxHeight}
           >
             <ListBox className={styles.listBox}>
               {items.map((item) => (
diff --git a/components/TempDesignSystem/Select/select.ts b/components/TempDesignSystem/Select/select.ts
index cac1e69cc..706ed71fd 100644
--- a/components/TempDesignSystem/Select/select.ts
+++ b/components/TempDesignSystem/Select/select.ts
@@ -9,6 +9,7 @@ export interface SelectProps
   onSelect: (key: Key) => void
   placeholder?: string
   value?: string | number
+  maxHeight?: number
 }
 
 export type SelectPortalContainer = HTMLDivElement | undefined
diff --git a/components/TempDesignSystem/Tooltip/tooltip.module.css b/components/TempDesignSystem/Tooltip/tooltip.module.css
index 2a6b00b43..da8e50cbd 100644
--- a/components/TempDesignSystem/Tooltip/tooltip.module.css
+++ b/components/TempDesignSystem/Tooltip/tooltip.module.css
@@ -15,6 +15,7 @@
   opacity: 0;
   transition: opacity 0.3s;
   max-width: 200px;
+  min-width: 150px;
 }
 
 .tooltipContainer:hover .tooltip {
@@ -31,11 +32,15 @@
 }
 
 .top {
-  bottom: 100%;
+  bottom: calc(100% + 8px);
 }
 
 .bottom {
-  top: 100%;
+  top: calc(100% + 8px);
+}
+
+.bottom.arrowRight {
+  right: 0;
 }
 
 .tooltip::before {
diff --git a/constants/booking.ts b/constants/booking.ts
index 8f5acb120..da6b30695 100644
--- a/constants/booking.ts
+++ b/constants/booking.ts
@@ -1,7 +1,18 @@
 export enum BookingStatusEnum {
-  CreatedInOhip = "CreatedInOhip",
-  PaymentRegistered = "PaymentRegistered",
   BookingCompleted = "BookingCompleted",
+  Cancelled = "Cancelled",
+  CheckedOut = "CheckedOut",
+  ConfirmedInScorpio = "ConfirmedInScorpio",
+  CreatedInOhip = "CreatedInOhip",
+  PaymentAuthorized = "PaymentAuthorized",
+  PaymentCancelled = "PaymentCancelled",
+  PaymentError = "PaymentError",
+  PaymentFailed = "PaymentFailed",
+  PaymentRegistered = "PaymentRegistered",
+  PaymentSucceeded = "PaymentSucceeded",
+  PendingAcceptPriceChange = "PendingAcceptPriceChange",
+  PendingGuarantee = "PendingGuarantee",
+  PendingPayment = "PendingPayment",
 }
 
 export enum BedTypeEnum {
diff --git a/constants/currentWebHrefs.ts b/constants/currentWebHrefs.ts
index 7438ee13a..751e875de 100644
--- a/constants/currentWebHrefs.ts
+++ b/constants/currentWebHrefs.ts
@@ -18,6 +18,24 @@ export const bookingTermsAndConditions: LangRoute = {
   sv: `${baseUrl.sv}/kundservice/priser-och-bokningsregler/bokningsregler`,
 }
 
+export const membershipTermsAndConditions: LangRoute = {
+  da: `${baseUrl.da}/kundeservice/priser-og-bookingvilkar/vilkar-betingelser-for-medlemsskab`,
+  de: `${baseUrl.de}/kundenbetreuung/preise-und-richtlinien/scandic-friends-allgemeine-geschaftsbedingungen`,
+  en: `${baseUrl.en}/customer-service/rates-and-policies/scandic-friends-terms-conditions`,
+  fi: `${baseUrl.fi}/asiakaspalvelu/hinnat-ja-varausehdot/jasenyyden-ehdot`,
+  no: `${baseUrl.no}/kundeservice/priser-og-bestillingsvilkar/betingelser-for-medlemskap`,
+  sv: `${baseUrl.sv}/kundservice/priser-och-bokningsregler/medlemsvillkor`,
+}
+
+export const faq: LangRoute = {
+  da: `${baseUrl.da}/scandic-friends/hjalp-og-service/ofte-stillede-sporgsmal`,
+  de: `${baseUrl.de}/scandic-friends/hilfe-und-service/haufig-gestellte-fragen`,
+  en: `${baseUrl.en}/scandic-friends/help-service/faq`,
+  fi: `${baseUrl.fi}/scandic-friends/apua-ongelmatilanteissa/usein-kysyttya`,
+  no: `${baseUrl.no}/scandic-friends/hjelp-og-medlemsservice/ofte-stilte-sporsmal`,
+  sv: `${baseUrl.sv}/scandic-friends/hjalp-och-service/vanliga-fragor`,
+}
+
 export const privacyPolicy: LangRoute = {
   da: `${baseUrl.da}/kundeservice/priser-og-bookingvilkar/persondatapolitik`,
   de: `${baseUrl.de}/kundenbetreuung/preise-und-richtlinien/datenschutzrichtlinie`,
diff --git a/i18n/dictionaries/da.json b/i18n/dictionaries/da.json
index d77219384..ff47c978c 100644
--- a/i18n/dictionaries/da.json
+++ b/i18n/dictionaries/da.json
@@ -1,17 +1,22 @@
 {
   "<b>Included</b> (based on availability)": "<b>Inkluderet</b> (baseret på tilgængelighed)",
-  "<b>{amount} {currency}</b>/night per adult": "<b>{amount} {currency}</b>/nat pr. voksen",
   "A destination or hotel name is needed to be able to search for a hotel room.": "Et destinations- eller hotelnavn er nødvendigt for at kunne søge efter et hotelværelse.",
   "A photo of the room": "Et foto af værelset",
+  "ACCE": "Tilgængelighed",
+  "ALLG": "Allergi",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "About the hotel",
+  "Accessibility": "Tilgængelighed",
+  "Accessible Room": "Tilgængelighedsrum",
   "Activities": "Aktiviteter",
   "Add code": "Tilføj kode",
   "Add new card": "Tilføj nyt kort",
+  "Add room": "Tilføj værelse",
   "Address": "Adresse",
   "Adults": "voksne",
   "Airport": "Lufthavn",
   "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.": "Alle vores morgenmadsbuffeter tilbyder glutenfrie, veganske og allergivenlige muligheder.",
+  "Allergy Room": "Allergirum",
   "Already a friend?": "Allerede en ven?",
   "Amenities": "Faciliteter",
   "Amusement park": "Forlystelsespark",
@@ -63,6 +68,7 @@
   "Coming up": "Er lige om hjørnet",
   "Compare all levels": "Sammenlign alle niveauer",
   "Complete booking & go to payment": "Udfyld booking & gå til betaling",
+  "Complete the booking": "Fuldfør bookingen",
   "Contact information": "Kontaktoplysninger",
   "Contact us": "Kontakt os",
   "Continue": "Blive ved",
@@ -80,6 +86,7 @@
   "Description": "Beskrivelse",
   "Destination": "Destination",
   "Destinations & hotels": "Destinationer & hoteller",
+  "Details": "Detaljer",
   "Disabled booking options header": "Vi beklager",
   "Disabled booking options text": "Koder, checks og bonusnætter er endnu ikke tilgængelige på den nye hjemmeside.",
   "Discard changes": "Kassér ændringer",
@@ -104,11 +111,13 @@
   "FAQ": "Ofte stillede spørgsmål",
   "Failed to delete credit card, please try again later.": "Kunne ikke slette kreditkort. Prøv venligst igen senere.",
   "Fair": "Messe",
+  "Filter": "Filter",
   "Find booking": "Find booking",
   "Find hotels": "Find hotel",
   "First name": "Fornavn",
   "Flexibility": "Fleksibilitet",
   "Follow us": "Følg os",
+  "Food options": "Madvalg",
   "Former Scandic Hotel": "Tidligere Scandic Hotel",
   "Free cancellation": "Gratis afbestilling",
   "Free rebooking": "Gratis ombooking",
@@ -118,6 +127,8 @@
   "Gift(s) added to your benefits": "{amount, plural, one {Gave} other {Gaver}} tilføjet til dine fordele",
   "Go back to edit": "Gå tilbage til redigering",
   "Go back to overview": "Gå tilbage til oversigten",
+  "Go to My Benefits": "Gå til ‘Mine fordele’",
+  "Guarantee booking with credit card": "Garantere booking med kreditkort",
   "Guest information": "Gæsteinformation",
   "Guests & Rooms": "Gæster & værelser",
   "Hi": "Hei",
@@ -172,6 +183,7 @@
   "Membership ID": "Medlems-id",
   "Membership ID copied to clipboard": "Medlems-ID kopieret til udklipsholder",
   "Membership cards": "Medlemskort",
+  "Membership terms and conditions": "Medlemsvilkår og -betingelser",
   "Menu": "Menu",
   "Modify": "Ændre",
   "Month": "Måned",
@@ -206,16 +218,22 @@
   "Open menu": "Åbn menuen",
   "Open my pages menu": "Åbn mine sider menuen",
   "Overview": "Oversigt",
+  "PETR": "Kæledyr",
   "Parking": "Parkering",
   "Parking / Garage": "Parkering / Garage",
   "Password": "Adgangskode",
   "Pay later": "Betal senere",
   "Pay now": "Betal nu",
+  "Payment": "Betaling",
+  "Payment Guarantee": "Garanti betaling",
   "Payment info": "Betalingsoplysninger",
+  "Pet Room": "Kæledyrsrum",
+  "Pet-friendly rooms have an additional fee of 20 EUR per stay": "Kæledyrsrum har en ekstra gebyr på 20 EUR per ophold",
   "Phone": "Telefon",
   "Phone is required": "Telefonnummer er påkrævet",
   "Phone number": "Telefonnummer",
   "Please enter a valid phone number": "Indtast venligst et gyldigt telefonnummer",
+  "Please note that this is mandatory, and that your card will only be charged in the event of a no-show.": "Vær opmærksom på, at dette er påkrævet, og at dit kort kun vil blive opkrævet i tilfælde af en no-show.",
   "Points": "Point",
   "Points being calculated": "Point udregnes",
   "Points earned prior to May 1, 2021": "Point optjent inden 1. maj 2021",
@@ -226,6 +244,7 @@
   "Previous victories": "Tidligere sejre",
   "Proceed to login": "Fortsæt til login",
   "Proceed to payment method": "Fortsæt til betalingsmetode",
+  "Provide a payment card in the next step": "Giv os dine betalingsoplysninger i næste skridt",
   "Public price from": "Offentlig pris fra",
   "Public transport": "Offentlig transport",
   "Queen bed": "Queensize-seng",
@@ -239,9 +258,9 @@
   "Restaurant & Bar": "Restaurant & Bar",
   "Restaurants & Bars": "Restaurants & Bars",
   "Retype new password": "Gentag den nye adgangskode",
-  "Room": "Værelse",
   "Room & Terms": "Værelse & Vilkår",
   "Room facilities": "Værelsesfaciliteter",
+  "Room types available": "{numberOfRooms, plural, one {# room type} other {# room types}} tilgængelig",
   "Rooms": "Værelser",
   "Rooms & Guests": "Værelser & gæster",
   "Sauna and gym": "Sauna and gym",
@@ -257,6 +276,7 @@
   "See room details": "Se værelsesdetaljer",
   "See rooms": "Se værelser",
   "Select a country": "Vælg et land",
+  "Select bed": "Vælg seng",
   "Select breakfast options": "Vælg morgenmadsmuligheder",
   "Select country of residence": "Vælg bopælsland",
   "Select date of birth": "Vælg fødselsdato",
@@ -289,8 +309,10 @@
   "Theatre": "Teater",
   "There are no transactions to display": "Der er ingen transaktioner at vise",
   "Things nearby HOTEL_NAME": "Ting i nærheden af {hotelName}",
+  "To secure your reservation, we kindly ask you to provide your payment card details. Rest assured, no charges will be made at this time.": "For at sikre din reservation, beder vi om at du giver os dine betalingsoplysninger. Du kan så være sikker på, at ingen gebyrer vil blive opkrævet på dette tidspunkt.",
   "Total Points": "Samlet antal point",
   "Total incl VAT": "Inkl. moms",
+  "Total price": "Samlet pris",
   "Tourist": "Turist",
   "Transaction date": "Overførselsdato",
   "Transactions": "Transaktioner",
@@ -316,7 +338,9 @@
   "Welcome": "Velkommen",
   "Welcome to": "Velkommen til",
   "Wellness & Exercise": "Velvære & Motion",
+  "What you have to do to guarantee booking:": "Hvad du skal gøre for at garantere booking:",
   "When": "Hvornår",
+  "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.": "Når du garanterer din booking, vil vi holde bookingen indtil 07:00 til dagen efter check-in. Dette vil give dig som gæst tilføjet fleksibilitet til check-in-tider.",
   "Where should you go next?": "Find inspiration til dit næste ophold",
   "Where to": "Hvor",
   "Which room class suits you the best?": "Hvilken rumklasse passer bedst til dig",
@@ -340,7 +364,42 @@
   "Zoo": "Zoo",
   "Zoom in": "Zoom ind",
   "Zoom out": "Zoom ud",
+  "as of today": "pr. dags dato",
+  "booking.accommodatesUpTo": "Plads til {nrOfGuests, plural, one {# person} other {op til # personer}}",
+  "booking.adults": "{totalAdults, plural, one {# voksen} other {# voksne}}",
+  "booking.children": "{totalChildren, plural, one {# barn} other {# børn}}",
+  "booking.guests": "Maks {nrOfGuests, plural, one {# gæst} other {# gæster}}",
+  "booking.nights": "{totalNights, plural, one {# nat} other {# nætter}}",
+  "booking.rooms": "{totalRooms, plural, one {# værelse} other {# værelser}}",
+  "booking.terms": "Ved at betale med en af de tilgængelige betalingsmetoder, accepterer jeg vilkårene for denne booking og de generelle <termsLink>Vilkår og betingelser</termsLink>, og forstår, at Scandic vil behandle min personlige data i forbindelse med denne booking i henhold til <privacyLink>Scandics Privatlivspolitik</privacyLink>. Jeg accepterer, at Scandic kræver et gyldigt kreditkort under min besøg i tilfælde af, at noget er tilbagebetalt.",
+  "booking.thisRoomIsEquippedWith": "Dette værelse er udstyret med",
+  "breakfast.price": "{amount} {currency}/nat",
+  "breakfast.price.free": "<strikethrough>{amount} {currency}</strikethrough> <free>0 {currency}</free>/nat",
+  "by": "inden",
+  "characters": "tegn",
+  "guaranteeing": "garanti",
   "guest": "gæst",
+  "guests": "gæster",
+  "hotelPages.rooms.roomCard.person": "person",
+  "hotelPages.rooms.roomCard.persons": "personer",
+  "hotelPages.rooms.roomCard.seeRoomDetails": "Se værelsesdetaljer",
+  "km to city center": "km til byens centrum",
+  "lowercase letter": "lille bogstav",
+  "n/a": "n/a",
+  "next level:": "Næste niveau:",
+  "night": "nat",
+  "nights": "nætter",
+  "number": "nummer",
+  "or": "eller",
+  "paying": "betaler  ",
+  "points": "Point",
+  "room type": "værelsestype",
+  "room types": "værelsestyper",
+  "special character": "speciel karakter",
+  "spendable points expiring by": "{points} Brugbare point udløber den {date}",
+  "to": "til",
+  "uppercase letter": "stort bogstav",
+  "{amount} out of {total}": "{amount} ud af {total}",
   "{amount} {currency}": "{amount} {currency}",
   "{difference}{amount} {currency}": "{difference}{amount} {currency}",
   "{width} cm × {length} cm": "{width} cm × {length} cm"
diff --git a/i18n/dictionaries/de.json b/i18n/dictionaries/de.json
index 9eb8bd1ec..008d7654e 100644
--- a/i18n/dictionaries/de.json
+++ b/i18n/dictionaries/de.json
@@ -1,17 +1,22 @@
 {
   "<b>Included</b> (based on availability)": "<b>Inbegriffen</b> (je nach Verfügbarkeit)",
-  "<b>{amount} {currency}</b>/night per adult": "<b>{amount} {currency}</b>/Nacht pro Erwachsener",
   "A destination or hotel name is needed to be able to search for a hotel room.": "Ein Reiseziel oder Hotelname wird benötigt, um nach einem Hotelzimmer suchen zu können.",
   "A photo of the room": "Ein Foto des Zimmers",
+  "ACCE": "Zugänglichkeit",
+  "ALLG": "Allergie",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "Über das Hotel",
+  "Accessibility": "Zugänglichkeit",
+  "Accessible Room": "Barrierefreies Zimmer",
   "Activities": "Aktivitäten",
   "Add code": "Code hinzufügen",
   "Add new card": "Neue Karte hinzufügen",
+  "Add room": "Zimmer hinzufügen",
   "Address": "Adresse",
   "Adults": "Erwachsene",
   "Airport": "Flughafen",
   "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.": "Alle unsere Frühstücksbuffets bieten glutenfreie, vegane und allergikerfreundliche Speisen.",
+  "Allergy Room": "Allergikerzimmer",
   "Already a friend?": "Sind wir schon Freunde?",
   "Amenities": "Annehmlichkeiten",
   "Amusement park": "Vergnügungspark",
@@ -63,6 +68,7 @@
   "Coming up": "Demnächst",
   "Compare all levels": "Vergleichen Sie alle Levels",
   "Complete booking & go to payment": "Buchung abschließen & zur Bezahlung gehen",
+  "Complete the booking": "Buchung abschließen",
   "Contact information": "Kontaktinformationen",
   "Contact us": "Kontaktieren Sie uns",
   "Continue": "Weitermachen",
@@ -80,6 +86,7 @@
   "Description": "Beschreibung",
   "Destination": "Bestimmungsort",
   "Destinations & hotels": "Reiseziele & Hotels",
+  "Details": "Details",
   "Disabled booking options header": "Es tut uns leid",
   "Disabled booking options text": "Codes, Schecks und Bonusnächte sind auf der neuen Website noch nicht verfügbar.",
   "Discard changes": "Änderungen verwerfen",
@@ -104,11 +111,13 @@
   "FAQ": "Häufig gestellte Fragen",
   "Failed to delete credit card, please try again later.": "Kreditkarte konnte nicht gelöscht werden. Bitte versuchen Sie es später noch einmal.",
   "Fair": "Messe",
+  "Filter": "Filter",
   "Find booking": "Buchung finden",
   "Find hotels": "Hotels finden",
   "First name": "Vorname",
   "Flexibility": "Flexibilität",
   "Follow us": "Folgen Sie uns",
+  "Food options": "Speisen & Getränke",
   "Former Scandic Hotel": "Ehemaliges Scandic Hotel",
   "Free cancellation": "Kostenlose Stornierung",
   "Free rebooking": "Kostenlose Umbuchung",
@@ -119,6 +128,7 @@
   "Go back to edit": "Zurück zum Bearbeiten",
   "Go back to overview": "Zurück zur Übersicht",
   "Go to My Benefits": "Gehen Sie zu „Meine Vorteile“",
+  "Guarantee booking with credit card": "Buchung mit Kreditkarte garantieren",
   "Guest information": "Informationen für Gäste",
   "Guests & Rooms": "Gäste & Zimmer",
   "Hi": "Hallo",
@@ -173,7 +183,6 @@
   "Membership ID": "Mitglieds-ID",
   "Membership ID copied to clipboard": "Mitglieds-ID in die Zwischenablage kopiert",
   "Membership cards": "Mitgliedskarten",
-  "Menu": "Menu",
   "Modify": "Ändern",
   "Month": "Monat",
   "Museum": "Museum",
@@ -207,16 +216,22 @@
   "Open menu": "Menü öffnen",
   "Open my pages menu": "Meine Seiten Menü öffnen",
   "Overview": "Übersicht",
+  "PETR": "Haustier",
   "Parking": "Parken",
   "Parking / Garage": "Parken / Garage",
   "Password": "Passwort",
   "Pay later": "Später bezahlen",
   "Pay now": "Jetzt bezahlen",
+  "Payment": "Zahlung",
+  "Payment Guarantee": "Zahlungsgarantie",
   "Payment info": "Zahlungsinformationen",
+  "Pet Room": "Haustierzimmer",
+  "Pet-friendly rooms have an additional fee of 20 EUR per stay": "Haustierzimmer haben einen zusätzlichen Preis von 20 EUR pro Aufenthalt",
   "Phone": "Telefon",
   "Phone is required": "Telefon ist erforderlich",
   "Phone number": "Telefonnummer",
   "Please enter a valid phone number": "Bitte geben Sie eine gültige Telefonnummer ein",
+  "Please note that this is mandatory, and that your card will only be charged in the event of a no-show.": "Bitte beachten Sie, dass dies erforderlich ist und dass Ihr Kreditkartenkonto nur in einem No-Show-Fall belastet wird.",
   "Points": "Punkte",
   "Points being calculated": "Punkte werden berechnet",
   "Points earned prior to May 1, 2021": "Zusammengeführte Punkte vor dem 1. Mai 2021",
@@ -227,6 +242,7 @@
   "Previous victories": "Bisherige Siege",
   "Proceed to login": "Weiter zum Login",
   "Proceed to payment method": "Weiter zur Zahlungsmethode",
+  "Provide a payment card in the next step": "Geben Sie Ihre Zahlungskarteninformationen im nächsten Schritt an",
   "Public price from": "Öffentlicher Preis ab",
   "Public transport": "Öffentliche Verkehrsmittel",
   "Queen bed": "Queensize-Bett",
@@ -243,6 +259,7 @@
   "Room": "Zimmer",
   "Room & Terms": "Zimmer & Bedingungen",
   "Room facilities": "Zimmerausstattung",
+  "Room types available": "{numberOfRooms, plural, one {# room type} other {# room types}} verfügbar",
   "Rooms": "Räume",
   "Rooms & Guests": "Zimmer & Gäste",
   "Sauna and gym": "Sauna and gym",
@@ -258,6 +275,7 @@
   "See room details": "Zimmerdetails ansehen",
   "See rooms": "Zimmer ansehen",
   "Select a country": "Wähle ein Land",
+  "Select bed": "Betttyp auswählen",
   "Select breakfast options": "Wählen Sie Frühstücksoptionen",
   "Select country of residence": "Wählen Sie das Land Ihres Wohnsitzes aus",
   "Select date of birth": "Geburtsdatum auswählen",
@@ -292,8 +310,10 @@
   "Theatre": "Theater",
   "There are no transactions to display": "Es sind keine Transaktionen zum Anzeigen vorhanden",
   "Things nearby HOTEL_NAME": "Dinge in der Nähe von {hotelName}",
+  "To secure your reservation, we kindly ask you to provide your payment card details. Rest assured, no charges will be made at this time.": "Um Ihre Reservierung zu sichern, bitten wir Sie, Ihre Zahlungskarteninformationen zu geben. Sie können sicher sein, dass keine Gebühren zu diesem Zeitpunkt erhoben werden.",
   "Total Points": "Gesamtpunktzahl",
   "Total incl VAT": "Gesamt inkl. MwSt.",
+  "Total price": "Gesamtpreis",
   "Tourist": "Tourist",
   "Transaction date": "Transaktionsdatum",
   "Transactions": "Transaktionen",
@@ -319,7 +339,9 @@
   "Welcome": "Willkommen",
   "Welcome to": "Willkommen zu",
   "Wellness & Exercise": "Wellness & Bewegung",
+  "What you have to do to guarantee booking:": "Was Sie tun müssen, um eine Buchung zu garantieren:",
   "When": "Wann",
+  "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.": "Wenn Sie Ihre Buchung garantieren, halten wir die Buchung bis 07:00 am Tag nach dem Check-in. Dies wird Ihnen als Gast zusätzliche Flexibilität für die Check-in-Zeiten gewähren.",
   "Where should you go next?": "Wo geht es als Nächstes hin?",
   "Where to": "Wohin",
   "Which room class suits you the best?": "Welche Zimmerklasse passt am besten zu Ihnen?",
@@ -354,8 +376,11 @@
   "booking.rooms": "{totalRooms, plural, one {# zimmer} other {# räume}}",
   "booking.terms": "Ved at betale med en af de tilgængelige betalingsmetoder, accepterer jeg vilkårene for denne booking og de generelle <termsLink>Vilkår og betingelser</termsLink>, og forstår, at Scandic vil behandle min personlige data i forbindelse med denne booking i henhold til <privacyLink>Scandics Privatlivspolitik</privacyLink>. Jeg accepterer, at Scandic kræver et gyldigt kreditkort under min besøg i tilfælde af, at noget er tilbagebetalt.",
   "booking.thisRoomIsEquippedWith": "Dieses Zimmer ist ausgestattet mit",
+  "breakfast.price": "{amount} {currency}/Nacht",
+  "breakfast.price.free": "<strikethrough>{amount} {currency}</strikethrough> <free>0 {currency}</free>/Nacht",
   "by": "bis",
   "characters": "figuren",
+  "guaranteeing": "garantiert",
   "guest": "gast",
   "guests": "gäste",
   "hotelPages.rooms.roomCard.person": "person",
@@ -369,7 +394,10 @@
   "nights": "Nächte",
   "number": "nummer",
   "or": "oder",
+  "paying": "bezahlt",
   "points": "Punkte",
+  "room type": "zimmerart",
+  "room types": "zimmerarten",
   "special character": "sonderzeichen",
   "spendable points expiring by": "{points} Einlösbare punkte verfallen bis zum {date}",
   "to": "zu",
diff --git a/i18n/dictionaries/en.json b/i18n/dictionaries/en.json
index f40909ac9..3679a2f4e 100644
--- a/i18n/dictionaries/en.json
+++ b/i18n/dictionaries/en.json
@@ -1,20 +1,25 @@
 {
   "<b>Included</b> (based on availability)": "<b>Included</b> (based on availability)",
-  "<b>{amount} {currency}</b>/night per adult": "<b>{amount} {currency}</b>/night per adult",
   "A destination or hotel name is needed to be able to search for a hotel room.": "A destination or hotel name is needed to be able to search for a hotel room.",
   "A photo of the room": "A photo of the room",
+  "ACCE": "Accessibility",
+  "ALLG": "Allergy",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "About the hotel",
+  "Accessibility": "Accessibility",
+  "Accessible Room": "Accessibility room",
   "Activities": "Activities",
   "Add Room": "Add room",
   "Add code": "Add code",
   "Add new card": "Add new card",
+  "Add room": "Add room",
   "Add to calendar": "Add to calendar",
   "Address": "Address",
   "Adults": "Adults",
   "Age": "Age",
   "Airport": "Airport",
   "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.": "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.",
+  "Allergy Room": "Allergy room",
   "Already a friend?": "Already a friend?",
   "Amenities": "Amenities",
   "Amusement park": "Amusement park",
@@ -52,8 +57,6 @@
   "Check in": "Check in",
   "Check out": "Check out",
   "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.": "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.",
-  "Check-in": "Check-in",
-  "Check-out": "Check-out",
   "Child age is required": "Child age is required",
   "Children": "Children",
   "Choose room": "Choose room",
@@ -71,6 +74,7 @@
   "Coming up": "Coming up",
   "Compare all levels": "Compare all levels",
   "Complete booking & go to payment": "Complete booking & go to payment",
+  "Complete the booking": "Complete the booking",
   "Contact information": "Contact information",
   "Contact us": "Contact us",
   "Continue": "Continue",
@@ -88,6 +92,7 @@
   "Description": "Description",
   "Destination": "Destination",
   "Destinations & hotels": "Destinations & hotels",
+  "Details": "Details",
   "Disabled booking options header": "We're sorry",
   "Disabled booking options text": "Codes, cheques and reward nights aren't available on the new website yet.",
   "Discard changes": "Discard changes",
@@ -113,11 +118,13 @@
   "FAQ": "FAQ",
   "Failed to delete credit card, please try again later.": "Failed to delete credit card, please try again later.",
   "Fair": "Fair",
+  "Filter": "Filter",
   "Find booking": "Find booking",
   "Find hotels": "Find hotels",
   "First name": "First name",
   "Flexibility": "Flexibility",
   "Follow us": "Follow us",
+  "Food options": "Food options",
   "Former Scandic Hotel": "Former Scandic Hotel",
   "Free cancellation": "Free cancellation",
   "Free rebooking": "Free rebooking",
@@ -129,6 +136,7 @@
   "Go back to edit": "Go back to edit",
   "Go back to overview": "Go back to overview",
   "Go to My Benefits": "Go to My Benefits",
+  "Guarantee booking with credit card": "Guarantee booking with credit card",
   "Guest": "Guest",
   "Guest information": "Guest information",
   "Guests & Rooms": "Guests & Rooms",
@@ -184,6 +192,7 @@
   "Membership ID": "Membership ID",
   "Membership ID copied to clipboard": "Membership ID copied to clipboard",
   "Membership cards": "Membership cards",
+  "Membership terms and conditions": "Membership terms and conditions",
   "Menu": "Menu",
   "Modify": "Modify",
   "Month": "Month",
@@ -218,17 +227,23 @@
   "Open menu": "Open menu",
   "Open my pages menu": "Open my pages menu",
   "Overview": "Overview",
+  "PETR": "Pet",
   "Parking": "Parking",
   "Parking / Garage": "Parking / Garage",
   "Password": "Password",
   "Pay later": "Pay later",
   "Pay now": "Pay now",
+  "Payment": "Payment",
+  "Payment Guarantee": "Payment Guarantee",
   "Payment info": "Payment info",
   "Payment received": "Payment received",
+  "Pet Room": "Pet room",
+  "Pet-friendly rooms have an additional fee of 20 EUR per stay": "Pet-friendly rooms have an additional fee of 20 EUR per stay",
   "Phone": "Phone",
   "Phone is required": "Phone is required",
   "Phone number": "Phone number",
   "Please enter a valid phone number": "Please enter a valid phone number",
+  "Please note that this is mandatory, and that your card will only be charged in the event of a no-show.": "Please note that this is mandatory, and that your card will only be charged in the event of a no-show.",
   "Points": "Points",
   "Points being calculated": "Points being calculated",
   "Points earned prior to May 1, 2021": "Points earned prior to May 1, 2021",
@@ -240,6 +255,7 @@
   "Print confirmation": "Print confirmation",
   "Proceed to login": "Proceed to login",
   "Proceed to payment method": "Proceed to payment method",
+  "Provide a payment card in the next step": "Provide a payment card in the next step",
   "Public price from": "Public price from",
   "Public transport": "Public transport",
   "Queen bed": "Queen bed",
@@ -258,6 +274,7 @@
   "Room": "Room",
   "Room & Terms": "Room & Terms",
   "Room facilities": "Room facilities",
+  "Room types available": "{numberOfRooms, plural, one {# room type} other {# room types}} available",
   "Rooms": "Rooms",
   "Rooms & Guests": "Rooms & Guests",
   "Sauna and gym": "Sauna and gym",
@@ -273,6 +290,7 @@
   "See room details": "See room details",
   "See rooms": "See rooms",
   "Select a country": "Select a country",
+  "Select bed": "Select bed",
   "Select breakfast options": "Select breakfast options",
   "Select country of residence": "Select country of residence",
   "Select date of birth": "Select date of birth",
@@ -307,9 +325,11 @@
   "Theatre": "Theatre",
   "There are no transactions to display": "There are no transactions to display",
   "Things nearby HOTEL_NAME": "Things nearby {hotelName}",
+  "To secure your reservation, we kindly ask you to provide your payment card details. Rest assured, no charges will be made at this time.": "To secure your reservation, we kindly ask you to provide your payment card details. Rest assured, no charges will be made at this time.",
   "Total Points": "Total Points",
   "Total cost": "Total cost",
   "Total incl VAT": "Total incl VAT",
+  "Total price": "Total price",
   "Tourist": "Tourist",
   "Transaction date": "Transaction date",
   "Transactions": "Transactions",
@@ -336,7 +356,9 @@
   "Welcome": "Welcome",
   "Welcome to": "Welcome to",
   "Wellness & Exercise": "Wellness & Exercise",
+  "What you have to do to guarantee booking:": "What you have to do to guarantee booking:",
   "When": "When",
+  "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.": "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.",
   "Where should you go next?": "Where should you go next?",
   "Where to": "Where to",
   "Which room class suits you the best?": "Which room class suits you the best?",
@@ -374,9 +396,12 @@
   "booking.rooms": "{totalRooms, plural, one {# room} other {# rooms}}",
   "booking.terms": "By paying with any of the payment methods available, I accept the terms for this booking and the general <termsLink>Terms & Conditions</termsLink>, and understand that Scandic will process my personal data for this booking in accordance with <privacyLink>Scandic's Privacy policy</privacyLink>. I also accept that Scandic require a valid credit card during my visit in case anything is left unpaid.",
   "booking.thisRoomIsEquippedWith": "This room is equipped with",
+  "breakfast.price": "{amount} {currency}/night",
+  "breakfast.price.free": "<strikethrough>{amount} {currency}</strikethrough> <free>0 {currency}</free>/night",
   "by": "by",
   "characters": "characters",
   "from": "from",
+  "guaranteeing": "guaranteeing",
   "guest": "guest",
   "guests": "guests",
   "hotelPages.rooms.roomCard.person": "person",
@@ -391,7 +416,10 @@
   "nights": "nights",
   "number": "number",
   "or": "or",
+  "paying": "paying",
   "points": "Points",
+  "room type": "room type",
+  "room types": "room types",
   "special character": "special character",
   "spendable points expiring by": "{points} spendable points expiring by {date}",
   "to": "to",
diff --git a/i18n/dictionaries/fi.json b/i18n/dictionaries/fi.json
index b44c6755d..65f7529b1 100644
--- a/i18n/dictionaries/fi.json
+++ b/i18n/dictionaries/fi.json
@@ -1,17 +1,22 @@
 {
   "<b>Included</b> (based on availability)": "<b>Sisältyy</b> (saatavuuden mukaan)",
-  "<b>{amount} {currency}</b>/night per adult": "<b>{amount} {currency}</b>/yö per aikuinen",
   "A destination or hotel name is needed to be able to search for a hotel room.": "Kohteen tai hotellin nimi tarvitaan, jotta hotellihuonetta voidaan hakea.",
   "A photo of the room": "Kuva huoneesta",
+  "ACCE": "Saavutettavuus",
+  "ALLG": "Allergia",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "Tietoja hotellista",
+  "Accessibility": "Saavutettavuus",
+  "Accessible Room": "Esteetön huone",
   "Activities": "Aktiviteetit",
   "Add code": "Lisää koodi",
   "Add new card": "Lisää uusi kortti",
+  "Add room": "Lisää huone",
   "Address": "Osoite",
   "Adults": "Aikuista",
   "Airport": "Lentokenttä",
   "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.": "Kaikki aamiaisbuffettimme tarjoavat gluteenittomia, vegaanisia ja allergiaystävällisiä vaihtoehtoja.",
+  "Allergy Room": "Allergiahuone",
   "Already a friend?": "Oletko jo ystävä?",
   "Amenities": "Mukavuudet",
   "Amusement park": "Huvipuisto",
@@ -63,6 +68,7 @@
   "Coming up": "Tulossa",
   "Compare all levels": "Vertaa kaikkia tasoja",
   "Complete booking & go to payment": "Täydennä varaus & siirry maksamaan",
+  "Complete the booking": "Täydennä varaus",
   "Contact information": "Yhteystiedot",
   "Contact us": "Ota meihin yhteyttä",
   "Continue": "Jatkaa",
@@ -80,6 +86,7 @@
   "Description": "Kuvaus",
   "Destination": "Kohde",
   "Destinations & hotels": "Kohteet ja hotellit",
+  "Details": "Tiedot",
   "Disabled booking options header": "Olemme pahoillamme",
   "Disabled booking options text": "Koodit, sekit ja palkintoillat eivät ole vielä saatavilla uudella verkkosivustolla.",
   "Discard changes": "Hylkää muutokset",
@@ -101,14 +108,16 @@
   "Explore all levels and benefits": "Tutustu kaikkiin tasoihin ja etuihin",
   "Explore nearby": "Tutustu lähialueeseen",
   "Extras to your booking": "Varauksessa lisäpalveluita",
-  "FAQ": "UKK",
+  "FAQ": "Usein kysytyt kysymykset",
   "Failed to delete credit card, please try again later.": "Luottokortin poistaminen epäonnistui, yritä myöhemmin uudelleen.",
   "Fair": "Messukeskus",
+  "Filter": "Suodatin",
   "Find booking": "Etsi varaus",
   "Find hotels": "Etsi hotelleja",
   "First name": "Etunimi",
   "Flexibility": "Joustavuus",
   "Follow us": "Seuraa meitä",
+  "Food options": "Ruokavalio",
   "Former Scandic Hotel": "Entinen Scandic-hotelli",
   "Free cancellation": "Ilmainen peruutus",
   "Free rebooking": "Ilmainen uudelleenvaraus",
@@ -119,6 +128,7 @@
   "Go back to edit": "Palaa muokkaamaan",
   "Go back to overview": "Palaa yleiskatsaukseen",
   "Go to My Benefits": "Siirry kohtaan ‘Omat edut’",
+  "Guarantee booking with credit card": "Varmista varaus luottokortilla",
   "Guest information": "Vieraan tiedot",
   "Guests & Rooms": "Vieraat & Huoneet",
   "Hi": "Hi",
@@ -173,6 +183,7 @@
   "Membership ID": "Jäsentunnus",
   "Membership ID copied to clipboard": "Jäsenyystunnus kopioitu leikepöydälle",
   "Membership cards": "Jäsenkortit",
+  "Membership terms and conditions": "Jäsenehdot ja -säännöt",
   "Menu": "Valikko",
   "Modify": "Muokkaa",
   "Month": "Kuukausi",
@@ -207,16 +218,22 @@
   "Open menu": "Avaa valikko",
   "Open my pages menu": "Avaa omat sivut -valikko",
   "Overview": "Yleiskatsaus",
+  "PETR": "Lemmikki",
   "Parking": "Pysäköinti",
   "Parking / Garage": "Pysäköinti / Autotalli",
   "Password": "Salasana",
   "Pay later": "Maksa myöhemmin",
   "Pay now": "Maksa nyt",
+  "Payment": "Maksu",
+  "Payment Guarantee": "Varmistusmaksu",
   "Payment info": "Maksutiedot",
+  "Pet Room": "Lemmikkihuone",
+  "Pet-friendly rooms have an additional fee of 20 EUR per stay": "Lemmikkihuoneen lisäkustannus on 20 EUR per majoitus",
   "Phone": "Puhelin",
   "Phone is required": "Puhelin vaaditaan",
   "Phone number": "Puhelinnumero",
   "Please enter a valid phone number": "Ole hyvä ja näppäile voimassaoleva puhelinnumero",
+  "Please note that this is mandatory, and that your card will only be charged in the event of a no-show.": "Huomaa, että tämä on pakollinen, ja että maksukorttiisi kirjataan vain, jos varausmyyntiä ei tapahtu.",
   "Points": "Pisteet",
   "Points being calculated": "Pisteitä lasketaan",
   "Points earned prior to May 1, 2021": "Pisteet, jotka ansaittu ennen 1.5.2021",
@@ -227,6 +244,7 @@
   "Previous victories": "Edelliset voitot",
   "Proceed to login": "Jatka kirjautumiseen",
   "Proceed to payment method": "Siirry maksutavalle",
+  "Provide a payment card in the next step": "Anna maksukortin tiedot seuraavassa vaiheessa",
   "Public price from": "Julkinen hinta alkaen",
   "Public transport": "Julkinen liikenne",
   "Queen bed": "Queen-vuode",
@@ -240,9 +258,9 @@
   "Restaurant & Bar": "Ravintola & Baari",
   "Restaurants & Bars": "Restaurants & Bars",
   "Retype new password": "Kirjoita uusi salasana uudelleen",
-  "Room": "Huone",
   "Room & Terms": "Huone & Ehdot",
   "Room facilities": "Huoneen varustelu",
+  "Room types available": "{numberOfRooms, plural, one {# room type} other {# room types}} saatavilla",
   "Rooms": "Huoneet",
   "Rooms & Guests": "Huoneet & Vieraat",
   "Rooms & Guestss": "Huoneet & Vieraat",
@@ -259,6 +277,7 @@
   "See room details": "Katso huoneen tiedot",
   "See rooms": "Katso huoneet",
   "Select a country": "Valitse maa",
+  "Select bed": "Valitse vuodetyyppi",
   "Select breakfast options": "Valitse aamiaisvaihtoehdot",
   "Select country of residence": "Valitse asuinmaa",
   "Select date of birth": "Valitse syntymäaika",
@@ -293,8 +312,10 @@
   "Theatre": "Teatteri",
   "There are no transactions to display": "Näytettäviä tapahtumia ei ole",
   "Things nearby HOTEL_NAME": "Lähellä olevia asioita {hotelName}",
+  "To secure your reservation, we kindly ask you to provide your payment card details. Rest assured, no charges will be made at this time.": "Varmistaaksesi varauksen, pyydämme sinua antamaan meille maksukortin tiedot. Varmista, että ei veloiteta maksusi tällä hetkellä.",
   "Total Points": "Kokonaispisteet",
   "Total incl VAT": "Yhteensä sis. alv",
+  "Total price": "Kokonaishinta",
   "Tourist": "Turisti",
   "Transaction date": "Tapahtuman päivämäärä",
   "Transactions": "Tapahtumat",
@@ -320,7 +341,9 @@
   "Welcome": "Tervetuloa",
   "Welcome to": "Tervetuloa",
   "Wellness & Exercise": "Hyvinvointi & Liikunta",
+  "What you have to do to guarantee booking:": "Mitä sinun on tehtävä varmistaaksesi varauksen:",
   "When": "Kun",
+  "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.": "Jos varaat varauksen, pidämme varauksen 07:00 päivän jälkeen tarkistuspäivän jälkeen. Tämä tarjoaa sinulle lisään tarkistuspäivän aikaan.",
   "Where should you go next?": "Mihin menisit seuraavaksi?",
   "Where to": "Minne",
   "Which room class suits you the best?": "Mikä huoneluokka sopii sinulle parhaiten?",
@@ -333,8 +356,6 @@
   "You have <b>#</b> gifts waiting for you!": "Sinulla on <b>{amount}</b> lahjaa odottamassa sinua!",
   "You have no previous stays.": "Sinulla ei ole aiempia majoituksia.",
   "You have no upcoming stays.": "Sinulla ei ole tulevia majoituksia.",
-  "You'll find all your gifts in 'My benefits'": "Löydät kaikki lahjasi kohdasta ‘Omat edut’",
-  "Your Challenges Conquer & Earn!": "Voita ja ansaitse haasteesi!",
   "Your card was successfully removed!": "Korttisi poistettiin onnistuneesti!",
   "Your card was successfully saved!": "Korttisi tallennettu onnistuneesti!",
   "Your current level": "Nykyinen tasosi",
@@ -355,8 +376,11 @@
   "booking.rooms": "{totalRooms, plural, one {# huone} other {# sviitti}}",
   "booking.terms": "Maksamalla minkä tahansa saatavilla olevan maksutavan avulla hyväksyn tämän varauksen ehdot ja yleiset <termsLink>ehdot ja ehtoja</termsLink>, ja ymmärrän, että Scandic käsittelee minun henkilötietoni tässä varauksessa mukaisesti <privacyLink>Scandicin tietosuojavaltuuden</privacyLink> mukaisesti. Hyväksyn myös, että Scandic vaatii validin luottokortin majoituksen ajan, jos jokin jää maksamatta.",
   "booking.thisRoomIsEquippedWith": "Tämä huone on varustettu",
+  "breakfast.price": "{amount} {currency}/yö",
+  "breakfast.price.free": "<strikethrough>{amount} {currency}</strikethrough> <free>0 {currency}</free>/yö",
   "by": "mennessä",
   "characters": "hahmoja",
+  "guaranteeing": "varmistetaan",
   "guest": "Vieras",
   "guests": "Vieraita",
   "hotelPages.rooms.roomCard.person": "henkilö",
@@ -370,7 +394,10 @@
   "nights": "yötä",
   "number": "määrä",
   "or": "tai",
+  "paying": "maksaa",
   "points": "pistettä",
+  "room type": "huonetyyppi",
+  "room types": "huonetyypit",
   "special character": "erikoishahmo",
   "spendable points expiring by": "{points} pistettä vanhenee {date} mennessä",
   "to": "to",
diff --git a/i18n/dictionaries/no.json b/i18n/dictionaries/no.json
index ab4143986..9ac8d540a 100644
--- a/i18n/dictionaries/no.json
+++ b/i18n/dictionaries/no.json
@@ -1,17 +1,22 @@
 {
   "<b>Included</b> (based on availability)": "<b>Inkludert</b> (basert på tilgjengelighet)",
-  "<b>{amount} {currency}</b>/night per adult": "<b>{amount} {currency}</b>/natt per voksen",
   "A destination or hotel name is needed to be able to search for a hotel room.": "Et reisemål eller hotellnavn er nødvendig for å kunne søke etter et hotellrom.",
   "A photo of the room": "Et bilde av rommet",
+  "ACCE": "Tilgjengelighet",
+  "ALLG": "Allergi",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "Om hotellet",
+  "Accessibility": "Tilgjengelighet",
+  "Accessible Room": "Tilgjengelighetsrom",
   "Activities": "Aktiviteter",
   "Add code": "Legg til kode",
   "Add new card": "Legg til nytt kort",
+  "Add room": "Legg til rom",
   "Address": "Adresse",
   "Adults": "Voksne",
   "Airport": "Flyplass",
   "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.": "Alle våre frokostbufféer tilbyr glutenfrie, veganske og allergivennlige alternativer.",
+  "Allergy Room": "Allergirom",
   "Already a friend?": "Allerede Friend?",
   "Amenities": "Fasiliteter",
   "Amusement park": "Tivoli",
@@ -63,6 +68,7 @@
   "Coming up": "Kommer opp",
   "Compare all levels": "Sammenlign alle nivåer",
   "Complete booking & go to payment": "Fullfør bestilling & gå til betaling",
+  "Complete the booking": "Fullfør reservasjonen",
   "Contact information": "Kontaktinformasjon",
   "Contact us": "Kontakt oss",
   "Continue": "Fortsette",
@@ -79,6 +85,7 @@
   "Description": "Beskrivelse",
   "Destination": "Destinasjon",
   "Destinations & hotels": "Destinasjoner og hoteller",
+  "Details": "Detaljer",
   "Disabled booking options header": "Vi beklager",
   "Disabled booking options text": "Koder, checks og belønningsnætter er enda ikke tilgjengelige på den nye nettsiden.",
   "Discard changes": "Forkaste endringer",
@@ -100,14 +107,16 @@
   "Explore all levels and benefits": "Utforsk alle nivåer og fordeler",
   "Explore nearby": "Utforsk i nærheten",
   "Extras to your booking": "Tilvalg til bestillingen din",
-  "FAQ": "FAQ",
+  "FAQ": "Ofte stilte spørsmål",
   "Failed to delete credit card, please try again later.": "Kunne ikke slette kredittkortet, prøv igjen senere.",
   "Fair": "Messe",
+  "Filter": "Filter",
   "Find booking": "Finn booking",
   "Find hotels": "Finn hotell",
   "First name": "Fornavn",
   "Flexibility": "Fleksibilitet",
   "Follow us": "Følg oss",
+  "Food options": "Matvalg",
   "Former Scandic Hotel": "Tidligere Scandic-hotell",
   "Free cancellation": "Gratis avbestilling",
   "Free rebooking": "Gratis ombooking",
@@ -118,6 +127,7 @@
   "Go back to edit": "Gå tilbake til redigering",
   "Go back to overview": "Gå tilbake til oversikten",
   "Go to My Benefits": "Gå til ‘Mine fordeler’",
+  "Guarantee booking with credit card": "Garantere booking med kredittkort",
   "Guest information": "Informasjon til gjester",
   "Guests & Rooms": "Gjester & rom",
   "Hi": "Hei",
@@ -171,6 +181,7 @@
   "Membership ID": "Medlems-ID",
   "Membership ID copied to clipboard": "Medlems-ID kopiert til utklippstavlen",
   "Membership cards": "Medlemskort",
+  "Membership terms and conditions": "Medlemsvilkår og -betingelser",
   "Menu": "Menu",
   "Modify": "Endre",
   "Month": "Måned",
@@ -205,16 +216,22 @@
   "Open menu": "Åpne menyen",
   "Open my pages menu": "Åpne mine sider menyen",
   "Overview": "Oversikt",
+  "PETR": "Kjæledyr",
   "Parking": "Parkering",
   "Parking / Garage": "Parkering / Garasje",
   "Password": "Passord",
   "Pay later": "Betal senere",
   "Pay now": "Betal nå",
+  "Payment": "Betaling",
+  "Payment Guarantee": "Garantera betalning",
   "Payment info": "Betalingsinformasjon",
+  "Pet Room": "Kjæledyrsrom",
+  "Pet-friendly rooms have an additional fee of 20 EUR per stay": "Kjæledyrsrom har en tilleggsavgift på 20 EUR per opphold",
   "Phone": "Telefon",
   "Phone is required": "Telefon kreves",
   "Phone number": "Telefonnummer",
   "Please enter a valid phone number": "Vennligst oppgi et gyldig telefonnummer",
+  "Please note that this is mandatory, and that your card will only be charged in the event of a no-show.": "Vær oppmerksom på at dette er påkrevd, og at ditt kredittkort kun vil bli belastet i tilfelle av en no-show.",
   "Points": "Poeng",
   "Points being calculated": "Poeng beregnes",
   "Points earned prior to May 1, 2021": "Opptjente poeng før 1. mai 2021",
@@ -225,6 +242,7 @@
   "Previous victories": "Tidligere seire",
   "Proceed to login": "Fortsett til innlogging",
   "Proceed to payment method": "Fortsett til betalingsmetode",
+  "Provide a payment card in the next step": "Gi oss dine betalingskortdetaljer i neste steg",
   "Public price from": "Offentlig pris fra",
   "Public transport": "Offentlig transport",
   "Queen bed": "Queen-size-seng",
@@ -238,9 +256,9 @@
   "Restaurant & Bar": "Restaurant & Bar",
   "Restaurants & Bars": "Restaurants & Bars",
   "Retype new password": "Skriv inn nytt passord på nytt",
-  "Room": "Rom",
   "Room & Terms": "Rom & Vilkår",
   "Room facilities": "Romfasiliteter",
+  "Room types available": "{numberOfRooms, plural, one {# room type} other {# room types}} tilgjengelig",
   "Rooms": "Rom",
   "Rooms & Guests": "Rom og gjester",
   "Sauna and gym": "Sauna and gym",
@@ -256,6 +274,7 @@
   "See room details": "Se detaljer om rommet",
   "See rooms": "Se rom",
   "Select a country": "Velg et land",
+  "Select bed": "Vælg seng",
   "Select breakfast options": "Velg frokostalternativer",
   "Select country of residence": "Velg bostedsland",
   "Select date of birth": "Velg fødselsdato",
@@ -290,8 +309,10 @@
   "Theatre": "Teater",
   "There are no transactions to display": "Det er ingen transaksjoner å vise",
   "Things nearby HOTEL_NAME": "Ting i nærheten av {hotelName}",
+  "To secure your reservation, we kindly ask you to provide your payment card details. Rest assured, no charges will be made at this time.": "For å sikre din reservasjon, ber vi om at du gir oss dine betalingskortdetaljer. Vær sikker på at ingen gebyrer vil bli belastet på dette tidspunktet.",
   "Total Points": "Totale poeng",
   "Total incl VAT": "Sum inkl mva",
+  "Total price": "Totalpris",
   "Tourist": "Turist",
   "Transaction date": "Transaksjonsdato",
   "Transactions": "Transaksjoner",
@@ -317,7 +338,9 @@
   "Welcome": "Velkommen",
   "Welcome to": "Velkommen til",
   "Wellness & Exercise": "Velvære & Trening",
+  "What you have to do to guarantee booking:": "Hva du må gjøre for å garantere reservasjonen:",
   "When": "Når",
+  "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.": "Når du garanterer din reservasjon, vil vi holde reservasjonen til 07:00 til dagen etter check-in. Dette vil gi deg som gjest tilføjet fleksibilitet for check-in-tider.",
   "Where should you go next?": "Hvor ønsker du å reise neste gang?",
   "Where to": "Hvor skal du",
   "Which room class suits you the best?": "Hvilken romklasse passer deg best?",
@@ -351,8 +374,11 @@
   "booking.nights": "{totalNights, plural, one {# natt} other {# netter}}",
   "booking.rooms": "{totalRooms, plural, one {# rom} other {# rom}}",
   "booking.thisRoomIsEquippedWith": "Dette rommet er utstyrt med",
+  "breakfast.price": "{amount} {currency}/natt",
+  "breakfast.price.free": "<strikethrough>{amount} {currency}</strikethrough> <free>0 {currency}</free>/natt",
   "by": "innen",
   "characters": "tegn",
+  "guaranteeing": "garantiert",
   "guest": "gjest",
   "guests": "gjester",
   "hotelPages.rooms.roomCard.person": "person",
@@ -366,7 +392,10 @@
   "nights": "netter",
   "number": "antall",
   "or": "eller",
+  "paying": "betaler",
   "points": "poeng",
+  "room type": "romtype",
+  "room types": "romtyper",
   "special character": "spesiell karakter",
   "spendable points expiring by": "{points} Brukbare poeng utløper innen {date}",
   "to": "til",
diff --git a/i18n/dictionaries/sv.json b/i18n/dictionaries/sv.json
index 9d7c3b95d..3c2023eed 100644
--- a/i18n/dictionaries/sv.json
+++ b/i18n/dictionaries/sv.json
@@ -1,17 +1,22 @@
 {
   "<b>Included</b> (based on availability)": "<b>Ingår</b> (baserat på tillgänglighet)",
-  "<b>{amount} {currency}</b>/night per adult": "<b>{amount} {currency}</b>/natt per vuxen",
   "A destination or hotel name is needed to be able to search for a hotel room.": "Ett destinations- eller hotellnamn behövs för att kunna söka efter ett hotellrum.",
   "A photo of the room": "Ett foto av rummet",
+  "ACCE": "Tillgänglighet",
+  "ALLG": "Allergi",
   "About meetings & conferences": "About meetings & conferences",
   "About the hotel": "Om hotellet",
+  "Accessibility": "Tillgänglighet",
+  "Accessible Room": "Tillgänglighetsrum",
   "Activities": "Aktiviteter",
   "Add code": "Lägg till kod",
   "Add new card": "Lägg till nytt kort",
+  "Add room": "Lägg till rum",
   "Address": "Adress",
   "Adults": "Vuxna",
   "Airport": "Flygplats",
   "All our breakfast buffets offer gluten free, vegan, and allergy-friendly options.": "Alla våra frukostbufféer erbjuder glutenfria, veganska och allergivänliga alternativ.",
+  "Allergy Room": "Allergirum",
   "Already a friend?": "Är du redan en vän?",
   "Amenities": "Bekvämligheter",
   "Amusement park": "Nöjespark",
@@ -63,6 +68,7 @@
   "Coming up": "Kommer härnäst",
   "Compare all levels": "Jämför alla nivåer",
   "Complete booking & go to payment": "Fullför bokning & gå till betalning",
+  "Complete the booking": "Slutför bokningen",
   "Contact information": "Kontaktinformation",
   "Contact us": "Kontakta oss",
   "Continue": "Fortsätt",
@@ -79,6 +85,7 @@
   "Description": "Beskrivning",
   "Destination": "Destination",
   "Destinations & hotels": "Destinationer & hotell",
+  "Details": "Detaljer",
   "Disabled booking options header": "Vi beklagar",
   "Disabled booking options text": "Koder, bonuscheckar och belöningsnätter är inte tillgängliga på den nya webbplatsen än.",
   "Discard changes": "Ignorera ändringar",
@@ -103,11 +110,13 @@
   "FAQ": "FAQ",
   "Failed to delete credit card, please try again later.": "Det gick inte att ta bort kreditkortet, försök igen senare.",
   "Fair": "Mässa",
+  "Filter": "Filter",
   "Find booking": "Hitta bokning",
   "Find hotels": "Hitta hotell",
   "First name": "Förnamn",
   "Flexibility": "Flexibilitet",
   "Follow us": "Följ oss",
+  "Food options": "Matval",
   "Former Scandic Hotel": "Tidigare Scandichotell",
   "Free cancellation": "Fri avbokning",
   "Free rebooking": "Fri ombokning",
@@ -118,6 +127,7 @@
   "Go back to edit": "Gå tillbaka till redigeringen",
   "Go back to overview": "Gå tillbaka till översikten",
   "Go to My Benefits": "Gå till ‘Mina förmåner’",
+  "Guarantee booking with credit card": "Garantera bokning med kreditkort",
   "Guest information": "Information till gästerna",
   "Guests & Rooms": "Gäster & rum",
   "Hi": "Hej",
@@ -171,6 +181,7 @@
   "Membership ID": "Medlems-ID",
   "Membership ID copied to clipboard": "Medlems-ID kopierat till urklipp",
   "Membership cards": "Medlemskort",
+  "Membership terms and conditions": "Medlemsvillkor",
   "Menu": "Meny",
   "Modify": "Ändra",
   "Month": "Månad",
@@ -205,16 +216,22 @@
   "Open menu": "Öppna menyn",
   "Open my pages menu": "Öppna mina sidor menyn",
   "Overview": "Översikt",
+  "PETR": "Husdjur",
   "Parking": "Parkering",
   "Parking / Garage": "Parkering / Garage",
   "Password": "Lösenord",
   "Pay later": "Betala senare",
   "Pay now": "Betala nu",
+  "Payment": "Betalning",
+  "Payment Guarantee": "Garantera betalning",
   "Payment info": "Betalningsinformation",
+  "Pet Room": "Husdjursrum",
+  "Pet-friendly rooms have an additional fee of 20 EUR per stay": "Husdjursrum har en extra avgift på 20 EUR per vistelse",
   "Phone": "Telefon",
   "Phone is required": "Telefonnummer är obligatorisk",
   "Phone number": "Telefonnummer",
   "Please enter a valid phone number": "Var vänlig och ange ett giltigt telefonnummer",
+  "Please note that this is mandatory, and that your card will only be charged in the event of a no-show.": "Vänligen notera att detta är obligatoriskt, och att ditt kreditkort endast debiteras i händelse av en no-show.",
   "Points": "Poäng",
   "Points being calculated": "Poäng beräknas",
   "Points earned prior to May 1, 2021": "Intjänade poäng före den 1 maj 2021",
@@ -225,6 +242,7 @@
   "Previous victories": "Tidigare segrar",
   "Proceed to login": "Fortsätt till inloggning",
   "Proceed to payment method": "Gå vidare till betalningsmetod",
+  "Provide a payment card in the next step": "Ge oss dina betalkortdetaljer i nästa steg",
   "Public price from": "Offentligt pris från",
   "Public transport": "Kollektivtrafik",
   "Queen bed": "Queen size-säng",
@@ -238,9 +256,9 @@
   "Restaurant & Bar": "Restaurang & Bar",
   "Restaurants & Bars": "Restaurants & Bars",
   "Retype new password": "Upprepa nytt lösenord",
-  "Room": "Rum",
   "Room & Terms": "Rum & Villkor",
   "Room facilities": "Rumfaciliteter",
+  "Room types available": "{numberOfRooms, plural, one {# room type} other {# room types}} tillgängliga",
   "Rooms": "Rum",
   "Rooms & Guests": "Rum och gäster",
   "Sauna and gym": "Sauna and gym",
@@ -256,6 +274,7 @@
   "See room details": "Se rumsdetaljer",
   "See rooms": "Se rum",
   "Select a country": "Välj ett land",
+  "Select bed": "Välj säng",
   "Select breakfast options": "Välj frukostalternativ",
   "Select country of residence": "Välj bosättningsland",
   "Select date of birth": "Välj födelsedatum",
@@ -290,8 +309,10 @@
   "Theatre": "Teater",
   "There are no transactions to display": "Det finns inga transaktioner att visa",
   "Things nearby HOTEL_NAME": "Saker i närheten av {hotelName}",
+  "To secure your reservation, we kindly ask you to provide your payment card details. Rest assured, no charges will be made at this time.": "För att säkra din bokning ber vi om att du ger oss dina betalkortdetaljer. Välj säker på att ingen avgifter kommer att debiteras just nu.",
   "Total Points": "Poäng totalt",
   "Total incl VAT": "Totalt inkl moms",
+  "Total price": "Totalpris",
   "Tourist": "Turist",
   "Transaction date": "Transaktionsdatum",
   "Transactions": "Transaktioner",
@@ -317,7 +338,9 @@
   "Welcome": "Välkommen",
   "Welcome to": "Välkommen till",
   "Wellness & Exercise": "Hälsa & Träning",
+  "What you have to do to guarantee booking:": "Vad du måste göra för att garantera bokningen:",
   "When": "När",
+  "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.": "När du garanterar din bokning kommer vi att hålla bokningen till 07:00 till dagen efter check-in. Detta ger dig som gäst extra flexibilitet för check-in-tider.",
   "Where should you go next?": "Låter inte en spontanweekend härligt?",
   "Where to": "Vart",
   "Which room class suits you the best?": "Vilken rumsklass passar dig bäst?",
@@ -352,8 +375,11 @@
   "booking.rooms": "{totalRooms, plural, one {# rum} other {# rum}}",
   "booking.terms": "Genom att betala med någon av de tillgängliga betalningsmetoderna accepterar jag villkoren för denna bokning och de generella <termsLink>Villkoren och villkoren</termsLink>, och förstår att Scandic kommer att behandla min personliga data i samband med denna bokning i enlighet med <privacyLink>Scandics integritetspolicy</privacyLink>. Jag accepterar att Scandic kräver ett giltigt kreditkort under min besök i fall att något är tillbaka betalt.",
   "booking.thisRoomIsEquippedWith": "Detta rum är utrustat med",
+  "breakfast.price": "{amount} {currency}/natt",
+  "breakfast.price.free": "<strikethrough>{amount} {currency}</strikethrough> <free>0 {currency}</free>/natt",
   "by": "innan",
   "characters": "tecken",
+  "guaranteeing": "garanterar",
   "guest": "gäst",
   "guests": "gäster",
   "hotelPages.rooms.roomCard.person": "person",
@@ -367,10 +393,15 @@
   "nights": "nätter",
   "number": "nummer",
   "or": "eller",
+  "paying": "betalar",
   "points": "poäng",
+  "room type": "rumtyp",
+  "room types": "rumstyper",
   "special character": "speciell karaktär",
   "spendable points expiring by": "{points} poäng förfaller {date}",
   "to": "till",
+  "type": "typ",
+  "types": "typer",
   "uppercase letter": "stor bokstav",
   "{amount} out of {total}": "{amount} av {total}",
   "{amount} {currency}": "{amount} {currency}",
diff --git a/lib/api/endpoints.ts b/lib/api/endpoints.ts
index 66bc36ec3..100fb7518 100644
--- a/lib/api/endpoints.ts
+++ b/lib/api/endpoints.ts
@@ -2,28 +2,190 @@
  * Nested enum requires namespace
  */
 export namespace endpoints {
-  export const enum v0 {
-    profile = "profile/v0/Profile",
+  namespace base {
+    export const enum path {
+      availability = "availability",
+      booking = "booking",
+      hotel = "hotel",
+      package = "package",
+      profile = "profile",
+    }
+
+    export const enum enitity {
+      Ancillary = "Ancillary",
+      Availabilities = "availabilities",
+      Bookings = "Bookings",
+      Breakfast = "breakfast",
+      Cities = "Cities",
+      Countries = "Countries",
+      Hotels = "Hotels",
+      Locations = "Locations",
+      Packages = "packages",
+      Profile = "Profile",
+      Reward = "Reward",
+      Stays = "Stays",
+      Transaction = "Transaction",
+    }
   }
-  export const enum v1 {
-    hotelsAvailability = "availability/v1/availabilities/city",
-    roomsAvailability = "availability/v1/availabilities/hotel",
-    profile = "profile/v1/Profile",
-    booking = "booking/v1/Bookings",
-    creditCards = `${profile}/creditCards`,
-    city = "hotel/v1/Cities",
-    citiesCountry = `${city}/country`,
-    countries = "hotel/v1/Countries",
-    friendTransactions = "profile/v1/Transaction/friendTransactions",
-    hotels = "hotel/v1/Hotels",
-    initiateSaveCard = `${creditCards}/initiateSaveCard`,
-    locations = "hotel/v1/Locations",
-    previousStays = "booking/v1/Stays/past",
-    upcomingStays = "booking/v1/Stays/future",
-    rewards = `${profile}/reward`,
-    tierRewards = `${profile}/TierRewards`,
-    subscriberId = `${profile}/SubscriberId`,
+
+  export namespace v1 {
+    const version = "v1"
+    /**
+     * availability (Swagger)
+     * https://tstapi.scandichotels.com/availability/swagger/v1/index.html
+     */
+    export namespace Availability {
+      export function city(cityId: string) {
+        return `${base.path.availability}/${version}/${base.enitity.Availabilities}/city/${cityId}`
+      }
+      export function hotel(hotelId: string) {
+        return `${base.path.availability}/${version}/${base.enitity.Availabilities}/hotel/${hotelId}`
+      }
+    }
+
+    /**
+     * booking (Swagger)
+     * https://tstapi.scandichotels.com/booking/swagger/v1/index.html
+     */
+    export namespace Booking {
+      export const bookings = `${base.path.booking}/${version}/${base.enitity.Bookings}`
+
+      export function booking(confirmationNumber: string) {
+        return `${bookings}/${confirmationNumber}`
+      }
+      export function cancel(confirmationNumber: string) {
+        return `${bookings}/${confirmationNumber}/cancel`
+      }
+      export function status(confirmationNumber: string) {
+        return `${bookings}/${confirmationNumber}/status`
+      }
+
+      export const enum Stays {
+        future = `${base.path.booking}/${version}/${base.enitity.Stays}/future`,
+        past = `${base.path.booking}/${version}/${base.enitity.Stays}/past`,
+      }
+    }
+
+    /**
+     * hotel (Swagger)
+     * https://tstapi.scandichotels.com/hotel/swagger/v1/index.html
+     */
+    export namespace Hotel {
+      export const cities = `${base.path.hotel}/${version}/${base.enitity.Cities}`
+      export namespace Cities {
+        export function city(cityId: string) {
+          return `${cities}/${cityId}`
+        }
+        export function country(countryId: string) {
+          return `${cities}/country/${countryId}`
+        }
+        export function hotel(hotelId: string) {
+          return `${cities}/hotel/${hotelId}`
+        }
+      }
+
+      export const countries = `${base.path.hotel}/${version}/${base.enitity.Countries}`
+      export namespace Countries {
+        export function country(countryId: string) {
+          return `${countries}/${countryId}`
+        }
+      }
+
+      export const hotels = `${base.path.hotel}/${version}/${base.enitity.Hotels}`
+      export namespace Hotels {
+        export function hotel(hotelId: string) {
+          return `${hotels}/${hotelId}`
+        }
+        export function meetingRooms(hotelId: string) {
+          return `${hotels}/${hotelId}/meetingRooms`
+        }
+        export function merchantInformation(hotelId: string) {
+          return `${hotels}/${hotelId}/merchantInformation`
+        }
+        export function nearbyHotels(hotelId: string) {
+          return `${hotels}/${hotelId}/nearbyHotels`
+        }
+        export function restaurants(hotelId: string) {
+          return `${hotels}/${hotelId}/restaurants`
+        }
+        export function roomCategories(hotelId: string) {
+          return `${hotels}/${hotelId}/roomCategories`
+        }
+      }
+
+      export const locations = `${base.path.hotel}/${version}/${base.enitity.Locations}`
+    }
+
+    /**
+     * package (Swagger)
+     * https://tstapi.scandichotels.com/package/swagger/v1/index.html
+     */
+    export namespace Package {
+      export namespace Ancillary {
+        export function hotel(hotelId: string) {
+          return `${base.path.package}/${version}/${base.enitity.Ancillary}/hotel/${hotelId}`
+        }
+        export function hotelAncillaries(hotelId: string) {
+          return `${base.path.package}/${version}/${base.enitity.Ancillary}/hotel/${hotelId}/ancillaries`
+        }
+      }
+
+      export namespace Breakfast {
+        export function hotel(hotelId: string) {
+          return `${base.path.package}/${version}/${base.enitity.Breakfast}/hotel/${hotelId}`
+        }
+      }
+
+      export namespace Packages {
+        export function hotel(hotelId: string) {
+          return `${base.path.package}/${version}/${base.enitity.Packages}/hotel/${hotelId}`
+        }
+      }
+    }
+
+    /**
+     * profile (Swagger)
+     * https://tstapi.scandichotels.com/profile/swagger/v1/index.html
+     */
+    export namespace Profile {
+      export const invalidateSessions = `${base.path.profile}/${version}/${base.enitity.Profile}/invalidateSessions`
+      export const membership = `${base.path.profile}/${version}/${base.enitity.Profile}/membership`
+      export const profile = `${base.path.profile}/${version}/${base.enitity.Profile}`
+      export const reward = `${base.path.profile}/${version}/${base.enitity.Profile}/reward`
+      export const subscriberId = `${base.path.profile}/${version}/${base.enitity.Profile}/SubscriberId`
+      export const tierRewards = `${base.path.profile}/${version}/${base.enitity.Profile}/tierRewards`
+
+      export function deleteProfile(profileId: string) {
+        return `${profile}/${profileId}`
+      }
+
+      export const creditCards = `${base.path.profile}/${version}/${base.enitity.Profile}/creditCards`
+      export namespace CreditCards {
+        export const initiateSaveCard = `${creditCards}/initiateSaveCard`
+
+        export function deleteCreditCard(creditCardId: string) {
+          return `${creditCards}/${creditCardId}`
+        }
+        export function transaction(transactionId: string) {
+          return `${creditCards}/${transactionId}`
+        }
+      }
+
+      export namespace Reward {
+        export const allTiers = `${base.path.profile}/${version}/${base.enitity.Reward}/AllTiers`
+        export const reward = `${base.path.profile}/${version}/${base.enitity.Reward}`
+        export const unwrap = `${base.path.profile}/${version}/${base.enitity.Reward}/Unwrap`
+
+        export function claim(rewardId: string) {
+          return `${base.path.profile}/${version}/${base.enitity.Reward}/Claim/${rewardId}`
+        }
+      }
+
+      export const enum Transaction {
+        friendTransactions = `${base.path.profile}/${version}/${base.enitity.Transaction}/friendTransactions`,
+      }
+    }
   }
 }
 
-export type Endpoint = endpoints.v0 | endpoints.v1
+export type Endpoint = string
diff --git a/lib/api/index.ts b/lib/api/index.ts
index 9e32ac0cc..46bae9f88 100644
--- a/lib/api/index.ts
+++ b/lib/api/index.ts
@@ -28,7 +28,7 @@ const wrappedFetch = fetchRetry(fetch, {
 })
 
 export async function get(
-  endpoint: Endpoint | `${Endpoint}/${string}`,
+  endpoint: Endpoint,
   options: RequestOptionsWithOutBody,
   params = {}
 ) {
@@ -37,7 +37,7 @@ export async function get(
   const searchParams = new URLSearchParams(params)
   if (searchParams.size) {
     searchParams.forEach((value, key) => {
-      url.searchParams.set(key, value)
+      url.searchParams.append(key, value)
     })
     url.searchParams.sort()
   }
diff --git a/lib/graphql/Query/ContentPage/ContentPage.graphql b/lib/graphql/Query/ContentPage/ContentPage.graphql
index 06174504a..c67738c05 100644
--- a/lib/graphql/Query/ContentPage/ContentPage.graphql
+++ b/lib/graphql/Query/ContentPage/ContentPage.graphql
@@ -26,6 +26,9 @@ query GetContentPage($locale: String!, $uid: String!) {
       preamble
       ...NavigationLinks
     }
+    blocks {
+      __typename
+    }
     sidebar {
       __typename
       ...ContentSidebar_ContentPage
diff --git a/lib/trpc/memoizedRequests/index.ts b/lib/trpc/memoizedRequests/index.ts
index d09349a8c..ec361b96c 100644
--- a/lib/trpc/memoizedRequests/index.ts
+++ b/lib/trpc/memoizedRequests/index.ts
@@ -52,14 +52,46 @@ export const getUserTracking = cache(async function getMemoizedUserTracking() {
 
 export const getHotelData = cache(async function getMemoizedHotelData(
   hotelId: string,
-  language: string
+  language: string,
+  isCardOnlyPayment?: boolean
 ) {
   return serverClient().hotel.hotelData.get({
     hotelId,
     language,
+    isCardOnlyPayment,
   })
 })
 
+export const getRoomAvailability = cache(
+  async function getMemoizedRoomAvailability({
+    hotelId,
+    adults,
+    roomStayStartDate,
+    roomStayEndDate,
+    children,
+    promotionCode,
+    rateCode,
+  }: {
+    hotelId: string
+    adults: number
+    roomStayStartDate: string
+    roomStayEndDate: string
+    children?: string
+    promotionCode?: string
+    rateCode?: string
+  }) {
+    return serverClient().hotel.availability.rooms({
+      hotelId: parseInt(hotelId),
+      adults,
+      roomStayStartDate,
+      roomStayEndDate,
+      children,
+      promotionCode,
+      rateCode,
+    })
+  }
+)
+
 export const getFooter = cache(async function getMemoizedFooter() {
   return serverClient().contentstack.base.footer()
 })
@@ -89,3 +121,9 @@ export const getLanguageSwitcher = cache(
 export const getSiteConfig = cache(async function getMemoizedSiteConfig() {
   return serverClient().contentstack.base.siteConfig()
 })
+
+export const getBreakfastPackages = cache(async function getMemoizedPackages(
+  hotelId: string
+) {
+  return serverClient().hotel.packages.breakfast({ hotelId })
+})
diff --git a/lib/trpc/server.ts b/lib/trpc/server.ts
index 46c0f8840..5d8539a8a 100644
--- a/lib/trpc/server.ts
+++ b/lib/trpc/server.ts
@@ -6,7 +6,6 @@ import { login } from "@/constants/routes/handleAuth"
 import { webviews } from "@/constants/routes/webviews"
 import { appRouter } from "@/server"
 import { createContext } from "@/server/context"
-import { internalServerError } from "@/server/errors/next"
 import { createCallerFactory } from "@/server/trpc"
 
 const createCaller = createCallerFactory(appRouter)
diff --git a/package-lock.json b/package-lock.json
index 9cd999fd9..e1cd6777e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8034,9 +8034,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001608",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz",
-      "integrity": "sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==",
+      "version": "1.0.30001669",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
+      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
       "funding": [
         {
           "type": "opencollective",
diff --git a/server/context.ts b/server/context.ts
index 76ea0ba34..f33d6b1c9 100644
--- a/server/context.ts
+++ b/server/context.ts
@@ -1,5 +1,6 @@
 import { cookies, headers } from "next/headers"
 import { type Session } from "next-auth"
+import { cache } from "react"
 
 import { Lang } from "@/constants/languages"
 
@@ -37,7 +38,7 @@ export function createContextInner(opts: CreateContextOptions) {
  * This is the actual context you'll use in your router
  * @link https://trpc.io/docs/context
  **/
-export function createContext() {
+export const createContext = cache(function () {
   const h = headers()
 
   const cookie = cookies()
@@ -66,6 +67,6 @@ export function createContext() {
     webToken: webviewTokenCookie?.value,
     contentType: h.get("x-contenttype")!,
   })
-}
+})
 
 export type Context = ReturnType<typeof createContext>
diff --git a/server/routers/booking/mutation.ts b/server/routers/booking/mutation.ts
index 9e5677d32..2edbd5bdd 100644
--- a/server/routers/booking/mutation.ts
+++ b/server/routers/booking/mutation.ts
@@ -62,7 +62,7 @@ export const bookingMutationRouter = router({
       Authorization: `Bearer ${ctx.serviceToken}`,
     }
 
-    const apiResponse = await api.post(api.endpoints.v1.booking, {
+    const apiResponse = await api.post(api.endpoints.v1.Booking.bookings, {
       headers,
       body: input,
     })
diff --git a/server/routers/booking/query.ts b/server/routers/booking/query.ts
index 76b874ba3..5c72bb284 100644
--- a/server/routers/booking/query.ts
+++ b/server/routers/booking/query.ts
@@ -33,7 +33,7 @@ export const bookingQueryRouter = router({
       getBookingConfirmationCounter.add(1, { confirmationNumber })
 
       const apiResponse = await api.get(
-        `${api.endpoints.v1.booking}/${confirmationNumber}`,
+        api.endpoints.v1.Booking.booking(confirmationNumber),
         {
           headers: {
             Authorization: `Bearer ${ctx.serviceToken}`,
@@ -142,7 +142,7 @@ export const bookingQueryRouter = router({
     getBookingStatusCounter.add(1, { confirmationNumber })
 
     const apiResponse = await api.get(
-      `${api.endpoints.v1.booking}/${confirmationNumber}/status`,
+      api.endpoints.v1.Booking.status(confirmationNumber),
       {
         headers: {
           Authorization: `Bearer ${ctx.serviceToken}`,
diff --git a/server/routers/contentstack/bookingwidget/query.ts b/server/routers/contentstack/bookingwidget/query.ts
index c8a64f20e..f87899965 100644
--- a/server/routers/contentstack/bookingwidget/query.ts
+++ b/server/routers/contentstack/bookingwidget/query.ts
@@ -26,7 +26,7 @@ export const bookingwidgetQueryRouter = router({
       const failedResponse = { hideBookingWidget: false }
       const { contentType, uid, lang } = ctx
 
-      // This condition is to handle 404 page case
+      // This condition is to handle 404 page case and booking flow
       if (!contentType || !uid) {
         console.log("No proper params defined: ", contentType, uid)
         return failedResponse
diff --git a/server/routers/contentstack/contentPage/query.ts b/server/routers/contentstack/contentPage/query.ts
index a7e5d53f0..44a765c49 100644
--- a/server/routers/contentstack/contentPage/query.ts
+++ b/server/routers/contentstack/contentPage/query.ts
@@ -19,7 +19,11 @@ import {
   TrackingChannelEnum,
   type TrackingSDKPageData,
 } from "@/types/components/tracking"
-import type { GetContentPageSchema } from "@/types/trpc/routers/contentstack/contentPage"
+import { ContentPageEnum } from "@/types/enums/contentPage"
+import type {
+  GetBlock,
+  GetContentPageSchema,
+} from "@/types/trpc/routers/contentstack/contentPage"
 
 export const contentPageQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
@@ -79,21 +83,36 @@ export const contentPageQueryRouter = router({
       ),
     ])
 
+    const blocksOrder = mainResponse.data.content_page.blocks?.map(
+      (block) => block.__typename
+    )
+
+    let sortedBlocks
+    if (blocksOrder) {
+      const blocks = [
+        blocksResponse1.data.content_page.blocks,
+        blocksResponse2.data.content_page.blocks,
+      ]
+        .flat(2)
+        .filter((obj) => !(obj && Object.keys(obj).length < 2))
+      // Remove empty objects and objects with only typename
+
+      sortedBlocks = blocksOrder
+        .map((typename: ContentPageEnum.ContentStack.blocks) =>
+          blocks.find((block) => block?.__typename === typename)
+        )
+        .filter((block): block is GetBlock => !!block)
+    }
+
     const responseData = {
       ...mainResponse.data,
       content_page: {
         ...mainResponse.data.content_page,
-        blocks: [
-          blocksResponse1.data.content_page.blocks,
-          blocksResponse2.data.content_page.blocks,
-        ]
-          .flat(2)
-          .filter((obj) => !(obj && Object.keys(obj).length < 2)), // Remove empty objects and objects with only typename
+        blocks: sortedBlocks,
       },
     }
 
     const contentPage = contentPageSchema.safeParse(responseData)
-
     if (!contentPage.success) {
       console.error(
         `Failed to validate Contentpage Data - (lang: ${lang}, uid: ${uid})`
diff --git a/server/routers/contentstack/reward/query.ts b/server/routers/contentstack/reward/query.ts
index 419e0a2c2..b4e0e54b2 100644
--- a/server/routers/contentstack/reward/query.ts
+++ b/server/routers/contentstack/reward/query.ts
@@ -75,7 +75,7 @@ function getUniqueRewardIds(rewardIds: string[]) {
 
 const getAllCachedApiRewards = unstable_cache(
   async function (token) {
-    const apiResponse = await api.get(api.endpoints.v1.tierRewards, {
+    const apiResponse = await api.get(api.endpoints.v1.Profile.tierRewards, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -194,7 +194,7 @@ export const rewardQueryRouter = router({
 
       const { limit, cursor } = input
 
-      const apiResponse = await api.get(api.endpoints.v1.rewards, {
+      const apiResponse = await api.get(api.endpoints.v1.Profile.reward, {
         cache: undefined, // override defaultOptions
         headers: {
           Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -393,7 +393,7 @@ export const rewardQueryRouter = router({
   surprises: contentStackBaseWithProtectedProcedure.query(async ({ ctx }) => {
     getCurrentRewardCounter.add(1)
 
-    const apiResponse = await api.get(api.endpoints.v1.rewards, {
+    const apiResponse = await api.get(api.endpoints.v1.Profile.reward, {
       cache: undefined, // override defaultOptions
       headers: {
         Authorization: `Bearer ${ctx.session.token.access_token}`,
diff --git a/server/routers/hotels/input.ts b/server/routers/hotels/input.ts
index 6deff63a6..2d69ab642 100644
--- a/server/routers/hotels/input.ts
+++ b/server/routers/hotels/input.ts
@@ -11,7 +11,7 @@ export const getHotelsAvailabilityInputSchema = z.object({
   roomStayStartDate: z.string(),
   roomStayEndDate: z.string(),
   adults: z.number(),
-  children: z.number().optional().default(0),
+  children: z.string().optional(),
   promotionCode: z.string().optional().default(""),
   reservationProfileType: z.string().optional().default(""),
   attachedProfileId: z.string().optional().default(""),
@@ -22,10 +22,11 @@ export const getRoomsAvailabilityInputSchema = z.object({
   roomStayStartDate: z.string(),
   roomStayEndDate: z.string(),
   adults: z.number(),
-  children: z.number().optional().default(0),
+  children: z.string().optional(),
   promotionCode: z.string().optional(),
   reservationProfileType: z.string().optional().default(""),
   attachedProfileId: z.string().optional().default(""),
+  rateCode: z.string().optional(),
 })
 
 export const getRatesInputSchema = z.object({
@@ -35,7 +36,12 @@ export const getRatesInputSchema = z.object({
 export const getlHotelDataInputSchema = z.object({
   hotelId: z.string(),
   language: z.string(),
+  isCardOnlyPayment: z.boolean().optional(),
   include: z
     .array(z.enum(["RoomCategories", "NearbyHotels", "Restaurants", "City"]))
     .optional(),
 })
+
+export const getBreakfastPackageInput = z.object({
+  hotelId: z.string().min(1, { message: "hotelId is required" }),
+})
diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts
index 0f545d673..b69207a7d 100644
--- a/server/routers/hotels/output.ts
+++ b/server/routers/hotels/output.ts
@@ -1,5 +1,6 @@
 import { z } from "zod"
 
+import { BedTypeEnum } from "@/constants/booking"
 import { dt } from "@/lib/dt"
 import { toLang } from "@/server/utils"
 
@@ -7,8 +8,11 @@ import { imageMetaDataSchema, imageSizesSchema } from "./schemas/image"
 import { roomSchema } from "./schemas/room"
 import { getPoiGroupByCategoryName } from "./utils"
 
+import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
 import { AlertTypeEnum } from "@/types/enums/alert"
+import { CurrencyEnum } from "@/types/enums/currency"
 import { FacilityEnum } from "@/types/enums/facilities"
+import { PackageTypeEnum } from "@/types/enums/packages"
 import { PointOfInterestCategoryNameEnum } from "@/types/hotel"
 
 const ratingsSchema = z
@@ -162,30 +166,20 @@ export const facilitySchema = z.object({
   ),
 })
 
+export const imageSchema = z.object({
+  metaData: imageMetaDataSchema,
+  imageSizes: imageSizesSchema,
+})
+
 export const gallerySchema = z.object({
-  heroImages: z.array(
-    z.object({
-      metaData: imageMetaDataSchema,
-      imageSizes: imageSizesSchema,
-    })
-  ),
-  smallerImages: z.array(
-    z.object({
-      metaData: imageMetaDataSchema,
-      imageSizes: imageSizesSchema,
-    })
-  ),
+  heroImages: z.array(imageSchema),
+  smallerImages: z.array(imageSchema),
 })
 
 const healthFacilitySchema = z.object({
   type: z.string(),
   content: z.object({
-    images: z.array(
-      z.object({
-        metaData: imageMetaDataSchema,
-        imageSizes: imageSizesSchema,
-      })
-    ),
+    images: z.array(imageSchema),
     texts: z.object({
       facilityInformation: z.string().optional(),
       surroundingInformation: z.string().optional(),
@@ -465,9 +459,14 @@ export const getHotelDataSchema = z.object({
   included: z.array(roomSchema).optional(),
 })
 
+export const childrenSchema = z.object({
+  age: z.number(),
+  bedType: z.nativeEnum(BedTypeEnum),
+})
+
 const occupancySchema = z.object({
   adults: z.number(),
-  children: z.number(),
+  children: z.array(childrenSchema),
 })
 
 const bestPricePerStaySchema = z.object({
@@ -545,7 +544,16 @@ const roomConfigurationSchema = z.object({
   roomTypeCode: z.string().optional(),
   roomType: z.string(),
   roomsLeft: z.number(),
-  features: z.array(z.object({ inventory: z.number(), code: z.string() })),
+  features: z.array(
+    z.object({
+      inventory: z.number(),
+      code: z.enum([
+        RoomPackageCodeEnum.PET_ROOM,
+        RoomPackageCodeEnum.ALLERGY_ROOM,
+        RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
+      ]),
+    })
+  ),
   products: z.array(productSchema),
 })
 
@@ -570,6 +578,7 @@ const roomsAvailabilitySchema = z
         hotelId: z.number(),
         roomConfigurations: z.array(roomConfigurationSchema),
         rateDefinitions: z.array(rateDefinitionSchema),
+        mustBeGuaranteed: z.boolean().optional(),
       }),
       relationships: linksSchema.optional(),
       type: z.string().optional(),
@@ -653,7 +662,7 @@ export const apiCountriesSchema = z.object({
           name: z.string(),
         }),
         hotelInformationSystemId: z.number().optional(),
-        id: z.string().optional(),
+        id: z.string().optional().default(""),
         language: z.string().optional(),
         type: z.literal("countries"),
       })
@@ -794,3 +803,30 @@ export const apiLocationsSchema = z.object({
         })
     ),
 })
+
+export const breakfastPackageSchema = z.object({
+  code: z.string(),
+  currency: z.nativeEnum(CurrencyEnum),
+  description: z.string(),
+  originalPrice: z.number().default(0),
+  packagePrice: z.number(),
+  packageType: z.enum([
+    PackageTypeEnum.BreakfastAdult,
+    PackageTypeEnum.BreakfastChildren,
+  ]),
+  totalPrice: z.number(),
+})
+
+export const breakfastPackagesSchema = z
+  .object({
+    data: z.object({
+      attributes: z.object({
+        hotelId: z.number(),
+        packages: z.array(breakfastPackageSchema),
+      }),
+      type: z.literal("breakfastpackage"),
+    }),
+  })
+  .transform(({ data }) =>
+    data.attributes.packages.filter((pkg) => pkg.code.match(/^(BRF\d+)$/gm))
+  )
diff --git a/server/routers/hotels/query.ts b/server/routers/hotels/query.ts
index b5b5ff34b..6ad27655a 100644
--- a/server/routers/hotels/query.ts
+++ b/server/routers/hotels/query.ts
@@ -9,11 +9,11 @@ import {
   notFound,
   serverErrorByStatus,
 } from "@/server/errors/trpc"
-import { extractHotelImages } from "@/server/routers/utils/hotels"
 import {
   contentStackUidWithServiceProcedure,
   publicProcedure,
   router,
+  safeProtectedServiceProcedure,
   serviceProcedure,
 } from "@/server/trpc"
 import { toApiLang } from "@/server/utils"
@@ -25,7 +25,13 @@ import {
   getHotelPageCounter,
   validateHotelPageRefs,
 } from "../contentstack/hotelPage/utils"
+import { getVerifiedUser, parsedUser } from "../user/query"
 import {
+  getRoomPackagesInputSchema,
+  getRoomPackagesSchema,
+} from "./schemas/packages"
+import {
+  getBreakfastPackageInput,
   getHotelInputSchema,
   getHotelsAvailabilityInputSchema,
   getlHotelDataInputSchema,
@@ -33,6 +39,7 @@ import {
   getRoomsAvailabilityInputSchema,
 } from "./input"
 import {
+  breakfastPackagesSchema,
   getHotelDataSchema,
   getHotelsAvailabilitySchema,
   getRatesSchema,
@@ -48,6 +55,7 @@ import {
 
 import { FacilityCardTypeEnum } from "@/types/components/hotelPage/facilities"
 import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
+import { BreakfastPackageEnum } from "@/types/enums/breakfast"
 import type { RequestOptionsWithOutBody } from "@/types/fetch"
 import type { Facility } from "@/types/hotel"
 import type { GetHotelPageData } from "@/types/trpc/routers/contentstack/hotelPage"
@@ -57,6 +65,14 @@ const getHotelCounter = meter.createCounter("trpc.hotel.get")
 const getHotelSuccessCounter = meter.createCounter("trpc.hotel.get-success")
 const getHotelFailCounter = meter.createCounter("trpc.hotel.get-fail")
 
+const getPackagesCounter = meter.createCounter("trpc.hotel.packages.get")
+const getPackagesSuccessCounter = meter.createCounter(
+  "trpc.hotel.packages.get-success"
+)
+const getPackagesFailCounter = meter.createCounter(
+  "trpc.hotel.packages.get-fail"
+)
+
 const hotelsAvailabilityCounter = meter.createCounter(
   "trpc.hotel.availability.hotels"
 )
@@ -77,6 +93,14 @@ const roomsAvailabilityFailCounter = meter.createCounter(
   "trpc.hotel.availability.rooms-fail"
 )
 
+const breakfastPackagesCounter = meter.createCounter("trpc.package.breakfast")
+const breakfastPackagesSuccessCounter = meter.createCounter(
+  "trpc.package.breakfast-success"
+)
+const breakfastPackagesFailCounter = meter.createCounter(
+  "trpc.package.breakfast-fail"
+)
+
 async function getContentstackData(lang: Lang, uid?: string | null) {
   if (!uid) {
     return null
@@ -158,7 +182,7 @@ export const hotelQueryRouter = router({
         })
       )
       const apiResponse = await api.get(
-        `${api.endpoints.v1.hotels}/${hotelId}`,
+        api.endpoints.v1.Hotel.Hotels.hotel(hotelId),
         {
           headers: {
             Authorization: `Bearer ${ctx.serviceToken}`,
@@ -218,7 +242,7 @@ export const hotelQueryRouter = router({
       const included = validatedHotelData.data.included || []
 
       const hotelAttributes = validatedHotelData.data.data.attributes
-      const images = extractHotelImages(hotelAttributes)
+      const images = hotelAttributes.gallery?.smallerImages
       const hotelAlerts = hotelAttributes.meta?.specialAlerts || []
 
       const roomCategories = included
@@ -288,13 +312,12 @@ export const hotelQueryRouter = router({
           roomStayStartDate,
           roomStayEndDate,
           adults,
-          children,
+          ...(children && { children }),
           promotionCode,
           reservationProfileType,
           attachedProfileId,
           language: apiLang,
         }
-
         hotelsAvailabilityCounter.add(1, {
           cityId,
           roomStayStartDate,
@@ -309,7 +332,7 @@ export const hotelQueryRouter = router({
           JSON.stringify({ query: { cityId, params } })
         )
         const apiResponse = await api.get(
-          `${api.endpoints.v1.hotelsAvailability}/${cityId}`,
+          api.endpoints.v1.Availability.city(cityId),
           {
             headers: {
               Authorization: `Bearer ${ctx.serviceToken}`,
@@ -407,13 +430,14 @@ export const hotelQueryRouter = router({
           promotionCode,
           reservationProfileType,
           attachedProfileId,
+          rateCode,
         } = input
 
         const params: Record<string, string | number | undefined> = {
           roomStayStartDate,
           roomStayEndDate,
           adults,
-          children,
+          ...(children && { children }),
           promotionCode,
           reservationProfileType,
           attachedProfileId,
@@ -433,7 +457,7 @@ export const hotelQueryRouter = router({
           JSON.stringify({ query: { hotelId, params } })
         )
         const apiResponse = await api.get(
-          `${api.endpoints.v1.roomsAvailability}/${hotelId}`,
+          api.endpoints.v1.Availability.hotel(hotelId.toString()),
           {
             headers: {
               Authorization: `Bearer ${ctx.serviceToken}`,
@@ -441,6 +465,7 @@ export const hotelQueryRouter = router({
           },
           params
         )
+
         if (!apiResponse.ok) {
           const text = await apiResponse.text()
           roomsAvailabilityFailCounter.add(1, {
@@ -510,6 +535,14 @@ export const hotelQueryRouter = router({
             query: { hotelId, params: params },
           })
         )
+
+        if (rateCode) {
+          validateAvailabilityData.data.mustBeGuaranteed =
+            validateAvailabilityData.data.rateDefinitions.filter(
+              (rate) => rate.rateCode === rateCode
+            )[0].mustBeGuaranteed
+        }
+
         return validateAvailabilityData.data
       }),
   }),
@@ -553,7 +586,7 @@ export const hotelQueryRouter = router({
     get: serviceProcedure
       .input(getlHotelDataInputSchema)
       .query(async ({ ctx, input }) => {
-        const { hotelId, language, include } = input
+        const { hotelId, language, include, isCardOnlyPayment } = input
 
         const params: Record<string, string> = {
           hotelId,
@@ -575,7 +608,7 @@ export const hotelQueryRouter = router({
         )
 
         const apiResponse = await api.get(
-          `${api.endpoints.v1.hotels}/${hotelId}`,
+          api.endpoints.v1.Hotel.Hotels.hotel(hotelId),
           {
             headers: {
               Authorization: `Bearer ${ctx.serviceToken}`,
@@ -645,6 +678,11 @@ export const hotelQueryRouter = router({
           })
         )
 
+        if (isCardOnlyPayment) {
+          validateHotelData.data.data.attributes.merchantInformationData.alternatePaymentOptions =
+            []
+        }
+
         return validateHotelData.data
       }),
   }),
@@ -693,4 +731,198 @@ export const hotelQueryRouter = router({
       return locations
     }),
   }),
+  packages: router({
+    get: serviceProcedure
+      .input(getRoomPackagesInputSchema)
+      .query(async ({ input, ctx }) => {
+        const { hotelId, startDate, endDate, adults, children, packageCodes } =
+          input
+
+        const searchParams = new URLSearchParams({
+          startDate,
+          endDate,
+          adults: adults.toString(),
+          children: children.toString(),
+        })
+
+        packageCodes.forEach((code) => {
+          searchParams.append("packageCodes", code)
+        })
+
+        const params = searchParams.toString()
+
+        getPackagesCounter.add(1, {
+          hotelId,
+        })
+        console.info(
+          "api.hotels.packages start",
+          JSON.stringify({ query: { hotelId, params } })
+        )
+
+        const apiResponse = await api.get(
+          api.endpoints.v1.Package.Packages.hotel(hotelId),
+          {
+            headers: {
+              Authorization: `Bearer ${ctx.serviceToken}`,
+            },
+          },
+          params
+        )
+
+        if (!apiResponse.ok) {
+          getPackagesFailCounter.add(1, {
+            hotelId,
+            error_type: "http_error",
+            error: JSON.stringify({
+              status: apiResponse.status,
+              statusText: apiResponse.statusText,
+            }),
+          })
+          console.error(
+            "api.hotels.packages error",
+            JSON.stringify({ query: { hotelId, params } })
+          )
+          throw serverErrorByStatus(apiResponse.status, apiResponse)
+        }
+
+        const apiJson = await apiResponse.json()
+        const validatedPackagesData = getRoomPackagesSchema.safeParse(apiJson)
+
+        if (!validatedPackagesData.success) {
+          getHotelFailCounter.add(1, {
+            hotelId,
+            error_type: "validation_error",
+            error: JSON.stringify(validatedPackagesData.error),
+          })
+
+          console.error(
+            "api.hotels.packages validation error",
+            JSON.stringify({
+              query: { hotelId, params },
+              error: validatedPackagesData.error,
+            })
+          )
+          throw badRequestError()
+        }
+
+        getPackagesSuccessCounter.add(1, {
+          hotelId,
+        })
+        console.info(
+          "api.hotels.packages success",
+          JSON.stringify({ query: { hotelId, params: params } })
+        )
+
+        return validatedPackagesData.data
+      }),
+    breakfast: safeProtectedServiceProcedure
+      .input(getBreakfastPackageInput)
+      .query(async function ({ ctx, input }) {
+        const params = {
+          Adults: 2,
+          EndDate: "2024-10-28",
+          StartDate: "2024-10-25",
+        }
+        const metricsData = { ...input, ...params }
+        breakfastPackagesCounter.add(1, metricsData)
+        console.info(
+          "api.package.breakfast start",
+          JSON.stringify({ query: metricsData })
+        )
+
+        const apiResponse = await api.get(
+          api.endpoints.v1.Package.Breakfast.hotel(input.hotelId),
+          {
+            cache: undefined,
+            headers: {
+              Authorization: `Bearer ${ctx.serviceToken}`,
+            },
+            next: {
+              revalidate: 60,
+            },
+          },
+          params
+        )
+
+        if (!apiResponse.ok) {
+          const text = await apiResponse.text()
+          breakfastPackagesFailCounter.add(1, {
+            ...metricsData,
+            error_type: "http_error",
+            error: JSON.stringify({
+              status: apiResponse.status,
+              statusText: apiResponse.statusText,
+              text,
+            }),
+          })
+          console.error(
+            "api.hotels.hotelsAvailability error",
+            JSON.stringify({
+              query: metricsData,
+              error: {
+                status: apiResponse.status,
+                statusText: apiResponse.statusText,
+                text,
+              },
+            })
+          )
+          return null
+        }
+
+        const apiJson = await apiResponse.json()
+        const breakfastPackages = breakfastPackagesSchema.safeParse(apiJson)
+        if (!breakfastPackages.success) {
+          hotelsAvailabilityFailCounter.add(1, {
+            ...metricsData,
+            error_type: "validation_error",
+            error: JSON.stringify(breakfastPackages.error),
+          })
+          console.error(
+            "api.package.breakfast validation error",
+            JSON.stringify({
+              query: metricsData,
+              error: breakfastPackages.error,
+            })
+          )
+          return null
+        }
+
+        breakfastPackagesSuccessCounter.add(1, metricsData)
+        console.info(
+          "api.package.breakfast success",
+          JSON.stringify({
+            query: metricsData,
+          })
+        )
+
+        if (ctx.session?.token) {
+          const apiUser = await getVerifiedUser({ session: ctx.session })
+          if (apiUser && !("error" in apiUser)) {
+            const user = parsedUser(apiUser.data, false)
+            if (
+              user.membership &&
+              ["L6", "L7"].includes(user.membership.membershipLevel)
+            ) {
+              const originalBreakfastPackage = breakfastPackages.data.find(
+                (pkg) => pkg.code === BreakfastPackageEnum.REGULAR_BREAKFAST
+              )
+              const freeBreakfastPackage = breakfastPackages.data.find(
+                (pkg) => pkg.code === BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
+              )
+              if (freeBreakfastPackage) {
+                if (originalBreakfastPackage) {
+                  freeBreakfastPackage.originalPrice =
+                    originalBreakfastPackage.packagePrice
+                }
+                return [freeBreakfastPackage]
+              }
+            }
+          }
+        }
+
+        return breakfastPackages.data.filter(
+          (pkg) => pkg.code !== BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
+        )
+      }),
+  }),
 })
diff --git a/server/routers/hotels/schemas/packages.ts b/server/routers/hotels/schemas/packages.ts
new file mode 100644
index 000000000..2f12f7255
--- /dev/null
+++ b/server/routers/hotels/schemas/packages.ts
@@ -0,0 +1,55 @@
+import { z } from "zod"
+
+import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
+
+export const getRoomPackagesInputSchema = z.object({
+  hotelId: z.string(),
+  startDate: z.string(),
+  endDate: z.string(),
+  adults: z.number(),
+  children: z.number().optional().default(0),
+  packageCodes: z.array(z.string()).optional().default([]),
+})
+
+const packagesSchema = z.array(
+  z.object({
+    code: z.enum([
+      RoomPackageCodeEnum.PET_ROOM,
+      RoomPackageCodeEnum.ALLERGY_ROOM,
+      RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
+    ]),
+    itemCode: z.string(),
+    description: z.string(),
+    currency: z.string(),
+    calculatedPrice: z.number(),
+    inventories: z.array(
+      z.object({
+        date: z.string(),
+        total: z.number(),
+        available: z.number(),
+      })
+    ),
+  })
+)
+
+export const getRoomPackagesSchema = z
+  .object({
+    data: z.object({
+      attributes: z.object({
+        hotelId: z.number(),
+        packages: packagesSchema,
+      }),
+      relationships: z
+        .object({
+          links: z.array(
+            z.object({
+              url: z.string(),
+              type: z.string(),
+            })
+          ),
+        })
+        .optional(),
+      type: z.string(),
+    }),
+  })
+  .transform((data) => data.data.attributes.packages)
diff --git a/server/routers/hotels/utils.ts b/server/routers/hotels/utils.ts
index 84020bfaa..6d384b3cf 100644
--- a/server/routers/hotels/utils.ts
+++ b/server/routers/hotels/utils.ts
@@ -96,7 +96,7 @@ export async function getCountries(
   return unstable_cache(
     async function (searchParams) {
       const countryResponse = await api.get(
-        api.endpoints.v1.countries,
+        api.endpoints.v1.Hotel.countries,
         options,
         searchParams
       )
@@ -136,7 +136,7 @@ export async function getCitiesByCountry(
       await Promise.all(
         searchedCountries.data.map(async (country) => {
           const countryResponse = await api.get(
-            `${api.endpoints.v1.citiesCountry}/${country.name}`,
+            api.endpoints.v1.Hotel.Cities.country(country.name),
             options,
             searchParams
           )
@@ -182,7 +182,7 @@ export async function getLocations(
       groupedCitiesByCountry: CitiesGroupedByCountry | null
     ) {
       const apiResponse = await api.get(
-        api.endpoints.v1.locations,
+        api.endpoints.v1.Hotel.locations,
         options,
         searchParams
       )
diff --git a/server/routers/user/mutation.ts b/server/routers/user/mutation.ts
index 005941090..b03e6a68e 100644
--- a/server/routers/user/mutation.ts
+++ b/server/routers/user/mutation.ts
@@ -35,16 +35,19 @@ export const userMutationRouter = router({
         "api.user.creditCard.add start",
         JSON.stringify({ query: { language: input.language } })
       )
-      const apiResponse = await api.post(api.endpoints.v1.initiateSaveCard, {
-        headers: {
-          Authorization: `Bearer ${ctx.session.token.access_token}`,
-        },
-        body: {
-          language: input.language,
-          mobileToken: false,
-          redirectUrl: `api/web/add-card-callback/${input.language}`,
-        },
-      })
+      const apiResponse = await api.post(
+        api.endpoints.v1.Profile.CreditCards.initiateSaveCard,
+        {
+          headers: {
+            Authorization: `Bearer ${ctx.session.token.access_token}`,
+          },
+          body: {
+            language: input.language,
+            mobileToken: false,
+            redirectUrl: `api/web/add-card-callback/${input.language}`,
+          },
+        }
+      )
 
       if (!apiResponse.ok) {
         const text = await apiResponse.text()
@@ -85,7 +88,7 @@ export const userMutationRouter = router({
       .mutation(async function ({ ctx, input }) {
         console.info("api.user.creditCard.save start", JSON.stringify({}))
         const apiResponse = await api.post(
-          `${api.endpoints.v1.creditCards}/${input.transactionId}`,
+          api.endpoints.v1.Profile.CreditCards.transaction(input.transactionId),
           {
             headers: {
               Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -118,7 +121,9 @@ export const userMutationRouter = router({
           JSON.stringify({ query: {} })
         )
         const apiResponse = await api.remove(
-          `${api.endpoints.v1.creditCards}/${input.creditCardId}`,
+          api.endpoints.v1.Profile.CreditCards.deleteCreditCard(
+            input.creditCardId
+          ),
           {
             headers: {
               Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -149,7 +154,7 @@ export const userMutationRouter = router({
     ctx,
   }) {
     generatePreferencesLinkCounter.add(1)
-    const apiResponse = await api.get(api.endpoints.v1.subscriberId, {
+    const apiResponse = await api.get(api.endpoints.v1.Profile.subscriberId, {
       headers: {
         Authorization: `Bearer ${ctx.session.token.access_token}`,
       },
diff --git a/server/routers/user/query.ts b/server/routers/user/query.ts
index 224f03198..10e1a4668 100644
--- a/server/routers/user/query.ts
+++ b/server/routers/user/query.ts
@@ -89,7 +89,7 @@ export const getVerifiedUser = cache(
     }
     getVerifiedUserCounter.add(1)
     console.info("api.user.profile getVerifiedUser start", JSON.stringify({}))
-    const apiResponse = await api.get(api.endpoints.v1.profile, {
+    const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
       headers: {
         Authorization: `Bearer ${session.token.access_token}`,
       },
@@ -163,7 +163,7 @@ export const getVerifiedUser = cache(
   }
 )
 
-function parsedUser(data: User, isMFA: boolean) {
+export function parsedUser(data: User, isMFA: boolean) {
   const country = countries.find((c) => c.code === data.address.countryCode)
 
   const user = {
@@ -211,7 +211,7 @@ function parsedUser(data: User, isMFA: boolean) {
 async function getCreditCards(session: Session) {
   getCreditCardsCounter.add(1)
   console.info("api.profile.creditCards start", JSON.stringify({}))
-  const apiResponse = await api.get(api.endpoints.v1.creditCards, {
+  const apiResponse = await api.get(api.endpoints.v1.Profile.creditCards, {
     headers: {
       Authorization: `Bearer ${session.token.access_token}`,
     },
@@ -354,7 +354,7 @@ export const userQueryRouter = router({
       JSON.stringify({ query: { params } })
     )
     const previousStaysResponse = await api.get(
-      api.endpoints.v1.previousStays,
+      api.endpoints.v1.Booking.Stays.past,
       {
         headers: {
           Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -430,7 +430,7 @@ export const userQueryRouter = router({
         )
 
         const apiResponse = await api.get(
-          api.endpoints.v1.previousStays,
+          api.endpoints.v1.Booking.Stays.past,
           {
             headers: {
               Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -525,7 +525,7 @@ export const userQueryRouter = router({
           JSON.stringify({ query: { params } })
         )
         const apiResponse = await api.get(
-          api.endpoints.v1.upcomingStays,
+          api.endpoints.v1.Booking.Stays.future,
           {
             headers: {
               Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -611,13 +611,16 @@ export const userQueryRouter = router({
           "api.transaction.friendTransactions start",
           JSON.stringify({})
         )
-        const apiResponse = await api.get(api.endpoints.v1.friendTransactions, {
-          cache: undefined, // override defaultOptions
-          headers: {
-            Authorization: `Bearer ${ctx.session.token.access_token}`,
-          },
-          next: { revalidate: 30 * 60 * 1000 },
-        })
+        const apiResponse = await api.get(
+          api.endpoints.v1.Profile.Transaction.friendTransactions,
+          {
+            cache: undefined, // override defaultOptions
+            headers: {
+              Authorization: `Bearer ${ctx.session.token.access_token}`,
+            },
+            next: { revalidate: 30 * 60 * 1000 },
+          }
+        )
 
         if (!apiResponse.ok) {
           // switch (apiResponse.status) {
@@ -740,7 +743,7 @@ export const userQueryRouter = router({
   membershipCards: protectedProcedure.query(async function ({ ctx }) {
     getProfileCounter.add(1)
     console.info("api.profile start", JSON.stringify({}))
-    const apiResponse = await api.get(api.endpoints.v1.profile, {
+    const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
       cache: "no-store",
       headers: {
         Authorization: `Bearer ${ctx.session.token.access_token}`,
diff --git a/server/routers/user/utils.ts b/server/routers/user/utils.ts
index cde50270f..c720195b1 100644
--- a/server/routers/user/utils.ts
+++ b/server/routers/user/utils.ts
@@ -35,7 +35,7 @@ async function updateStaysBookingUrl(
   // Temporary API call needed till we have user name in ctx session data
   getProfileCounter.add(1)
   console.info("api.user.profile updatebookingurl start", JSON.stringify({}))
-  const apiResponse = await api.get(api.endpoints.v1.profile, {
+  const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
     cache: "no-store",
     headers: {
       Authorization: `Bearer ${token}`,
diff --git a/server/routers/utils/hotels.ts b/server/routers/utils/hotels.ts
deleted file mode 100644
index 37ae167cb..000000000
--- a/server/routers/utils/hotels.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { ImageItem } from "@/types/components/lightbox/lightbox"
-import type { Hotel } from "@/types/hotel"
-
-export function extractHotelImages(hotelData: Hotel): ImageItem[] {
-  const images: ImageItem[] = []
-
-  if (hotelData.hotelContent?.images) {
-    images.push({
-      url: hotelData.hotelContent.images.imageSizes.large,
-      alt: hotelData.hotelContent.images.metaData.altText,
-      title:
-        hotelData.hotelContent.images.metaData.title ||
-        hotelData.hotelContent.images.metaData.altText,
-    })
-  }
-
-  if (hotelData.healthFacilities) {
-    hotelData.healthFacilities.forEach((facility) => {
-      facility.content.images.forEach((image) => {
-        images.push({
-          url: image.imageSizes.large,
-          alt: image.metaData.altText,
-          title: image.metaData.title || image.metaData.altText,
-        })
-      })
-    })
-  }
-
-  return images
-}
diff --git a/server/tokenManager.ts b/server/tokenManager.ts
index 24180d017..980ca071d 100644
--- a/server/tokenManager.ts
+++ b/server/tokenManager.ts
@@ -74,7 +74,7 @@ export async function getServiceToken() {
   if (env.HIDE_FOR_NEXT_RELEASE) {
     scopes = ["profile"]
   } else {
-    scopes = ["profile", "hotel", "booking"]
+    scopes = ["profile", "hotel", "booking", "package"]
   }
   const tag = generateServiceTokenTag(scopes)
   const getCachedJwt = unstable_cache(
diff --git a/server/trpc.ts b/server/trpc.ts
index 0079a1ff6..688ea01cf 100644
--- a/server/trpc.ts
+++ b/server/trpc.ts
@@ -176,7 +176,7 @@ export const protectedServerActionProcedure = serverActionProcedure.use(
   }
 )
 
-// NOTE: This is actually save to use, just the implementation could change
+// NOTE: This is actually safe to use, just the implementation could change
 // in minor version bumps. Please read: https://trpc.io/docs/faq#unstable
 export const contentStackUidWithServiceProcedure =
   contentstackExtendedProcedureUID.unstable_concat(serviceProcedure)
@@ -186,3 +186,6 @@ export const contentStackBaseWithServiceProcedure =
 
 export const contentStackBaseWithProtectedProcedure =
   contentstackBaseProcedure.unstable_concat(protectedProcedure)
+
+export const safeProtectedServiceProcedure =
+  safeProtectedProcedure.unstable_concat(serviceProcedure)
diff --git a/stores/enter-details.ts b/stores/enter-details.ts
index d4d2666d1..b5c862d36 100644
--- a/stores/enter-details.ts
+++ b/stores/enter-details.ts
@@ -3,21 +3,22 @@ import { createContext, useContext } from "react"
 import { create, useStore } from "zustand"
 
 import { bedTypeSchema } from "@/components/HotelReservation/EnterDetails/BedType/schema"
-import { breakfastSchema } from "@/components/HotelReservation/EnterDetails/Breakfast/schema"
+import { breakfastStoreSchema } from "@/components/HotelReservation/EnterDetails/Breakfast/schema"
 import { detailsSchema } from "@/components/HotelReservation/EnterDetails/Details/schema"
 
+import { BreakfastPackage } from "@/types/components/enterDetails/breakfast"
 import { DetailsSchema } from "@/types/components/enterDetails/details"
 import { SidePeekEnum } from "@/types/components/enterDetails/sidePeek"
 import { StepEnum } from "@/types/components/enterDetails/step"
-import { bedTypeEnum } from "@/types/enums/bedType"
-import { breakfastEnum } from "@/types/enums/breakfast"
+import { BedTypeEnum } from "@/types/enums/bedType"
+import { BreakfastPackageEnum } from "@/types/enums/breakfast"
 
 const SESSION_STORAGE_KEY = "enterDetails"
 
 interface EnterDetailsState {
   data: {
-    bedType: bedTypeEnum | undefined
-    breakfast: breakfastEnum | undefined
+    bedType: BedTypeEnum | undefined
+    breakfast: BreakfastPackage | BreakfastPackageEnum.NO_BREAKFAST | undefined
   } & DetailsSchema
   steps: StepEnum[]
   currentStep: StepEnum
@@ -26,7 +27,7 @@ interface EnterDetailsState {
   completeStep: (updatedData: Partial<EnterDetailsState["data"]>) => void
   navigate: (
     step: StepEnum,
-    updatedData?: Record<string, string | boolean>
+    updatedData?: Record<string, string | boolean | BreakfastPackage>
   ) => void
   setCurrentStep: (step: StepEnum) => void
   openSidePeek: (key: SidePeekEnum | null) => void
@@ -75,7 +76,7 @@ export function initEditDetailsState(currentStep: StepEnum) {
     initialData = { ...initialData, ...validatedBedType.data }
     isValid[StepEnum.selectBed] = true
   }
-  const validatedBreakfast = breakfastSchema.safeParse(inputData)
+  const validatedBreakfast = breakfastStoreSchema.safeParse(inputData)
   if (validatedBreakfast.success) {
     validPaths.push(StepEnum.details)
     initialData = { ...initialData, ...validatedBreakfast.data }
diff --git a/stores/guests-rooms.ts b/stores/guests-rooms.ts
index 2866184b0..bc305db61 100644
--- a/stores/guests-rooms.ts
+++ b/stores/guests-rooms.ts
@@ -1,22 +1,28 @@
 "use client"
 
 import { produce } from "immer"
-import { create } from "zustand"
+import { createContext, useContext } from "react"
+import { create, useStore } from "zustand"
 
 import { BedTypeEnum } from "@/types/components/bookingWidget/enums"
-import { Child } from "@/types/components/bookingWidget/guestsRoomsPicker"
+import {
+  Child,
+  GuestsRoom,
+} from "@/types/components/bookingWidget/guestsRoomsPicker"
 
-interface GuestsRooms {
-  rooms: [
-    {
-      adults: number
-      children: Child[]
-      childrenInAdultsBed: number
-    },
-  ]
+const SESSION_STORAGE_KEY = "guests_rooms"
+
+interface extendedGuestsRoom extends GuestsRoom {
+  childrenInAdultsBed: number
+}
+interface GuestsRoomsState {
+  rooms: extendedGuestsRoom[]
   adultCount: number
   childCount: number
   isValidated: boolean
+}
+
+interface GuestsRoomsStoreState extends GuestsRoomsState {
   increaseAdults: (roomIndex: number) => void
   decreaseAdults: (roomIndex: number) => void
   increaseChildren: (roomIndex: number) => void
@@ -30,115 +36,192 @@ interface GuestsRooms {
   setIsValidated: (isValidated: boolean) => void
 }
 
-export const useGuestsRoomsStore = create<GuestsRooms>((set, get) => ({
-  rooms: [
-    {
-      adults: 1,
-      children: [],
-      childrenInAdultsBed: 0,
-    },
-  ],
-  adultCount: 1,
-  childCount: 0,
-  isValidated: false,
-  increaseAdults: (roomIndex) =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms[roomIndex].adults = state.rooms[roomIndex].adults + 1
-        state.adultCount = state.adultCount + 1
-      })
-    ),
-  decreaseAdults: (roomIndex) =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms[roomIndex].adults = state.rooms[roomIndex].adults - 1
-        state.adultCount = state.adultCount - 1
-        if (
-          state.rooms[roomIndex].childrenInAdultsBed >
-          state.rooms[roomIndex].adults
-        ) {
-          const toUpdateIndex = state.rooms[roomIndex].children.findIndex(
-            (child) => child.bed == BedTypeEnum.IN_ADULTS_BED
-          )
-          if (toUpdateIndex != -1) {
-            state.rooms[roomIndex].children[toUpdateIndex].bed =
-              state.rooms[roomIndex].children[toUpdateIndex].age < 3
-                ? BedTypeEnum.IN_CRIB
-                : BedTypeEnum.IN_EXTRA_BED
-            state.rooms[roomIndex].childrenInAdultsBed =
-              state.rooms[roomIndex].adults
-          }
-        }
-      })
-    ),
-  increaseChildren: (roomIndex) =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms[roomIndex].children.push({
-          age: -1,
-          bed: -1,
+export function validateBedTypes(data: extendedGuestsRoom[]) {
+  data.forEach((room) => {
+    room.child.forEach((child) => {
+      const allowedBedTypes: number[] = []
+      if (child.age <= 5 && room.adults >= room.childrenInAdultsBed) {
+        allowedBedTypes.push(BedTypeEnum.IN_ADULTS_BED)
+      } else if (child.age <= 5) {
+        room.childrenInAdultsBed = room.childrenInAdultsBed - 1
+      }
+      if (child.age < 3) {
+        allowedBedTypes.push(BedTypeEnum.IN_CRIB)
+      }
+      if (child.age > 2) {
+        allowedBedTypes.push(BedTypeEnum.IN_EXTRA_BED)
+      }
+      if (!allowedBedTypes.includes(child.bed)) {
+        child.bed = allowedBedTypes[0]
+      }
+    })
+  })
+}
+
+export function initGuestsRoomsState(initData?: GuestsRoom[]) {
+  const isBrowser = typeof window !== "undefined"
+  const sessionData = isBrowser
+    ? sessionStorage.getItem(SESSION_STORAGE_KEY)
+    : null
+
+  const defaultGuestsData: extendedGuestsRoom = {
+    adults: 1,
+    child: [],
+    childrenInAdultsBed: 0,
+  }
+  const defaultData: GuestsRoomsState = {
+    rooms: [defaultGuestsData],
+    adultCount: 1,
+    childCount: 0,
+    isValidated: false,
+  }
+
+  let inputData: GuestsRoomsState = defaultData
+  if (sessionData) {
+    inputData = JSON.parse(sessionData)
+  }
+  if (initData) {
+    inputData.rooms = initData.map((room) => {
+      const childrenInAdultsBed = room.child
+        ? room.child.reduce((acc, child) => {
+            acc = acc + (child.bed == BedTypeEnum.IN_ADULTS_BED ? 1 : 0)
+            return acc
+          }, 0)
+        : 0
+      return { ...defaultGuestsData, ...room, childrenInAdultsBed }
+    }) as extendedGuestsRoom[]
+
+    inputData.adultCount = initData.reduce((acc, room) => {
+      acc = acc + room.adults
+      return acc
+    }, 0)
+    inputData.childCount = initData.reduce((acc, room) => {
+      acc = acc + room.child?.length
+      return acc
+    }, 0)
+    validateBedTypes(inputData.rooms)
+  }
+
+  return create<GuestsRoomsStoreState>()((set, get) => ({
+    ...inputData,
+    increaseAdults: (roomIndex) =>
+      set(
+        produce((state: GuestsRoomsState) => {
+          state.rooms[roomIndex].adults = state.rooms[roomIndex].adults + 1
+          state.adultCount = state.adultCount + 1
         })
-        state.childCount = state.childCount + 1
-      })
-    ),
-  decreaseChildren: (roomIndex) => {
-    set(
-      produce((state: GuestsRooms) => {
-        const roomChildren = state.rooms[roomIndex].children
-        if (
-          roomChildren.length &&
-          roomChildren[roomChildren.length - 1].bed == BedTypeEnum.IN_ADULTS_BED
-        ) {
+      ),
+    decreaseAdults: (roomIndex) =>
+      set(
+        produce((state: GuestsRoomsState) => {
+          state.rooms[roomIndex].adults = state.rooms[roomIndex].adults - 1
+          state.adultCount = state.adultCount - 1
+          if (
+            state.rooms[roomIndex].childrenInAdultsBed >
+            state.rooms[roomIndex].adults
+          ) {
+            const toUpdateIndex = state.rooms[roomIndex].child.findIndex(
+              (child) => child.bed == BedTypeEnum.IN_ADULTS_BED
+            )
+            if (toUpdateIndex != -1) {
+              state.rooms[roomIndex].child[toUpdateIndex].bed =
+                state.rooms[roomIndex].child[toUpdateIndex].age < 3
+                  ? BedTypeEnum.IN_CRIB
+                  : BedTypeEnum.IN_EXTRA_BED
+              state.rooms[roomIndex].childrenInAdultsBed =
+                state.rooms[roomIndex].adults
+            }
+          }
+        })
+      ),
+    increaseChildren: (roomIndex) =>
+      set(
+        produce((state: GuestsRoomsState) => {
+          state.rooms[roomIndex].child.push({
+            age: -1,
+            bed: -1,
+          })
+          state.childCount = state.childCount + 1
+        })
+      ),
+    decreaseChildren: (roomIndex) => {
+      set(
+        produce((state: GuestsRoomsState) => {
+          const roomChildren = state.rooms[roomIndex].child
+          if (
+            roomChildren.length &&
+            roomChildren[roomChildren.length - 1].bed ==
+              BedTypeEnum.IN_ADULTS_BED
+          ) {
+            state.rooms[roomIndex].childrenInAdultsBed =
+              state.rooms[roomIndex].childrenInAdultsBed - 1
+          }
+          state.rooms[roomIndex].child.pop()
+          state.childCount = state.childCount - 1
+        })
+      )
+      return get().rooms[roomIndex].child
+    },
+    updateChildAge: (age, roomIndex, childIndex) =>
+      set(
+        produce((state: GuestsRoomsState) => {
+          state.rooms[roomIndex].child[childIndex].age = age
+        })
+      ),
+    updateChildBed: (bed, roomIndex, childIndex) =>
+      set(
+        produce((state: GuestsRoomsState) => {
+          state.rooms[roomIndex].child[childIndex].bed = bed
+        })
+      ),
+    increaseChildInAdultsBed: (roomIndex) =>
+      set(
+        produce((state: GuestsRoomsState) => {
+          state.rooms[roomIndex].childrenInAdultsBed =
+            state.rooms[roomIndex].childrenInAdultsBed + 1
+        })
+      ),
+    decreaseChildInAdultsBed: (roomIndex) =>
+      set(
+        produce((state: GuestsRoomsState) => {
           state.rooms[roomIndex].childrenInAdultsBed =
             state.rooms[roomIndex].childrenInAdultsBed - 1
-        }
-        state.rooms[roomIndex].children.pop()
-        state.childCount = state.childCount - 1
-      })
-    )
-    return get().rooms[roomIndex].children
-  },
-  updateChildAge: (age, roomIndex, childIndex) =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms[roomIndex].children[childIndex].age = age
-      })
-    ),
-  updateChildBed: (bed, roomIndex, childIndex) =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms[roomIndex].children[childIndex].bed = bed
-      })
-    ),
-  increaseChildInAdultsBed: (roomIndex) =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms[roomIndex].childrenInAdultsBed =
-          state.rooms[roomIndex].childrenInAdultsBed + 1
-      })
-    ),
-  decreaseChildInAdultsBed: (roomIndex) =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms[roomIndex].childrenInAdultsBed =
-          state.rooms[roomIndex].childrenInAdultsBed - 1
-      })
-    ),
-  increaseRoom: () =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms.push({
-          adults: 1,
-          children: [],
-          childrenInAdultsBed: 0,
         })
-      })
-    ),
-  decreaseRoom: (roomIndex) =>
-    set(
-      produce((state: GuestsRooms) => {
-        state.rooms.splice(roomIndex, 1)
-      })
-    ),
-  setIsValidated: (isValidated) => set(() => ({ isValidated })),
-}))
+      ),
+    increaseRoom: () =>
+      set(
+        produce((state: GuestsRoomsState) => {
+          state.rooms.push({
+            adults: 1,
+            child: [],
+            childrenInAdultsBed: 0,
+          })
+        })
+      ),
+    decreaseRoom: (roomIndex) =>
+      set(
+        produce((state: GuestsRoomsState) => {
+          state.rooms.splice(roomIndex, 1)
+        })
+      ),
+    setIsValidated: (isValidated) => set(() => ({ isValidated })),
+  }))
+}
+
+export type GuestsRoomsStore = ReturnType<typeof initGuestsRoomsState>
+
+export const GuestsRoomsContext = createContext<GuestsRoomsStore | null>(null)
+
+export const useGuestsRoomsStore = <T>(
+  selector: (store: GuestsRoomsStoreState) => T
+): T => {
+  const guestsRoomsContextStore = useContext(GuestsRoomsContext)
+
+  if (!guestsRoomsContextStore) {
+    throw new Error(
+      `guestsRoomsContextStore must be used within GuestsRoomsContextProvider`
+    )
+  }
+
+  return useStore(guestsRoomsContextStore, selector)
+}
diff --git a/types/components/bookingWidget/guestsRoomsPicker.ts b/types/components/bookingWidget/guestsRoomsPicker.ts
index 5b3b7b3e2..61e8f7d7a 100644
--- a/types/components/bookingWidget/guestsRoomsPicker.ts
+++ b/types/components/bookingWidget/guestsRoomsPicker.ts
@@ -10,7 +10,7 @@ export type Child = {
 
 export type GuestsRoom = {
   adults: number
-  children: Child[]
+  child: Child[]
 }
 
 export interface GuestsRoomsPickerProps {
diff --git a/types/components/bookingWidget/index.ts b/types/components/bookingWidget/index.ts
index 8652b63da..c668617da 100644
--- a/types/components/bookingWidget/index.ts
+++ b/types/components/bookingWidget/index.ts
@@ -4,6 +4,8 @@ import { z } from "zod"
 import { bookingWidgetSchema } from "@/components/Forms/BookingWidget/schema"
 import { bookingWidgetVariants } from "@/components/Forms/BookingWidget/variants"
 
+import { GuestsRoom } from "./guestsRoomsPicker"
+
 import type { Locations } from "@/types/trpc/routers/hotel/locations"
 
 export type BookingWidgetSchema = z.output<typeof bookingWidgetSchema>
@@ -13,7 +15,7 @@ export type BookingWidgetSearchParams = {
   hotel?: string
   fromDate?: string
   toDate?: string
-  room?: string
+  room?: GuestsRoom[]
 }
 
 export type BookingWidgetType = VariantProps<
@@ -22,13 +24,13 @@ export type BookingWidgetType = VariantProps<
 
 export interface BookingWidgetProps {
   type?: BookingWidgetType
-  searchParams?: BookingWidgetSearchParams
+  searchParams?: URLSearchParams
 }
 
 export interface BookingWidgetClientProps {
   locations: Locations
   type?: BookingWidgetType
-  searchParams?: BookingWidgetSearchParams
+  searchParams?: URLSearchParams
 }
 
 export interface BookingWidgetToggleButtonProps {
diff --git a/types/components/contentPage/hotelListingItem.ts b/types/components/contentPage/hotelListingItem.ts
new file mode 100644
index 000000000..1065d1c5f
--- /dev/null
+++ b/types/components/contentPage/hotelListingItem.ts
@@ -0,0 +1,9 @@
+export type HotelListingItemProps = {
+  imageUrl: string
+  altText: string
+  name: string
+  address: string
+  distanceToCentre: number
+  description: string
+  link: string
+}
diff --git a/types/components/enterDetails/breakfast.ts b/types/components/enterDetails/breakfast.ts
index 868bc96a1..21ba37bd0 100644
--- a/types/components/enterDetails/breakfast.ts
+++ b/types/components/enterDetails/breakfast.ts
@@ -1,5 +1,21 @@
 import { z } from "zod"
 
-import { breakfastSchema } from "@/components/HotelReservation/EnterDetails/Breakfast/schema"
+import {
+  breakfastPackageSchema,
+  breakfastPackagesSchema,
+} from "@/server/routers/hotels/output"
 
-export interface BreakfastSchema extends z.output<typeof breakfastSchema> {}
+import { breakfastFormSchema } from "@/components/HotelReservation/EnterDetails/Breakfast/schema"
+
+export interface BreakfastFormSchema
+  extends z.output<typeof breakfastFormSchema> {}
+
+export interface BreakfastPackages
+  extends z.output<typeof breakfastPackagesSchema> {}
+
+export interface BreakfastPackage
+  extends z.output<typeof breakfastPackageSchema> {}
+
+export interface BreakfastProps {
+  packages: BreakfastPackages | null
+}
diff --git a/types/components/form/filterChip.ts b/types/components/form/filterChip.ts
new file mode 100644
index 000000000..3ff40673d
--- /dev/null
+++ b/types/components/form/filterChip.ts
@@ -0,0 +1,16 @@
+type FilterChipType = "checkbox" | "radio"
+
+export interface FilterChipProps {
+  Icon?: React.ElementType
+  iconHeight?: number
+  iconWidth?: number
+  id?: string
+  label: string
+  name: string
+  type: FilterChipType
+  value?: string
+  selected?: boolean
+  disabled?: boolean
+}
+
+export type FilterChipCheckboxProps = Omit<FilterChipProps, "type">
diff --git a/types/components/hotelPage/previewImages.ts b/types/components/hotelPage/previewImages.ts
index 204a23fd4..d808fdcf7 100644
--- a/types/components/hotelPage/previewImages.ts
+++ b/types/components/hotelPage/previewImages.ts
@@ -1,6 +1,6 @@
-import type { ImageItem } from "@/types/components/lightbox/lightbox"
+import type { GalleryImage } from "@/types/hotel"
 
 export type PreviewImagesProps = {
-  images: ImageItem[]
+  images: GalleryImage[]
   hotelName: string
 }
diff --git a/types/components/hotelReservation/selectHotel/availabilityInput.ts b/types/components/hotelReservation/selectHotel/availabilityInput.ts
index ff25984b9..5b3a51b93 100644
--- a/types/components/hotelReservation/selectHotel/availabilityInput.ts
+++ b/types/components/hotelReservation/selectHotel/availabilityInput.ts
@@ -3,7 +3,7 @@ export type AvailabilityInput = {
   roomStayStartDate: string
   roomStayEndDate: string
   adults: number
-  children?: number
+  children?: string
   promotionCode?: string
   reservationProfileType?: string
   attachedProfileId?: string
diff --git a/types/components/hotelReservation/selectRate/flexibilityOption.ts b/types/components/hotelReservation/selectRate/flexibilityOption.ts
index 1835c3b65..1a432dc32 100644
--- a/types/components/hotelReservation/selectRate/flexibilityOption.ts
+++ b/types/components/hotelReservation/selectRate/flexibilityOption.ts
@@ -18,6 +18,7 @@ export type FlexibilityOptionProps = {
   priceInformation?: Array<string>
   roomType: RoomConfiguration["roomType"]
   roomTypeCode: RoomConfiguration["roomTypeCode"]
+  features: RoomConfiguration["features"]
   handleSelectRate: (rate: Rate) => void
 }
 
diff --git a/types/components/hotelReservation/selectRate/imageGallery.ts b/types/components/hotelReservation/selectRate/imageGallery.ts
index 333ff2d94..5d75189fa 100644
--- a/types/components/hotelReservation/selectRate/imageGallery.ts
+++ b/types/components/hotelReservation/selectRate/imageGallery.ts
@@ -1,3 +1,3 @@
-import type { GalleryImages } from "@/types/hotel"
+import type { GalleryImage } from "@/types/hotel"
 
-export type ImageGalleryProps = { images: GalleryImages; title: string }
+export type ImageGalleryProps = { images: GalleryImage[]; title: string }
diff --git a/types/components/hotelReservation/selectRate/rateSummary.ts b/types/components/hotelReservation/selectRate/rateSummary.ts
index 672df21dd..f6c0f03b6 100644
--- a/types/components/hotelReservation/selectRate/rateSummary.ts
+++ b/types/components/hotelReservation/selectRate/rateSummary.ts
@@ -1,6 +1,10 @@
-import { Rate } from "./selectRate"
+import type { RoomsAvailability } from "@/server/routers/hotels/output"
+import type { RoomPackageData } from "./roomFilter"
+import type { Rate } from "./selectRate"
 
 export interface RateSummaryProps {
   rateSummary: Rate
   isUserLoggedIn: boolean
+  packages: RoomPackageData
+  roomsAvailability: RoomsAvailability
 }
diff --git a/types/components/hotelReservation/selectRate/roomFilter.ts b/types/components/hotelReservation/selectRate/roomFilter.ts
new file mode 100644
index 000000000..d42669295
--- /dev/null
+++ b/types/components/hotelReservation/selectRate/roomFilter.ts
@@ -0,0 +1,19 @@
+import { z } from "zod"
+
+import { getRoomPackagesSchema } from "@/server/routers/hotels/schemas/packages"
+
+export enum RoomPackageCodeEnum {
+  PET_ROOM = "PETR",
+  ALLERGY_ROOM = "ALLG",
+  ACCESSIBILITY_ROOM = "ACCE",
+}
+export interface RoomFilterProps {
+  numberOfRooms: number
+  onFilter: (filter: Record<string, boolean | undefined>) => void
+  filterOptions: RoomPackageData
+}
+
+export interface RoomPackageData
+  extends z.output<typeof getRoomPackagesSchema> {}
+
+export type RoomPackageCodes = RoomPackageData[number]["code"]
diff --git a/types/components/hotelReservation/selectRate/roomSelection.ts b/types/components/hotelReservation/selectRate/roomSelection.ts
index 9e944f5d8..8d006779c 100644
--- a/types/components/hotelReservation/selectRate/roomSelection.ts
+++ b/types/components/hotelReservation/selectRate/roomSelection.ts
@@ -1,10 +1,11 @@
-import { RoomsAvailability } from "@/server/routers/hotels/output"
-
-import { RoomData } from "@/types/hotel"
-import { SafeUser } from "@/types/user"
+import type { RoomData } from "@/types/hotel"
+import type { SafeUser } from "@/types/user"
+import type { RoomsAvailability } from "@/server/routers/hotels/output"
+import type { RoomPackageData } from "./roomFilter"
 
 export interface RoomSelectionProps {
-  roomConfigurations: RoomsAvailability
+  roomsAvailability: RoomsAvailability
   roomCategories: RoomData[]
   user: SafeUser
+  packages: RoomPackageData
 }
diff --git a/types/components/hotelReservation/selectRate/section.ts b/types/components/hotelReservation/selectRate/section.ts
index a02107caf..85dc2a55d 100644
--- a/types/components/hotelReservation/selectRate/section.ts
+++ b/types/components/hotelReservation/selectRate/section.ts
@@ -31,6 +31,7 @@ export interface PaymentProps {
   hotelId: string
   otherPaymentOptions: string[]
   savedCreditCards: CreditCard[] | null
+  mustBeGuaranteed: boolean
 }
 
 export interface SectionPageProps {
diff --git a/types/components/hotelReservation/selectRate/selectRate.ts b/types/components/hotelReservation/selectRate/selectRate.ts
index da8792133..553d09827 100644
--- a/types/components/hotelReservation/selectRate/selectRate.ts
+++ b/types/components/hotelReservation/selectRate/selectRate.ts
@@ -1,6 +1,6 @@
 import { Product, RoomConfiguration } from "@/server/routers/hotels/output"
 
-interface Child {
+export interface Child {
   bed: string
   age: number
 }
@@ -26,4 +26,5 @@ export interface Rate {
   priceName: string
   public: Product["productType"]["public"]
   member: Product["productType"]["member"]
+  features: RoomConfiguration["features"]
 }
diff --git a/types/components/lightbox/lightbox.ts b/types/components/lightbox/lightbox.ts
index fc8d11066..af592bca6 100644
--- a/types/components/lightbox/lightbox.ts
+++ b/types/components/lightbox/lightbox.ts
@@ -1,26 +1,22 @@
-export interface ImageItem {
-  url: string
-  alt: string
-  title: string
-}
+import type { GalleryImage } from "@/types/hotel"
 
 export interface LightboxProps {
-  images: ImageItem[]
+  images: GalleryImage[]
   dialogTitle: string /* Accessible title for dialog screen readers */
   children: React.ReactNode
 }
 
 export interface GalleryProps {
-  images: ImageItem[]
+  images: GalleryImage[]
   dialogTitle: string
   onClose: () => void
-  onSelectImage: (image: ImageItem) => void
+  onSelectImage: (image: GalleryImage) => void
   onImageClick: () => void
-  selectedImage: ImageItem | null
+  selectedImage: GalleryImage | null
 }
 
 export interface FullViewProps {
-  image: ImageItem
+  image: GalleryImage
   onClose: () => void
   onNext: () => void
   onPrev: () => void
diff --git a/types/enums/bedType.ts b/types/enums/bedType.ts
index 0b4ba284d..2feb6d980 100644
--- a/types/enums/bedType.ts
+++ b/types/enums/bedType.ts
@@ -1,4 +1,4 @@
-export enum bedTypeEnum {
+export enum BedTypeEnum {
   KING = "KING",
   QUEEN = "QUEEN",
 }
diff --git a/types/enums/breakfast.ts b/types/enums/breakfast.ts
index 567db2860..81ff51a2e 100644
--- a/types/enums/breakfast.ts
+++ b/types/enums/breakfast.ts
@@ -1,4 +1,5 @@
-export enum breakfastEnum {
-  BREAKFAST = "BREAKFAST",
+export enum BreakfastPackageEnum {
+  FREE_MEMBER_BREAKFAST = "BRF0",
+  REGULAR_BREAKFAST = "BRF1",
   NO_BREAKFAST = "NO_BREAKFAST",
 }
diff --git a/types/enums/currency.ts b/types/enums/currency.ts
new file mode 100644
index 000000000..c04ed8450
--- /dev/null
+++ b/types/enums/currency.ts
@@ -0,0 +1,7 @@
+export enum CurrencyEnum {
+  DKK = "DKK",
+  EUR = "EUR",
+  NOK = "NOK",
+  PLN = "PLN",
+  SEK = "SEK",
+}
diff --git a/types/enums/packages.ts b/types/enums/packages.ts
new file mode 100644
index 000000000..f030ccaab
--- /dev/null
+++ b/types/enums/packages.ts
@@ -0,0 +1,7 @@
+export enum PackageTypeEnum {
+  AccessibleFriendlyRoom = "AccessibleFriendlyRoom",
+  AllergyRoom = "AllergyRoom",
+  BreakfastAdult = "BreakfastAdult",
+  BreakfastChildren = "BreakfastChildren",
+  PetRoom = "PetRoom",
+}
diff --git a/types/hotel.ts b/types/hotel.ts
index 972c6459e..9c95a9067 100644
--- a/types/hotel.ts
+++ b/types/hotel.ts
@@ -2,8 +2,8 @@ import { z } from "zod"
 
 import {
   facilitySchema,
-  gallerySchema,
   getHotelDataSchema,
+  imageSchema,
   parkingSchema,
   pointOfInterestSchema,
 } from "@/server/routers/hotels/output"
@@ -22,8 +22,7 @@ export type HotelTripAdvisor =
   | undefined
 
 export type RoomData = z.infer<typeof roomSchema>
-export type GallerySchema = z.infer<typeof gallerySchema>
-export type GalleryImages = GallerySchema["heroImages"]
+export type GalleryImage = z.infer<typeof imageSchema>
 
 export type PointOfInterest = z.output<typeof pointOfInterestSchema>
 
diff --git a/types/trpc/routers/contentstack/contentPage.ts b/types/trpc/routers/contentstack/contentPage.ts
index e3f0f99bb..e1b71bff5 100644
--- a/types/trpc/routers/contentstack/contentPage.ts
+++ b/types/trpc/routers/contentstack/contentPage.ts
@@ -4,7 +4,6 @@ import {
   blocksSchema,
   contentPageRefsSchema,
   contentPageSchema,
-  contentPageSchemaBlocks,
   sidebarSchema,
 } from "@/server/routers/contentstack/contentPage/output"
 
@@ -21,4 +20,6 @@ export interface ContentPage extends z.output<typeof contentPageSchema> {}
 
 export type Block = z.output<typeof blocksSchema>
 
+export type GetBlock = z.input<typeof blocksSchema>
+
 export type SidebarBlock = z.output<typeof sidebarSchema>
diff --git a/utils/url.ts b/utils/url.ts
index d9be2c491..4366fa181 100644
--- a/utils/url.ts
+++ b/utils/url.ts
@@ -9,3 +9,36 @@ export function removeTrailingSlash(pathname: string) {
   }
   return pathname
 }
+
+export function getFormattedUrlQueryParams(
+  searchParams: URLSearchParams,
+  dataTypes: Record<string, unknown>
+) {
+  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) {
+          if (dataTypes[k] == "number") {
+            ;(nestedAcc as Record<string, unknown>)[k] = Number(value)
+          } else if (dataTypes[k] == "boolean") {
+            ;(nestedAcc as Record<string, unknown>)[k] =
+              value.toLowerCase() === "true"
+          } else {
+            ;(nestedAcc as Record<string, unknown>)[k] = 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
+}