diff --git a/app/components/cart/CartItem.tsx b/app/components/cart/CartItem.tsx
index ea5273d..44f66be 100644
--- a/app/components/cart/CartItem.tsx
+++ b/app/components/cart/CartItem.tsx
@@ -1,4 +1,4 @@
-import { Check, Trash } from "lucide-react";
+import { Trash } from "lucide-react";
 import { memo, useMemo } from "react";
 import { QuantityControl } from "./QuantityControl";
 import { formatPrice } from "../../utils/helpers";
@@ -34,145 +34,113 @@ export const CartItem = memo(function CartItem({
     );
   }, [item.productVariant?.discountPrice, item.productVariant?.price]);
 
-  // Memoize video check
   const isVideoMedia = useMemo(
     () => isVideo(item.productVariant?.productImage || ""),
     [item.productVariant?.productImage]
   );
+
+  const color =
+    item.productVariant?.color?.value !== "UNSELECTED"
+      ? item.productVariant?.color?.info?.detail || ""
+      : "";
+  const size =
+    item.productVariant?.size?.value !== "UNSELECTED"
+      ? item.productVariant?.size?.info?.detail || ""
+      : "";
+
+  const effectivePrice =
+    item.productVariant?.discountPrice || item.productVariant?.price || "";
+  const inStock =
+    !!item?.productVariant?.stock && item.productVariant.stock > 0;
+
   return (
-    <div
-      className={`flex p-4 gap-4 w-full flex-col ${hasBorder && "border-b"}`}
-    >
-      <div className="flex gap-2 w-full items-center">
-        {isVideoMedia ? (
-          <video
-            src={item.productVariant?.productImage}
-            className="rounded-[5px] w-[116px] h-[116px] object-cover"
-            muted
-            loop
-            autoPlay
-            playsInline
-          />
-        ) : (
-          <img
-            src={item.productVariant?.productImage}
-            alt={item.productVariant?.productTitle || ""}
-            className="rounded-[5px] w-[116px] h-[116px] object-cover"
-            loading="lazy"
-          />
+    <div className={`flex gap-3 p-4 w-full ${hasBorder && "border-b"}`}>
+      {isVideoMedia ? (
+        <video
+          src={item.productVariant?.productImage}
+          className="rounded-[11px] w-[88px] h-[110px] object-cover shrink-0"
+          muted
+          loop
+          autoPlay
+          playsInline
+        />
+      ) : (
+        <img
+          src={item.productVariant?.productImage}
+          alt={item.productVariant?.productTitle || ""}
+          className="rounded-[11px] w-[88px] h-[110px] object-cover shrink-0"
+          loading="lazy"
+        />
+      )}
+
+      <div className="flex flex-col flex-1 min-w-0">
+        <h4 className="text-B14 font-bold line-clamp-2">
+          {item.productVariant?.productTitle || ""}
+        </h4>
+
+        {/* Attribute chips */}
+        {(color || size) && (
+          <div className="flex gap-1.5 flex-wrap mt-2">
+            {color && (
+              <span className="inline-flex items-center gap-1.5 text-R12 text-BLACK2 bg-WHITE3 rounded-[7px] px-2 py-1">
+                <span
+                  className="w-3.5 h-3.5 rounded-full border border-WHITE3"
+                  style={{ backgroundColor: color }}
+                />
+                رنگ
+              </span>
+            )}
+            {size && (
+              <span className="text-R12 text-BLACK2 bg-WHITE3 rounded-[7px] px-2 py-1">
+                سایز {size}
+              </span>
+            )}
+          </div>
         )}
-        <div className="flex flex-col gap-2">
-          <p className="text-B14 font-bold">
-            {item.productVariant?.productTitle || ""}
-          </p>
-          <p className="text-R12 text-GRAY line-clamp-1">
-            کد کالا: {item.productVariant?.id || ""}
-          </p>
-        </div>
-      </div>
 
-      <ColorSelector
-        color={
-          item.productVariant?.color?.value !== "UNSELECTED"
-            ? item.productVariant?.color?.info?.detail || ""
-            : ""
-        }
-      />
-      <SizeSelector
-        size={
-          item.productVariant?.size?.value !== "UNSELECTED"
-            ? item.productVariant?.size?.info?.detail || ""
-            : ""
-        }
-      />
-
-      <div className="flex w-full items-center justify-between">
-        <p className="text-B14 font-bold">قیمت واحد :</p>
-        <p className="text-B14 font-bold">
-          {formatPrice(item.productVariant?.price || "")} تومان
-        </p>
-      </div>
-
-      {discountPercent ? (
-        <div className="flex w-full items-center justify-between">
-          <div className="flex items-center gap-2">
-            <p className="text-B14 font-bold">مقدار تخفیف :</p>
-            <div className="bg-BLACK rounded-full text-WHITE text-R14 px-2 py-1">
-              {discountPercent}%
+        {/* Bottom row: stepper + price */}
+        {inStock ? (
+          <div className="flex items-center gap-3 mt-auto pt-3">
+            <QuantityControl
+              isPending={isLoading}
+              quantity={item.quantity}
+              maxQuantity={item.productVariant?.stock || 0}
+              onIncrease={() =>
+                onQuantityChange(item.id || "", item.quantity + 1)
+              }
+              onDecrease={() =>
+                onQuantityChange(item.id || "", item.quantity - 1)
+              }
+              onRemove={() => onRemoveItem(item.id || "")}
+            />
+            <div className="ms-auto text-left">
+              <b className="text-B14 font-bold">
+                {formatPrice(effectivePrice)}
+                <span className="text-R10 font-semibold text-BLACK2"> ت</span>
+              </b>
+              {discountPercent ? (
+                <del className="block text-R10 text-GRAY">
+                  {formatPrice(item.productVariant?.price || "")}
+                </del>
+              ) : null}
             </div>
           </div>
-          <p className="text-B14 font-bold">
-            {formatPrice(
-              (
-                Number(item.productVariant?.price) -
-                Number(item.productVariant?.discountPrice)
-              ).toString()
-            )}{" "}
-            تومان
-          </p>
-        </div>
-      ) : null}
-
-      {item?.productVariant?.stock && item?.productVariant?.stock > 0 ? (
-        <div className="flex w-full items-center justify-between">
-          <div className="flex items-center gap-2"></div>
-          <QuantityControl
-            isPending={isLoading}
-            quantity={item.quantity}
-            maxQuantity={item.productVariant?.stock || 0}
-            onIncrease={() =>
-              onQuantityChange(item.id || "", item.quantity + 1)
-            }
-            onDecrease={() =>
-              onQuantityChange(item.id || "", item.quantity - 1)
-            }
-            onRemove={() => onRemoveItem(item.id || "")}
-          />
-        </div>
-      ) : (
-        <div className="flex w-full items-center justify-between">
-          <p className="text-B14 font-bold">محصول در حال حاضر موجود نیست</p>
-          <Button
-            variant="dark"
-            className="flex items-center gap-2 bg-red-500"
-            size="sm"
-            onClick={() => onRemoveItem(item.id || "")}
-          >
-            <Trash size={16} />
-          </Button>
-        </div>
-      )}
+        ) : (
+          <div className="flex w-full items-center justify-between mt-auto pt-3">
+            <p className="text-R12 font-bold text-RED">
+              در حال حاضر موجود نیست
+            </p>
+            <Button
+              variant="dark"
+              className="flex items-center gap-2 bg-red-500"
+              size="sm"
+              onClick={() => onRemoveItem(item.id || "")}
+            >
+              <Trash size={16} />
+            </Button>
+          </div>
+        )}
+      </div>
     </div>
   );
 });
