diff --git a/Components/IconButton.qml b/Components/IconButton.qml
index e55289a..e121651 100644
--- a/Components/IconButton.qml
+++ b/Components/IconButton.qml
@@ -41,12 +41,11 @@ CustomRect {
 	color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
 	implicitHeight: label.implicitHeight + padding * 2
 	implicitWidth: implicitHeight
-	radius: internalChecked ? 6 : implicitHeight / 2 * Math.min(1, 1)
+	radius: internalChecked ? 6 : (implicitHeight / 2 * Math.min(1, 1)) * Appearance.rounding.scale
 
 	Behavior on radius {
 		Anim {
 			id: radiusAnim
-
 		}
 	}
 
diff --git a/Drawers/Windows.qml b/Drawers/Windows.qml
index 5c9aa97..957b21f 100644
--- a/Drawers/Windows.qml
+++ b/Drawers/Windows.qml
@@ -242,7 +242,7 @@ Variants {
 					implicitHeight: panels.popouts.height * (1 + extraHeight)
 					implicitWidth: panels.popouts.width
 					panel: panels.popouts
-					radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : Appearance.rounding.smallest
+					radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : 20 * Appearance.rounding.scale
 					x: panels.popoutsWrapper.x + panels.popouts.x + Config.barConfig.border
 					y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
 
diff --git a/Modules/Resources.qml b/Modules/Resources.qml
index 0ded577..2334666 100644
--- a/Modules/Resources.qml
+++ b/Modules/Resources.qml
@@ -17,7 +17,7 @@ CustomRect {
 	color: visibilities.resources ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
 	implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
 	implicitWidth: rowLayout.implicitWidth + Appearance.padding.normal * 2
-	radius: height / 2
+	radius: Appearance.rounding.full
 
 	StateLayer {
 		onClicked: root.visibilities.resources = !root.visibilities.resources
diff --git a/Modules/Settings/Controls/SettingListView.qml b/Modules/Settings/Controls/SettingListView.qml
index 2e6fc55..0893937 100644
--- a/Modules/Settings/Controls/SettingListView.qml
+++ b/Modules/Settings/Controls/SettingListView.qml
@@ -38,7 +38,7 @@ Item {
 			Layout.preferredHeight: 42 * 6 + Appearance.padding.normal * 2 + Appearance.spacing.small * 5
 			Layout.preferredWidth: 500
 			color: DynamicColors.tPalette.m3surfaceContainer
-			radius: 21 + Appearance.padding.normal
+			radius: (21 + Appearance.padding.normal) * Appearance.rounding.scale
 
 			CustomRect {
 				id: searchBox
diff --git a/Modules/SysTray/Popouts/TrayMenuPopout.qml b/Modules/SysTray/Popouts/TrayMenuPopout.qml
index f8cea7f..908b2f6 100644
--- a/Modules/SysTray/Popouts/TrayMenuPopout.qml
+++ b/Modules/SysTray/Popouts/TrayMenuPopout.qml
@@ -82,12 +82,14 @@ StackView {
 			CustomRect {
 				id: item
 
+				required property int index
 				required property QsMenuEntry modelData
 
 				color: modelData.isSeparator ? DynamicColors.palette.m3outlineVariant : "transparent"
 				implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight
 				implicitWidth: root.biggestWidth
-				radius: Appearance.rounding.smallest / 2
+				radius: Appearance.rounding.full
+				visible: index !== (menuOpener.children.values.length - 1) ? true : (modelData.isSeparator ? false : true)
 
 				Loader {
 					id: children
@@ -201,18 +203,18 @@ StackView {
 			asynchronous: true
 
 			sourceComponent: Item {
-				implicitHeight: back.implicitHeight + 2 / 2
+				implicitHeight: 30
 				implicitWidth: back.implicitWidth
 
 				Item {
 					anchors.bottom: parent.bottom
-					implicitHeight: back.implicitHeight
-					implicitWidth: back.implicitWidth + 10
+					implicitHeight: 30
+					implicitWidth: root.biggestWidth
 
 					CustomRect {
 						anchors.fill: parent
 						color: DynamicColors.palette.m3secondaryContainer
-						radius: Appearance.rounding.smallest / 2
+						radius: Appearance.rounding.full
 
 						StateLayer {
 							function onClicked(): void {
diff --git a/Modules/SysTray/Popouts/UPowerPopout.qml b/Modules/SysTray/Popouts/UPowerPopout.qml
index 17b551b..775e47f 100644
--- a/Modules/SysTray/Popouts/UPowerPopout.qml
+++ b/Modules/SysTray/Popouts/UPowerPopout.qml
@@ -31,7 +31,7 @@ Item {
 		implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + 5 * 2 + saverLabel.contentHeight
 		implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + 8 * 2 + saverLabel.contentWidth
 		// color: "transparent"
-		radius: 6
+		radius: (20 - Appearance.padding.small) * Appearance.rounding.scale
 
 		CustomRect {
 			id: indicator
diff --git a/Modules/Updates/UpdatesWidget.qml b/Modules/Updates/UpdatesWidget.qml
index b006086..bcc1063 100644
--- a/Modules/Updates/UpdatesWidget.qml
+++ b/Modules/Updates/UpdatesWidget.qml
@@ -14,7 +14,7 @@ CustomRect {
 	color: DynamicColors.tPalette.m3surfaceContainer
 	implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
 	implicitWidth: contentRow.implicitWidth + Appearance.spacing.small * 2
-	radius: height / 2
+	radius: Appearance.rounding.full
 
 	RowLayout {
 		id: contentRow