diff --git a/src/common/components/comment/__snapshots__/index.spec.tsx.snap b/src/common/components/comment/__snapshots__/index.spec.tsx.snap
index fb05bb0f5f7..571aed53baa 100644
--- a/src/common/components/comment/__snapshots__/index.spec.tsx.snap
+++ b/src/common/components/comment/__snapshots__/index.spec.tsx.snap
@@ -203,7 +203,7 @@ exports[`(1) Default render 1`] = `
     </div>
     <div
       className="editor-tool"
-      id="editor-tool-emoji-picker"
+      id="editor-tool-emoji-picker-06e3946d-1fdb-430e-979e-8fdb4a086fd3"
       role="none"
       title="Emoji"
     >
@@ -552,7 +552,7 @@ exports[`(2) Cancellable, in progress 1`] = `
     </div>
     <div
       className="editor-tool"
-      id="editor-tool-emoji-picker"
+      id="editor-tool-emoji-picker-d43c9c65-cc67-4dca-abd2-c7fd66846e01"
       role="none"
       title="Emoji"
     >
diff --git a/src/common/components/entry-list-item/__snapshots__/index.spec.tsx.snap b/src/common/components/entry-list-item/__snapshots__/index.spec.tsx.snap
index 93aed378bed..15ad69461ba 100644
--- a/src/common/components/entry-list-item/__snapshots__/index.spec.tsx.snap
+++ b/src/common/components/entry-list-item/__snapshots__/index.spec.tsx.snap
@@ -117,6 +117,7 @@ exports[`(1) Default render 1`] = `
           />
           <img
             alt=""
+            className="w-full sm:w-auto"
           />
         </picture>
       </a>
@@ -400,6 +401,7 @@ exports[`(2) Grid view 1`] = `
           />
           <img
             alt=""
+            className="w-full sm:w-auto"
           />
         </picture>
       </a>
@@ -675,6 +677,7 @@ exports[`(3) Nsfw 1`] = `
     >
       <img
         alt="Awesome Hive"
+        className="w-full sm:w-auto"
         src="nsfw.png"
       />
     </div>
@@ -725,6 +728,7 @@ exports[`(3) Nsfw 1`] = `
           />
           <img
             alt=""
+            className="w-full sm:w-auto"
           />
         </picture>
       </a>
@@ -1000,6 +1004,7 @@ exports[`(4) Nsfw with active user 1`] = `
     >
       <img
         alt="Awesome Hive"
+        className="w-full sm:w-auto"
         src="nsfw.png"
       />
     </div>
@@ -1050,6 +1055,7 @@ exports[`(4) Nsfw with active user 1`] = `
           />
           <img
             alt=""
+            className="w-full sm:w-auto"
           />
         </picture>
       </a>
@@ -1325,6 +1331,7 @@ exports[`(5) Nsfw but allowed 1`] = `
     >
       <img
         alt="Awesome Hive"
+        className="w-full sm:w-auto"
         src="nsfw.png"
       />
     </div>
@@ -1375,6 +1382,7 @@ exports[`(5) Nsfw but allowed 1`] = `
           />
           <img
             alt=""
+            className="w-full sm:w-auto"
           />
         </picture>
       </a>
@@ -1693,6 +1701,7 @@ exports[`(6) Cross post. Bottom menu 1`] = `
           />
           <img
             alt=""
+            className="w-full sm:w-auto"
           />
         </picture>
       </a>
diff --git a/src/common/components/key-or-hot/__snapshots__/index.spec.tsx.snap b/src/common/components/key-or-hot/__snapshots__/index.spec.tsx.snap
index 4c12076c7e0..cdfd833582d 100644
--- a/src/common/components/key-or-hot/__snapshots__/index.spec.tsx.snap
+++ b/src/common/components/key-or-hot/__snapshots__/index.spec.tsx.snap
@@ -16,7 +16,9 @@ exports[`(1) Default render 1`] = `
         onClick={[Function]}
       >
         <svg
+          height="18"
           viewBox="0 0 24 24"
