diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php
index 0e23d473d..11da2b0bb 100644
--- a/app/bridges/bridges.php
+++ b/app/bridges/bridges.php
@@ -47,7 +47,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['bridges'])) {
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index 3d6ae3c27..386ddbfbc 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -46,7 +46,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['call_blocks'])) {
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index aac61a9d6..1bc0b669a 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -47,7 +47,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['call_broadcasts'])) {
diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php
index 634b1468a..e14424d72 100644
--- a/app/call_centers/call_center_agents.php
+++ b/app/call_centers/call_center_agents.php
@@ -43,7 +43,7 @@
 	$text = $language->get();
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['call_center_agents'])) {
diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php
index 3c8ea1743..943af8fe8 100644
--- a/app/call_centers/call_center_queues.php
+++ b/app/call_centers/call_center_queues.php
@@ -46,7 +46,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['call_center_queues']) && is_array($_POST['call_center_queues'])) {
diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php
index 85d518249..3fa0d04a6 100644
--- a/app/call_flows/call_flows.php
+++ b/app/call_flows/call_flows.php
@@ -46,7 +46,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get search
 	$search = $_REQUEST['search'] ?? null;
diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php
index e7de481ed..5e6a6da89 100644
--- a/app/call_forward/call_forward.php
+++ b/app/call_forward/call_forward.php
@@ -296,7 +296,7 @@
 		echo "	<th>" . $text['label-dnd'] . "</th>\n";
 	}
 	echo "	<th class='" . ($is_included ? 'hide-md-dn' : 'hide-sm-dn') . "'>" . $text['label-description'] . "</th>\n";
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 	if ($list_row_edit_button) {
 		echo "	<td class='action-button'>&nbsp;</td>\n";
 	}
diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php
index 91aa6a350..d77939cda 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -49,7 +49,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['conference_centers'])) {
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index ce52a1cc2..e997ca44a 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -49,7 +49,7 @@
 	$search = $_GET["search"] ?? null;
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['conference_rooms'])) {
diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php
index ae36677f0..4bfbfec39 100644
--- a/app/conference_centers/conference_session_details.php
+++ b/app/conference_centers/conference_session_details.php
@@ -45,7 +45,7 @@
 	$text = $language->get();
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //set variables from the http values
 	$order_by = $_GET["order_by"] ?? '' ? $_GET["order_by"] : 'start_epoch';
diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php
index e881be1fb..3d765bda3 100644
--- a/app/conference_centers/conference_sessions.php
+++ b/app/conference_centers/conference_sessions.php
@@ -46,7 +46,7 @@
 	$text = $language->get();
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['conference_sessions'])) {
diff --git a/app/conference_controls/conference_control_details.php b/app/conference_controls/conference_control_details.php
index ba3569a98..c65d18403 100644
--- a/app/conference_controls/conference_control_details.php
+++ b/app/conference_controls/conference_control_details.php
@@ -43,7 +43,7 @@
 	$text = $language->get();
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['conference_control_details'])) {
diff --git a/app/conference_controls/conference_controls.php b/app/conference_controls/conference_controls.php
index 43af79f9d..41f7bbac5 100644
--- a/app/conference_controls/conference_controls.php
+++ b/app/conference_controls/conference_controls.php
@@ -43,7 +43,7 @@
 	$text = $language->get();
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['conference_controls'])) {
diff --git a/app/conference_profiles/conference_profile_params.php b/app/conference_profiles/conference_profile_params.php
index 0ab480e91..7edf4e3fb 100644
--- a/app/conference_profiles/conference_profile_params.php
+++ b/app/conference_profiles/conference_profile_params.php
@@ -43,7 +43,7 @@
 	$text = $language->get();
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['conference_profile_params'])) {
diff --git a/app/conference_profiles/conference_profiles.php b/app/conference_profiles/conference_profiles.php
index 4a7a0c9ba..37259c0a9 100644
--- a/app/conference_profiles/conference_profiles.php
+++ b/app/conference_profiles/conference_profiles.php
@@ -45,7 +45,7 @@
 	$search = $_GET["search"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['conference_profiles'])) {
diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php
index e61d54b0d..54ce65339 100644
--- a/app/conferences/conferences.php
+++ b/app/conferences/conferences.php
@@ -46,7 +46,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['conferences'])) {
diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php
index d95129a4c..4ec96f3af 100644
--- a/app/database_transactions/database_transactions.php
+++ b/app/database_transactions/database_transactions.php
@@ -51,7 +51,7 @@
 	$order = $_GET["order"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 	$button_icon_view = !empty($_SESSION['theme']['button_icon_view']) ? $_SESSION['theme']['button_icon_view'] : '';
 
 //add the user filter and search term
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index 62b2cd8be..201d72dab 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -141,7 +141,7 @@
 	$order = $_GET["order"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //prepare to page the results
 	$sql = "select count(*) from v_destinations ";
diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php
index 594ac1470..9a9ac8b47 100644
--- a/app/dialplans/dialplans.php
+++ b/app/dialplans/dialplans.php
@@ -134,7 +134,7 @@
 	$show = !empty($_GET["show"]) ? $_GET["show"] : '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 	$button_icon_add = $_SESSION['theme']['button_icon_add'] ?? '';
 	$button_icon_copy = $_SESSION['theme']['button_icon_copy'] ?? '';
 	$button_icon_toggle = $_SESSION['theme']['button_icon_toggle'] ?? '';
diff --git a/app/extension_settings/extension_settings.php b/app/extension_settings/extension_settings.php
index c2716b6af..26f06fffe 100644
--- a/app/extension_settings/extension_settings.php
+++ b/app/extension_settings/extension_settings.php
@@ -44,7 +44,7 @@
 	$id = '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['extension_settings'])) {
diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php
index cb9d02729..b28182747 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -118,7 +118,7 @@
 	$show = !empty($_GET["show"]) ? $_GET["show"] : '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get total gateway count from the database
 	$sql = "select count(*) from v_gateways where true ";
diff --git a/app/ivr_menus/ivr_menus.php b/app/ivr_menus/ivr_menus.php
index edb964215..3e57f95ea 100644
--- a/app/ivr_menus/ivr_menus.php
+++ b/app/ivr_menus/ivr_menus.php
@@ -94,7 +94,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //prepare to page the results
 	$sql = "select count(*) from v_ivr_menus ";
diff --git a/app/modules/modules.php b/app/modules/modules.php
index cdc8b56f0..3c52b5320 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -60,7 +60,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //process the http post data by action
 	if ($action != '' && is_array($modules) && @sizeof($modules) != 0) {
diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php
index 073c1b2c6..26da79e41 100644
--- a/app/number_translations/number_translations.php
+++ b/app/number_translations/number_translations.php
@@ -46,7 +46,7 @@
 	$search = $_GET["search"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['number_translations'])) {
diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php
index 565f227ea..e39bd3480 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -76,7 +76,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get order and order by
 	if (isset($_GET["order_by"])) {
diff --git a/app/sofia_global_settings/sofia_global_settings.php b/app/sofia_global_settings/sofia_global_settings.php
index d9b89df7e..e877f3e2f 100644
--- a/app/sofia_global_settings/sofia_global_settings.php
+++ b/app/sofia_global_settings/sofia_global_settings.php
@@ -44,7 +44,7 @@
 	$search = '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['sofia_global_settings'])) {
diff --git a/app/vars/vars.php b/app/vars/vars.php
index 305fc7bef..4935b0103 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -85,7 +85,7 @@
 	$order = $_GET["order"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the count
 	$sql = "select count(var_uuid) from v_vars ";
diff --git a/core/contacts/contact_addresses.php b/core/contacts/contact_addresses.php
index eb874eb19..ea19afab4 100644
--- a/core/contacts/contact_addresses.php
+++ b/core/contacts/contact_addresses.php
@@ -38,7 +38,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //set the uuid
 	if (!empty($_GET['id']) && is_uuid($_GET['id'])) {
diff --git a/core/contacts/contact_attachments.php b/core/contacts/contact_attachments.php
index b9d92d682..f34061174 100644
--- a/core/contacts/contact_attachments.php
+++ b/core/contacts/contact_attachments.php
@@ -38,7 +38,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the contact attachment list
 	$sql = "select *, length(decode(attachment_content,'base64')) as attachment_size from v_contact_attachments ";
diff --git a/core/contacts/contact_emails.php b/core/contacts/contact_emails.php
index d0da02429..2537253a6 100644
--- a/core/contacts/contact_emails.php
+++ b/core/contacts/contact_emails.php
@@ -38,7 +38,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the contact list
 	$sql = "select * from v_contact_emails ";
diff --git a/core/contacts/contact_extensions.php b/core/contacts/contact_extensions.php
index 5354aae37..6d6d4b8a5 100644
--- a/core/contacts/contact_extensions.php
+++ b/core/contacts/contact_extensions.php
@@ -38,7 +38,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the extension list
 	$sql = "select e.extension_uuid, e.extension, e.enabled, e.description ";
diff --git a/core/contacts/contact_relations.php b/core/contacts/contact_relations.php
index a717f46bd..1d20bd23a 100644
--- a/core/contacts/contact_relations.php
+++ b/core/contacts/contact_relations.php
@@ -38,7 +38,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the related contacts
 	$sql = "select ";
diff --git a/core/contacts/contact_settings.php b/core/contacts/contact_settings.php
index f14b23c13..e017dc974 100644
--- a/core/contacts/contact_settings.php
+++ b/core/contacts/contact_settings.php
@@ -39,7 +39,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the list
 	$sql = "select * from v_contact_settings ";
diff --git a/core/contacts/contact_times.php b/core/contacts/contact_times.php
index bd7169f7a..9a7f9cace 100644
--- a/core/contacts/contact_times.php
+++ b/core/contacts/contact_times.php
@@ -38,7 +38,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //set the uuid
 	if (!empty($_GET['id']) && is_uuid($_GET['id'])) {
diff --git a/core/contacts/contacts.php b/core/contacts/contacts.php
index 42e9f87cc..405bcbf1e 100644
--- a/core/contacts/contacts.php
+++ b/core/contacts/contacts.php
@@ -46,7 +46,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['contacts'])) {
diff --git a/core/databases/databases.php b/core/databases/databases.php
index bf4c3d339..dc24bdb9a 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -46,7 +46,7 @@
 	$text = $language->get();
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['databases'])) {
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index d2690bdb4..4d2af87dd 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -82,7 +82,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //build the query string
 	$query_string = '';
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index f772f503f..cd1228a67 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -54,7 +54,7 @@
 	$show = !empty($_GET["show"]) ? $_GET["show"] : '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the http post data
 	if (!empty($_POST['action'])) {
diff --git a/core/domains/domains.php b/core/domains/domains.php
index 981d051f1..c1f8d3426 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -156,7 +156,7 @@
 	$show = $_GET["show"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //add the search string
 	if (!empty($search)) {
diff --git a/core/email_templates/email_templates.php b/core/email_templates/email_templates.php
index e7d3363c3..3cf16a6b6 100644
--- a/core/email_templates/email_templates.php
+++ b/core/email_templates/email_templates.php
@@ -40,7 +40,7 @@
 	$text = $language->get();
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get posted data
 	if (!empty($_POST['email_templates'])) {
diff --git a/core/groups/groups.php b/core/groups/groups.php
index 1c220033f..05eca2eaa 100644
--- a/core/groups/groups.php
+++ b/core/groups/groups.php
@@ -88,7 +88,7 @@
 	}
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //get the count
 	$sql = "select count(*) from view_groups \n";
diff --git a/core/menu/menu.php b/core/menu/menu.php
index 22713d8ed..fec34008b 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -48,7 +48,7 @@
 	$search = $_GET["search"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 	$button_icon_add = $_SESSION['theme']['button_icon_add'] ?? '';
 
 //get the http post data
diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php
index 2f3a10f24..e672c1ffa 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -73,7 +73,7 @@
 	$order = $_GET["order"] ?? '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //set the initial value
 	$tmp_menu_item_order = 0;
diff --git a/core/users/users.php b/core/users/users.php
index e9da99404..4546d8e3f 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -89,7 +89,7 @@
 	$show = !empty($_GET["show"]) ? $_GET["show"] : '';
 
 //set from session variables
-	$list_row_edit_button = filter_var($_SESSION['theme']['list_row_edit_button']['boolean'] ?? false, FILTER_VALIDATE_BOOL);
+	$list_row_edit_button = $settings->get('theme', 'list_row_edit_button', false);
 
 //add the search string
 	if (!empty($search)) {