diff --git a/daemon b/daemon
index c9bb7b123194967dda603f0ef3ba00d2b5b4c520..7a45b5b197f57bab2c6b999c5b101c2af242c9cd 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit c9bb7b123194967dda603f0ef3ba00d2b5b4c520
+Subproject commit 7a45b5b197f57bab2c6b999c5b101c2af242c9cd
diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 9604e49e7f7c0dd0c71c61dde45fcdf1c59be2e8..82617463cad838f0a19b08ef758861596f5a4fae 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/src/app/mainview/components/CallActionBar.qml
@@ -350,15 +350,6 @@ Control {
             enabled: CurrentCall.isSIP
             onEnabledChanged: CallOverlayModel.setEnabled(this, inputPanelSIPAction.enabled)
         },
-        Action {
-            id: callTransferAction
-            onTriggered: root.transferClicked()
-            icon.source: JamiResources.phone_forwarded_24dp_svg
-            icon.color: "white"
-            text: JamiStrings.transferCall
-            enabled: CurrentCall.isSIP
-            onEnabledChanged: CallOverlayModel.setEnabled(this, callTransferAction.enabled)
-        },
         Action {
             id: shareAction
             onTriggered: {
@@ -420,9 +411,18 @@ Control {
             icon.source: JamiResources.plugins_24dp_svg
             icon.color: "white"
             text: JamiStrings.viewPlugin
-            enabled: PluginAdapter.callMediaHandlersListCount
+            enabled: PluginAdapter.isEnabled && PluginAdapter.callMediaHandlersListCount
             onEnabledChanged: CallOverlayModel.setEnabled(this, pluginsAction.enabled)
         },
+        Action {
+            id: callTransferAction
+            onTriggered: root.transferClicked()
+            icon.source: JamiResources.phone_forwarded_24dp_svg
+            icon.color: "white"
+            text: JamiStrings.transferCall
+            enabled: !CurrentCall.isConference
+            onEnabledChanged: CallOverlayModel.setEnabled(this, callTransferAction.enabled)
+        },
         Action {
             id: swarmDetailsAction
             onTriggered: root.swarmDetailsClicked()
@@ -458,12 +458,12 @@ Control {
         CallOverlayModel.addSecondaryControl(addPersonAction, addPersonAction.enabled);
         CallOverlayModel.addSecondaryControl(resumePauseCallAction, resumePauseCallAction.enabled);
         CallOverlayModel.addSecondaryControl(inputPanelSIPAction, inputPanelSIPAction.enabled);
-        CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled);
         CallOverlayModel.addSecondaryControl(chatAction, chatAction.enabled);
         CallOverlayModel.addSecondaryControl(shareAction, shareAction.enabled);
         CallOverlayModel.addSecondaryControl(layoutAction, layoutAction.enabled);
         CallOverlayModel.addSecondaryControl(recordAction, recordAction.enabled);
         CallOverlayModel.addSecondaryControl(pluginsAction, pluginsAction.enabled);
+        CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled);
         CallOverlayModel.addSecondaryControl(swarmDetailsAction, swarmDetailsAction.enabled);
         overflowItemCount = CallOverlayModel.secondaryModel().rowCount();
     }