diff --git a/EnvelopeGenerator.Web/Models/CustomImages.cs b/EnvelopeGenerator.Web/Models/CustomImages.cs
new file mode 100644
index 00000000..da0d6502
--- /dev/null
+++ b/EnvelopeGenerator.Web/Models/CustomImages.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.Web.Models;
+
+public class CustomImages : Dictionary<string, Image>
+{
+    public new Image this[string key] => TryGetValue(key, out var img) && img is not null ? img : new();
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/Models/Image.cs b/EnvelopeGenerator.Web/Models/Image.cs
new file mode 100644
index 00000000..5c993e27
--- /dev/null
+++ b/EnvelopeGenerator.Web/Models/Image.cs
@@ -0,0 +1,10 @@
+namespace EnvelopeGenerator.Web.Models;
+
+public class Image
+{
+    public string Src { get; init; } = string.Empty;
+
+    public Dictionary<string, string> Classes { get; init; } = new();
+
+    public string GetClassIn(string page) => Classes.TryGetValue(page, out var cls) && cls is not null ? cls : string.Empty;
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/Models/Img.cs b/EnvelopeGenerator.Web/Models/Img.cs
deleted file mode 100644
index ddb48b44..00000000
--- a/EnvelopeGenerator.Web/Models/Img.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EnvelopeGenerator.Web.Models
-{
-    public class Img
-    {
-        public string Src { get; init; } = string.Empty;
-
-        public Dictionary<string, string> Classes { get; init; } = new();
-
-        public string ClassIn(string page) => Classes.TryGetValue(page, out var cls) && cls is not null ? cls : string.Empty;
-    }
-}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs
index 86822926..9c61127c 100644
--- a/EnvelopeGenerator.Web/Program.cs
+++ b/EnvelopeGenerator.Web/Program.cs
@@ -161,7 +161,7 @@ try
 
     builder.Services.AddMemoryCache();
 
-    builder.ConfigureBySection<Img>();
+    builder.ConfigureBySection<CustomImages>();
 
     var app = builder.Build();
 
diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
index af65948a..59824058 100644
--- a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
@@ -4,7 +4,7 @@
 @{
     //TODO: Create view model
     var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
-    var logo = _logoOpt.Value;
+    var cImg = _cImgOpt.Value;
     ViewData["Title"] = _localizer[WebKey.DocProtected];
     var userCulture = ViewData["UserCulture"] as Culture;
     string codeType = ViewData["CodeType"] is string _codeType ? _codeType : "accessCode";
@@ -24,7 +24,7 @@
     <header class="text-center">
         <div class="header-1 alert alert-secondary" role="alert">
             <h3 class="text">@_localizer[WebKey.WelcomeToTheESignPortal]</h3>
-            <img class="@logo.ClassIn("Locked")" src="@logo.Src" />
+            <img class="@cImg["Company"].GetClassIn("Locked")" src="@cImg["Company"].Src" />
         </div>
         <div class="icon locked @(viaTFA ? "tfa" : "") mt-4 mb-1">
             <svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" fill="currentColor" class="bi bi-shield-lock" viewBox="0 0 16 16">
diff --git a/EnvelopeGenerator.Web/Views/Home/Main.cshtml b/EnvelopeGenerator.Web/Views/Home/Main.cshtml
index e052fc82..4c2bf3da 100644
--- a/EnvelopeGenerator.Web/Views/Home/Main.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/Main.cshtml
@@ -1,6 +1,6 @@
 @{
     var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
-    var logo = _logoOpt.Value;
+    var cImg = _cImgOpt.Value;
     ViewData["Title"] = _localizer["Home"];
     var userCulture = ViewData["UserCulture"] as Culture;
 }
@@ -8,7 +8,7 @@
     <header class="text-center">
         <div class="header-1 alert alert-secondary" role="alert">
             <h3 class="text">@_localizer[WebKey.WelcomeToTheESignPortal]</h3>
-            <img class="@logo.ClassIn("Locked")" src="@logo.Src" />
+            <img class="@cImg["Company"].GetClassIn("Locked")" src="@cImg["Company"].Src" />
         </div>
         <div class="icon mt-4 mb-1">
             <img src="~/img/sign_flow_min.svg">
diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
index 03f4b109..3eb96719 100644
--- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
@@ -1,6 +1,6 @@
 @{
     var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
-    var logo = _logoOpt.Value;
+    var cImg = _cImgOpt.Value;
 }
 @using DigitalData.Core.DTO;
 @using EnvelopeGenerator.Application.DTOs;
@@ -66,7 +66,7 @@
             </div>
             <div class="dd-card-info">
                 <div class="logo">
-                    <img class="@logo.ClassIn("Show")" src="@logo.Src" alt="logo">
+                    <img class="@cImg["Company"].GetClassIn("Show")" src="@cImg["Company"].Src" alt="logo">
                 </div>
                 <h2>@($"{envelope?.Title}".TrySanitize(_sanitizer))</h2>
                 @if (isReadOnly)
diff --git a/EnvelopeGenerator.Web/Views/_ViewImports.cshtml b/EnvelopeGenerator.Web/Views/_ViewImports.cshtml
index 39dbe3c3..0d07d11e 100644
--- a/EnvelopeGenerator.Web/Views/_ViewImports.cshtml
+++ b/EnvelopeGenerator.Web/Views/_ViewImports.cshtml
@@ -11,5 +11,5 @@
 @inject HighlightHtmlSanitizer _hlSanitizer
 @inject Microsoft.AspNetCore.Http.IHttpContextAccessor _accessor
 @inject Cultures _cultures
-@inject IOptions<Img> _logoOpt
+@inject IOptions<CustomImages> _cImgOpt
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/appsettings.json b/EnvelopeGenerator.Web/appsettings.json
index 8267b2da..eb43caa2 100644
--- a/EnvelopeGenerator.Web/appsettings.json
+++ b/EnvelopeGenerator.Web/appsettings.json
@@ -103,11 +103,13 @@
       "Platforms": [ "javascript" ]
     }
   ],
-  "Img": {
-    "Src": "/img/digital_data.svg",
-    "Classes": {
-      "Show": "dd-show-logo",
-      "Locked": "dd-locked-logo"
+  "CustomImages": {
+    "Company": {
+      "Src": "/img/digital_data.svg",
+      "Classes": {
+        "Show": "dd-show-logo",
+        "Locked": "dd-locked-logo"
+      }
     }
   },
   "DispatcherParams": {
@@ -139,6 +141,6 @@
     "EnvelopeHistory": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
     "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
     "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
-    "Receiver": [ ]
+    "Receiver": []
   }
 }