diff --git a/options/mzta-options.css b/options/mzta-options.css
index f0c21d66..86d168d1 100644
--- a/options/mzta-options.css
+++ b/options/mzta-options.css
@@ -163,6 +163,10 @@ div#miczTranslate{
     color: #292929;
 }
 
+label:has(input[type="checkbox"]) {
+    cursor: pointer;
+}
+
 @media (prefers-color-scheme: dark) {
     body {
         background-color: rgb(35, 34, 43);
diff --git a/pages/addtags/mzta-add-tags.css b/pages/addtags/mzta-add-tags.css
index 9b02a45c..268fd478 100644
--- a/pages/addtags/mzta-add-tags.css
+++ b/pages/addtags/mzta-add-tags.css
@@ -167,6 +167,9 @@ table#miczPrefs  tr:last-child td {
     color: red;
 }
 
+label:has(input[type="checkbox"]) {
+    cursor: pointer;
+}
 
 @media (prefers-color-scheme: dark) {
     body {
diff --git a/pages/customdataplaceholders/mzta-custom-dataplaceholders.css b/pages/customdataplaceholders/mzta-custom-dataplaceholders.css
index 888459df..02aeae07 100644
--- a/pages/customdataplaceholders/mzta-custom-dataplaceholders.css
+++ b/pages/customdataplaceholders/mzta-custom-dataplaceholders.css
@@ -302,6 +302,10 @@ input.input_additional[type="text"]{
     cursor: pointer;
 }
 
+label:has(input[type="checkbox"]) {
+    cursor: pointer;
+}
+
 @media (prefers-color-scheme: dark) {
     body {
         background-color: #1C1B22;
diff --git a/pages/customprompts/mzta-custom-prompts.css b/pages/customprompts/mzta-custom-prompts.css
index 5ff45b45..b44628d0 100644
--- a/pages/customprompts/mzta-custom-prompts.css
+++ b/pages/customprompts/mzta-custom-prompts.css
@@ -326,6 +326,10 @@ input.input_additional[type="text"]{
     text-decoration: underline;
 }
 
+label:has(input[type="checkbox"]) {
+    cursor: pointer;
+}
+
 @media (prefers-color-scheme: dark) {
     body {
         background-color: #1C1B22;
diff --git a/pages/customprompts/mzta-custom-prompts.html b/pages/customprompts/mzta-custom-prompts.html
index 1ec1d4bb..34622d5d 100644
--- a/pages/customprompts/mzta-custom-prompts.html
+++ b/pages/customprompts/mzta-custom-prompts.html
@@ -62,15 +62,15 @@
             <td rowspan="2" class="w19">
                 <label class="field_title">__MSG_customPrompts_Properties__:</label>
                 <br>
-                <span class="need_selected_span"><input type="checkbox" id="checkboxNeedSelectedNew" name="need_selected" class="need_selected_new" value="1" tabindex="6"> <label for="checkboxNeedSelectedNew">__MSG_customPrompts_form_label_need_selected__</label></span>
+                <label for="checkboxNeedSelectedNew"><span class="need_selected_span"><input type="checkbox" id="checkboxNeedSelectedNew" name="need_selected" class="need_selected_new" value="1" tabindex="6"> __MSG_customPrompts_form_label_need_selected__</label></span>
                 <br>
-                <input type="checkbox" id="checkboxNeedSignatureNew" name="need_signature" value="1" tabindex="7"> <label for="checkboxNeedSignatureNew">__MSG_customPrompts_form_label_need_signature__</label>
+                <label for="checkboxNeedSignatureNew"><input type="checkbox" id="checkboxNeedSignatureNew" name="need_signature" value="1" tabindex="7"> __MSG_customPrompts_form_label_need_signature__</label>
                 <br>
-                <span class="need_custom_text_span"><input type="checkbox" id="checkboxNeedCustomTextNew" name="need_custom_text" class="need_custom_text_new" value="1" tabindex="8"> <label for="checkboxNeedCustomTextNew">__MSG_customPrompts_form_label_need_custom_text__</label></span>
+                <label for="checkboxNeedCustomTextNew"><span class="need_custom_text_span"><input type="checkbox" id="checkboxNeedCustomTextNew" name="need_custom_text" class="need_custom_text_new" value="1" tabindex="8"> __MSG_customPrompts_form_label_need_custom_text__</label></span>
                 <br>
-                <input type="checkbox" id="checkboxDefineResponseLangNew" name="define_response_lang" value="1" tabindex="8"> <label for="checkboxDefineResponseLangNew">__MSG_customPrompts_form_label_define_response_lang__</label>
+                <label for="checkboxDefineResponseLangNew"><input type="checkbox" id="checkboxDefineResponseLangNew" name="define_response_lang" value="1" tabindex="8"> __MSG_customPrompts_form_label_define_response_lang__</label>
                 <br>
-                <input type="checkbox" id="checkboxUseDiffViewerNew" name="use_diff_viewer" value="1" tabindex="9" title="__MSG_customPrompts_form_label_use_diff_viewer_title__"> <label for="checkboxUseDiffViewerNew" title="__MSG_customPrompts_form_label_use_diff_viewer_title__">__MSG_customPrompts_form_label_use_diff_viewer__</label>
+                <label for="checkboxUseDiffViewerNew" title="__MSG_customPrompts_form_label_use_diff_viewer_title__"><input type="checkbox" id="checkboxUseDiffViewerNew" name="use_diff_viewer" value="1" tabindex="9" title="__MSG_customPrompts_form_label_use_diff_viewer_title__"> __MSG_customPrompts_form_label_use_diff_viewer__</label>
             </td>
         </tr>
         <tr>
diff --git a/pages/get-calendar-event/mzta-get-calendar-event.css b/pages/get-calendar-event/mzta-get-calendar-event.css
index 3e9f8137..d5e85b91 100644
--- a/pages/get-calendar-event/mzta-get-calendar-event.css
+++ b/pages/get-calendar-event/mzta-get-calendar-event.css
@@ -91,6 +91,9 @@ table#miczPrefs  tr:last-child td {
     color: red;
 }
 
+label:has(input[type="checkbox"]) {
+    cursor: pointer;
+}
 
 @media (prefers-color-scheme: dark) {
     body {
diff --git a/pages/get-task/mzta-get-task.css b/pages/get-task/mzta-get-task.css
index 0ce83ec5..806b5ac9 100644
--- a/pages/get-task/mzta-get-task.css
+++ b/pages/get-task/mzta-get-task.css
@@ -91,6 +91,9 @@ table#miczPrefs  tr:last-child td {
     color: red;
 }
 
+label:has(input[type="checkbox"]) {
+    cursor: pointer;
+}
 
 @media (prefers-color-scheme: dark) {
     body {
diff --git a/pages/spamfilter/mzta-spamfilter.css b/pages/spamfilter/mzta-spamfilter.css
index 85dc977f..7d330186 100644
--- a/pages/spamfilter/mzta-spamfilter.css
+++ b/pages/spamfilter/mzta-spamfilter.css
@@ -127,6 +127,10 @@ table#report_data th {
     background-color: #f4f4f4;
 }
 
+label:has(input[type="checkbox"]) {
+    cursor: pointer;
+}
+
 @media (prefers-color-scheme: dark) {
     body {
         background-color: #1C1B22;