diff --git a/src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96_.png b/src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96_.png
rename to src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96.png
diff --git a/src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200_.png b/src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200_.png
rename to src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200.png
diff --git a/src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white_.png b/src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white_.png
rename to src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white.png
diff --git a/src/Calculator.Shared/Assets/LockScreenLogo.scale-200_.png b/src/Calculator.Shared/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/LockScreenLogo.scale-200_.png
rename to src/Calculator.Shared/Assets/LockScreenLogo.scale-200.png
diff --git a/src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white_.png b/src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white_.png
rename to src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white.png
diff --git a/src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white_.png b/src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white_.png
rename to src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white.png
diff --git a/src/Calculator.Shared/Assets/SplashScreen.scale-200_.png b/src/Calculator.Shared/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/SplashScreen.scale-200_.png
rename to src/Calculator.Shared/Assets/SplashScreen.scale-200.png
diff --git a/src/Calculator.Shared/Assets/Square150x150Logo.scale-200_.png b/src/Calculator.Shared/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Square150x150Logo.scale-200_.png
rename to src/Calculator.Shared/Assets/Square150x150Logo.scale-200.png
diff --git a/src/Calculator.Shared/Assets/Square44x44Logo.scale-200_.png b/src/Calculator.Shared/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Square44x44Logo.scale-200_.png
rename to src/Calculator.Shared/Assets/Square44x44Logo.scale-200.png
diff --git a/src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated_.png b/src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated_.png
rename to src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white_.png b/src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white_.png
rename to src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white.png
diff --git a/src/Calculator.Shared/Assets/StoreLogo_.png b/src/Calculator.Shared/Assets/StoreLogo.png
similarity index 100%
rename from src/Calculator.Shared/Assets/StoreLogo_.png
rename to src/Calculator.Shared/Assets/StoreLogo.png
diff --git a/src/Calculator.Shared/Assets/Wide310x150Logo.scale-200_.png b/src/Calculator.Shared/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Wide310x150Logo.scale-200_.png
rename to src/Calculator.Shared/Assets/Wide310x150Logo.scale-200.png
diff --git a/src/Calculator.Shared/Calculator.Shared.projitems b/src/Calculator.Shared/Calculator.Shared.projitems
index b251370a..24599449 100644
--- a/src/Calculator.Shared/Calculator.Shared.projitems
+++ b/src/Calculator.Shared/Calculator.Shared.projitems
@@ -226,24 +226,24 @@
   <ItemGroup>
     <Content Include="$(MSBuildThisFileDirectory)Assets\CalcMDL2.ttf" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\CalcMDL2.woff" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorAppList.targetsize-96_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorLargeTile.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorMedTile.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSmallTile.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSplashScreen.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorStoreLogo.contrast-white_scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorWideTile.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Date.targetsize-64_contrast-white_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\LockScreenLogo.scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Programmer.targetsize-64_contrast-white_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Scientific.targetsize-64_contrast-white_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\SplashScreen.scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square150x150Logo.scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.targetsize-24_altform-unplated_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Standard.targetsize-64_contrast-white_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\StoreLogo_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Wide310x150Logo.scale-200_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorAppList.targetsize-96.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorLargeTile.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorMedTile.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSmallTile.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSplashScreen.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorStoreLogo.contrast-white_scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorWideTile.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Date.targetsize-64_contrast-white.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Programmer.targetsize-64_contrast-white.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Scientific.targetsize-64_contrast-white.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\SplashScreen.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Standard.targetsize-64_contrast-white.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\StoreLogo.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="$(MSBuildThisFileDirectory)Resources\af-ZA\CEngineStrings.resw" />