diff --git a/components/StyledTabBar.qml b/components/StyledTabBar.qml
index c81c935..5459d8b 100644
--- a/components/StyledTabBar.qml
+++ b/components/StyledTabBar.qml
@@ -1,18 +1,23 @@
 import QtQuick
-import QtQuick.Controls.Basic
+import QtQuick.Controls
 
 TabBar {
     id: control
 
     property alias orientation: view.orientation
 
-    contentItem: ListView {
-        id: view
-        model: control.contentModel
-        currentIndex: control.currentIndex
-        spacing: control.spacing
-        orientation: ListView.Horizontal
-        boundsBehavior: Flickable.StopAtBounds
+    contentItem: Item {
+        ListView {
+            id: view
+            anchors.centerIn: parent
+            implicitWidth: parent.width - 20
+            implicitHeight: parent.height - 20
+            model: control.contentModel
+            currentIndex: control.currentIndex
+            spacing: control.spacing
+            orientation: ListView.Horizontal
+            boundsBehavior: Flickable.StopAtBounds
+        }
     }
 
     background: Item {}
diff --git a/components/StyledTabButton.qml b/components/StyledTabButton.qml
index 1c85273..fc78729 100644
--- a/components/StyledTabButton.qml
+++ b/components/StyledTabButton.qml
@@ -1,6 +1,6 @@
 import qs.config
 import QtQuick
-import QtQuick.Controls.Basic
+import QtQuick.Controls
 
 TabButton {
     id: control
@@ -14,31 +14,28 @@ TabButton {
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
         padding: 6
-        color: control.hovered ? Styling.theme.primarycontent : control.checked ? Styling.theme.accent : Styling.theme.basecontent
+        color: control.hovered ? Styling.theme.primarycontent : Styling.theme.basecontent
         Behavior on color {
             ColorAnimation {
                 duration: Styling.animations.speed.normal
             }
         }
-        rotation: control.rotation
-        Behavior on rotation {
-            RotationAnimation {
-                duration: Styling.animations.speed.slow
-                easing.type: Easing.OutQuad
-            }
-        }
     }
 
     background: Rectangle {
         id: rectangle
-        color: control.hovered ? Styling.theme.primary : Styling.theme.base200
+        color: control.hovered ? Styling.theme.primary : Styling.theme.base100
         Behavior on color {
             ColorAnimation {
                 duration: Styling.animations.speed.normal
             }
         }
-        border.width: 2
-        border.color: control.checked ? Styling.theme.accent : "transparent"
+        opacity: control.checked || control.hovered ? 1.0 : 0.0
+        Behavior on opacity {
+            NumberAnimation {
+                duration: Styling.animations.speed.normal
+            }
+        }
     }
 
     HoverHandler {