+          width="18"
         >
           <path
             d="M7,14A2,2 0 0,1 5,12A2,2 0 0,1 7,10A2,2 0 0,1 9,12A2,2 0 0,1 7,14M12.65,10C11.83,7.67 9.61,6 7,6A6,6 0 0,0 1,12A6,6 0 0,0 7,18C9.61,18 11.83,16.33 12.65,14H17V18H21V14H23V10H12.65Z"
diff --git a/src/common/components/market-swap-form/__snapshots__/market-swap-form-header.spec.tsx.snap b/src/common/components/market-swap-form/__snapshots__/market-swap-form-header.spec.tsx.snap
index ce70fb0d9d6..36a1843ba7c 100644
--- a/src/common/components/market-swap-form/__snapshots__/market-swap-form-header.spec.tsx.snap
+++ b/src/common/components/market-swap-form/__snapshots__/market-swap-form-header.spec.tsx.snap
@@ -9,18 +9,22 @@ exports[`should render loader on loading 1`] = `
   >
     Swap your funds
   </div>
-  <i
-    className="loading-market-svg ml-2 text-blue-dark-sky"
+  <svg
+    aria-hidden="true"
+    className="ecency-spinner text-gray-400 animate-spin dark:text-gray-600 fill-blue-dark-sky w-4 h-4 ml-3"
+    fill="none"
+    viewBox="0 0 100 101"
+    xmlns="http://www.w3.org/2000/svg"
   >
-    <svg
-      viewBox="0 0 24 24"
-    >
-      <path
-        d="M12,18A6,6 0 0,1 6,12C6,11 6.25,10.03 6.7,9.2L5.24,7.74C4.46,8.97 4,10.43 4,12A8,8 0 0,0 12,20V23L16,19L12,15M12,4V1L8,5L12,9V6A6,6 0 0,1 18,12C18,13 17.75,13.97 17.3,14.8L18.76,16.26C19.54,15.03 20,13.57 20,12A8,8 0 0,0 12,4Z"
-        fill="currentColor"
-      />
-    </svg>
-  </i>
+    <path
+      d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+      fill="currentColor"
+    />
+    <path
+      d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+      fill="currentFill"
+    />
+  </svg>
 </div>
 `;
 
diff --git a/src/common/components/password-update/__snapshots__/index.spec.tsx.snap b/src/common/components/password-update/__snapshots__/index.spec.tsx.snap
index 3f01343be9b..d3622868426 100644
--- a/src/common/components/password-update/__snapshots__/index.spec.tsx.snap
+++ b/src/common/components/password-update/__snapshots__/index.spec.tsx.snap
@@ -14,7 +14,9 @@ exports[`(1) Default render 1`] = `
 >
   <div>
     <svg
+      height="18"
       viewBox="0 0 24 24"
+      width="18"
     >
       <path
         d="M7,14A2,2 0 0,1 5,12A2,2 0 0,1 7,10A2,2 0 0,1 9,12A2,2 0 0,1 7,14M12.65,10C11.83,7.67 9.61,6 7,6A6,6 0 0,0 1,12A6,6 0 0,0 7,18C9.61,18 11.83,16.33 12.65,14H17V18H21V14H23V10H12.65Z"
diff --git a/src/common/components/transfer-he/__snapshots__/index.spec.tsx.snap b/src/common/components/transfer-he/__snapshots__/index.spec.tsx.snap
index 04347a02d7b..31b73b2308f 100644
--- a/src/common/components/transfer-he/__snapshots__/index.spec.tsx.snap
+++ b/src/common/components/transfer-he/__snapshots__/index.spec.tsx.snap
@@ -427,7 +427,9 @@ exports[`(1) Hive Engine - Transfer (3) Step 3 1`] = `
               onClick={[Function]}
             >
               <svg
+                height="18"
                 viewBox="0 0 24 24"
+                width="18"
               >
                 <path
                   d="M7,14A2,2 0 0,1 5,12A2,2 0 0,1 7,10A2,2 0 0,1 9,12A2,2 0 0,1 7,14M12.65,10C11.83,7.67 9.61,6 7,6A6,6 0 0,0 1,12A6,6 0 0,0 7,18C9.61,18 11.83,16.33 12.65,14H17V18H21V14H23V10H12.65Z"
