diff --git a/shell/package/contents/configuration/TasksConfig.qml b/shell/package/contents/configuration/TasksConfig.qml
index 6d6105221..dbd65f52c 100644
--- a/shell/package/contents/configuration/TasksConfig.qml
+++ b/shell/package/contents/configuration/TasksConfig.qml
@@ -62,17 +62,6 @@ PlasmaComponents.Page {
                 }
             }
 
-            PlasmaComponents.CheckBox {
-                id: reverseLinesPosition
-                Layout.leftMargin: units.smallSpacing * 2
-                text: i18n("Reverse position for lines and dots")
-                checked: plasmoid.configuration.reverseLinesPosition
-
-                onClicked: {
-                    plasmoid.configuration.reverseLinesPosition = checked
-                }
-            }
-
             PlasmaComponents.CheckBox {
                 id: dotsOnActive
                 Layout.leftMargin: units.smallSpacing * 2
diff --git a/shell/package/contents/configuration/TweaksConfig.qml b/shell/package/contents/configuration/TweaksConfig.qml
index 7ee26116f..4eea250bb 100644
--- a/shell/package/contents/configuration/TweaksConfig.qml
+++ b/shell/package/contents/configuration/TweaksConfig.qml
@@ -219,126 +219,126 @@ PlasmaComponents.Page {
         //! END: Behavior
 
         //! BEGIN: Active Indicator
-        ColumnLayout {
-            Layout.fillWidth: true
+        ColumnLayout{
             spacing: units.smallSpacing
-            visible: plasmoid.configuration.advanced
+            Layout.rightMargin: units.smallSpacing * 2
 
             Header {
                 text: i18n("Active Indicator")
             }
 
-            RowLayout{
-                spacing: units.smallSpacing
+            GridLayout {
+                Layout.fillWidth: true
+                rowSpacing: units.smallSpacing * 2
+                columnSpacing: units.smallSpacing
 
-                ColumnLayout{
-                    spacing: units.smallSpacing
+                columns: 5
 
-                    PlasmaComponents.Label {
-                        text: i18n("Style: ")
-                        horizontalAlignment: Text.AlignLeft
-                    }
+                property int indicatorType: plasmoid.configuration.activeIndicatorType
+                property int activeIndicator: plasmoid.configuration.activeIndicator
 
-                    PlasmaComponents.Label {
-                        text: i18n("Applets: ")
-                        horizontalAlignment: Text.AlignLeft
+                ExclusiveGroup {
+                    id: activeIndicatorTypeGroup
+                    onCurrentChanged: {
+                        if (current.checked)
+                            plasmoid.configuration.activeIndicatorType = current.indicatorType;
                     }
                 }
 
-                ColumnLayout{
-                    spacing: units.smallSpacing
-
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Layout.leftMargin: units.smallSpacing * 2
-                        Layout.rightMargin: units.smallSpacing * 2
-                        spacing: units.smallSpacing
-
-                        property int indicatorType: plasmoid.configuration.activeIndicatorType
-
-                        ExclusiveGroup {
-                            id: activeIndicatorTypeGroup
-                            onCurrentChanged: {
-                                if (current.checked)
-                                    plasmoid.configuration.activeIndicatorType = current.indicatorType;
-                            }
-                        }
-
-                        PlasmaComponents.Button {
-                            Layout.fillWidth: true
-
-                            text: i18nc("line indicator","Line")
-                            checked: parent.indicatorType === indicatorType
-                            checkable: true
-                            exclusiveGroup: activeIndicatorTypeGroup
-                            tooltip: i18n("Show a line indicator for active tasks/applets")
-
-                            readonly property int indicatorType: Latte.Dock.LineIndicator
-                        }
-                        PlasmaComponents.Button {
-                            Layout.fillWidth: true
-
-                            text: i18nc("dot indicator", "Dot")
-                            checked: parent.indicatorType === indicatorType
-                            checkable: true
-                            exclusiveGroup: activeIndicatorTypeGroup
-                            tooltip: i18n("Show a dot indicator for active tasks/applets")
-
-                            readonly property int indicatorType: Latte.Dock.DotIndicator
-                        }
+                ExclusiveGroup {
+                    id: activeIndicatorGroup
+                    onCurrentChanged: {
+                        if (current.checked)
+                            plasmoid.configuration.activeIndicator = current.activeIndicator
                     }
+                }
+
+                PlasmaComponents.Label {
+                    text: i18n("Style ")
+                    horizontalAlignment: Text.AlignLeft
+                }
+
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+
+                    text: i18nc("line indicator","Line")
+                    checked: parent.indicatorType === indicatorType
+                    checkable: true
+                    exclusiveGroup: activeIndicatorTypeGroup
+                    tooltip: i18n("Show a line indicator for active tasks/applets")
+
+                    readonly property int indicatorType: Latte.Dock.LineIndicator
+                }
+
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+
+                    text: i18nc("dot indicator", "Dot")
+                    checked: parent.indicatorType === indicatorType
+                    checkable: true
+                    exclusiveGroup: activeIndicatorTypeGroup
+                    tooltip: i18n("Show a dot indicator for active tasks/applets")
+
+                    readonly property int indicatorType: Latte.Dock.DotIndicator
+                }
+
+                PlasmaComponents.Label{
+                    text:"  |  "
+                }
+
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+
+                    text: i18nc("reverse the position of the active indicator e.g. from bottom to top", "Reverse")
+                    checked: plasmoid.configuration.reverseLinesPosition
+                    checkable: true
+                    tooltip: i18n("Reverse the position of the active indicator e.g. from bottom to top")
 
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Layout.leftMargin: units.smallSpacing * 2
-                        Layout.rightMargin: units.smallSpacing * 2
-                        spacing: units.smallSpacing
-
-                        property int activeIndicator: plasmoid.configuration.activeIndicator
-
-                        ExclusiveGroup {
-                            id: activeIndicatorGroup
-                            onCurrentChanged: {
-                                if (current.checked)
-                                    plasmoid.configuration.activeIndicator = current.activeIndicator
-                            }
-                        }
-
-                        PlasmaComponents.Button {
-                            Layout.fillWidth: true
-
-                            text: i18nc("active indicator to no applets", "None")
-                            checked: parent.activeIndicator === activeIndicator
-                            checkable: true
-                            exclusiveGroup: activeIndicatorGroup
-                            tooltip: i18n("Latte will not show any active applet indicator on its own\n except those the plasma theme provides")
-
-                            readonly property int activeIndicator: Latte.Dock.NoneIndicator
-                        }
-                        PlasmaComponents.Button {
-                            Layout.fillWidth: true
-
-                            text: i18nc("active indicator only to in-house latte applets", "Internals")
-                            checked: parent.activeIndicator === activeIndicator
-                            checkable: true
-                            exclusiveGroup: activeIndicatorGroup
-                            tooltip: i18n("Latte will show active applet indicators only for applets that have been adjusted\n by it for hovering capabilities e.g. folderview")
-
-                            readonly property int activeIndicator: Latte.Dock.InternalsIndicator
-                        }
-                        PlasmaComponents.Button {
-                            Layout.fillWidth: true
-
-                            text: i18nc("active indicator to all applets", "All")
-                            checked: parent.activeIndicator === activeIndicator
-                            checkable: true
-                            exclusiveGroup: activeIndicatorGroup
-                            tooltip: i18n("Latte will show active applet indicators for all applets")
-
-                            readonly property int activeIndicator: Latte.Dock.AllIndicator
-                        }
+                    onClicked: {
+                        plasmoid.configuration.reverseLinesPosition = checked;
                     }
                 }
+
+                PlasmaComponents.Label {
+                    text: i18n("Applets ")
+                    horizontalAlignment: Text.AlignLeft
+                }
+
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+
+                    text: i18nc("active indicator to no applets", "None")
+                    checked: parent.activeIndicator === activeIndicator
+                    checkable: true
+                    exclusiveGroup: activeIndicatorGroup
+                    tooltip: i18n("Latte will not show any active applet indicator on its own\n except those the plasma theme provides")
+
+                    readonly property int activeIndicator: Latte.Dock.NoneIndicator
+                }
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+
+                    text: i18nc("active indicator only to in-house latte applets", "Internals")
+                    checked: parent.activeIndicator === activeIndicator
+                    checkable: true
+                    exclusiveGroup: activeIndicatorGroup
+                    tooltip: i18n("Latte will show active applet indicators only for applets that have been adjusted\n by it for hovering capabilities e.g. folderview")
+
+                    readonly property int activeIndicator: Latte.Dock.InternalsIndicator
+                }
+
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    Layout.columnSpan: 2
+
+                    text: i18nc("active indicator to all applets", "All")
+                    checked: parent.activeIndicator === activeIndicator
+                    checkable: true
+                    exclusiveGroup: activeIndicatorGroup
+                    tooltip: i18n("Latte will show active applet indicators for all applets")
+
+                    readonly property int activeIndicator: Latte.Dock.AllIndicator
+                }
             }
         }
         //! END: Active Indicator
@@ -356,7 +356,7 @@ PlasmaComponents.Page {
             RowLayout {
                 Layout.fillWidth: true
                 Layout.leftMargin: units.smallSpacing * 2
-                spacing: 2
+                spacing: units.smallSpacing
 
                 PlasmaComponents.Button {
                     iconSource: "distribute-horizontal-x"