diff --git a/app/src/main/java/org/futo/circles/feature/settings/SettingsNavigator.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsNavigator.kt
index 6578d2340ad3998e7fd7a862145b58c0359143e2..ae245082367ec9aa4ef3a1c2189d26edaba9b632 100644
--- a/app/src/main/java/org/futo/circles/feature/settings/SettingsNavigator.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsNavigator.kt
@@ -21,7 +21,7 @@ class SettingsNavigator(private val fragment: SettingsFragment) {
 
     fun navigateToSystemNotices() {
         val systemNoticesRoomId = getSystemNoticesRoomId() ?: run {
-            fragment.showError(fragment.getString(R.string.system_notices_room_not_found))
+            fragment.showError(fragment.getString(org.futo.circles.core.R.string.system_notices_room_not_found))
             return
         }
         fragment.findNavController().navigateSafe(
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 83a21c19ada376a3f1b8d730ef386b7b1196acc8..b16c075c62b88e3adcb80ff601716fec5e067bbb 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -153,7 +153,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     tools:ignore="RtlSymmetry" />
 
-                <org.futo.circles.view.NotificationCounterView
+                <org.futo.circles.core.view.NotificationCounterView
                     android:id="@+id/ivNoticesCount"
                     android:layout_width="18dp"
                     android:layout_height="0dp"
diff --git a/app/src/main/res/layout/list_item_joined_circle.xml b/app/src/main/res/layout/list_item_joined_circle.xml
index dc4af3223f7f70884398e0882f37a036d82802b7..51599599b194c5413f3c86b463846d76bc51341c 100644
--- a/app/src/main/res/layout/list_item_joined_circle.xml
+++ b/app/src/main/res/layout/list_item_joined_circle.xml
@@ -71,7 +71,7 @@
         app:layout_constraintTop_toBottomOf="@id/tvFollowing"
         tools:text="texsdt" />
 
-    <org.futo.circles.view.NotificationCounterView
+    <org.futo.circles.core.view.NotificationCounterView
         android:id="@+id/vNotificationsCount"
         android:layout_width="24dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_joined_group.xml b/app/src/main/res/layout/list_item_joined_group.xml
index 64a74a0f4174a65d829c16fbc5cd2571676fced7..92ccc7c503c47058bf0427d423de3514e41486bd 100644
--- a/app/src/main/res/layout/list_item_joined_group.xml
+++ b/app/src/main/res/layout/list_item_joined_group.xml
@@ -89,7 +89,7 @@
         app:layout_constraintTop_toBottomOf="@id/tvTopic"
         tools:text="texsdt" />
 
-    <org.futo.circles.view.NotificationCounterView
+    <org.futo.circles.core.view.NotificationCounterView
         android:id="@+id/vNotificationsCount"
         android:layout_width="24dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 5ecd638b5c9a8b45a24ca5d915f2a18feee2ef53..ac9eed3a50e31cf0d63f6b3e43237019b581fe79 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <declare-styleable name="LoadingButton">
-        <attr name="android:text" />
-        <attr name="android:textSize" />
-        <attr name="textPadding" format="dimension" />
-        <attr name="android:enabled" />
-    </declare-styleable>
-
     <declare-styleable name="GroupPostHeaderView">
         <attr name="optionsVisible" format="boolean" />
     </declare-styleable>
@@ -17,9 +10,7 @@
         <attr name="readMoreText" format="string" />
         <attr name="readMoreTextColor" format="reference|color" />
     </declare-styleable>
+
     <attr name="readMoreTextViewStyle" format="reference" />
 
-    <declare-styleable name="NotificationCounterView">
-        <attr name="notificationCircleBackground" format="reference|color" />
-    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3deb0fe86fb5f19592b84401472221f02e59218..37977f3f51f2a7ef2af488b78a3fbf40c2ad890f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -160,7 +160,6 @@
     <string name="poll_closed_not_voted">Result will be visible when the poll is ended</string>
     <string name="end_poll">End poll</string>
     <string name="end_poll_message">This will stop people from being able to vote and will display the final results of the poll.</string>
-    <string name="system_notices_room_not_found">System notices room not found.</string>
     <string name="you_are_signed_out">You’re signed out</string>
     <string name="create_your_first_circle_to_be_able_to_accept_invite">Create your first Circle to be able to accept invite</string>
     <string name="show_more">Show more</string>
diff --git a/app/src/main/java/org/futo/circles/view/NotificationCounterView.kt b/core/src/main/java/org/futo/circles/core/view/NotificationCounterView.kt
similarity index 91%
rename from app/src/main/java/org/futo/circles/view/NotificationCounterView.kt
rename to core/src/main/java/org/futo/circles/core/view/NotificationCounterView.kt
index 02d2fbff04db0f9dfde5c4e9ebb4c97a39d58c57..83516b7506f1d594b74909108866977882005d72 100644
--- a/app/src/main/java/org/futo/circles/view/NotificationCounterView.kt
+++ b/core/src/main/java/org/futo/circles/core/view/NotificationCounterView.kt
@@ -1,4 +1,4 @@
-package org.futo.circles.view
+package org.futo.circles.core.view
 
 import android.content.Context
 import android.graphics.Color
@@ -7,10 +7,10 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import com.amulyakhare.textdrawable.TextDrawable
-import org.futo.circles.R
+import org.futo.circles.core.R
+import org.futo.circles.core.databinding.ViewNotificationCounterBinding
 import org.futo.circles.core.extensions.getAttributes
 import org.futo.circles.core.extensions.setIsVisible
-import org.futo.circles.databinding.ViewNotificationCounterBinding
 
 class NotificationCounterView(
     context: Context,
diff --git a/app/src/main/res/drawable/ic_edit.xml b/core/src/main/res/drawable/ic_edit.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_edit.xml
rename to core/src/main/res/drawable/ic_edit.xml
diff --git a/app/src/main/res/layout/view_notification_counter.xml b/core/src/main/res/layout/view_notification_counter.xml
similarity index 100%
rename from app/src/main/res/layout/view_notification_counter.xml
rename to core/src/main/res/layout/view_notification_counter.xml
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 4caaf323ef0d9eb3c8fa5fa149f0b547b74c3d74..cf791360e7da5487f4ac3bceaa25c75a623a1183 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -8,4 +8,8 @@
         <attr name="android:enabled" />
     </declare-styleable>
 
+    <declare-styleable name="NotificationCounterView">
+        <attr name="notificationCircleBackground" format="reference|color" />
+    </declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index b8e2376a974141cc41e58bfdf6a2883f5d3c0a9d..3370cae6c99f1cba942d3c4f690bc935561e4638 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -57,5 +57,6 @@
     <string name="pick_media">Pick media</string>
     <string name="change_icon">Change icon</string>
     <string name="system_notices">System notices</string>
+    <string name="system_notices_room_not_found">System notices room not found.</string>
 
 </resources>
\ No newline at end of file