diff --git a/assets/share/assignment/ui/ENTRY_LOADED.png b/assets/share/assignment/ui/ENTRY_LOADED.png
index 05a9e86ea..1afc6997e 100644
Binary files a/assets/share/assignment/ui/ENTRY_LOADED.png and b/assets/share/assignment/ui/ENTRY_LOADED.png differ
diff --git a/tasks/assignment/assets/assets_assignment_ui.py b/tasks/assignment/assets/assets_assignment_ui.py
index fb9e5f8f6..4f0adf42a 100644
--- a/tasks/assignment/assets/assets_assignment_ui.py
+++ b/tasks/assignment/assets/assets_assignment_ui.py
@@ -58,10 +58,10 @@ ENTRY_LOADED = ButtonWrapper(
     name='ENTRY_LOADED',
     share=Button(
         file='./assets/share/assignment/ui/ENTRY_LOADED.png',
-        area=(467, 235, 498, 619),
-        search=(447, 215, 518, 639),
-        color=(217, 214, 205),
-        button=(467, 235, 498, 619),
+        area=(474, 161, 491, 615),
+        search=(454, 141, 511, 635),
+        color=(197, 193, 186),
+        button=(474, 161, 491, 615),
     ),
 )
 EXP_MATERIALS_CREDITS_CHECK = ButtonWrapper(
diff --git a/tasks/assignment/claim.py b/tasks/assignment/claim.py
index 297ab24eb..7b4260d00 100644
--- a/tasks/assignment/claim.py
+++ b/tasks/assignment/claim.py
@@ -80,9 +80,11 @@ class AssignmentClaim(AssignmentDispatch):
                 logger.info('Assignment report is closed')
                 break
             # Close report
-            if self.appear(REPORT, interval=2):
+            if self.appear(REPORT, interval=1):
                 self.device.click(click_button)
                 continue
+        # Ensure report totally disappears
+        self._wait_until_entry_loaded()
 
     def _is_duration_expected(self, duration: int) -> bool:
         """
diff --git a/tasks/assignment/ui.py b/tasks/assignment/ui.py
index 1b8400bb3..c69095c6a 100644
--- a/tasks/assignment/ui.py
+++ b/tasks/assignment/ui.py
@@ -196,8 +196,7 @@ class AssignmentUI(UI):
             if timeout.reached():
                 logger.warning('Wait entry loaded timeout')
                 break
-            # Maybe not reliable
-            if self.image_color_count(ENTRY_LOADED, (35, 35, 35)):
+            if self.image_color_count(ENTRY_LOADED, (35, 35, 35), count=800):
                 logger.info('Entry loaded')
                 break