diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index ce378f30a..253ed64f4 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -5,18 +5,18 @@
 
     <!-- Bootstrap CSS -->
     <?php if ($this->optionslib->get_theme()) { ?>
-        <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->optionslib->get_theme(); ?>/bootstrap.min.css">
-        <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
-        <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->optionslib->get_theme(); ?>/overrides.css">
+        <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $this->optionslib->get_theme() . '/bootstrap.min.css'); ?>">
+        <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/general.css'); ?>">
+        <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $this->optionslib->get_theme() . '/overrides.css'); ?>">
     <?php } ?>
 
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.min.css">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/fontawesome/css/all.min.css'); ?>">
 
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/jquery.fancybox.min.css'); ?>" />
 
-    <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
-    <script src="<?php echo base_url(); ?>assets/js/jquery.fancybox.min.js"></script>
-    <script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
+    <script src="<?php echo $this->paths->cache_buster('/assets/js/jquery-3.3.1.min.js'); ?>"></script>
+    <script src="<?php echo $this->paths->cache_buster('/assets/js/jquery.fancybox.min.js'); ?>"></script>
+    <script src="<?php echo $this->paths->cache_buster('/assets/js/bootstrap.min.js'); ?>"></script>
 </head>
 
 <body class="container-fluid qso-edit-box">
diff --git a/application/views/qso/edit_done.php b/application/views/qso/edit_done.php
index 6afdd1cff..76b4ebe06 100644
--- a/application/views/qso/edit_done.php
+++ b/application/views/qso/edit_done.php
@@ -3,7 +3,7 @@
 <head>
 	<title></title>
 
-	<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
+	<script src="<?php echo $this->paths->cache_buster('/assets/js/jquery-3.3.1.min.js'); ?>"></script>
 </head>
 <body>
 	<script type="text/javascript">
diff --git a/application/views/qso/log_qso.php b/application/views/qso/log_qso.php
index 90387e0c1..6f8e53c98 100644
--- a/application/views/qso/log_qso.php
+++ b/application/views/qso/log_qso.php
@@ -11,7 +11,7 @@
 </div>
 
 
