diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 4b5e0c6e5..2998124c0 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -8,51 +8,51 @@
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-status-bar-style" content="default">
-	<link rel="manifest" href="<?php echo base_url(); ?>manifest.json" />
+	<link rel="manifest" href="<?php echo $this->paths->cache_buster('manifest.json'); ?>" />
 
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/buttons.dataTables.min.css" />
+	<link rel="stylesheet" type="text/css" href="<?php echo $this->paths->cache_buster('assets/css/buttons.dataTables.min.css'); ?>" />
 
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/datatables.min.css" />
+	<link rel="stylesheet" type="text/css" href="<?php echo $this->paths->cache_buster('assets/css/datatables.min.css'); ?>" />
 
 	<!-- Bootstrap CSS -->
 	<?php
 	$theme = $this->optionslib->get_theme();
 	if ($theme) { ?>
-		<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap-multiselect.css">
-		<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/general.css">
-		<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/selectize.bootstrap4.css" />
-		<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap-dialog.css" />
-		<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $theme; ?>/overrides.css">
+		<link rel="stylesheet" href="<?php echo $this->paths->cache_buster('assets/css/bootstrap-multiselect.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/general.css'); ?>">
+		<link rel="stylesheet" href="<?php echo $this->paths->cache_buster('assets/css/selectize.bootstrap4.css'); ?>" />
+		<link rel="stylesheet" href="<?php echo $this->paths->cache_buster('assets/css/bootstrap-dialog.css'); ?>" />
+		<link rel="stylesheet" href="<?php echo $this->paths->cache_buster('assets/css/'.$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'); ?>" />
 
 	<!-- Maps -->
-	<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 base_url(); ?>assets/js/leaflet/Control.FullScreen.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 $this->paths->cache_buster('assets/js/leaflet/Control.FullScreen.css'); ?>" />
 
 	<?php if ($this->uri->segment(1) == "search" && $this->uri->segment(2) == "filter") { ?>
-		<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/query-builder.default.min.css" />
+		<link rel="stylesheet" type="text/css" href="<?php echo $this->paths->cache_buster('assets/css/query-builder.default.min.css'); ?>" />
 	<?php } ?>
 
 	<?php if ($this->uri->segment(1) == "notes" && ($this->uri->segment(2) == "add" || $this->uri->segment(2) == "edit")) { ?>
-		<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/plugins/quill/quill.snow.css" />
+		<link rel="stylesheet" type="text/css" href="<?php echo $this->paths->cache_buster('assets/plugins/quill/quill.snow.css'); ?>" />
 	<?php } ?>
 
-	<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'); ?>" />
 
 
 	<?php if ($this->uri->segment(1) == "sattimers") { ?>
-		<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/sattimers.css" />
+		<link rel="stylesheet" type="text/css" href="<?php echo $this->paths->cache_buster('assets/css/sattimers.css'); ?>" />
 	<?php } ?>
 
-	<?php if (file_exists(APPPATH . '../assets/css/custom.css')) {
-		echo '<link rel="stylesheet" href="' . base_url() . 'assets/css/custom.css">';
-	} ?>
+	<?php if (file_exists(APPPATH . '../assets/css/custom.css')) { ?>
+		<link rel="stylesheet" href="<?php echo $this->paths->cache_buster('assets/css/custom.css'); ?>">
+	<?php } ?>
 
 	<script>
 		var userName = '<?php echo $this->session->userdata('user_name'); ?>';
@@ -67,11 +67,11 @@
                 ?>
 	</script>
 
-	<?php if (file_exists(APPPATH . '../assets/js/sections/custom.js')) {
-		echo '<script src="' . base_url() . 'assets/js/sections/custom.js"></script>';
-	} ?>
+	<?php if (file_exists(APPPATH . '../assets/js/sections/custom.js')) { ?>
+		<script src="<?php echo $this->paths->cache_buster('assets/js/sections/custom.js"></script>'); ?>">
+	<?php } ?>
 
-	<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;
@@ -81,7 +81,7 @@
 <body dir="<?php echo $language['direction']; ?>">
 	<nav class="navbar navbar-expand-lg navbar-light bg-light main-nav" id="header-menu">
 		<div class="container">
-			<a class="navbar-brand" href="<?php echo site_url(); ?>"><img class="headerLogo" src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo'); ?>.png" alt="Logo" /></a>
+			<a class="navbar-brand" href="<?php echo site_url(); ?>"><img class="headerLogo" src="<?php echo $this->paths->cache_buster('assets/logo/'. $this->optionslib->get_logo('header_logo').'.png'); ?>" alt="Logo" /></a>
 			<?php if (ENVIRONMENT == "development") { ?>
 				<span class="badge text-bg-danger"><?= __("Developer Mode"); ?></span>
 			<?php } ?>