diff --git a/plasmoid/contents/ui/AudioStream.qml b/plasmoid/contents/ui/AudioStream.qml
index 0e23042a8..88fb08126 100644
--- a/plasmoid/contents/ui/AudioStream.qml
+++ b/plasmoid/contents/ui/AudioStream.qml
@@ -57,10 +57,9 @@ Item {
             height: width
             radius: width/2
 
-            color: theme.textColor
+            color: theme.backgroundColor
             border.width: 1
-            border.color: "grey"
-
+            border.color: root.minimizedDotColor
 
             Latte.IconItem{
                 id: audioStreamIcon
diff --git a/plasmoid/contents/ui/CircleText.qml b/plasmoid/contents/ui/CircleText.qml
index 465154295..7d25ae877 100644
--- a/plasmoid/contents/ui/CircleText.qml
+++ b/plasmoid/contents/ui/CircleText.qml
@@ -47,10 +47,10 @@ Rectangle {
 
     property color alphaBackColor: Qt.rgba(theme.backgroundColor.r, theme.backgroundColor.g, theme.backgroundColor.b, 0.45)
     property color alphaBackColor2: Qt.rgba(theme.backgroundColor.r, theme.backgroundColor.g, theme.backgroundColor.b, 0.8)
-    color: mainItemContainer.badgeIndicator > 0 ? alphaBackColor2 : alphaBackColor
+    color: theme.backgroundColor //mainItemContainer.badgeIndicator > 0 ? alphaBackColor2 : alphaBackColor
     radius: width
     border.width: Math.max(1,width/64)
-    border.color: alphaBackColor2
+    border.color: root.minimizedDotColor //alphaBackColor2
 
     onProportionChanged: {
       //  console.log(previousProportion + " - "+proportion);
@@ -114,6 +114,19 @@ Rectangle {
         visible: showNumber
     }
 
+
+    Rectangle{
+       anchors.fill: parent
+       anchors.topMargin: parent.border.width
+       anchors.bottomMargin: parent.border.width
+       anchors.leftMargin: parent.border.width
+       anchors.rightMargin: parent.border.width
+       color: "transparent"
+       border.width: parent.border.width
+       border.color: parent.alphaBackColor2
+       radius: parent.radius
+    }
+
     Rectangle{
         anchors.fill: parent
         border.width: parent.border.width
diff --git a/plasmoid/contents/ui/TaskIconItem.qml b/plasmoid/contents/ui/TaskIconItem.qml
index ae6fc783b..0116e4f71 100644
--- a/plasmoid/contents/ui/TaskIconItem.qml
+++ b/plasmoid/contents/ui/TaskIconItem.qml
@@ -262,7 +262,7 @@ Item{
         Loader{
             id: progressLoader
             anchors.fill: iconImageBuffer
-            active: (centralItem.smartLauncherEnabled && centralItem.smartLauncherItem
+            active: (centralItem.smartLauncherEnabled && centralItem.smartLauncherItem && !mainItemContainer.isSeparator
                      && (centralItem.smartLauncherItem.progressVisible || mainItemContainer.badgeIndicator > 0))
             asynchronous: true
 
@@ -370,7 +370,7 @@ Item{
         Loader{
             id: audioStreamIconLoader
             anchors.fill: iconImageBuffer
-            active: mainItemContainer.hasAudioStream
+            active: mainItemContainer.hasAudioStream && !mainItemContainer.isSeparator
             asynchronous: true
 
             readonly property bool shown: item && item.visible