diff --git a/src/core/cmakehelper.cmake b/src/core/cmakehelper.cmake
index 61a1691..d3cef71 100644
--- a/src/core/cmakehelper.cmake
+++ b/src/core/cmakehelper.cmake
@@ -39,7 +39,7 @@ function(setup_compile_params arg_target)
         QT_DISABLE_DEPRECATED_BEFORE=0x070000
         QT_DISABLE_DEPRECATED_UP_TO=0x070000 # Since 6.5
     )
-    if(NOT DEFINED __DONT_DISABLE_QT_KEYWORDS OR NOT __DONT_DISABLE_QT_KEYWORDS)
+    if(NOT (DEFINED __DONT_DISABLE_QT_KEYWORDS AND __DONT_DISABLE_QT_KEYWORDS))
         target_compile_definitions(${arg_target} PRIVATE
             QT_NO_KEYWORDS # Some QtQuick private headers still use the traditional Qt keywords.
         )
@@ -152,7 +152,7 @@ function(setup_compile_params arg_target)
             target_compile_options(${arg_target} PRIVATE /Zc:enumTypes /Zc:gotoScope /Zc:nrvo)
         endif()
         if(MSVC_VERSION GREATER_EQUAL 1935) # Visual Studio 2022 version 17.5
-            target_compile_options(${arg_target} PRIVATE /Zc:templateScope)
+            target_compile_options(${arg_target} PRIVATE /Zc:templateScope /Zc:checkGwOdr)
         endif()
     else()
         target_compile_options(${arg_target} PRIVATE
diff --git a/src/core/resources/fonts/iconfont.ttf b/src/core/resources/fonts/iconfont.ttf
index 5855799..26a3b01 100644
Binary files a/src/core/resources/fonts/iconfont.ttf and b/src/core/resources/fonts/iconfont.ttf differ
diff --git a/src/core/utils.cpp b/src/core/utils.cpp
index bb20802..2bf844e 100644
--- a/src/core/utils.cpp
+++ b/src/core/utils.cpp
@@ -68,10 +68,10 @@ static const QHash<int, FONT_ICON> g_fontIconsTable = {
     {static_cast<int>(SystemButtonType::Unknown), {0x0000, 0x0000}},
     {static_cast<int>(SystemButtonType::WindowIcon), {0xE756, 0x0000}},
     {static_cast<int>(SystemButtonType::Help), {0xE897, 0x0000}},
-    {static_cast<int>(SystemButtonType::Minimize), {0xE921, 0xE64C}},
-    {static_cast<int>(SystemButtonType::Maximize), {0xE922, 0xE64D}},
-    {static_cast<int>(SystemButtonType::Restore), {0xE923, 0xE64E}},
-    {static_cast<int>(SystemButtonType::Close), {0xE8BB, 0xE64F}}
+    {static_cast<int>(SystemButtonType::Minimize), {0xE921, 0xE93E}},
+    {static_cast<int>(SystemButtonType::Maximize), {0xE922, 0xE93C}},
+    {static_cast<int>(SystemButtonType::Restore), {0xE923, 0xE93D}},
+    {static_cast<int>(SystemButtonType::Close), {0xE8BB, 0xE93B}}
 };
 #endif // FRAMELESSHELPER_CORE_NO_BUNDLE_RESOURCE