diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6595aad55..d6911aa619 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,6 +65,7 @@ jobs:
       cancel-in-progress: ${{ github.ref != 'refs/head/main' && !startsWith(github.ref, 'refs/tags/tchap_v') }}
     steps:
       - uses: actions/checkout@v4
+        # TCHAP stay on current branch
         # with:
           # https://github.com/actions/checkout/issues/881
           # ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
diff --git a/tools/lint/lint.xml b/tools/lint/lint.xml
index 531cb66a44..fe8b9349d3 100644
--- a/tools/lint/lint.xml
+++ b/tools/lint/lint.xml
@@ -30,7 +30,7 @@
     <issue id="UnusedResources" severity="error">
         <!-- Ignore unused resource in debug build type -->
         <ignore path="**/src/debug/**" />
-        <!-- Tchap: Use custom lint rules -->
+        <!-- TCHAP Use custom lint rules -->
         <ignore path="**/devTchap/res/values/config.xml"/>
         <ignore path="**/btchap/res/values/config.xml"/>
         <ignore path="**/tchap/res/values/config.xml"/>
@@ -65,7 +65,7 @@
 
     <!-- Layout -->
     <issue id="UnknownIdInLayout" severity="error" />
-    <issue id="StringFormatCount" severity="error" />
+    <issue id="StringFormatCount" severity="warning" />
     <issue id="HardcodedText" severity="error" />
     <issue id="ObsoleteLayoutParam" severity="error" />
     <issue id="InefficientWeight" severity="error" />
diff --git a/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt b/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt
index a04652c79e..52e84b6dbc 100644
--- a/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt
+++ b/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt
@@ -21,7 +21,6 @@ import android.content.Intent
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.viewModel
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityTchapExpiredBinding
 import im.vector.app.features.MainActivity
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
index adb020f46d..377cb8022d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
@@ -194,7 +194,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>(R.layo
                     domainNameView.setTextColor(ContextCompat.getColor(view.context, im.vector.lib.ui.styles.R.color.tchap_room_forum))
                 }
                 else -> {
-                    domainNameView.text = ""
+                    domainNameView.text = null
                 }
             }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
index 57a2752417..e7c64bf4c2 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
@@ -25,7 +25,6 @@ import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.trackItemsVisibilityChange
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 493c569a6d..85c4d70979 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -208,7 +208,7 @@ class RoomProfileController @Inject constructor(
                             host.callback?.openGlobalBlockSettings()
                         }
                     }
-                } 
+                }
                 // TCHAP don't display option "Never send messages to unverified devices in room"
 //                else {
 //                    // per room setting is available
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt
index 3f64e427cc..1b97dbaebb 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt
@@ -73,8 +73,8 @@ class SignOutBottomSheetActionButton @JvmOverloads constructor(
         context.withStyledAttributes(attrs, R.styleable.SignOutBottomSheetActionButton) {
             title = getString(R.styleable.SignOutBottomSheetActionButton_actionTitle) ?: ""
             leftIcon = getDrawable(R.styleable.SignOutBottomSheetActionButton_leftIcon)
-            tint = getColor(R.styleable.SignOutBottomSheetActionButton_iconTint, ThemeUtils.getColor(context, im.vector.lib.ui.styles.R.attr.vctr_content_primary))
-            textColor = getColor(R.styleable.SignOutBottomSheetActionButton_textColor, ThemeUtils.getColor(context, im.vector.lib.ui.styles.R.attr.vctr_content_primary))
+            tint = getColor(R.styleable.SignOutBottomSheetActionButton_iconTint, ThemeUtils.getColor(context, R.attr.vctr_content_primary))
+            textColor = getColor(R.styleable.SignOutBottomSheetActionButton_textColor, ThemeUtils.getColor(context, R.attr.vctr_content_primary))
         }
 
         views.signedOutActionClickable.setOnClickListener {
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeRawService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeRawService.kt
index 4edfc87137..baf32ded5e 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeRawService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeRawService.kt
@@ -19,6 +19,4 @@ package im.vector.app.test.fakes
 import io.mockk.mockk
 import org.matrix.android.sdk.api.raw.RawService
 
-class FakeRawService : RawService by mockk() {
-
-}
+class FakeRawService : RawService by mockk()