-
-// Color Selector Component
-const ColorSelector = ({ color }: { color: string }) => (
-  <>
-    {color && (
-      <div className="flex w-full items-center justify-between">
-        <p className="text-B14 font-bold">رنگ :</p>
-        <div
-          className="w-10 h-10 rounded-[7px] flex items-center justify-center border border-BLACK"
-          style={{
-            backgroundColor: color,
-          }}
-        >
-          <Check size={24} className="text-WHITE" />
-        </div>
-      </div>
-    )}
-  </>
-);
-
-// Size Selector Component
-const SizeSelector = ({ size }: { size: string }) => (
-  <>
-    {size && (
-      <div className="flex w-full items-center justify-between">
-        <p className="text-B14 font-bold">سایز :</p>
-        <p className="text-BLACK text-R12">{size}</p>
-      </div>
-    )}
-  </>
-);
diff --git a/app/routes/cart._index.tsx b/app/routes/cart._index.tsx
index ffeaf69..6777f3c 100644
--- a/app/routes/cart._index.tsx
+++ b/app/routes/cart._index.tsx
@@ -116,6 +116,9 @@ export default function CartIndex() {
                         <p className="text-B12 font-bold">
                           {cart.seller?.name}
                         </p>
+                        <span className="ms-auto shrink-0 text-R10 font-semibold text-green-600">
+                          ارسال جداگانه
+                        </span>
                       </a>
                       <p className="text-B12 font-bold line-clamp-1">
                         {cart.items