diff --git a/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml b/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
index 811b6ab3..0fe5ce91 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
@@ -21,6 +21,7 @@ TextField{
     }
     font:FluTextStyle.Body
     padding: 7
+    rightPadding: 40
     leftPadding: padding+4
     echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml b/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
index 4a03cf86..d1a099f6 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
@@ -12,7 +12,6 @@ TextField{
     property color placeholderNormalColor: FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
     property color placeholderFocusColor: FluTheme.dark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
     property color placeholderDisableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
-    property int iconRightMargin: icon_end.visible ? 40 : 5
     property bool cleanEnabled: true
     id:control
     padding: 7
@@ -38,7 +37,7 @@ TextField{
         return placeholderNormalColor
     }
     selectByMouse: true
-    rightPadding: icon_end.visible ? 50 : 30
+    rightPadding: icon_end.visible ? 66 : 40
     background: FluTextBoxBackground{
         inputItem: control
         implicitWidth: 240
@@ -91,7 +90,7 @@ TextField{
             iconSource: control.iconSource
             iconSize: 12
             Layout.alignment: Qt.AlignVCenter
-            Layout.rightMargin: 10
+            Layout.rightMargin: 7
             iconColor: FluTheme.dark ? Qt.rgba(222/255,222/255,222/255,1) : Qt.rgba(97/255,97/255,97/255,1)
             visible: control.iconSource != 0
         }
diff --git a/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml b/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
index 319ec100..12971300 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
@@ -22,6 +22,7 @@ TextField{
     }
     font:FluTextStyle.Body
     padding: 7
+    rightPadding: 40
     leftPadding: padding+4
     echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml b/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
index d74ae240..7f7de308 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
@@ -13,7 +13,6 @@ TextField{
     property color placeholderNormalColor: FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
     property color placeholderFocusColor: FluTheme.dark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
     property color placeholderDisableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
-    property int iconRightMargin: icon_end.visible ? 40 : 5
     property bool cleanEnabled: true
     id:control
     padding: 7
@@ -39,7 +38,7 @@ TextField{
         return placeholderNormalColor
     }
     selectByMouse: true
-    rightPadding: icon_end.visible ? 50 : 30
+    rightPadding: icon_end.visible ? 66 : 40
     background: FluTextBoxBackground{
         inputItem: control
         implicitWidth: 240
@@ -92,7 +91,7 @@ TextField{
             iconSource: control.iconSource
             iconSize: 12
             Layout.alignment: Qt.AlignVCenter
-            Layout.rightMargin: 10
+            Layout.rightMargin: 7
             iconColor: FluTheme.dark ? Qt.rgba(222/255,222/255,222/255,1) : Qt.rgba(97/255,97/255,97/255,1)
             visible: control.iconSource != 0
         }