diff --git a/assets/icons/water_heater_icon.svg b/assets/icons/water_heater_icon.svg
new file mode 100644
index 0000000..5cb97f5
--- /dev/null
+++ b/assets/icons/water_heater_icon.svg
@@ -0,0 +1,22 @@
+<svg width="27" height="40" viewBox="0 0 27 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.7445 35.1952C10.4209 35.1952 10.1586 35.4576 10.1586 35.7812V37.2605C10.1586 38.1249 9.45534 38.8282 8.59099 38.8282H7.12205C6.79847 38.8282 6.53613 39.0905 6.53613 39.4141C6.53613 39.7377 6.79847 40 7.12205 40H8.59099C10.1015 40 11.3304 38.7711 11.3304 37.2605V35.7812C11.3304 35.4576 11.0681 35.1952 10.7445 35.1952Z" fill="#72BBFF"/>
+<path d="M11.7906 32.7314H9.69835C9.37476 32.7314 9.11243 32.9937 9.11243 33.3173V34.7541C9.11243 35.6541 9.84459 36.3862 10.7445 36.3862C11.6444 36.3862 12.3765 35.654 12.3765 34.7541V33.3173C12.3765 32.9937 12.1142 32.7314 11.7906 32.7314Z" fill="#6B717D"/>
+<path d="M16.0857 35.1952C16.4093 35.1952 16.6716 35.4576 16.6716 35.7812V37.2605C16.6716 38.1249 17.3749 38.8282 18.2392 38.8282H19.7081C20.0317 38.8282 20.2941 39.0905 20.2941 39.4141C20.2941 39.7377 20.0317 40 19.7081 40H18.2392C16.7287 40 15.4998 38.7711 15.4998 37.2605V35.7812C15.4998 35.4576 15.7621 35.1952 16.0857 35.1952Z" fill="#FF6C6C"/>
+<path d="M15.0395 32.7314H17.1318C17.4554 32.7314 17.7177 32.9937 17.7177 33.3173V34.7541C17.7177 35.6541 16.9856 36.3862 16.0857 36.3862C15.1858 36.3862 14.4536 35.654 14.4536 34.7541V33.3173C14.4536 32.9937 14.7159 32.7314 15.0395 32.7314Z" fill="#6B717D"/>
+<path d="M2.38438 3.6581H0.585919C0.262336 3.6581 0 3.92043 0 4.24402C0 4.5676 0.262336 4.82993 0.585919 4.82993H2.38438C2.70796 4.82993 2.9703 4.5676 2.9703 4.24402C2.9703 3.92043 2.70796 3.6581 2.38438 3.6581Z" fill="#6B717D"/>
+<path d="M2.38438 6.3924H0.585919C0.262336 6.3924 0 6.65473 0 6.97831C0 7.3019 0.262336 7.56423 0.585919 7.56423H2.38438C2.70796 7.56423 2.9703 7.3019 2.9703 6.97831C2.9703 6.65473 2.70796 6.3924 2.38438 6.3924Z" fill="#6B717D"/>
+<path d="M26.2441 19.7208H24.4456C24.122 19.7208 23.8597 19.9831 23.8597 20.3067C23.8597 20.6303 24.122 20.8926 24.4456 20.8926H26.2441C26.5676 20.8926 26.83 20.6303 26.83 20.3067C26.83 19.9831 26.5676 19.7208 26.2441 19.7208Z" fill="#6B717D"/>
+<path d="M21.766 30.5576V33.2958C21.766 33.6193 21.5035 33.8818 21.1801 33.8818H5.65013C5.3267 33.8818 5.06421 33.6193 5.06421 33.2958V30.5576C5.06421 30.2342 5.3267 29.9717 5.65013 29.9717H21.1801C21.5035 29.9717 21.766 30.2342 21.766 30.5576Z" fill="#D6EAEC"/>
+<path d="M21.766 30.5576V33.2958C21.766 33.6193 21.5035 33.8818 21.18 33.8818H18.8364C19.1598 33.8818 19.4223 33.6193 19.4223 33.2958V30.5576C19.4223 30.2342 19.1598 29.9717 18.8364 29.9717H21.18C21.5035 29.9717 21.766 30.2342 21.766 30.5576Z" fill="#B5D9DD"/>
+<path d="M25.0315 1.84682V24.8047L22.6878 25.4437L13.4146 27.9741L1.79858 24.8047V1.84682C1.79858 0.828099 2.62668 0 3.6454 0H23.1846C24.2026 0 25.0315 0.828099 25.0315 1.84682Z" fill="#D6EAEC"/>
+<path d="M25.0314 1.84682V24.8047L22.6878 25.4437V1.84682C22.6878 0.828099 21.8589 0 20.8409 0H23.1846C24.2026 0 25.0314 0.828099 25.0314 1.84682Z" fill="#B5D9DD"/>
+<path d="M25.0315 24.8047V29.2967C25.0315 30.3155 24.2026 31.1436 23.1846 31.1436H3.6454C2.62668 31.1436 1.79858 30.3155 1.79858 29.2967V24.8047H25.0315Z" fill="#6B717D"/>
+<path d="M25.0314 24.8047V29.2967C25.0314 30.3155 24.2026 31.1436 23.1846 31.1436H20.8409C21.8589 31.1436 22.6878 30.3155 22.6878 29.2967V24.8047H25.0314Z" fill="#47505E"/>
+<path d="M13.8105 15.476C13.5866 15.2712 13.2434 15.2712 13.0195 15.476C12.9301 15.5578 10.8306 17.5023 10.8306 19.5649C10.8306 20.99 11.9899 22.1494 13.415 22.1494C14.8401 22.1494 15.9995 20.99 15.9995 19.5649C15.9994 17.5023 13.8998 15.5578 13.8105 15.476Z" fill="#72BBFF"/>
+<path d="M17.952 9.8444C18.9889 7.34275 17.8015 4.47417 15.2999 3.43723C12.7983 2.4003 9.92967 3.58768 8.89274 6.08932C7.8558 8.59096 9.04318 11.4595 11.5448 12.4965C14.0465 13.5334 16.915 12.346 17.952 9.8444Z" fill="#B5D9DD"/>
+<path d="M16.3638 7.96677C16.3638 10.0237 15.4716 11.6971 13.4147 11.6971C13.1053 11.6971 12.8045 11.6588 12.5163 11.587C10.8921 11.1846 9.68433 9.71437 9.68433 7.96677C9.68433 6.21917 10.8921 4.7489 12.5163 4.34657C12.8045 4.2747 13.1053 4.23642 13.4147 4.23642C15.4716 4.23642 16.3638 5.9098 16.3638 7.96677Z" fill="white"/>
+<path d="M17.1451 7.96677C17.1451 10.0237 15.4717 11.6971 13.4147 11.6971C13.1053 11.6971 12.8046 11.6588 12.5163 11.587C14.1405 11.1846 15.3482 9.71437 15.3482 7.96677C15.3482 6.21917 14.1405 4.7489 12.5163 4.34657C12.8046 4.2747 13.1053 4.23642 13.4147 4.23642C15.4717 4.23642 17.1451 5.9098 17.1451 7.96677Z" fill="#D6EAEC"/>
+<path d="M13.8294 7.55251C13.6005 7.3236 13.2295 7.32368 13.0008 7.55251L11.7521 8.80126C11.5233 9.03009 11.5233 9.4011 11.7521 9.62985C11.8665 9.74423 12.0165 9.80149 12.1664 9.80149C12.3163 9.80149 12.4663 9.74431 12.5807 9.62985L13.8294 8.3811C14.0582 8.15228 14.0582 7.78126 13.8294 7.55251Z" fill="#FF6C6C"/>
+<path d="M6.17188 28.5601C6.49548 28.5601 6.75781 28.2977 6.75781 27.9741C6.75781 27.6505 6.49548 27.3882 6.17188 27.3882C5.84827 27.3882 5.58594 27.6505 5.58594 27.9741C5.58594 28.2977 5.84827 28.5601 6.17188 28.5601Z" fill="#47505E"/>
+<path d="M20.6581 28.5601C20.9817 28.5601 21.2441 28.2977 21.2441 27.9741C21.2441 27.6505 20.9817 27.3882 20.6581 27.3882C20.3345 27.3882 20.0722 27.6505 20.0722 27.9741C20.0722 28.2977 20.3345 28.5601 20.6581 28.5601Z" fill="#47505E"/>
+</svg>
diff --git a/lib/features/devices/model/device_model.dart b/lib/features/devices/model/device_model.dart
index c5ba2ae..2e961f5 100644
--- a/lib/features/devices/model/device_model.dart
+++ b/lib/features/devices/model/device_model.dart
@@ -62,6 +62,8 @@ class DeviceModel {
       tempIcon = Assets.oneGang;
     } else if (type == DeviceType.TwoGang) {
       tempIcon = Assets.twoGang;
+    }else if (type == DeviceType.WH) {
+      tempIcon = Assets.waterHeaterIcon;
     } else {
       tempIcon = Assets.assetsIconsLogo;
     }
diff --git a/lib/features/devices/view/widgets/water_heater/water_heater_page.dart b/lib/features/devices/view/widgets/water_heater/water_heater_page.dart
index 109822d..94ee5cf 100644
--- a/lib/features/devices/view/widgets/water_heater/water_heater_page.dart
+++ b/lib/features/devices/view/widgets/water_heater/water_heater_page.dart
@@ -10,9 +10,9 @@ import 'package:syncrow_app/features/devices/view/widgets/water_heater/wh_timer_
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
+import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
-import '../../../../../generated/assets.dart';
 
 class WaterHeaterPage extends StatelessWidget {
   final DeviceModel? device;
diff --git a/lib/generated/assets.dart b/lib/generated/assets.dart
index 59b833f..20bdb39 100644
--- a/lib/generated/assets.dart
+++ b/lib/generated/assets.dart
@@ -1048,6 +1048,7 @@ class Assets {
   static const String scheduleCirculateIcon = "assets/icons/schedule_circulate_icon.svg";
   static const String scheduleInchingIcon = "assets/icons/schedule_Inching_icon.svg";
   static const String scheduleTimeIcon = "assets/icons/schedule_time_icon.svg";
+  static const String waterHeaterIcon = "assets/icons/water_heater_icon.svg";
 
 
 
diff --git a/lib/services/api/devices_api.dart b/lib/services/api/devices_api.dart
index 1e984d6..dccb2de 100644
--- a/lib/services/api/devices_api.dart
+++ b/lib/services/api/devices_api.dart
@@ -37,7 +37,6 @@ class DevicesAPI {
         body: controlModel.toJson(),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          print('controlDevice=$json' );
           return json;
         },
 
@@ -76,8 +75,6 @@ class DevicesAPI {
       path: ApiEndpoints.deviceFunctionsStatus.replaceAll('{deviceUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        print('json===$json');
-
         return json;
       },
     );