diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj
index 0a1e1688..54788dcf 100644
--- a/Marechai/Marechai.csproj
+++ b/Marechai/Marechai.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>4.0.0.1756</Version>
+    <Version>4.0.0.1758</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>
diff --git a/Marechai/Pages/Admin/Details/Company.razor b/Marechai/Pages/Admin/Details/Company.razor
index 7864b77b..55686e86 100644
--- a/Marechai/Pages/Admin/Details/Company.razor
+++ b/Marechai/Pages/Admin/Details/Company.razor
@@ -354,7 +354,7 @@
                             <source type="image/svg+xml" srcset="/assets/logos/@(logo.Guid).svg">
                             <source type="image/webp" srcset="/assets/logos/webp/1x/@(logo.Guid).webp, /assets/logos/webp/2x/@(logo.Guid).webp 2x, /assets/logos/webp/3x/@(logo.Guid).webp 3x">
                             <img srcset="/assets/logos/png/1x/@(logo.Guid).png, /assets/logos/png/2x/@(logo.Guid).png 2x, /assets/logos/png/3x/@(logo.Guid).png 3x"
-                                 src="/assets/logos/png/1x@(logo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
+                                 src="/assets/logos/png/1x/@(logo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
                         </picture>
                     }
                     else
@@ -423,7 +423,7 @@
                     <picture>
                         <source type="image/svg+xml" srcset="/assets/logos/@(_currentLogo.Guid).svg">
                         <source type="image/webp" srcset="/assets/logos/webp/1x/@(_currentLogo.Guid).webp, /assets/logos/webp/2x/@(_currentLogo.Guid).webp 2x, /assets/logos/webp/3x/@(_currentLogo.Guid).webp 3x">
-                        <img srcset="/assets/logos/png/1x/@(_currentLogo.Guid).png, /assets/logos/png/2x/@(_currentLogo.Guid).png 2x, /assets/logos/png/3x/@(_currentLogo.Guid).png 3x" src="/assets/logos/png/1x@(_currentLogo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
+                        <img srcset="/assets/logos/png/1x/@(_currentLogo.Guid).png, /assets/logos/png/2x/@(_currentLogo.Guid).png 2x, /assets/logos/png/3x/@(_currentLogo.Guid).png 3x" src="/assets/logos/png/1x/@(_currentLogo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
                     </picture>
                 </div>
                 <Field>
diff --git a/Marechai/Pages/Companies/Index.razor b/Marechai/Pages/Companies/Index.razor
index cd3b5d7d..853edfae 100644
--- a/Marechai/Pages/Companies/Index.razor
+++ b/Marechai/Pages/Companies/Index.razor
@@ -43,16 +43,16 @@
 {
     <p align="center">
         <b>@string.Format(L["Companies founded in {0}."], L[_countryName])</b>
-        @if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", CountryId + ".svg")))
+        @if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", $"{CountryId:D3}.svg")))
         {
         <picture>
-            <source type="image/svg+xml" srcset="/assets/flags/countries/@(CountryId).svg">
-            <source type="image/webp" srcset="/assets/flags/countries/webp/1x/@(CountryId).webp,
-        /assets/flags/countries/webp/1x/@(CountryId).webp 2x,
-        /assets/flags/countries/webp/1x/@(CountryId).webp 3x">
-            <img srcset="/assets/flags/countries/png/1x/@(CountryId).png,
-                                 /assets/flags/countries/png/1x/@(CountryId).png 2x,
-                                 /assets/flags/countries/png/1x/@(CountryId).webp 3x" src="/assets/flags/countries/png/1x@(CountryId).png" alt="" height="32" />
+            <source type="image/svg+xml" srcset="/assets/flags/countries/@($"{CountryId:D3}").svg">
+            <source type="image/webp" srcset="/assets/flags/countries/webp/1x/@($"{CountryId:D3}").webp,
+        /assets/flags/countries/webp/1x/@($"{CountryId:D3}").webp 2x,
+        /assets/flags/countries/webp/1x/@($"{CountryId:D3}").webp 3x">
+            <img srcset="/assets/flags/countries/png/1x/@($"{CountryId:D3}").png,
+                                 /assets/flags/countries/png/1x/@($"{CountryId:D3}").png 2x,
+                                 /assets/flags/countries/png/1x/@($"{CountryId:D3}").webp 3x" src="/assets/flags/countries/png/1x/@($"{CountryId:D3}").png" alt="" height="32" />
         </picture>
         }
     </p>
@@ -85,7 +85,7 @@
 /assets/logos/thumbs/webp/3x/@(company.LastLogo).webp 3x">
                         <img srcset="/assets/logos/thumbs/png/1x/@(company.LastLogo).png,
                      /assets/logos/thumbs/png/2x/@(company.LastLogo).png 2x,
-                     /assets/logos/thumbs/png/3x/@(company.LastLogo).png 3x" src="/assets/logos/thumbs/png/1x@(company.LastLogo).png" alt="" height="auto" width="auto" style="max-height: 32px; max-width: 128px" />
+                     /assets/logos/thumbs/png/3x/@(company.LastLogo).png 3x" src="/assets/logos/thumbs/png/1x/@(company.LastLogo).png" alt="" height="auto" width="auto" style="max-height: 32px; max-width: 128px" />
                     </picture>
                 }
             </a>
