diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/SkillButton.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/SkillButton.kt
index 8294368a..83cb838b 100644
--- a/core/ui/src/main/java/ru/yeahub/core_ui/component/SkillButton.kt
+++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/SkillButton.kt
@@ -138,12 +138,9 @@ fun DefaultButton(
 
     val onSurfaceClick: () -> Unit = {
         if (fillButton) {
-            newContainerColor = if (newContainerColor == defaultColor) {
-                purple
-            } else {
-                defaultColor
-            }
-            newContentColor = if (newContentColor == black) {
+            showBorder = !showBorder
+
+            newContentColor = if (showBorder) {
                 defaultColor
             } else {
                 black
@@ -163,6 +160,7 @@ fun DefaultButton(
     }
     val border = when {
         showBorder && !fillButton && !buttonWithoutBackground -> activeBorder()
+        fillButton && enabled && activeButton -> activeBorder()
         fillButton && enabled -> null
         buttonWithoutBackground -> null
         else -> defaultsBorder()
@@ -171,7 +169,7 @@ fun DefaultButton(
         if (newContentColor == black && buttonWithoutBackground && activeButton) {
             purple
         } else if (newContentColor == black && fillButton && activeButton) {
-            defaultColor
+            black
         } else {
             newContentColor
         }
@@ -182,7 +180,7 @@ fun DefaultButton(
         enabled = enabled,
         shape = shape,
         color = if (activeButton && fillButton) {
-            purple
+            defaultColor
         } else {
             if (buttonWithoutBackground) Color.Transparent else newContainerColor
         },
diff --git a/core/utils/src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt b/core/utils/src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt
index be109914..23b55a3f 100644
--- a/core/utils/src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt
+++ b/core/utils/src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt
@@ -1,7 +1,9 @@
 package ru.yeahub.core_utils.common
 
 import android.content.Context
+import androidx.compose.runtime.Immutable
 
+@Immutable
 sealed class TextOrResource {
     data class Text(val text: String) : TextOrResource()
     data class Resource(val resource: Int) : TextOrResource()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 776d5c21..00f8973c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,6 +30,7 @@ jsoup = "1.17.2"
 shimmer = "1.3.3"
 uiToolingPreviewAndroid = "1.8.3"
 runtime = "1.9.0"
+immutableCollections = "0.4.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -66,6 +67,9 @@ koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref =
 #COIL
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 
+#Immutable Collections
+immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "immutableCollections" }
+
 #Jsoup
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }