diff --git a/odex25_ensan/odex_takaful/static/description/icon.png b/odex25_ensan/odex_takaful/static/description/icon.png
index f457cc4e3..d18f5bcd4 100644
Binary files a/odex25_ensan/odex_takaful/static/description/icon.png and b/odex25_ensan/odex_takaful/static/description/icon.png differ
diff --git a/odex25_ensan/odex_takaful/static/description/icon2.png b/odex25_ensan/odex_takaful/static/description/icon2.png
deleted file mode 100644
index 1be4bef67..000000000
Binary files a/odex25_ensan/odex_takaful/static/description/icon2.png and /dev/null differ
diff --git a/odex25_ensan/odex_takaful/static/description/icon3.png b/odex25_ensan/odex_takaful/static/description/icon3.png
deleted file mode 100644
index c51ae8ef5..000000000
Binary files a/odex25_ensan/odex_takaful/static/description/icon3.png and /dev/null differ
diff --git a/odex25_ensan/odex_takaful/static/description/icon4.png b/odex25_ensan/odex_takaful/static/description/icon4.png
deleted file mode 100644
index 495671b12..000000000
Binary files a/odex25_ensan/odex_takaful/static/description/icon4.png and /dev/null differ
diff --git a/odex25_ensan/odex_takaful/static/description/icon5.png b/odex25_ensan/odex_takaful/static/description/icon5.png
deleted file mode 100644
index d18f5bcd4..000000000
Binary files a/odex25_ensan/odex_takaful/static/description/icon5.png and /dev/null differ
diff --git a/odex25_ensan/odex_takaful/static/description/logo.png b/odex25_ensan/odex_takaful/static/description/logo.png
deleted file mode 100644
index 30c35f813..000000000
Binary files a/odex25_ensan/odex_takaful/static/description/logo.png and /dev/null differ
diff --git a/odex25_ensan/odex_takaful/views/assets.xml b/odex25_ensan/odex_takaful/views/assets.xml
index 715e7f559..4e5f5b785 100644
--- a/odex25_ensan/odex_takaful/views/assets.xml
+++ b/odex25_ensan/odex_takaful/views/assets.xml
@@ -206,14 +206,16 @@
                             _setupSimpleUI: function () {
                                 var self = this;
                                 var currentData = self.model.localData[self.handle].data;
-                                var isReadonly = currentData.state !== 'draft' || self.mode === 'readonly';
+                                // CRITICAL: Buttons are ONLY editable in 'draft' state
+                                // Even if user clicks "Edit", buttons remain readonly if state != 'draft'
+                                var isDraftState = currentData.state === 'draft';
                                 
                                 // Remove old event handlers to prevent duplicates
                                 this.$('.record_option').off('click');
                                 this.$('.mechanism_option').off('click');
                                 
-                                // Disable buttons if readonly
-                                if (isReadonly) {
+                                // Disable buttons if NOT in draft state (regardless of form mode)
+                                if (!isDraftState) {
                                     this.$('.record_option').css({
                                         'pointer-events': 'none',
                                         'opacity': '0.6',
@@ -224,9 +226,9 @@
                                         'opacity': '0.6',
                                         'cursor': 'not-allowed'
                                     });
-                                    return; // Don't attach click handlers if readonly
+                                    return; // Don't attach click handlers if not draft
                                 } else {
-                                    // Re-enable buttons if not readonly
+                                    // Enable buttons ONLY in draft state
                                     this.$('.record_option').css({
                                         'pointer-events': 'auto',
                                         'opacity': '1',
diff --git a/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml b/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
index 27de63dc2..79ff0230d 100644
--- a/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <odoo>
 
-    <menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon5.png" groups="odex_takaful.group_kufula_user"/>
+    <menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon.png" groups="odex_takaful.group_kufula_user"/>
 
     <!-- Main Kafalat-->
     <menuitem id="kafalat_main_menu" parent="takaful_kufula_app_top_menu"