diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc
index 8d88da175..547f819b9 100644
--- a/src/etc/inc/authgui.inc
+++ b/src/etc/inc/authgui.inc
@@ -475,7 +475,7 @@ function display_login_form($Login_Error)
     <main class="login-modal-container">
       <header class="login-modal-head" style="height:55px;">
         <div class="navbar-brand">
-          <img src="/ui/themes/<?= $themename ?>/build/images/default-logo.png" height="30" alt="logo"/>
+          <img src="/ui/themes/<?=$themename;?>/build/images/default-logo.<?=file_exists("/usr/local/opnsense/www/themes/{$themename}/build/images/default-logo.svg") ? "svg" : "png";?>" height="30" alt="logo" />
         </div>
       </header>
 
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index d90f4bc47..8fac22479 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -52,8 +52,8 @@ if($need_alert_display == true) {
     <div class="container-fluid">
       <div class="navbar-header">
         <a class="navbar-brand" href="/index.php">
-        <img class="brand-logo" src="/ui/themes/<?= $themename ?>/build/images/default-logo.png" height="30" alt="logo" />
-        <img class="brand-icon" src="/ui/themes/<?= $themename ?>/build/images/icon-logo.png" height="30" alt="icon" />
+        <img class="brand-logo" src="/ui/themes/<?= $themename ?>/build/images/default-logo.<?=file_exists("/usr/local/opnsense/www/themes/{$themename}/build/images/default-logo.svg") ? "svg" : "png";?>" height="30" alt="logo" />
+        <img class="brand-icon" src="/ui/themes/<?= $themename ?>/build/images/icon-logo.<?=file_exists("/usr/local/opnsense/www/themes/{$themename}/build/images/icon-logo.svg") ? "svg" : "png";?>" height="30" alt="icon" />
         </a>
         <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navigation">
           <span class="sr-only">Toggle navigation</span>
diff --git a/src/www/index.php b/src/www/index.php
index fcb49dc91..934e41541 100644
--- a/src/www/index.php
+++ b/src/www/index.php
@@ -124,7 +124,7 @@ include("fbegin.inc");?>
         <section class="col-xs-12">
           <div class="content-box" style="padding: 20px;">
             <div class="table-responsive">
-              <img src="/ui/themes/<?=$themename;?>/build/images/default-logo.png" border="0" alt="logo" />
+              <img src="/ui/themes/<?=$themename;?>/build/images/default-logo.<?=file_exists("/usr/local/opnsense/www/themes/{$themename}/build/images/default-logo.svg") ? "svg" : "png";?>" border="0" alt="logo" />
               <br />
               <div class="content-box-main">
                 <?php