-<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
+<script src="<?php echo $this->paths->cache_buster('/assets/js/jquery-3.3.1.min.js'); ?>"></script>
 <script>
     $(document).ready(function() {
         let call = "<?php echo $callsign; ?>";
diff --git a/application/views/satellite/flightpath.php b/application/views/satellite/flightpath.php
index 05846121a..a1ff80db8 100644
--- a/application/views/satellite/flightpath.php
+++ b/application/views/satellite/flightpath.php
@@ -4,7 +4,7 @@
 	const homelat = "<?php echo $latlng[0]; ?>";
 	const homelon = "<?php echo $latlng[1]; ?>";
 	const homegrid = "<?php echo $homegrid; ?>";
-	var icon_home_url = "<?php echo base_url();?>assets/images/dot.png";
+	var icon_home_url = "<?php echo $this->paths->cache_buster('/assets/images/dot.png'); ?>";
 	var tileUrl = "<?php echo $this->optionslib->get_option('option_map_tile_server'); ?>";
 </script>
 <script type="text/javascript">
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index 07d0fb06f..60115c666 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_logo('main_logo'); ?>.png" class="mx-auto d-block mainLogo" alt="">
+    <img src="<?php echo $this->paths->cache_buster('/assets/logo/' . $this->optionslib->get_logo('main_logo') . '.png'); ?>" class="mx-auto d-block mainLogo" alt="">
     <div class="my-2 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 52d2308e0..c53fd56ed 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -30,7 +30,7 @@
     }
 </style>
 <main class="form-signin">
-    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('main_logo'); ?>.png" class="mx-auto d-block mainLogo" alt="">
+    <img src="<?php echo $this->paths->cache_buster('/assets/logo/' . $this->optionslib->get_logo('main_logo') . '.png'); ?>" class="mx-auto d-block mainLogo" alt="">
     <?php if (ENVIRONMENT == 'maintenance') { ?>
         <div class="d-flex justify-content-center align-items-center">
             <span class="badge text-bg-warning mb-4 pt-2 pb-2"><?= __("MAINTENANCE MODE"); ?></span>
diff --git a/application/views/user/modals/first_login_wizard.php b/application/views/user/modals/first_login_wizard.php
index cc3d02447..1b90f84cf 100644
--- a/application/views/user/modals/first_login_wizard.php
+++ b/application/views/user/modals/first_login_wizard.php
@@ -8,7 +8,7 @@
             <div class="modal-body" id="firstloginwizard_modal_content" style="overflow-y: auto; max-height: 75vh;">
                     <div class="row" style="margin-top: 20px;">
                         <div class="col-md-5" id="logo-container">
-                            <img src="<?php echo base_url(); ?>assets/logo/wavelog_logo_darkly.png" alt="" style="max-width: 100%; height: auto; margin-top: 70px;">
+                            <img src="<?php echo $this->paths->cache_buster('/assets/logo/wavelog_logo_darkly.png'); ?>" alt="" style="max-width: 100%; height: auto; margin-top: 70px;">
                         </div>
 
                         <div class="col-md-7">
diff --git a/application/views/visitor/exportmap/footer.php b/application/views/visitor/exportmap/footer.php
index c853aa913..3bd474dab 100644
--- a/application/views/visitor/exportmap/footer.php
+++ b/application/views/visitor/exportmap/footer.php
@@ -6,23 +6,23 @@
 		*/
 		var base_url = "<?php echo base_url(); ?>"; // Base URL
 		var site_url = "<?php echo site_url(); ?>"; // Site URL
-		var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
+		var icon_dot_url = "<?php echo $this->paths->cache_buster('/assets/images/dot.png'); ?>";
 		var option_map_tile_server_copyright = '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>';
 		var option_map_tile_subdomains = '<?php echo $this->optionslib->get_option('option_map_tile_subdomains') ?? 'abc';?>';
 	</script>
 
 	<!-- General JS Files used across Wavelog -->
-	<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
-	<script src="<?php echo base_url(); ?>assets/js/bootstrap.bundle.js"></script>
-	<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.js"></script>
-	<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.Maidenhead.qrb.js"></script>
-	<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.geodesic.js"></script>
-	<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/darkmodehelpers.js"></script>
-	<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/easyprint.js"></script>
+	<script src="<?php echo $this->paths->cache_buster('/assets/js/jquery-3.3.1.min.js'); ?>"></script>
+	<script src="<?php echo $this->paths->cache_buster('/assets/js/bootstrap.bundle.js'); ?>"></script>
+	<script type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/leaflet/leaflet.js'); ?>"></script>
+	<script type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/leaflet/L.Maidenhead.qrb.js'); ?>"></script>
+	<script type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/leaflet/leaflet.geodesic.js'); ?>"></script>
+	<script type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/darkmodehelpers.js'); ?>"></script>
+	<script type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/easyprint.js'); ?>"></script>
 
-    <script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('map_tile_server');?>"></script>
-	<script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/exportmap.js"></script>
-	<script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/cqmap_geojson.js"></script>
-	<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Terminator.js"></script>
+    <script id="leafembed" type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/leaflet/leafembed.js'); ?>" tileUrl="<?php echo $this->optionslib->get_option('map_tile_server');?>"></script>
+	<script type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/sections/exportmap.js'); ?>"></script>
+	<script type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/sections/cqmap_geojson.js'); ?>"></script>
+	<script type="text/javascript" src="<?php echo $this->paths->cache_buster('/assets/js/leaflet/L.Terminator.js'); ?>"></script>
 	</body>
 </html>
diff --git a/application/views/visitor/exportmap/header.php b/application/views/visitor/exportmap/header.php
index c83e82b65..b69dfbd33 100644
--- a/application/views/visitor/exportmap/header.php
+++ b/application/views/visitor/exportmap/header.php
@@ -8,19 +8,19 @@
 
   <!-- Bootstrap CSS -->
   <?php if ($this->optionslib->get_theme()) { ?>
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->optionslib->get_theme(); ?>/bootstrap.min.css">
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->optionslib->get_theme(); ?>/overrides.css">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $this->optionslib->get_theme() . '/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/general.css'); ?>">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $this->optionslib->get_theme() . '/overrides.css'); ?>">
   <?php } ?>
 
-  <link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.min.css">
+  <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/fontawesome/css/all.min.css'); ?>">
 
-  <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" />
+  <link rel="stylesheet" type="text/css" href="<?php echo $this->paths->cache_buster('/assets/js/leaflet/leaflet.css'); ?>" />
 
-  <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/loading.min.css" />
-  <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/ldbtn.min.css" />
+  <link rel="stylesheet" type="text/css" href="<?php echo $this->paths->cache_buster('/assets/css/loading.min.css'); ?>" />
+  <link rel="stylesheet" type="text/css" href="<?php echo $this->paths->cache_buster('/assets/css/ldbtn.min.css'); ?>" />
 
-  <link rel="icon" href="<?php echo base_url(); ?>favicon.ico">
+  <link rel="icon" href="<?php echo $this->paths->cache_buster('/favicon.ico'); ?>">
 
   <title><?php if (isset($page_title)) { echo $page_title; } ?> - Wavelog</title>
 </head>
diff --git a/application/views/widgets/on_air.php b/application/views/widgets/on_air.php
index 49cf85ee4..3411f544f 100644
--- a/application/views/widgets/on_air.php
+++ b/application/views/widgets/on_air.php
@@ -22,9 +22,9 @@ The widget automatically detects the nojs=1 parameter and serves a JavaScript-fr
     <!-- No auto-refresh for QRZ.com compatibility - blocked by sandbox -->
     <?php endif; ?>
 
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $theme; ?>/bootstrap.min.css">
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $theme; ?>/overrides.css">
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $theme . '/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $theme . '/overrides.css'); ?>">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/general.css'); ?>">
 
     <title><?= "Wavelog Dynamic On-Air widget"; ?></title>
     <style>
