diff --git a/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
index 12fe67738a53fd79b67faca7447ae8d26b363533..c0dd299e1198c617a262a107b1f09a174d3e8cdf 100644
--- a/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
@@ -46,8 +46,8 @@ class MemberViewHolder(
             if (data.isOptionsAvailable) {
                 ivOptionsArrow.visible()
                 ivOptionsArrow.setImageResource(
-                    if (data.isOptionsOpened) R.drawable.ic_keyboard_arrow_up
-                    else R.drawable.ic_keyboard_arrow_down
+                    if (data.isOptionsOpened) org.futo.circles.core.R.drawable.ic_keyboard_arrow_up
+                    else org.futo.circles.core.R.drawable.ic_keyboard_arrow_down
                 )
                 onClick(binding.contentLayout) { position -> onUserClicked(position) }
                 with(optionsView) {
@@ -95,8 +95,8 @@ class InvitedMemberViewHolder(
             if (data.isOptionsAvailable) {
                 ivOptionsArrow.visible()
                 ivOptionsArrow.setImageResource(
-                    if (data.isOptionsOpened) R.drawable.ic_keyboard_arrow_up
-                    else R.drawable.ic_keyboard_arrow_down
+                    if (data.isOptionsOpened) org.futo.circles.core.R.drawable.ic_keyboard_arrow_up
+                    else org.futo.circles.core.R.drawable.ic_keyboard_arrow_down
                 )
                 onClick(binding.contentLayout) { position -> onUserClicked(position) }
                 binding.optionsLayout.setIsVisible(data.isOptionsOpened)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 48788c86a6051234c55463c87f54843bc588dae0..08e34a40d4ce92348fc0436d23fdafb7fd060362 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -143,10 +143,7 @@
     <string name="profile_updated">Profile updated</string>
     <string name="deactivate_message">This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user lD. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.</string>
     <string name="deactivate">Deactivate</string>
-    <string name="invalid_auth">Invalid auth</string>
     <string name="active_login_sessions">Active login sessions</string>
-    <string name="current_session">Current session</string>
-    <string name="other_sessions">Other sessions</string>
     <string name="verify">Verify</string>
     <string name="remove_session">Remove session</string>
     <string name="remove_session_message">In order to sign out from this session you should confirm your auth.</string>
@@ -183,11 +180,6 @@
     <string name="you_are_signed_out">You’re signed out</string>
     <string name="verify_session">Verify session</string>
     <string name="scan_qr_code">Scan QR code</string>
-    <string name="waiting_for_verification_format">Waiting for %s to start verification</string>
-    <string name="cross_signed">cross signed</string>
-    <string name="session_verified">Session verified</string>
-    <string name="scan_with_one_of_devices_message">Scan QR code with one of your devices to finish verification</string>
-    <string name="failed_to_read_qr_code">Failed to read QR code</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>
     <string name="edit">Edit</string>
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/SettingsDataSource.kt b/settings/src/main/java/org/futo/circles/settings/feature/SettingsDataSource.kt
index 2fa2296544561b1fe7781c53afa8bab04b76fd66..ebc6181d1ccc18892c8f828ad1fac5452f0727d2 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/SettingsDataSource.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/SettingsDataSource.kt
@@ -16,7 +16,7 @@ import javax.inject.Inject
 
 class SettingsDataSource @Inject constructor(
     @ApplicationContext private val context: Context,
-    private val changePasswordDataSource: org.futo.circles.auth.feature.change_password.ChangePasswordDataSource,
+    private val changePasswordDataSource: ChangePasswordDataSource,
     private val authConfirmationProvider: AuthConfirmationProvider
 ) {
 
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/list/ActiveSessionsViewHolder.kt b/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/list/ActiveSessionsViewHolder.kt
index 088af949d62d138c7e607069054417c812b62300..3642e6a15e0552cf27fd00c59b2866658ad26351 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/list/ActiveSessionsViewHolder.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/list/ActiveSessionsViewHolder.kt
@@ -42,8 +42,8 @@ class SessionItemViewHolder(
             )
 
             ivOptionsArrow.setImageResource(
-                if (data.isOptionsVisible) R.drawable.ic_keyboard_arrow_up
-                else R.drawable.ic_keyboard_arrow_down
+                if (data.isOptionsVisible) org.futo.circles.core.R.drawable.ic_keyboard_arrow_up
+                else org.futo.circles.core.R.drawable.ic_keyboard_arrow_down
             )
         }
     }
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/edit_profile/EditProfileDialogFragment.kt b/settings/src/main/java/org/futo/circles/settings/feature/edit_profile/EditProfileDialogFragment.kt
index c2c03f66ee09808e22fd191a6fcc8366663b9f55..a7002891a462f45ab353b77fadd4abcbd561f723 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/edit_profile/EditProfileDialogFragment.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/edit_profile/EditProfileDialogFragment.kt
@@ -16,6 +16,7 @@ import org.futo.circles.core.extensions.showSuccess
 import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
 import org.futo.circles.core.fragment.HasLoadingState
 import org.futo.circles.gallery.feature.pick.AllMediaPickerHelper
+import org.futo.circles.settings.R
 import org.futo.circles.settings.databinding.DialogFragmentEditProfileBinding
 import org.matrix.android.sdk.api.session.user.model.User
 
diff --git a/settings/src/main/res/values/strings.xml b/settings/src/main/res/values/strings.xml
index 55344e51920f3dcbb968d32ee2281e029d1571bf..0f421f8e5a05e9b4a0ace3e1b890954607fbdf17 100644
--- a/settings/src/main/res/values/strings.xml
+++ b/settings/src/main/res/values/strings.xml
@@ -1,3 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="failed_to_read_qr_code">Failed to read QR code</string>
+    <string name="scan_with_one_of_devices_message">Scan QR code with one of your devices to finish verification</string>
+    <string name="cross_signed">cross signed</string>
+    <string name="waiting_for_verification_format">Waiting for %s to start verification</string>
+    <string name="session_verified">Session verified</string>
+    <string name="current_session">Current session</string>
+    <string name="other_sessions">Other sessions</string>
+    <string name="invalid_auth">Invalid auth</string>
+
 </resources>
\ No newline at end of file