diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 4c6e72dc5..e4157bfd1 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -65,7 +65,7 @@
 
 	<nav class="navbar navbar-expand-lg navbar-light bg-light main-nav">
 		<div class="container">
-			<a class="navbar-brand" href="<?php echo site_url(); ?>"><img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_theme(); ?>/wavelog_icon_only.png" alt="Logo" style="width:50px; height:50px;" /></a> <?php if (ENVIRONMENT == "development") { ?><span class="badge text-bg-danger"><?php echo lang('menu_badge_developer_mode'); ?></span><?php } ?>
+			<a class="navbar-brand" href="<?php echo site_url(); ?>"><img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo'); ?>.png" alt="Logo" style="width:50px; height:50px;" /></a> <?php if (ENVIRONMENT == "development") { ?><span class="badge text-bg-danger"><?php echo lang('menu_badge_developer_mode'); ?></span><?php } ?>
 
 			<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
 
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index ecbadc2ea..51f2b8442 100644
--- a/application/views/user/forgot_password.php
+++ b/application/views/user/forgot_password.php
@@ -26,7 +26,7 @@ input[type="email"] {
 </style>
 
 <main class="form-forgot">
-    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_theme(); ?>/wavelog_logo.png" class="mx-auto d-block" alt="" style="width:300px;height:300px;">
+    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('main_logo'); ?>.png" class="mx-auto d-block" alt="" style="width:300px;height:300px;">
     <div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
         <div class="card-body">
             <div class="text-center">
diff --git a/application/views/user/login.php b/application/views/user/login.php
index 630fa6b40..c589a389d 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -30,7 +30,7 @@ body {
 }
 </style>
 <main class="form-signin">
-    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_theme(); ?>/wavelog_logo.png" class="mx-auto d-block" alt="" style="width:300px;height:300px;">
+    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('main_logo'); ?>.png" class="mx-auto d-block" alt="" style="width:300px;height:300px;">
     <div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
         <div class="card-body">
             <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
diff --git a/application/views/visitor/layout/header.php b/application/views/visitor/layout/header.php
index e71c70107..9937f2efa 100644
--- a/application/views/visitor/layout/header.php
+++ b/application/views/visitor/layout/header.php
@@ -42,9 +42,9 @@
 
 	<?php
 		if (!empty($slug)) {
-			echo '<a class="navbar-brand" href="' . site_url('visitor/'.$slug) .'"><img src="' . base_url() . 'assets/logo/' . $this->optionslib->get_theme() . '/wavelog_icon_only.png" alt="Logo" style="width:50px; height:50px;" /></a>';
+			echo '<a class="navbar-brand" href="' . site_url('visitor/'.$slug) .'"><img src="' . base_url() . 'assets/logo/' . $this->optionslib->get_logo('header_logo') . '.png" alt="Logo" style="width:50px; height:50px;" /></a>';
 		} else {
-			echo '<a class="navbar-brand" href="' . site_url() .'"><img src="' . base_url() . 'assets/logo/' . $this->optionslib->get_theme() . '/wavelog_icon_only.png" alt="Logo" style="width:50px; height:50px;" /></a>';
+			echo '<a class="navbar-brand" href="' . site_url() .'"><img src="' . base_url() . 'assets/logo/' . $this->optionslib->get_logo('header_logo') . '.png" alt="Logo" style="width:50px; height:50px;" /></a>';
 		}
 	?>
 	<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>