diff --git a/src/common/components/transfer/__snapshots__/index.spec.tsx.snap b/src/common/components/transfer/__snapshots__/index.spec.tsx.snap
index e6902729885..796581a55bd 100644
--- a/src/common/components/transfer/__snapshots__/index.spec.tsx.snap
+++ b/src/common/components/transfer/__snapshots__/index.spec.tsx.snap
@@ -433,7 +433,9 @@ exports[`(1) Transfer HIVE (3) Step 3 1`] = `
               onClick={[Function]}
             >
               <svg
+                height="18"
                 viewBox="0 0 24 24"
+                width="18"
               >
                 <path
                   d="M7,14A2,2 0 0,1 5,12A2,2 0 0,1 7,10A2,2 0 0,1 9,12A2,2 0 0,1 7,14M12.65,10C11.83,7.67 9.61,6 7,6A6,6 0 0,0 1,12A6,6 0 0,0 7,18C9.61,18 11.83,16.33 12.65,14H17V18H21V14H23V10H12.65Z"
diff --git a/src/common/features/ui/dropdown/dropdown-item.tsx b/src/common/features/ui/dropdown/dropdown-item.tsx
index b806d9b4c72..55bf1ef81b9 100644
--- a/src/common/features/ui/dropdown/dropdown-item.tsx
+++ b/src/common/features/ui/dropdown/dropdown-item.tsx
@@ -9,7 +9,7 @@ export function DropdownItem(props: HTMLProps<HTMLDivElement>) {
     <div
       {...props}
       className={classNameObject({
-        "min-w-[80%] cursor-pointer px-3 py-2 text-dark-default hover:bg-blue-dark-sky-040 hover:text-blue-dark-sky rounded-tr-2xl rounded-br-2xl":
+        "min-w-[80%] cursor-pointer px-3 py-2 text-dark-default dark:text-white hover:bg-blue-dark-sky-040 hover:text-blue-dark-sky dark:hover:bg-gray-900 rounded-tr-2xl rounded-br-2xl":
           true,
         [props.className ?? ""]: !!props.className
       })}
diff --git a/src/common/features/ui/dropdown/dropdown-menu.tsx b/src/common/features/ui/dropdown/dropdown-menu.tsx
index 2bdf5242e5f..c12d8188f41 100644
--- a/src/common/features/ui/dropdown/dropdown-menu.tsx
+++ b/src/common/features/ui/dropdown/dropdown-menu.tsx
@@ -16,7 +16,7 @@ export function DropdownMenu(props: HTMLProps<HTMLDivElement> & Props) {
     <div
       {...nativeProps}
       className={classNameObject({
-        "z-[1000] absolute top-[100%] flex flex-col items-start border min-w-[200px] py-2 gap-2 pr-3 rounded-xl bg-white":
+        "z-[1000] absolute top-[100%] flex flex-col items-start border border-[--border-color] min-w-[200px] py-2 gap-2 pr-3 rounded-xl bg-white":
           true,
         "right-0": props.align === "right",
         [props.className ?? ""]: !!props.className
diff --git a/src/common/features/ui/modal/index.tsx b/src/common/features/ui/modal/index.tsx
index fcffd639452..44483c663d4 100644
--- a/src/common/features/ui/modal/index.tsx
+++ b/src/common/features/ui/modal/index.tsx
@@ -48,7 +48,7 @@ export function Modal(props: Omit<HTMLProps<HTMLDivElement>, "size"> & Props) {
     <ModalContext.Provider value={{ show, setShow }}>
       {show &&
         createPortal(
-          <div className="bg-black dark:bg-white opacity-[50%] dark:opacity-[25%] z-[1040] fixed top-0 left-0 right-0 bottom-0" />,
+          <div className="bg-black opacity-[50%] z-[1040] fixed top-0 left-0 right-0 bottom-0" />,
           document.querySelector("#modal-overlay-container")!!
         )}
       {show &&