diff --git a/GliaWidgets/Sources/CallVisualizer/ScreenSharing/View/ScreenSharingView.swift b/GliaWidgets/Sources/CallVisualizer/ScreenSharing/View/ScreenSharingView.swift
index 033f18f7c..4aec32547 100644
--- a/GliaWidgets/Sources/CallVisualizer/ScreenSharing/View/ScreenSharingView.swift
+++ b/GliaWidgets/Sources/CallVisualizer/ScreenSharing/View/ScreenSharingView.swift
@@ -53,7 +53,7 @@ extension CallVisualizer.ScreenSharingView {
             .padding(.horizontal, 60)
         })
         .migrationAccessibilityIdentifier("end_screen_sharing_button")
-        .migrationAccessibilityLabel(L10n.CallVisualizer.ScreenSharing.Accessibility.buttonLabel)
-        .migrationAccessibilityHint(L10n.CallVisualizer.ScreenSharing.Accessibility.buttonHint)
+        .migrationAccessibilityLabel(Localization.ScreenSharing.VisitorScreen.End.title)
+        .migrationAccessibilityHint(Localization.ScreenSharing.VisitorScreen.End.Accessibility.hint)
     }
 }
diff --git a/GliaWidgets/Sources/ViewModel/Chat/ChatViewModel+ViewModel.swift b/GliaWidgets/Sources/ViewModel/Chat/ChatViewModel+ViewModel.swift
index 90e7493d8..5af530cab 100644
--- a/GliaWidgets/Sources/ViewModel/Chat/ChatViewModel+ViewModel.swift
+++ b/GliaWidgets/Sources/ViewModel/Chat/ChatViewModel+ViewModel.swift
@@ -1,8 +1,6 @@
 import Foundation
 
 extension ChatViewModel: ViewModel {
-    typealias Strings = L10n.Chat
-
     enum Event {
         case viewDidLoad
         case messageTextChanged(String)
diff --git a/SnapshotTests/VideoCallViewControllerDynamicTypeFontTests.swift b/SnapshotTests/VideoCallViewControllerDynamicTypeFontTests.swift
index cf0b80b3e..2e9f44ecc 100644
--- a/SnapshotTests/VideoCallViewControllerDynamicTypeFontTests.swift
+++ b/SnapshotTests/VideoCallViewControllerDynamicTypeFontTests.swift
@@ -12,29 +12,29 @@ final class VideoCallViewControllerDynamicTypeFontTests: SnapshotTestCase {
                     videButton: .mock(
                         inactive: .activeMock(
                             image: Asset.callVideoActive.image,
-                            title: L10n.Call.Buttons.Video.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Video.Active.label)
+                            title: Localization.Engagement.Video.title,
+                            accessibility: .init(label: Localization.General.selected)
                         )
                     ),
                     muteButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callMuteInactive.image,
-                            title: L10n.Call.Buttons.Mute.Inactive.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Mute.Inactive.label)
+                            title: Localization.Call.Mute.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     speakerButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callSpeakerInactive.image,
-                            title: L10n.Call.Buttons.Speaker.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Speaker.Inactive.label)
+                            title: Localization.Call.Speaker.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     minimizeButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callMiminize.image,
-                            title: L10n.Call.Buttons.Minimize.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Minimize.Inactive.label)
+                            title: Localization.Engagement.MinimizeVideo.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     badge: .mock()
diff --git a/SnapshotTests/VideoCallViewControllerLayoutTests.swift b/SnapshotTests/VideoCallViewControllerLayoutTests.swift
index 387ed0249..2efe05f40 100644
--- a/SnapshotTests/VideoCallViewControllerLayoutTests.swift
+++ b/SnapshotTests/VideoCallViewControllerLayoutTests.swift
@@ -11,29 +11,29 @@ final class VideoCallViewControllerLayoutTests: SnapshotTestCase {
                     videButton: .mock(
                         inactive: .activeMock(
                             image: Asset.callVideoActive.image,
-                            title: L10n.Call.Buttons.Video.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Video.Active.label)
+                            title: Localization.Engagement.Video.title,
+                            accessibility: .init(label: Localization.General.selected)
                         )
                     ),
                     muteButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callMuteInactive.image,
-                            title: L10n.Call.Buttons.Mute.Inactive.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Mute.Inactive.label)
+                            title: Localization.Call.Mute.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     speakerButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callSpeakerInactive.image,
-                            title: L10n.Call.Buttons.Speaker.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Speaker.Inactive.label)
+                            title: Localization.Call.Speaker.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     minimizeButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callMiminize.image,
-                            title: L10n.Call.Buttons.Minimize.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Minimize.Inactive.label)
+                            title: Localization.Engagement.MinimizeVideo.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     badge: .mock()
diff --git a/SnapshotTests/VideoCallViewControllerVoiceOverTests.swift b/SnapshotTests/VideoCallViewControllerVoiceOverTests.swift
index a407f8d4b..df163f8ae 100644
--- a/SnapshotTests/VideoCallViewControllerVoiceOverTests.swift
+++ b/SnapshotTests/VideoCallViewControllerVoiceOverTests.swift
@@ -12,29 +12,29 @@ final class VideoCallViewControllerVoiceOverTests: SnapshotTestCase {
                     videButton: .mock(
                         inactive: .activeMock(
                             image: Asset.callVideoActive.image,
-                            title: L10n.Call.Buttons.Video.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Video.Active.label)
+                            title: Localization.Engagement.Video.title,
+                            accessibility: .init(label: Localization.General.selected)
                         )
                     ),
                     muteButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callMuteInactive.image,
-                            title: L10n.Call.Buttons.Mute.Inactive.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Mute.Inactive.label)
+                            title: Localization.Call.Mute.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     speakerButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callSpeakerInactive.image,
-                            title: L10n.Call.Buttons.Speaker.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Speaker.Inactive.label)
+                            title: Localization.Call.Speaker.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     minimizeButton: .mock(
                         inactive: .inactiveMock(
                             image: Asset.callMiminize.image,
-                            title: L10n.Call.Buttons.Minimize.title,
-                            accessibility: .init(label: L10n.Call.Accessibility.Buttons.Minimize.Inactive.label)
+                            title: Localization.Engagement.MinimizeVideo.button,
+                            accessibility: .init(label: "")
                         )
                     ),
                     badge: .mock()