diff --git a/aegisub/build/Aegisub/standard-libraries.props b/aegisub/build/Aegisub/standard-libraries.props
index 3496179c9..aec526d39 100644
--- a/aegisub/build/Aegisub/standard-libraries.props
+++ b/aegisub/build/Aegisub/standard-libraries.props
@@ -15,11 +15,10 @@
         advapi32.lib;
         wsock32.lib;
         opengl32.lib;
-        sicudtd.lib;
-        sicuind.lib;
-        sicutestd.lib;
-        sicutud.lib;
-        sicuucd.lib;
+        sicudt.lib;
+        sicuin.lib;
+        sicutu.lib;
+        sicuuc.lib;
         %(AdditionalDependencies)
       </AdditionalDependencies>
     </Link>
diff --git a/aegisub/build/boost/boost.vcxproj b/aegisub/build/boost/boost.vcxproj
index b77bdfb82..986ec1ccc 100644
--- a/aegisub/build/boost/boost.vcxproj
+++ b/aegisub/build/boost/boost.vcxproj
@@ -13,6 +13,25 @@
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
 
+  <!-- Project specific configuration -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>
+        BOOST_LOCALE_WITH_ICONV=1;
+        BOOST_LOCALE_WITH_ICU=1;
+        BOOST_LOCALE_NO_STD_BACKEND=1;
+        BOOST_LOCALE_NO_WINAPI_BACKEND=1;
+        BOOST_LOCALE_NO_POSIX_BACKEND=1;
+        BOOST_THREAD_BUILD_LIB;
+        %(PreprocessorDefinitions)
+      </PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>
+        $(AegisubContribBase)iconv\include;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <!-- Source files -->
   <ItemGroup>
     <ClCompile Include="$(BoostPath)\libs\regex\src\cpp_regex_traits.cpp" />
@@ -40,10 +59,58 @@
     <ClCompile Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.cpp" />
     <ClCompile Include="$(BoostPath)\libs\system\src\error_code.cpp" />
     <ClCompile Include="$(BoostPath)\libs\regex\src\icu.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\encoding\codepage.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\boundary.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\codecvt.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\collator.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\conversion.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\date_time.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\formatter.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\icu_backend.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\numeric.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\time_zone.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\date_time.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\format.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\formatting.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\generator.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\ids.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\localization_backend.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\message.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\mo_lambda.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\codecvt_converter.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\default_locale.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\gregorian.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\info.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\locale_data.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\thread\src\win32\thread.cpp" />
+    <ClCompile Include="$(BoostPath)\libs\thread\src\win32\tss_pe.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(BoostPath)\libs\regex\src\internals.hpp" />
     <ClInclude Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.hpp" />
     <ClInclude Include="$(BoostPath)\libs\system\src\local_free_on_destruction.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\encoding\conv.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\all_generator.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\cdata.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\codecvt.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\formatter.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\icu_backend.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\icu_util.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\predefined_formatters.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\time_zone.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\uconv.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\shared\ios_prop.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\shared\mo_hash.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\shared\mo_lambda.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\gregorian.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\iconv.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\locale_data.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\numeric.hpp" />
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\timezone.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(BoostPath)\libs\locale\src\encoding\iconv_codepage.ipp" />
+    <None Include="$(BoostPath)\libs\locale\src\encoding\uconv_codepage.ipp" />
+    <None Include="$(BoostPath)\libs\locale\src\encoding\wconv_codepage.ipp" />
   </ItemGroup>
 </Project>
diff --git a/aegisub/build/boost/boost.vcxproj.filters b/aegisub/build/boost/boost.vcxproj.filters
index aeee1e3bc..8eb1ecd14 100644
--- a/aegisub/build/boost/boost.vcxproj.filters
+++ b/aegisub/build/boost/boost.vcxproj.filters
@@ -10,6 +10,24 @@
     <Filter Include="filesystem">
       <UniqueIdentifier>{98abe5b9-aca6-4145-ab6d-e472e24eb522}</UniqueIdentifier>
     </Filter>
