diff --git a/qt6/src/qml/AlertToolTip.qml b/qt6/src/qml/AlertToolTip.qml
index 6608fb1b9..931a0592b 100644
--- a/qt6/src/qml/AlertToolTip.qml
+++ b/qt6/src/qml/AlertToolTip.qml
@@ -20,24 +20,10 @@ ToolTip {
     margins: 0
     closePolicy: Popup.NoAutoClose
 
-    background: Item {
-        BoxShadow {
-            anchors.fill: _background
-            shadowBlur: 20
-            shadowOffsetY: 6
-            shadowColor: Qt.rgba(0, 0, 0, 0.2)
-            cornerRadius: _background.radius
-        }
-
-        Rectangle {
-            property D.Palette backgroundColor: DS.Style.alertToolTip.background
-            property D.Palette borderColor: DS.Style.control.border
-            id: _background
-            anchors.fill: parent
-            color: D.ColorSelector.backgroundColor
-            border.color: D.ColorSelector.borderColor
-            radius: DS.Style.control.radius
-        }
+    background: FloatingPanel {
+        backgroundColor: DS.Style.alertToolTip.background
+        insideBorderColor: DS.Style.alertToolTip.insideBorder
+        outsideBorderColor: DS.Style.alertToolTip.outsideBorder
     }
 
     contentItem: Text {
@@ -59,23 +45,4 @@ ToolTip {
         NumberAnimation { properties: "opacity"; from: 1.0; to: 0.0 }
         NumberAnimation { properties: "y"; from: control.target.height + DS.Style.control.spacing ; to: control.target.height }
     }
-
-    BoxShadow {
-        property D.Palette dropShadowColor: DS.Style.alertToolTip.connecterdropShadow
-        property D.Palette backgroundColor: DS.Style.alertToolTip.connecterBackground
-        y: - height * (0.75) - control.topMargin - control.topPadding
-        width: DS.Style.alertToolTip.connectorWidth
-        height: DS.Style.alertToolTip.connectorHeight
-        shadowBlur: 4
-        shadowOffsetY: 2
-        shadowColor: D.ColorSelector.dropShadowColor
-        cornerRadius: _background.radius
-
-        Rectangle {
-            anchors.fill: parent
-            color: parent.D.ColorSelector.backgroundColor
-            border.color: _background.D.ColorSelector.borderColor
-            border.width: 1
-        }
-    }
 }
diff --git a/qt6/src/qml/FloatingPanel.qml b/qt6/src/qml/FloatingPanel.qml
index bed1c1d40..2b6f88292 100644
--- a/qt6/src/qml/FloatingPanel.qml
+++ b/qt6/src/qml/FloatingPanel.qml
@@ -81,7 +81,7 @@ Control {
 
         Loader {
             anchors.fill: backgroundRect
-            active: control.insideBorderColor && control.D.ColorSelector.controlTheme === D.ApplicationHelper.DarkType
+            active: control.insideBorderColor
             sourceComponent: InsideBoxBorder {
                 radius: backgroundRect.radius
                 color: control.D.ColorSelector.insideBorderColor
diff --git a/qt6/src/qml/FlowStyle.qml b/qt6/src/qml/FlowStyle.qml
index de7adacee..19751853e 100644
--- a/qt6/src/qml/FlowStyle.qml
+++ b/qt6/src/qml/FlowStyle.qml
@@ -619,8 +619,8 @@ QtObject {
         }
 
         property D.Palette background: D.Palette {
-            normal: Qt.rgba(247 / 255, 247 / 255, 247 / 255, 0.6)
-            normalDark: Qt.rgba(59 / 255, 59 / 255, 59 / 255, 0.6)
+            normal: Qt.rgba(247 / 255.0, 247 / 255.0, 247 / 255.0, 0.5)
+            normalDark: Qt.rgba(59 / 255.0, 59 / 255.0, 59 / 255.0, 0.5)
         }
 
         property D.Palette connecterdropShadow: D.Palette {
@@ -631,6 +631,21 @@ QtObject {
             normal: Qt.rgba(1, 1, 1, 1)
             normalDark: Qt.rgba(0, 0, 0, 0.1)
         }
+
+        property D.Palette dropShadow: D.Palette {
+            normal: Qt.rgba(0, 0, 0, 0.1)
+            normalDark: Qt.rgba(0, 0, 0, 0.2)
+        }
+
+        property D.Palette outsideBorder: D.Palette {
+            normal: Qt.rgba(0, 0, 0, 0.1)
+            normalDark: Qt.rgba(0, 0, 0, 0.7)
+        }
+
+        property D.Palette insideBorder: D.Palette {
+            normal: Qt.rgba(1, 1, 1, 0.3)
+            normalDark: Qt.rgba(1, 1, 1, 0.1)
+        }
     }
 
     property QtObject menu: QtObject {