diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 6ff84ee..901b4ee 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -77,8 +77,5 @@ PanelWindow {
             PowerButton {}
 
         }
-
-        // TODO: Somewhere add Tray
-
     }
 }
diff --git a/modules/bar/widgets/Network.qml b/modules/bar/widgets/Network.qml
index 1a12c68..3b3bee4 100644
--- a/modules/bar/widgets/Network.qml
+++ b/modules/bar/widgets/Network.qml
@@ -6,7 +6,7 @@ import "../../../colors"
 
 MouseArea {
     id: networkButton
-    width: output.width + 16
+    width: bar.height
     height: bar.height
     hoverEnabled: true
     cursorShape: Qt.PointingHandCursor
@@ -19,7 +19,9 @@ MouseArea {
         anchors.fill: parent
         color: networkButton.containsMouse ? Colors.tertiary : Qt.alpha(Colors.tertiaryContainer, 0.25)
         radius: 6
-        width: output.width + 16
+        border.width: 2
+        border.color: networkButton.containsMouse ? Colors.tertiaryContainer_fg
+            : Colors.secondaryContainer_fg
 
         Text {
             id: output
diff --git a/modules/bar/widgets/Tray.qml b/modules/bar/widgets/Tray.qml
index 783eb3b..c306fad 100644
--- a/modules/bar/widgets/Tray.qml
+++ b/modules/bar/widgets/Tray.qml
@@ -7,7 +7,7 @@ import "../../../colors"
 
 Row {   // Workspace Row
     id: trayRow
-    spacing: 8
+    spacing: 4
 
     Repeater {
         model: SystemTray.items