diff --git a/Common/UI/View.cpp b/Common/UI/View.cpp
index c8f74ee1f1..72d3443ab0 100644
--- a/Common/UI/View.cpp
+++ b/Common/UI/View.cpp
@@ -1046,7 +1046,7 @@ void TextEdit::Draw(UIContext &dc) {
 }
 
 void TextEdit::GetContentDimensions(const UIContext &dc, float &w, float &h) const {
-	dc.MeasureText(dc.theme->uiFont, 1.0f, 1.0f, text_.size() ? text_.c_str() : "Wj", &w, &h, align_);
+	dc.MeasureText(dc.theme->uiFont, 1.0f, 1.0f, !text_.empty() ? text_.c_str() : "Wj", &w, &h, align_);
 	w += 2;
 	h += 2;
 }
diff --git a/UWP/UWP.vcxproj b/UWP/UWP.vcxproj
index 767f2573fa..6426e6309b 100644
--- a/UWP/UWP.vcxproj
+++ b/UWP/UWP.vcxproj
@@ -184,14 +184,14 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>PPSSPP_UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <AppxBundle>Never</AppxBundle>
-    <PackageCertificateThumbprint>b5e422213fb26042db3327f1102c4f9b86c27b1c</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>169879A9D7A20F22B0DD435921035E3E6D5996A4</PackageCertificateThumbprint>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Link>
@@ -596,6 +596,13 @@
       <DeploymentContent>true</DeploymentContent>
       <FileType>Document</FileType>
     </Image>
+    <Image Include="Content\asciifont_atlas.zim">
+      <DeploymentContent>true</DeploymentContent>
+      <FileType>Document</FileType>
+    </Image>
+    <None Include="Content\asciifont_atlas.meta">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
     <None Include="..\assets\ppge_atlas.meta">
       <DeploymentContent>true</DeploymentContent>
     </None>
diff --git a/UWP/UWP.vcxproj.filters b/UWP/UWP.vcxproj.filters
index 4fcd4bd2ee..209fd4951f 100644
--- a/UWP/UWP.vcxproj.filters
+++ b/UWP/UWP.vcxproj.filters
@@ -88,9 +88,6 @@
     <Image Include="Content\7z.png">
       <Filter>Content</Filter>
     </Image>
-    <Image Include="Content\rargray.png">
-      <Filter>Content</Filter>
-    </Image>
     <Image Include="Content\unknown.png">
       <Filter>Content</Filter>
     </Image>
@@ -103,12 +100,17 @@
     <Image Include="AssetsGold\StoreLogo.scale-100.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Content\rargray.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Content\asciifont_atlas.zim">
+      <Filter>Content</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="UWP_TemporaryKey.pfx" />
     <None Include="Content\compat.ini">
       <Filter>Content</Filter>
     </None>
@@ -365,6 +367,9 @@
     <None Include="..\assets\themes\defaultthemes.ini">
       <Filter>Content\themes</Filter>
     </None>
+    <None Include="Content\asciifont_atlas.meta">
+      <Filter>Content</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Content\gamecontrollerdb.txt">
@@ -376,4 +381,4 @@
       <Filter>Content</Filter>
     </Font>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>