diff --git a/src/plugin-accounts/qml/AccountSettings.qml b/src/plugin-accounts/qml/AccountSettings.qml
index b3dbc5fb18..edeb24f617 100644
--- a/src/plugin-accounts/qml/AccountSettings.qml
+++ b/src/plugin-accounts/qml/AccountSettings.qml
@@ -527,7 +527,7 @@ DccObject {
                         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
                         Layout.rightMargin: 10
                         text: groupSettings.isEditing ? qsTr("done") : qsTr("edit")
-                        font.pointSize: 13
+                        font.pointSize: 12
                         background: null
                         textColor: Palette {
                             normal {
diff --git a/src/plugin-datetime/qml/LangAndFormat.qml b/src/plugin-datetime/qml/LangAndFormat.qml
index 197593bf4f..98e86cad3d 100644
--- a/src/plugin-datetime/qml/LangAndFormat.qml
+++ b/src/plugin-datetime/qml/LangAndFormat.qml
@@ -32,6 +32,8 @@ DccObject {
             Button {
                 id: button
                 checkable: true
+                visible: langRepeater.count > 1
+                font.pointSize: 12
                 checked: languageListTiltle.isEditing
                 Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
                 Layout.rightMargin: 10
@@ -66,6 +68,7 @@ DccObject {
             onParentItemChanged: item => { if (item) item.topPadding = 10 }
 
             DccRepeater {
+                id: langRepeater
                 model: dccData.langList
                 delegate: DccObject {
                     name: "languageItem" + index
@@ -230,7 +233,7 @@ DccObject {
                 IconLabel {
                     Layout.alignment: Qt.AlignRight | Qt.AlignHCenter
                     icon.name: "arrow_ordinary_right"
-                    icon.palette: DTK.makeIconPalette(palette)
+                    icon.palette: DTK.makeIconPalette(regionLabel.palette)
                     icon.mode: ColorSelector.controlState
                     icon.theme: ColorSelector.controlTheme
                 }
@@ -279,12 +282,13 @@ DccObject {
             RowLayout {
                 id: layout
                 Label {
+                    id: currentLabel
                     text: dccData.currentLanguageAndRegion
                 }
                 IconLabel {
                     Layout.alignment: Qt.AlignRight | Qt.AlignHCenter
                     icon.name: "arrow_ordinary_right"
-                    icon.palette: DTK.makeIconPalette(palette)
+                    icon.palette: DTK.makeIconPalette(currentLabel.palette)
                     icon.mode: ColorSelector.controlState
                     icon.theme: ColorSelector.controlTheme
                 }
diff --git a/src/plugin-keyboard/qml/KeyboardLayout.qml b/src/plugin-keyboard/qml/KeyboardLayout.qml
index f598b6d9ab..f70b512457 100644
--- a/src/plugin-keyboard/qml/KeyboardLayout.qml
+++ b/src/plugin-keyboard/qml/KeyboardLayout.qml
@@ -27,11 +27,12 @@ DccObject {
             D.Button {
                 id: button
                 checkable: true
+                visible: dccData.layoutCount > 1
                 checked: keyboardLayoutTitle.isEditing
                 Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
                 Layout.rightMargin: 10
                 text: keyboardLayoutTitle.isEditing ? qsTr("done") : qsTr("edit")
-                font.pointSize: 13
+                font.pointSize: 12
                 background: null
                 textColor: D.Palette {
                     normal {
diff --git a/src/plugin-keyboard/qml/Shortcuts.qml b/src/plugin-keyboard/qml/Shortcuts.qml
index 2591e39fe5..c2c26d403b 100644
--- a/src/plugin-keyboard/qml/Shortcuts.qml
+++ b/src/plugin-keyboard/qml/Shortcuts.qml
@@ -93,7 +93,7 @@ DccObject {
                         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
                         Layout.rightMargin: 10
                         text: shortcutSettingsBody.isEditing ? qsTr("done") : qsTr("edit")
-                        font.pointSize: 13
+                        font.pointSize: 12
                         background: null
                         textColor: D.Palette {
                             normal {