diff --git a/frontend/src/pages/Batches/Batches.vue b/frontend/src/pages/Batches/Batches.vue
index e48db2fe..f46571a0 100644
--- a/frontend/src/pages/Batches/Batches.vue
+++ b/frontend/src/pages/Batches/Batches.vue
@@ -78,13 +78,14 @@
 					</div>
 				</div>
 
-				<Switch
-					size="sm"
-					v-model="certification"
-					:label="__('Certification')"
-					:description="__('Only show batches that offer a certificate.')"
-					@change="updateBatches()"
-				/>
+				<Tooltip :text="__('Only show batches that offer a certificate')">
+					<FormControl
+						type="checkbox"
+						v-model="certification"
+						:label="__('Certification')"
+						@change="updateBatches()"
+					/>
+				</Tooltip>
 			</div>
 		</div>
 		<div
@@ -123,7 +124,7 @@ import {
 	Dropdown,
 	FormControl,
 	Select,
-	Switch,
+	Tooltip,
 	TabButtons,
 	usePageMeta,
 } from 'frappe-ui'
diff --git a/frontend/src/pages/Courses/Courses.vue b/frontend/src/pages/Courses/Courses.vue
index 3cdc5491..18d72c48 100644
--- a/frontend/src/pages/Courses/Courses.vue
+++ b/frontend/src/pages/Courses/Courses.vue
@@ -77,7 +77,7 @@
 					</div>
 				</div>
 
-				<Tooltip :text="__('Only show courses that offer a certificate.')">
+				<Tooltip :text="__('Only show courses that offer a certificate')">
 					<FormControl
 						type="checkbox"
 						v-model="certification"