diff --git a/nebula/ui/components/MZSegmentedToggle.qml b/nebula/ui/components/MZSegmentedToggle.qml
index effe73a424..3433cf24fe 100644
--- a/nebula/ui/components/MZSegmentedToggle.qml
+++ b/nebula/ui/components/MZSegmentedToggle.qml
@@ -110,15 +110,6 @@ Rectangle {
 
                 Accessible.name: (root.selectedIndex === index ? MZI18n.AccessibilitySelectedAndItemName.arg(MZI18n[segmentLabelStringId]) : MZI18n[segmentLabelStringId]) + MZI18n.AccessibilityCurrentIndexFocusedOfTotalItemsInGroup.arg(index + 1).arg(options.count)
 
-                Rectangle {
-                    anchors.fill: parent
-                    border.width: MZTheme.theme.focusBorderWidth
-                    border.color: MZTheme.theme.fontColor
-                    color: MZTheme.theme.transparent
-                    visible: parent.focus
-                    radius: root.radius
-                }
-
                 onFocusChanged: {
                     if(!root.anySegmentFocused()) root.focusedViaClick = false
                 }
diff --git a/nebula/ui/components/MZTabNavigation.qml b/nebula/ui/components/MZTabNavigation.qml
index a1ceef0f91..bab8a6e445 100644
--- a/nebula/ui/components/MZTabNavigation.qml
+++ b/nebula/ui/components/MZTabNavigation.qml
@@ -79,16 +79,6 @@ Item {
                     // Accessibility provided by btn's Accessible properties
                     Accessible.ignored: true
 
-                    Rectangle {
-                        anchors.fill: parent
-                        anchors.margins: 2
-                        border.width: MZTheme.theme.focusBorderWidth
-                        border.color: MZTheme.theme.fontColor
-                        color: MZTheme.theme.transparent
-                        visible: btn.activeFocus
-                        radius: 4
-                    }
-
                     Behavior on color {
                         PropertyAnimation {
                             duration: 100