+    <Filter Include="locale">
+      <UniqueIdentifier>{0dae6521-8684-471f-8d62-9fe3b9295b0c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="locale\encoding">
+      <UniqueIdentifier>{8c30568b-1ab1-4815-82e0-127ad31732d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="locale\icu">
+      <UniqueIdentifier>{47e5ad22-f37e-4512-a8e1-bcb5f04ad24b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="locale\shared">
+      <UniqueIdentifier>{52190269-979d-429b-a825-8e68eacc2274}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="locale\util">
+      <UniqueIdentifier>{829ed5fb-dcba-4d3e-910c-33341e0e6379}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="thread">
+      <UniqueIdentifier>{c76e09db-3a8e-4eaf-bb9a-6bac6945fd6f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(BoostPath)\libs\regex\src\c_regex_traits.cpp">
@@ -87,6 +105,81 @@
     <ClCompile Include="$(BoostPath)\libs\regex\src\icu.cpp">
       <Filter>regex</Filter>
     </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\boundary.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\codecvt.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\collator.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\conversion.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\date_time.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\formatter.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\icu_backend.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\numeric.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\icu\time_zone.cpp">
+      <Filter>locale\icu</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\codecvt_converter.cpp">
+      <Filter>locale\util</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\default_locale.cpp">
+      <Filter>locale\util</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\gregorian.cpp">
+      <Filter>locale\util</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\info.cpp">
+      <Filter>locale\util</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\util\locale_data.cpp">
+      <Filter>locale\util</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\date_time.cpp">
+      <Filter>locale\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\format.cpp">
+      <Filter>locale\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\formatting.cpp">
+      <Filter>locale\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\generator.cpp">
+      <Filter>locale\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\ids.cpp">
+      <Filter>locale\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\localization_backend.cpp">
+      <Filter>locale\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\message.cpp">
+      <Filter>locale\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\shared\mo_lambda.cpp">
+      <Filter>locale\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\locale\src\encoding\codepage.cpp">
+      <Filter>locale\encoding</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\thread\src\win32\thread.cpp">
+      <Filter>thread</Filter>
+    </ClCompile>
+    <ClCompile Include="$(BoostPath)\libs\thread\src\win32\tss_pe.cpp">
+      <Filter>thread</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(BoostPath)\libs\regex\src\internals.hpp">
@@ -98,5 +191,70 @@
     <ClInclude Include="$(BoostPath)\libs\filesystem\src\windows_file_codecvt.hpp">
       <Filter>filesystem</Filter>
     </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\all_generator.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\cdata.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\codecvt.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\formatter.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\icu_backend.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\icu_util.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\predefined_formatters.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\time_zone.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\icu\uconv.hpp">
+      <Filter>locale\icu</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\gregorian.hpp">
+      <Filter>locale\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\iconv.hpp">
+      <Filter>locale\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\locale_data.hpp">
+      <Filter>locale\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\numeric.hpp">
+      <Filter>locale\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\util\timezone.hpp">
+      <Filter>locale\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\shared\ios_prop.hpp">
+      <Filter>locale\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\shared\mo_hash.hpp">
+      <Filter>locale\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\shared\mo_lambda.hpp">
+      <Filter>locale\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="$(BoostPath)\libs\locale\src\encoding\conv.hpp">
+      <Filter>locale\encoding</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(BoostPath)\libs\locale\src\encoding\iconv_codepage.ipp">
+      <Filter>locale\encoding</Filter>
+    </None>
+    <None Include="$(BoostPath)\libs\locale\src\encoding\uconv_codepage.ipp">
+      <Filter>locale\encoding</Filter>
+    </None>
+    <None Include="$(BoostPath)\libs\locale\src\encoding\wconv_codepage.ipp">
+      <Filter>locale\encoding</Filter>
+    </None>
   </ItemGroup>
 </Project>