@@ -136,7 +136,7 @@ The widget automatically detects the nojs=1 parameter and serves a JavaScript-fr
     <!-- No-JavaScript mode for QRZ.com compatibility -->
     <div class="widget container d-flex">
         <div class="left-column">
-            <img class="widgetLogo" src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo', $theme); ?>.png" alt="Logo" />
+            <img class="widgetLogo" src="<?php echo $this->paths->cache_buster('/assets/logo/' . $this->optionslib->get_logo('header_logo', $theme) . '.png'); ?>" alt="Logo" />
         </div>
         <?php if (!isset($error)) { ?>
         <div class="right-column">
@@ -197,7 +197,7 @@ The widget automatically detects the nojs=1 parameter and serves a JavaScript-fr
     <!-- Normal JavaScript-enabled mode -->
     <div class="widget container d-flex">
         <div class="left-column">
-            <img class="widgetLogo" src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo', $theme); ?>.png" alt="Logo" />
+            <img class="widgetLogo" src="<?php echo $this->paths->cache_buster('/assets/logo/' . $this->optionslib->get_logo('header_logo', $theme) . '.png'); ?>" alt="Logo" />
         </div>
         <?php if (!isset($error)) { ?>
         <div class="right-column">
diff --git a/application/views/widgets/oqrs.php b/application/views/widgets/oqrs.php
index a5ec8ce70..54072107a 100644
--- a/application/views/widgets/oqrs.php
+++ b/application/views/widgets/oqrs.php
@@ -14,9 +14,9 @@ To use this widget insert this Element:
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $theme; ?>/bootstrap.min.css">
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $theme; ?>/overrides.css">
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $theme . '/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $theme . '/overrides.css'); ?>">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/general.css'); ?>">
 
     <title><?= __("Wavelog OQRS"); ?></title>
     <style>
@@ -69,7 +69,7 @@ To use this widget insert this Element:
 <body>
     <div class="widget container d-flex">
         <div class="left-column">
-            <a href="<?php echo $logo_url; ?>" target="_blank"><img class="widgetLogo" src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo', $theme); ?>.png" alt="Logo" /></a>
+            <a href="<?php echo $logo_url; ?>" target="_blank"><img class="widgetLogo" src="<?php echo $this->paths->cache_buster('/assets/logo/' . $this->optionslib->get_logo('header_logo', $theme) . '.png'); ?>" alt="Logo" /></a>
         </div>
         <div class="right-column">
             <div class="top-right">
diff --git a/application/views/widgets/qsos.php b/application/views/widgets/qsos.php
index e95300471..bd18b5d20 100644
--- a/application/views/widgets/qsos.php
+++ b/application/views/widgets/qsos.php
@@ -3,9 +3,9 @@
 	<meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $theme; ?>/bootstrap.min.css">
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $theme; ?>/overrides.css">
-    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $theme . '/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/' . $theme . '/overrides.css'); ?>">
+    <link rel="stylesheet" href="<?php echo $this->paths->cache_buster('/assets/css/general.css'); ?>">
 
     <title><?= "QSOs"; ?></title>
 </head>
