diff --git a/src/modules/MouseUtils/FindMyMouse/Directory.Build.targets b/src/modules/MouseUtils/FindMyMouse/Directory.Build.targets
deleted file mode 100644
index 53fe8fc425..0000000000
--- a/src/modules/MouseUtils/FindMyMouse/Directory.Build.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 .\ resource.base.h resource.h FindMyMouse.base.rc FindMyMouse.rc" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.base.rc b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.rc
similarity index 95%
rename from src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.base.rc
rename to src/modules/MouseUtils/FindMyMouse/FindMyMouse.rc
index 0bcdeca2ef..5fa3c8b90d 100644
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.base.rc
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include "resource.h"
-#include "../../../../common/version/version.h"
+#include "../../../common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 #include "winres.h"
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
index d3a1764f30..fcf3bd4ae1 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
@@ -106,8 +106,7 @@
   <ItemGroup>
     <ClInclude Include="FindMyMouse.h" />
     <ClInclude Include="pch.h" />
-    <ClInclude Include="Generated Files\resource.h" />
-    <None Include="resource.base.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="trace.h" />
   </ItemGroup>
   <ItemGroup>
@@ -117,7 +116,6 @@
       <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="trace.cpp" />
-    <None Include="FindMyMouse.base.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
@@ -128,7 +126,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Generated Files\FindMyMouse.rc" />
+    <ResourceCompile Include="FindMyMouse.rc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj.filters b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj.filters
index f2c5464f75..616e9c4092 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj.filters
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj.filters
@@ -41,22 +41,16 @@
     <ClInclude Include="FindMyMouse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Generated Files\resource.h">
-      <Filter>Generated Files</Filter>
+    <ClInclude Include="resource.h">
+      <Filter>Resource Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="resource.base.h">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="FindMyMouse.base.rc">
-      <Filter>Resource Files</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Generated Files\FindMyMouse.rc">
-      <Filter>Generated Files</Filter>
+    <ResourceCompile Include="FindMyMouse.rc">
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/MouseUtils/FindMyMouse/resource.base.h b/src/modules/MouseUtils/FindMyMouse/resource.h
similarity index 90%
rename from src/modules/MouseUtils/FindMyMouse/resource.base.h
rename to src/modules/MouseUtils/FindMyMouse/resource.h
index 9d96dea5e2..8e97eabe3f 100644
--- a/src/modules/MouseUtils/FindMyMouse/resource.base.h
+++ b/src/modules/MouseUtils/FindMyMouse/resource.h
@@ -8,7 +8,6 @@
 #define FILE_DESCRIPTION "PowerToys FindMyMouse"
 #define INTERNAL_NAME "PowerToys.FindMyMouse"
 #define ORIGINAL_FILENAME "PowerToys.FindMyMouse.dll"
-#define IDS_KEYBOARDMANAGER_ICON 1001
 
 // Non-localizable
 //////////////////////////////
diff --git a/src/modules/MouseUtils/MouseHighlighter/Directory.Build.targets b/src/modules/MouseUtils/MouseHighlighter/Directory.Build.targets
deleted file mode 100644
index 7e1362ac60..0000000000
--- a/src/modules/MouseUtils/MouseHighlighter/Directory.Build.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 .\ resource.base.h resource.h MouseHighlighter.base.rc MouseHighlighter.rc" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.base.rc b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.rc
similarity index 95%
rename from src/modules/MouseUtils/FindMyMouse/FindMyMouse.base.rc
rename to src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.rc
index 0bcdeca2ef..5fa3c8b90d 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.base.rc
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include "resource.h"
-#include "../../../../common/version/version.h"
+#include "../../../common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 #include "winres.h"
diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
index bd53e8824c..b9459eadeb 100644
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
@@ -106,8 +106,7 @@
     <ClInclude Include="MouseHighlighter.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="trace.h" />
-    <ClInclude Include="Generated Files\resource.h" />
-    <None Include="resource.base.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />
@@ -116,13 +115,12 @@
       <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="trace.cpp" />
-    <None Include="MouseHighlighter.base.rc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Generated Files\MouseHighlighter.rc" />
+    <ResourceCompile Include="MouseHighlighter.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj.filters b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj.filters
index ab12bcf6d6..cd395a2921 100644
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj.filters
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj.filters
@@ -21,8 +21,8 @@
     <ClInclude Include="trace.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Generated Files\resource.h">
-      <Filter>Generated Files</Filter>
+    <ClInclude Include="resource.h">
+      <Filter>Resource Files</Filter>
     </ClInclude>
     <ClInclude Include="MouseHighlighter.h">
       <Filter>Header Files</Filter>
@@ -30,12 +30,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="MouseHighlighter.base.rc">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource.base.h">
-      <Filter>Resource Files</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -55,8 +49,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Generated Files\MouseHighlighter.rc">
-      <Filter>Generated Files</Filter>
+    <ResourceCompile Include="MouseHighlighter.rc">
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MouseHighlighter/resource.base.h b/src/modules/MouseUtils/MouseHighlighter/resource.h
similarity index 90%
rename from src/modules/MouseUtils/MouseHighlighter/resource.base.h
rename to src/modules/MouseUtils/MouseHighlighter/resource.h
index a666878efe..703b045b31 100644
--- a/src/modules/MouseUtils/MouseHighlighter/resource.base.h
+++ b/src/modules/MouseUtils/MouseHighlighter/resource.h
@@ -8,7 +8,6 @@
 #define FILE_DESCRIPTION "PowerToys MouseHighlighter"
 #define INTERNAL_NAME "PowerToys.MouseHighlighter"
 #define ORIGINAL_FILENAME "PowerToys.MouseHighlighter.dll"
-#define IDS_KEYBOARDMANAGER_ICON 1001
 
 // Non-localizable
 //////////////////////////////