diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs
index bec63763..f1655ed8 100644
--- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs
@@ -57,6 +57,7 @@ public class FooterManager : MonoBehaviour
                 ScrollGameLockDialog.ShowDialog();
             }).AddTo(this);
 
+        scrollGameNotifyIcon.SetActive(false);
         GameDataObserver.Instance.ShopLevelObserver
             .DistinctUntilChanged()
             .Where(x => x >= Const.ScrollGameAvailableLevel)
@@ -65,17 +66,10 @@ public class FooterManager : MonoBehaviour
             {
                 scrollGameButton.gameObject.SetActive(true);
                 scrollGameLockedButton.gameObject.SetActive(false);
-            }).AddTo(this);
-
-        scrollGameNotifyIcon.SetActive(false);
-        GameDataObserver.Instance.ShopLevelObserver
-            .DistinctUntilChanged()
-            .Where(x => x >= Const.ScrollGameAvailableLevel)
-            .TakeWhile(_ => !GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.ScrollGame))
-            .Take(1)
-            .Subscribe(x =>
-            {
-                scrollGameNotifyIcon.SetActive(true);
+                if (!GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.ScrollGame))
+                {
+                    scrollGameNotifyIcon.SetActive(true);
+                }
             }).AddTo(this);
     }
 }
\ No newline at end of file
diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
index bc43e3fd..781a8250 100644
--- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
@@ -30,7 +30,6 @@ public class HeaderManager : MonoBehaviour
                 {
                     isOpenMission = false;
                     GameDataObserver.Instance.CheckMissionProgress();
-                    missionIndicator.SetActive(GameDataObserver.Instance.UpdateMissionAchieved.Value);
                 },
                 active => missionIndicator.SetActive(active));
         }).AddTo(this);
@@ -43,9 +42,8 @@ public class HeaderManager : MonoBehaviour
             TransitionManager.Instance.LoadScene(GameScenes.WorldMap);
         }).AddTo(this);
 
-        var gameData = GameDataManager.GameData;
         var cityData = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet)
-            .First(data => data.id == gameData.CurrentCityId);
+            .First(data => data.id == GameDataManager.GameData.CurrentCityId);
         cityIconTarget.DestroyAllChildrens();
         Instantiate(cityData.GetIconPrefab(), cityIconTarget);
         
diff --git a/popcorn/Assets/MyGame/Scripts/TutorialManager.cs b/popcorn/Assets/MyGame/Scripts/TutorialManager.cs
index 599d31ab..119a3cb6 100644
--- a/popcorn/Assets/MyGame/Scripts/TutorialManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/TutorialManager.cs
@@ -10,7 +10,7 @@ namespace MyGame.Scripts
     public enum TutorialFlag
     {
         None = 0,
-        FirstPlay = 1,
+        FirstPlay = 1 << 0,
         CornField = 1 << 1,
         Shopping = 1 << 2,
         Management = 1 << 3,