diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/utils/ViewUtis.kt b/core/src/main/java/com/example/util/simpletimetracker/core/utils/ViewUtis.kt
index f10663de..827cf13e 100644
--- a/core/src/main/java/com/example/util/simpletimetracker/core/utils/ViewUtis.kt
+++ b/core/src/main/java/com/example/util/simpletimetracker/core/utils/ViewUtis.kt
@@ -2,7 +2,7 @@ package com.example.util.simpletimetracker.core.utils
 
 import androidx.cardview.widget.CardView
 import com.example.util.simpletimetracker.core.R
-import com.example.util.simpletimetracker.feature_base_adapter.extensions.getThemedAttr
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 
 /**
  * Sets card background depending if it was clicked before (eg. opening a choose by clicking on card).
diff --git a/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/multitaskRecord/customView/MultitaskRecordView.kt b/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/multitaskRecord/customView/MultitaskRecordView.kt
index b4c2cc4b..e703fa8d 100644
--- a/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/multitaskRecord/customView/MultitaskRecordView.kt
+++ b/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/multitaskRecord/customView/MultitaskRecordView.kt
@@ -10,7 +10,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.databinding.ItemMultitaskDataLayoutBinding
 import com.example.util.simpletimetracker.feature_base_adapter.databinding.MultitaskRecordViewLayoutBinding
-import com.example.util.simpletimetracker.feature_base_adapter.extensions.getThemedAttr
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.example.util.simpletimetracker.feature_views.R
 import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon
 
diff --git a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/adapter/ChangeRecordTypeIconCategoryAdapterDelegate.kt b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/adapter/ChangeRecordTypeIconCategoryAdapterDelegate.kt
index 5f4dc7ee..cf1e5297 100644
--- a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/adapter/ChangeRecordTypeIconCategoryAdapterDelegate.kt
+++ b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/adapter/ChangeRecordTypeIconCategoryAdapterDelegate.kt
@@ -5,7 +5,7 @@ import com.example.util.simpletimetracker.feature_views.extension.setOnClickWith
 import com.example.util.simpletimetracker.feature_change_record_type.databinding.ChangeRecordTypeItemIconCategoryLayoutBinding as Binding
 import com.example.util.simpletimetracker.feature_change_record_type.viewData.ChangeRecordTypeIconCategoryViewData as ViewData
 import androidx.core.view.isVisible
-import com.example.util.simpletimetracker.feature_base_adapter.extensions.getThemedAttr
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.example.util.simpletimetracker.feature_change_record_type.R
 
 fun createChangeRecordTypeIconCategoryAdapterDelegate(
diff --git a/features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/view/MainFragment.kt b/features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/view/MainFragment.kt
index 0ccf6f1a..ab134741 100644
--- a/features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/view/MainFragment.kt
+++ b/features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/view/MainFragment.kt
@@ -17,7 +17,7 @@ import com.example.util.simpletimetracker.core.sharedViewModel.MainTabsViewModel
 import com.example.util.simpletimetracker.core.utils.SHORTCUT_NAVIGATION_KEY
 import com.example.util.simpletimetracker.core.view.SafeFragmentStateAdapter
 import com.example.util.simpletimetracker.domain.extension.orZero
-import com.example.util.simpletimetracker.feature_base_adapter.extensions.getThemedAttr
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.example.util.simpletimetracker.feature_main.R
 import com.example.util.simpletimetracker.feature_main.adapter.MainContentAdapter
 import com.example.util.simpletimetracker.feature_main.provider.MainTabsProvider
diff --git a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt
index 679edb29..9d23aaed 100644
--- a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt
+++ b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt
@@ -16,7 +16,7 @@ import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.divider.createDividerAdapterDelegate
-import com.example.util.simpletimetracker.feature_base_adapter.extensions.getThemedAttr
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.hintBig.createHintBigAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.loader.createLoaderAdapterDelegate
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailCardAdapterDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailCardAdapterDelegate.kt
index b93df28d..40e0940a 100644
--- a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailCardAdapterDelegate.kt
+++ b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailCardAdapterDelegate.kt
@@ -7,7 +7,7 @@ import androidx.core.view.ViewCompat
 import com.example.util.simpletimetracker.core.extension.getCoordinates
 import com.example.util.simpletimetracker.domain.model.Coordinates
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
-import com.example.util.simpletimetracker.feature_base_adapter.extensions.getThemedAttr
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.example.util.simpletimetracker.feature_statistics_detail.R
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import com.example.util.simpletimetracker.feature_views.extension.visible
diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/GoalCheckmarkView.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/GoalCheckmarkView.kt
index e3428e9e..0d7b8bd4 100644
--- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/GoalCheckmarkView.kt
+++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/GoalCheckmarkView.kt
@@ -1,11 +1,13 @@
 package com.example.util.simpletimetracker.feature_views
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
 import com.example.util.simpletimetracker.feature_views.databinding.GoalCheckmarkViewLayoutBinding
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 
 class GoalCheckmarkView @JvmOverloads constructor(
     context: Context,
@@ -51,9 +53,14 @@ class GoalCheckmarkView @JvmOverloads constructor(
     private fun setCheckmark() = with(binding) {
         if (itemWithCheck) {
             ivGoalCheckmarkItemCheckOutline.isVisible = true
+            val colorAttr = if (itemIsChecked) R.attr.appIconColor else R.attr.colorSecondary
+            val color = ColorStateList.valueOf(context.getThemedAttr(colorAttr))
+            ivGoalCheckmarkItemCheckOutline.imageTintList = color
+            ivGoalCheckmarkItemCheckBorder.isVisible = !itemIsChecked
             ivGoalCheckmarkItemCheck.isVisible = itemIsChecked
         } else {
             ivGoalCheckmarkItemCheckOutline.isVisible = false
+            ivGoalCheckmarkItemCheckBorder.isVisible = false
             ivGoalCheckmarkItemCheck.isVisible = false
         }
     }
diff --git a/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/extensions/ContextExtensions.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ContextExtensions.kt
similarity index 73%
rename from features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/extensions/ContextExtensions.kt
rename to features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ContextExtensions.kt
index ce27fd46..04d68174 100644
--- a/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/extensions/ContextExtensions.kt
+++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ContextExtensions.kt
@@ -1,4 +1,4 @@
-package com.example.util.simpletimetracker.feature_base_adapter.extensions
+package com.example.util.simpletimetracker.feature_views.extension
 
 import android.content.Context
 import android.util.TypedValue
diff --git a/features/feature_views/src/main/res/drawable/record_type_check_border.xml b/features/feature_views/src/main/res/drawable/record_type_check_border.xml
new file mode 100644
index 00000000..a0d4a4c7
--- /dev/null
+++ b/features/feature_views/src/main/res/drawable/record_type_check_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+  <solid android:color="@color/transparent" />
+  <stroke
+      android:width="3dp"
+      android:color="#FFFFFF" />
+</shape>
\ No newline at end of file
diff --git a/features/feature_views/src/main/res/layout/goal_checkmark_view_layout.xml b/features/feature_views/src/main/res/layout/goal_checkmark_view_layout.xml
index 6ef551e7..bc20f058 100644
--- a/features/feature_views/src/main/res/layout/goal_checkmark_view_layout.xml
+++ b/features/feature_views/src/main/res/layout/goal_checkmark_view_layout.xml
@@ -10,6 +10,7 @@
         android:id="@+id/ivGoalCheckmarkItemCheckOutline"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_margin="0.1dp"
         android:tint="?colorSecondary"
         android:visibility="gone"
         app:srcCompat="@drawable/record_type_check_unmarked"
@@ -19,9 +20,18 @@
         android:id="@+id/ivGoalCheckmarkItemCheck"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:tint="@color/white"
+        android:tint="@color/colorPrimaryDark"
         android:visibility="gone"
         app:srcCompat="@drawable/record_type_check_mark"
         tools:visibility="visible" />
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/ivGoalCheckmarkItemCheckBorder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:tint="?appIconColor"
+        android:visibility="gone"
+        app:srcCompat="@drawable/record_type_check_border"
+        tools:visibility="visible" />
+
 </merge>
\ No newline at end of file