diff --git a/src/commoncomponents/PreferenceItemDelegate.qml b/src/commoncomponents/PreferenceItemDelegate.qml
index c0d07e46391b47fe8589d6f63a904a938684fa91..3708a245500c46f9fc4e1e1ba7667edb44b26a3b 100644
--- a/src/commoncomponents/PreferenceItemDelegate.qml
+++ b/src/commoncomponents/PreferenceItemDelegate.qml
@@ -25,6 +25,7 @@ import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
 
 import "../commoncomponents"
+import "../settingsview/components"
 
 ItemDelegate {
     id: root
@@ -130,7 +131,7 @@ ItemDelegate {
             opacity: enabled ? 1.0 : 0.5
         }
 
-        Switch {
+        ToggleSwitch {
             id: btnPreferenceSwitch
 
             visible: preferenceType === PreferenceItemDelegate.SWITCH
@@ -140,7 +141,7 @@ ItemDelegate {
             Layout.preferredWidth: 30
             checked: preferenceCurrentValue === "1"
 
-            onToggled: getNewPreferenceValueSlot(checked)
+            onSwitchToggled: getNewPreferenceValueSlot(checked)
             opacity: enabled ? 1.0 : 0.5
         }
 
diff --git a/src/settingsview/components/PluginItemDelegate.qml b/src/settingsview/components/PluginItemDelegate.qml
index 45bbdf74d8508137085ecf43b3b6e72b79e15479..d8dad4707408ef0f4799c0740901e7ff6023623c 100644
--- a/src/settingsview/components/PluginItemDelegate.qml
+++ b/src/settingsview/components/PluginItemDelegate.qml
@@ -94,7 +94,7 @@ ItemDelegate {
                 verticalAlignment: Text.AlignVCenter
             }
 
-            Switch {
+            ToggleSwitch {
                 id: loadSwitch
                 Layout.fillHeight: true
                 property bool isHovering: false
@@ -106,29 +106,10 @@ ItemDelegate {
                 ToolTip.text: qsTr("Load/Unload")
 
                 checked: isLoaded
-                onClicked: {
+                onSwitchToggled: {
                     btnLoadPluginToggled()
                     pluginListPreferencesView.isLoaded = root.isLoaded
                 }
-
-                background: Rectangle {
-                    id: switchBackground
-
-                    color: "transparent"
-                    MouseArea {
-                        id: btnMouseArea
-                        hoverEnabled: true
-                        onReleased: {
-                            loadSwitch.clicked()
-                        }
-                        onEntered: {
-                            loadSwitch.isHovering = true
-                        }
-                        onExited: {
-                            loadSwitch.isHovering = false
-                        }
-                    }
-                }
             }
 
             PushButton {