diff --git a/base/system/conime/CMakeLists.txt b/base/system/conime/CMakeLists.txt
index b34266ff689..2cc50b5bbc9 100644
--- a/base/system/conime/CMakeLists.txt
+++ b/base/system/conime/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-add_executable(conime WIN32 conime.c conime_res.rc)
+add_executable(conime WIN32 conime.c conime.rc)
 set_module_type(conime win32gui UNICODE)
 target_link_libraries(conime wine ${PSEH_LIB})
-add_importlibs(conime msvcrt imm32 advapi32 user32 gdi32 kernel32 ntdll)
+add_importlibs(conime imm32 advapi32 user32 gdi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET conime DESTINATION reactos/system32 FOR all)
diff --git a/base/system/conime/conime.h b/base/system/conime/conime.h
index 90785d67d86..cb108675476 100644
--- a/base/system/conime/conime.h
+++ b/base/system/conime/conime.h
@@ -42,7 +42,7 @@ typedef struct tagIMEDISPLAY
     UINT uCharInfoLen;
     BOOL bFlag;
     CHAR_INFO CharInfo[IMEDISPLAY_MAX_X];
-} IMEDISPLAY, *PIMEDISPLAY; // 0x288
+} IMEDISPLAY, *PIMEDISPLAY;
 
 // Keyboard layout info
 typedef struct tagKLINFO
diff --git a/base/system/conime/conime_res.rc b/base/system/conime/conime.rc
similarity index 94%
rename from base/system/conime/conime_res.rc
rename to base/system/conime/conime.rc
index 3b93f143614..74c5fcf7059 100644
--- a/base/system/conime/conime_res.rc
+++ b/base/system/conime/conime.rc
@@ -18,4 +18,4 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_MAINICON ICON "res/Icon_2.ico"
+IDI_MAINICON ICON "res/conime.ico"
diff --git a/base/system/conime/res/Icon_2.ico b/base/system/conime/res/conime.ico
similarity index 100%
rename from base/system/conime/res/Icon_2.ico
rename to base/system/conime/res/conime.ico
diff --git a/base/system/conime/resource.h b/base/system/conime/resource.h
index 7ebd9832b36..32a15e1f640 100644
--- a/base/system/conime/resource.h
+++ b/base/system/conime/resource.h
@@ -5,4 +5,4 @@
  * COPYRIGHT:   Copyright 2026 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  */
 
-#define IDI_MAINICON                        2
+#define IDI_MAINICON 100