diff --git a/Marechai/Pages/Companies/View.razor b/Marechai/Pages/Companies/View.razor
index ffacc829..62fd260c 100644
--- a/Marechai/Pages/Companies/View.razor
+++ b/Marechai/Pages/Companies/View.razor
@@ -60,7 +60,7 @@
 /assets/logos/webp/3x/@(_company.LastLogo).webp 3x">
             <img srcset="/assets/logos/png/1x/@(_company.LastLogo).png,
                          /assets/logos/png/2x/@(_company.LastLogo).png 2x,
-                         /assets/logos/png/3x/@(_company.LastLogo).png 3x" src="/assets/logos/png/1x@(_company.LastLogo).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
+                         /assets/logos/png/3x/@(_company.LastLogo).png 3x" src="/assets/logos/png/1x/@(_company.LastLogo).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
         </picture>
     }
 </p>
@@ -85,7 +85,7 @@
     /assets/logos/webp/1x/@(logo.Guid).webp 3x">
                             <img class="d-block w-100" srcset="/assets/logos/png/1x/@(logo.Guid).png,
                              /assets/logos/png/1x/@(logo.Guid).png 2x,
-                             /assets/logos/png/1x/@(logo.Guid).webp 3x" src="/assets/logos/png/1x@(logo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
+                             /assets/logos/png/1x/@(logo.Guid).webp 3x" src="/assets/logos/png/1x/@(logo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
                         </picture>
                     </div>
 
@@ -136,16 +136,16 @@
                 @if (_company.Country != null)
                 {
                     <a href="/companies/country/@_company.CountryId">
-                        @if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", _company.CountryId + ".svg")))
+                        @if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", $"{_company.CountryId:D3}.svg")))
                         {
                             <picture>
-                                <source type="image/svg+xml" srcset="/assets/flags/countries/@(_company.CountryId).svg">
-                                <source type="image/webp" srcset="/assets/flags/countries/webp/1x/@(_company.CountryId).webp,
-        /assets/flags/countries/webp/1x/@(_company.CountryId).webp 2x,
-        /assets/flags/countries/webp/1x/@(_company.CountryId).webp 3x">
-                                <img srcset="/assets/flags/countries/png/1x/@(_company.CountryId).png,
-                                 /assets/flags/countries/png/1x/@(_company.CountryId).png 2x,
-                                 /assets/flags/countries/png/1x/@(_company.CountryId).webp 3x" src="/assets/flags/countries/png/1x@(_company.CountryId).png" alt="" height="32" />
+                                <source type="image/svg+xml" srcset="/assets/flags/countries/@($"{_company.CountryId:D3}").svg">
+                                <source type="image/webp" srcset="/assets/flags/countries/webp/1x/@($"{_company.CountryId:D3}").webp,
+        /assets/flags/countries/webp/1x/@($"{_company.CountryId:D3}").webp 2x,
+        /assets/flags/countries/webp/1x/@($"{_company.CountryId:D3}").webp 3x">
+                                <img srcset="/assets/flags/countries/png/1x/@($"{_company.CountryId:D3}").png,
+                                 /assets/flags/countries/png/1x/@($"{_company.CountryId:D3}").png 2x,
+                                 /assets/flags/countries/png/1x/@($"{_company.CountryId:D3}").webp 3x" src="/assets/flags/countries/png/1x/@($"{_company.CountryId:D3}").png" alt="" height="32" />
                             </picture>
                         }
                         @L[_company.Country]