diff --git a/Import/GacUIWindows.cpp b/Import/GacUIWindows.cpp
index c5984a1d..cfd529a7 100644
--- a/Import/GacUIWindows.cpp
+++ b/Import/GacUIWindows.cpp
@@ -9398,8 +9398,8 @@ WindowsForm
 						if (hAppIcon == NULL) hAppIcon = (HICON)LoadImage(NULL, IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED);
 						bool isVisible = IsVisible();
 						if (isVisible) SendMessage(handle, WM_SETREDRAW, (WPARAM)FALSE, NULL);
-						SendMessage(handle, WM_SETICON, ICON_BIG, (LPARAM)newReplacementHIcon);
-						SendMessage(handle, WM_SETICON, ICON_SMALL, (LPARAM)newReplacementHIcon);
+						SendMessage(handle, WM_SETICON, ICON_BIG, (LPARAM)hAppIcon);
+						SendMessage(handle, WM_SETICON, ICON_SMALL, (LPARAM)hAppIcon);
 						if (isVisible) SendMessage(handle, WM_SETREDRAW, (WPARAM)TRUE, NULL);
 
 						if (this == GetCurrentController()->WindowService()->GetMainWindow())
diff --git a/TODO.md b/TODO.md
index 13e6a843..806b0fa4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,8 +6,6 @@ https://zhuanlan.zhihu.com/p/39369370
 
 ### Bugs
 
-- **Windows**
-  - **WindowIcon**: Check and uncheck custom icon, the icon in the task bar doesn't come back.
 - **Controls**
   - **DocumentEditor**: When a document's height is smaller than the control, the lower part cannot click to interact with the last line.
   - **DocumentEditor**: In default font, the lower part of "g" in the last line is clipped, not rendered properly.