diff --git a/src/assets/locals/ar.json b/src/assets/locals/ar.json
index c03f541..139bd14 100644
--- a/src/assets/locals/ar.json
+++ b/src/assets/locals/ar.json
@@ -238,7 +238,12 @@
     "pleaseAddLoyaltyItems": "يرجى إضافة عناصر ولاء إلى سلة المشتريات لاستخدام نقاط الولاء",
     "loyaltyDiscountApplied": "تم تطبيق خصم الولاء: {{itemName}} (خصم {{amount}})",
     "deliveryFee": "رسوم التوصيل",
-    "scheduledDate": "تاريخ الطلب المجدول"
+    "scheduledDate": "تاريخ الطلب المجدول",
+    "couponApplied": "تم تطبيق القسيمة بنجاح",
+    "couponInvalid": "رمز القسيمة غير صالح",
+    "couponExpired": "رمز القسيمة منتهي الصلاحية",
+    "couponAlreadyUsed": "رمز القسيمة مستخدم بالفعل",
+    "couponNotApplicable": "رمز القسيمة غير مطبق"
   },
   "checkout": {
     "title": "الدفع",
diff --git a/src/assets/locals/en.json b/src/assets/locals/en.json
index dd7fa96..43ba0bc 100644
--- a/src/assets/locals/en.json
+++ b/src/assets/locals/en.json
@@ -248,7 +248,12 @@
     "pleaseAddLoyaltyItems": "Please add loyalty items to your cart to use loyalty points",
     "loyaltyDiscountApplied": "Loyalty discount applied: {{itemName}} ({{amount}} off)",
     "deliveryFee": "Delivery Fee",
-    "scheduledDate": "Scheduled Date"
+    "scheduledDate": "Scheduled Date",
+    "couponApplied": "Coupon applied successfully",
+    "couponInvalid": "Invalid coupon code",
+    "couponExpired": "Coupon expired",
+    "couponAlreadyUsed": "Coupon already used",
+    "couponNotApplicable": "Coupon not applicable"
   },
   "checkout": {
     "title": "Checkout",
diff --git a/src/components/ImageWithFallback/ImageWithFallback.module.css b/src/components/ImageWithFallback/ImageWithFallback.module.css
index ebeb490..c4be6bf 100644
--- a/src/components/ImageWithFallback/ImageWithFallback.module.css
+++ b/src/components/ImageWithFallback/ImageWithFallback.module.css
@@ -29,18 +29,14 @@
   border-radius: 4px;
 }
 
-/* Dark theme support */
-@media (prefers-color-scheme: dark) {
-  .loadingContainer {
-    background-color: #343a40;
-  }
-
-  .loadingState {
-    background-color: #343a40;
-  }
-
-  .errorState {
-    background-color: #45232a;
-    color: #f8d7da;
-  }
+:global(.darkApp) .loadingContainer {
+  background-color: #343a40;
+}
+
+:global(.darkApp) .loadingState {
+  background-color: #343a40;
+}
+
+:global(.darkApp) .errorState {
+  background-color: #45232a;
 }
diff --git a/src/components/OrderSummary/OrderSummary.tsx b/src/components/OrderSummary/OrderSummary.tsx
index 79f5664..3a319c6 100644
--- a/src/components/OrderSummary/OrderSummary.tsx
+++ b/src/components/OrderSummary/OrderSummary.tsx
@@ -48,7 +48,7 @@ export default function OrderSummary() {
             <ProText type="secondary">{t("cart.basketTotal")}</ProText>
             <ArabicPrice price={subtotal} />
           </div>
-          {orderType != OrderType.DineIn && (
+          {orderType === OrderType.Delivery && (
             <div className={styles.summaryRow}>
               <ProText type="secondary">{t("cart.deliveryFee")}</ProText>
               <ArabicPrice price={Number(restaurant?.delivery_fees || 0)} />
diff --git a/src/features/order/orderSlice.ts b/src/features/order/orderSlice.ts
index 0aef39a..4ff21a9 100644
--- a/src/features/order/orderSlice.ts
+++ b/src/features/order/orderSlice.ts
@@ -698,7 +698,7 @@ export const selectGrandTotal = (state: RootState) => {
   const taxAmount = selectTaxAmount(state);
   const subtotal = selectCartTotal(state);
   const deliveryFee =
-    state.order.orderType !== OrderType.DineIn
+    state.order.orderType === OrderType.Delivery
       ? Number(state.order.restaurant?.delivery_fees) || 0
       : 0;
 
diff --git a/src/pages/cart/components/CouponCard.tsx b/src/pages/cart/components/CouponCard.tsx
index f1c2c42..c6c7078 100644
--- a/src/pages/cart/components/CouponCard.tsx
+++ b/src/pages/cart/components/CouponCard.tsx
@@ -35,6 +35,7 @@ export default function CouponCard() {
             isDiscount: response.isDiscount,
           }),
         );
+        message.success(t("cart.couponApplied"));
       })
       .catch((error) => {
         message.error(error.data.message || t("cart.couponInvalid"));