diff --git a/example/qml-Qt6/page/T_Awesome.qml b/example/qml-Qt6/page/T_Awesome.qml
index 6acab4f5..d8e660f5 100644
--- a/example/qml-Qt6/page/T_Awesome.qml
+++ b/example/qml-Qt6/page/T_Awesome.qml
@@ -62,7 +62,7 @@ FluContentPage {
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: item_icon.bottom
                 width:parent.width
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 text: modelData.name
                 horizontalAlignment: Text.AlignHCenter
             }
diff --git a/example/qml-Qt6/page/T_Badge.qml b/example/qml-Qt6/page/T_Badge.qml
index 0385e23e..4a536a3c 100644
--- a/example/qml-Qt6/page/T_Badge.qml
+++ b/example/qml-Qt6/page/T_Badge.qml
@@ -23,7 +23,7 @@ FluScrollablePage{
                 right: parent.right
             }
             FluText{
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 width: parent.width
                 text: qsTr("It usually appears in the upper right corner of the notification icon or avatar to display the number of messages that need to be processed")
             }
diff --git a/example/qml-Qt6/page/T_Expander.qml b/example/qml-Qt6/page/T_Expander.qml
index c2d7cb9d..602f67c9 100644
--- a/example/qml-Qt6/page/T_Expander.qml
+++ b/example/qml-Qt6/page/T_Expander.qml
@@ -64,7 +64,7 @@ FluScrollablePage{
                         FluText{
                             id:text_info
                             width: scrollview.width
-                            wrapMode: Text.WordWrap
+                            wrapMode: Text.WrapAnywhere
                             padding: 14
                             text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work, the restoration of Han. Today, the empire is still divided in three, and our very survival is threatened. Yet still the officials at court and the soldiers throughout the realm remain loyal to you, your majesty. Because they remember the late emperor, all of them, and they wish to repay his kindness in service to you. This is the moment to extend your divine influence, to honour the memory of the late Emperor and strengthen the morale of your officers. It is not time to listen to bad advice, or close your ears to the suggestions of loyal men.
 The court and the administration are as one. Both must be judged by one standard. Those who are loyal and good must get what they deserve, but so must the evil-doers who break the law. This will demonstrate the justice of your rule. There cannot be one law for the court and another for the administration.
@@ -97,7 +97,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
             FluText{
                 id:text_info
                 width: scrollview.width
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 padding: 14
                 text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...")
             }
diff --git a/example/qml-Qt6/page/T_Home.qml b/example/qml-Qt6/page/T_Home.qml
index 5a850dc4..d226fbf4 100644
--- a/example/qml-Qt6/page/T_Home.qml
+++ b/example/qml-Qt6/page/T_Home.qml
@@ -118,7 +118,7 @@ FluScrollablePage{
                             Layout.leftMargin: 20
                             color: FluColors.Grey120
                             font.pixelSize: 12
-                            wrapMode: Text.WordWrap
+                            wrapMode: Text.WrapAnywhere
                         }
                     }
                     FluIcon{
@@ -214,7 +214,7 @@ FluScrollablePage{
                     id:item_desc
                     text:desc
                     color:FluColors.Grey120
-                    wrapMode: Text.WordWrap
+                    wrapMode: Text.WrapAnywhere
                     elide: Text.ElideRight
                     font: FluTextStyle.Caption
                     maximumLineCount: 2
diff --git a/example/qml-Qt6/page/T_Network.qml b/example/qml-Qt6/page/T_Network.qml
index e0d90d8b..f4313c92 100644
--- a/example/qml-Qt6/page/T_Network.qml
+++ b/example/qml-Qt6/page/T_Network.qml
@@ -552,7 +552,7 @@ FluContentPage{
             FluText{
                 id:text_info
                 width: scrollview.width
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 padding: 14
             }
         }
diff --git a/example/qml-Qt6/page/T_Timeline.qml b/example/qml-Qt6/page/T_Timeline.qml
index 1a127916..08e9497a 100644
--- a/example/qml-Qt6/page/T_Timeline.qml
+++ b/example/qml-Qt6/page/T_Timeline.qml
@@ -23,7 +23,7 @@ FluScrollablePage{
     Component{
         id:com_lable
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             font.bold: true
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.lable
@@ -41,7 +41,7 @@ FluScrollablePage{
     Component{
         id:com_text
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
             font.bold: true
diff --git a/example/qml-Qt6/window/CrashWindow.qml b/example/qml-Qt6/window/CrashWindow.qml
index 6abf7396..7a25f0de 100644
--- a/example/qml-Qt6/window/CrashWindow.qml
+++ b/example/qml-Qt6/window/CrashWindow.qml
@@ -44,7 +44,7 @@ FluWindow {
             leftMargin: 10
             rightMargin: 10
         }
-        wrapMode: Text.WordWrap
+        wrapMode: Text.WrapAnywhere
         text: qsTr("We apologize for the inconvenience caused by an unexpected error")
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
diff --git a/example/qml-Qt6/window/HotloadWindow.qml b/example/qml-Qt6/window/HotloadWindow.qml
index acf75bd4..7ae6be9d 100644
--- a/example/qml-Qt6/window/HotloadWindow.qml
+++ b/example/qml-Qt6/window/HotloadWindow.qml
@@ -32,7 +32,7 @@ FluWindow {
                     text:loader.itemLodaer().sourceComponent.errorString()
                     color:"red"
                     anchors.fill: parent
-                    wrapMode: Text.WordWrap
+                    wrapMode: Text.WrapAnywhere
                     padding: 20
                     verticalAlignment: Qt.AlignVCenter
                     horizontalAlignment: Qt.AlignHCenter
diff --git a/example/qml-Qt6/window/SingleInstanceWindow.qml b/example/qml-Qt6/window/SingleInstanceWindow.qml
index 5e7e47a9..aca0d519 100644
--- a/example/qml-Qt6/window/SingleInstanceWindow.qml
+++ b/example/qml-Qt6/window/SingleInstanceWindow.qml
@@ -22,7 +22,7 @@ FluWindow {
     }
 
     FluText{
-        wrapMode: Text.WordWrap
+        wrapMode: Text.WrapAnywhere
         anchors{
             left: parent.left
             right: parent.right
diff --git a/example/qml/page/T_Awesome.qml b/example/qml/page/T_Awesome.qml
index 8d81181b..e203ba2f 100644
--- a/example/qml/page/T_Awesome.qml
+++ b/example/qml/page/T_Awesome.qml
@@ -62,7 +62,7 @@ FluContentPage {
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: item_icon.bottom
                 width:parent.width
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 text: modelData.name
                 horizontalAlignment: Text.AlignHCenter
             }
diff --git a/example/qml/page/T_Badge.qml b/example/qml/page/T_Badge.qml
index 3e205c25..a0ac3d2b 100644
--- a/example/qml/page/T_Badge.qml
+++ b/example/qml/page/T_Badge.qml
@@ -23,7 +23,7 @@ FluScrollablePage{
                 right: parent.right
             }
             FluText{
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 width: parent.width
                 text: qsTr("It usually appears in the upper right corner of the notification icon or avatar to display the number of messages that need to be processed")
             }
diff --git a/example/qml/page/T_Expander.qml b/example/qml/page/T_Expander.qml
index ebe727c2..ac6c5ded 100644
--- a/example/qml/page/T_Expander.qml
+++ b/example/qml/page/T_Expander.qml
@@ -64,7 +64,7 @@ FluScrollablePage{
                         FluText{
                             id:text_info
                             width: scrollview.width
-                            wrapMode: Text.WordWrap
+                            wrapMode: Text.WrapAnywhere
                             padding: 14
                             text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work, the restoration of Han. Today, the empire is still divided in three, and our very survival is threatened. Yet still the officials at court and the soldiers throughout the realm remain loyal to you, your majesty. Because they remember the late emperor, all of them, and they wish to repay his kindness in service to you. This is the moment to extend your divine influence, to honour the memory of the late Emperor and strengthen the morale of your officers. It is not time to listen to bad advice, or close your ears to the suggestions of loyal men.
 The court and the administration are as one. Both must be judged by one standard. Those who are loyal and good must get what they deserve, but so must the evil-doers who break the law. This will demonstrate the justice of your rule. There cannot be one law for the court and another for the administration.
@@ -97,7 +97,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
             FluText{
                 id:text_info
                 width: scrollview.width
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 padding: 14
                 text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...")
             }
diff --git a/example/qml/page/T_Home.qml b/example/qml/page/T_Home.qml
index e1195786..7f9cde08 100644
--- a/example/qml/page/T_Home.qml
+++ b/example/qml/page/T_Home.qml
@@ -118,7 +118,7 @@ FluScrollablePage{
                             Layout.leftMargin: 20
                             color: FluColors.Grey120
                             font.pixelSize: 12
-                            wrapMode: Text.WordWrap
+                            wrapMode: Text.WrapAnywhere
                         }
                     }
                     FluIcon{
@@ -214,7 +214,7 @@ FluScrollablePage{
                     id:item_desc
                     text:desc
                     color:FluColors.Grey120
-                    wrapMode: Text.WordWrap
+                    wrapMode: Text.WrapAnywhere
                     elide: Text.ElideRight
                     font: FluTextStyle.Caption
                     maximumLineCount: 2
diff --git a/example/qml/page/T_Network.qml b/example/qml/page/T_Network.qml
index 2bd28414..16dd73bb 100644
--- a/example/qml/page/T_Network.qml
+++ b/example/qml/page/T_Network.qml
@@ -552,7 +552,7 @@ FluContentPage{
             FluText{
                 id:text_info
                 width: scrollview.width
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 padding: 14
             }
         }
diff --git a/example/qml/page/T_Timeline.qml b/example/qml/page/T_Timeline.qml
index 1d60373a..2b37a1c2 100644
--- a/example/qml/page/T_Timeline.qml
+++ b/example/qml/page/T_Timeline.qml
@@ -23,7 +23,7 @@ FluScrollablePage{
     Component{
         id:com_lable
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             font.bold: true
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.lable
@@ -41,7 +41,7 @@ FluScrollablePage{
     Component{
         id:com_text
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
             font.bold: true
diff --git a/example/qml/window/CrashWindow.qml b/example/qml/window/CrashWindow.qml
index f012f0f3..c7ea293a 100644
--- a/example/qml/window/CrashWindow.qml
+++ b/example/qml/window/CrashWindow.qml
@@ -44,7 +44,7 @@ FluWindow {
             leftMargin: 10
             rightMargin: 10
         }
-        wrapMode: Text.WordWrap
+        wrapMode: Text.WrapAnywhere
         text: qsTr("We apologize for the inconvenience caused by an unexpected error")
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
diff --git a/example/qml/window/HotloadWindow.qml b/example/qml/window/HotloadWindow.qml
index 2031b0e1..8d77d8db 100644
--- a/example/qml/window/HotloadWindow.qml
+++ b/example/qml/window/HotloadWindow.qml
@@ -32,7 +32,7 @@ FluWindow {
                     text:loader.itemLodaer().sourceComponent.errorString()
                     color:"red"
                     anchors.fill: parent
-                    wrapMode: Text.WordWrap
+                    wrapMode: Text.WrapAnywhere
                     padding: 20
                     verticalAlignment: Qt.AlignVCenter
                     horizontalAlignment: Qt.AlignHCenter
diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml
index 96c83c2f..4939439e 100644
--- a/example/qml/window/MainWindow.qml
+++ b/example/qml/window/MainWindow.qml
@@ -13,7 +13,7 @@ FluWindow {
 
     id:window
     title: "FluentUI"
-    width: 960
+    width: 980
     height: 600
     minimumWidth: 520
     minimumHeight: 200
diff --git a/example/qml/window/SingleInstanceWindow.qml b/example/qml/window/SingleInstanceWindow.qml
index 0c1b7865..570b7ce1 100644
--- a/example/qml/window/SingleInstanceWindow.qml
+++ b/example/qml/window/SingleInstanceWindow.qml
@@ -22,7 +22,7 @@ FluWindow {
     }
 
     FluText{
-        wrapMode: Text.WordWrap
+        wrapMode: Text.WrapAnywhere
         anchors{
             left: parent.left
             right: parent.right
diff --git a/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml b/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
index 8ca8a3ba..1a49ddad 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
@@ -41,7 +41,7 @@ FluPopup {
             FluText{
                 id:text_message
                 font: FluTextStyle.Body
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 text:message
                 width: parent.width
                 topPadding: 4
@@ -67,7 +67,7 @@ FluPopup {
                 topPadding: 20
                 leftPadding: 20
                 rightPadding: 20
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
             }
             FluLoader{
                 sourceComponent: com_message
diff --git a/src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml b/src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml
index 2dd4f198..04a0e419 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml
@@ -45,7 +45,7 @@ Button {
             radius: parent.radius
             anchors{
                 fill: parent
-                topMargin: control.enabled ? 1 : 0
+                topMargin: control.enabled ? 0 : 0
                 leftMargin: control.enabled ? 1 : 0
                 rightMargin: control.enabled ? 1 : 0
                 bottomMargin: control.enabled ? 2 : 0
diff --git a/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml b/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
index 355f99c4..78bfa7c0 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
@@ -192,13 +192,13 @@ FluObject {
                     spacing: 5
                     FluText{
                         text:_super.text
-                        wrapMode: Text.WordWrap
+                        wrapMode: Text.WrapAnywhere
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }
                     FluText{
                         text: _super.moremsg
                         visible: _super.moremsg
-                        wrapMode : Text.WordWrap
+                        wrapMode : Text.WrapAnywhere
                         textColor: FluColors.Grey120
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }
diff --git a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
index 7168f25b..c09d6193 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
@@ -20,7 +20,7 @@ TextArea{
         return normalColor
     }
     font:FluTextStyle.Body
-    wrapMode: Text.WordWrap
+    wrapMode: Text.WrapAnywhere
     padding: 8
     leftPadding: padding+4
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
index 0f5a94af..7ff4ffe3 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
@@ -141,7 +141,7 @@ Rectangle {
             id:item_text
             text: String(display)
             elide: Text.ElideRight
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             anchors{
                 fill: parent
                 leftMargin: 11
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml b/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
index f4508aac..a4a3b564 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
@@ -95,7 +95,7 @@ Item{
     Component{
         id:com_lable
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: {
                 if(modelData.lable){
@@ -110,7 +110,7 @@ Item{
     Component{
         id:com_text
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
             textFormat: Text.RichText
diff --git a/src/Qt5/imports/FluentUI/Controls/FluToggleButton.qml b/src/Qt5/imports/FluentUI/Controls/FluToggleButton.qml
index e77ba5bc..27c5a505 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluToggleButton.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluToggleButton.qml
@@ -61,7 +61,7 @@ Button {
             radius: parent.radius
             anchors{
                 fill: parent
-                topMargin: checked && enabled ? 1 : 0
+                topMargin: checked && enabled ? 0 : 0
                 leftMargin: checked && enabled ? 1 : 0
                 rightMargin: checked && enabled ? 1 : 0
                 bottomMargin: checked && enabled ? 2 : 0
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTour.qml b/src/Qt5/imports/FluentUI/Controls/FluTour.qml
index dd336479..f1359117 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTour.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTour.qml
@@ -145,7 +145,7 @@ Popup{
         FluText{
             id: text_desc
             font: FluTextStyle.Body
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             maximumLineCount: 4
             elide: Text.ElideRight
             text: d.step.description
diff --git a/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml b/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
index b281ed7e..0ca3b277 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
@@ -41,7 +41,7 @@ FluPopup {
             FluText{
                 id:text_message
                 font: FluTextStyle.Body
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
                 text:message
                 width: parent.width
                 topPadding: 4
@@ -67,7 +67,7 @@ FluPopup {
                 topPadding: 20
                 leftPadding: 20
                 rightPadding: 20
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAnywhere
             }
             FluLoader{
                 sourceComponent: com_message
diff --git a/src/Qt6/imports/FluentUI/Controls/FluFilledButton.qml b/src/Qt6/imports/FluentUI/Controls/FluFilledButton.qml
index 9827c289..b83505cf 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluFilledButton.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluFilledButton.qml
@@ -46,7 +46,7 @@ Button {
             radius: parent.radius
             anchors{
                 fill: parent
-                topMargin: control.enabled ? 1 : 0
+                topMargin: control.enabled ? 0 : 0
                 leftMargin: control.enabled ? 1 : 0
                 rightMargin: control.enabled ? 1 : 0
                 bottomMargin: control.enabled ? 2 : 0
diff --git a/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml b/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
index c54f526a..4eaa185c 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
@@ -192,13 +192,13 @@ FluObject {
                     spacing: 5
                     FluText{
                         text:_super.text
-                        wrapMode: Text.WordWrap
+                        wrapMode: Text.WrapAnywhere
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }
                     FluText{
                         text: _super.moremsg
                         visible: _super.moremsg
-                        wrapMode : Text.WordWrap
+                        wrapMode : Text.WrapAnywhere
                         textColor: FluColors.Grey120
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }
diff --git a/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
index d8562a4b..6d1c3649 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
@@ -21,7 +21,7 @@ TextArea{
         return normalColor
     }
     font:FluTextStyle.Body
-    wrapMode: Text.WordWrap
+    wrapMode: Text.WrapAnywhere
     padding: 8
     leftPadding: padding+4
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
index 2b3f8f5b..1be0d668 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
@@ -142,7 +142,7 @@ Rectangle {
             id:item_text
             text: String(display)
             elide: Text.ElideRight
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             anchors{
                 fill: parent
                 leftMargin: 11
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml b/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
index 32253e04..6a42bf9c 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
@@ -95,7 +95,7 @@ Item{
     Component{
         id:com_lable
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: {
                 if(modelData.lable){
@@ -110,7 +110,7 @@ Item{
     Component{
         id:com_text
         FluText{
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
             textFormat: Text.RichText
diff --git a/src/Qt6/imports/FluentUI/Controls/FluToggleButton.qml b/src/Qt6/imports/FluentUI/Controls/FluToggleButton.qml
index 19dc6560..5dbb33d8 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluToggleButton.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluToggleButton.qml
@@ -57,7 +57,7 @@ Button {
             radius: parent.radius
             anchors{
                 fill: parent
-                topMargin: checked && enabled ? 1 : 0
+                topMargin: checked && enabled ? 0 : 0
                 leftMargin: checked && enabled ? 1 : 0
                 rightMargin: checked && enabled ? 1 : 0
                 bottomMargin: checked && enabled ? 2 : 0
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTour.qml b/src/Qt6/imports/FluentUI/Controls/FluTour.qml
index d406beb5..fd906744 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTour.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTour.qml
@@ -145,7 +145,7 @@ Popup{
         FluText{
             id: text_desc
             font: FluTextStyle.Body
-            wrapMode: Text.WordWrap
+            wrapMode: Text.WrapAnywhere
             maximumLineCount: 4
             elide: Text.ElideRight
             text: d.step.description