diff --git a/app/src/main/java/com/glia/exampleapp/Application.java b/app/src/main/java/com/glia/exampleapp/Application.java
index abf6528e0..1f4cc0ed3 100644
--- a/app/src/main/java/com/glia/exampleapp/Application.java
+++ b/app/src/main/java/com/glia/exampleapp/Application.java
@@ -1,14 +1,8 @@
 package com.glia.exampleapp;
 
-import android.app.Activity;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.glia.androidsdk.Glia;
 import com.glia.widgets.GliaWidgets;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
@@ -22,8 +16,6 @@ public void onCreate() {
 
         GliaWidgets.onAppCreate(this);
         GliaWidgets.setCustomCardAdapter(new ExampleCustomCardAdapter());
-
-        initGliaWidgets();
     }
 
     private void initFirebase() {
@@ -43,35 +35,4 @@ private void initFirebase() {
                 .build();
         FirebaseApp.initializeApp(this, options);
     }
-
-    private void initGliaWidgets() {
-        registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
-            @Override
-            public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
-                if (activity.getClass() != com.glia.exampleapp.Activity.class) {
-                    if (Glia.isInitialized()) return;
-
-                    GliaWidgets.init(ExampleAppConfigManager.createDefaultConfig(getApplicationContext()));
-                }
-            }
-
-            @Override
-            public void onActivityStarted(@NonNull Activity activity) {}
-
-            @Override
-            public void onActivityResumed(@NonNull Activity activity) {}
-
-            @Override
-            public void onActivityPaused(@NonNull Activity activity) {}
-
-            @Override
-            public void onActivityStopped(@NonNull Activity activity) {}
-
-            @Override
-            public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {}
-
-            @Override
-            public void onActivityDestroyed(@NonNull Activity activity) {}
-        });
-    }
 }
diff --git a/app/src/main/java/com/glia/exampleapp/ChatFragment.java b/app/src/main/java/com/glia/exampleapp/ChatFragment.java
deleted file mode 100644
index 66a0e7793..000000000
--- a/app/src/main/java/com/glia/exampleapp/ChatFragment.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.glia.exampleapp;
-
-import static java.util.Collections.singletonList;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.navigation.NavController;
-import androidx.navigation.fragment.NavHostFragment;
-import androidx.preference.PreferenceManager;
-
-import com.glia.widgets.UiTheme;
-import com.glia.widgets.chat.ChatView;
-
-import java.util.Collections;
-
-public class ChatFragment extends Fragment {
-
-    private NavController navController;
-    private ChatView chatView;
-    private ChatView.OnEndListener onEndListener = () -> navController.popBackStack();
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.chat_fragment, container, false);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        navController = NavHostFragment.findNavController(this);
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext());
-        chatView = view.findViewById(R.id.chat_view);
-        UiTheme theme = Utils.getRunTimeThemeByPrefs(sharedPreferences, getResources());
-        chatView.setUiTheme(theme);
-        chatView.setOnEndListener(onEndListener);
-        chatView.startChat(
-                Utils.getStringFromPrefs(R.string.pref_company_name, getString(R.string.settings_value_default_company_name), sharedPreferences, getResources()),
-                singletonList(Utils.getStringFromPrefs(R.string.pref_queue_id, getString(R.string.glia_queue_id), sharedPreferences, getResources())),
-                Utils.getStringFromPrefs(R.string.pref_context_asset_id, null, sharedPreferences, getResources()));
-    }
-
-    @Override
-    public void onResume() {
-        chatView.onResume();
-        super.onResume();
-    }
-
-    @Override
-    public void onDestroyView() {
-        onEndListener = null;
-        chatView.onDestroyView();
-        super.onDestroyView();
-    }
-}
diff --git a/app/src/main/java/com/glia/exampleapp/ExampleAppConfigManager.kt b/app/src/main/java/com/glia/exampleapp/ExampleAppConfigManager.kt
index c969d307a..84d5b203a 100644
--- a/app/src/main/java/com/glia/exampleapp/ExampleAppConfigManager.kt
+++ b/app/src/main/java/com/glia/exampleapp/ExampleAppConfigManager.kt
@@ -7,7 +7,6 @@ import androidx.preference.PreferenceManager
 import com.glia.androidsdk.SiteApiKey
 import com.glia.androidsdk.screensharing.ScreenSharing
 import com.glia.widgets.GliaWidgetsConfig
-import com.glia.widgets.UiTheme
 
 /**
  * Helper class to obtain Glia Config params from deep-link or preferences.
@@ -103,7 +102,6 @@ object ExampleAppConfigManager {
     fun createDefaultConfig(
         context: Context,
         uiJsonRemoteConfig: String? = null,
-        runtimeConfig: UiTheme? = null,
         region: String? = null,
         baseDomain: String = DEFAULT_BASE_DOMAIN,
         preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
@@ -157,7 +155,6 @@ object ExampleAppConfigManager {
             .setScreenSharingMode(screenSharingMode)
             .setContext(context)
             .setUiJsonRemoteConfig(uiJsonRemoteConfig ?: Utils.getRemoteThemeByPrefs(preferences, context.resources))
-            .setUiTheme(runtimeConfig ?: Utils.getRunTimeThemeByPrefs(preferences, context.resources))
             .setManualLocaleOverride(manualLocaleOverride)
             .build()
     }
diff --git a/app/src/main/java/com/glia/exampleapp/MainFragment.kt b/app/src/main/java/com/glia/exampleapp/MainFragment.kt
index dd6d69d34..eb000b6bf 100644
--- a/app/src/main/java/com/glia/exampleapp/MainFragment.kt
+++ b/app/src/main/java/com/glia/exampleapp/MainFragment.kt
@@ -12,6 +12,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
+import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
@@ -26,22 +27,19 @@ import com.glia.androidsdk.Glia
 import com.glia.androidsdk.GliaException
 import com.glia.androidsdk.fcm.GliaPushMessage
 import com.glia.androidsdk.omnibrowse.Omnibrowse
-import com.glia.androidsdk.screensharing.ScreenSharing
 import com.glia.androidsdk.visitor.Authentication
 import com.glia.exampleapp.ExampleAppConfigManager.createDefaultConfig
 import com.glia.exampleapp.Utils.getAuthenticationBehaviorFromPrefs
 import com.glia.widgets.GliaWidgets
-import com.glia.widgets.UiTheme
-import com.glia.widgets.call.CallActivity
-import com.glia.widgets.chat.ChatActivity
-import com.glia.widgets.chat.ChatType
 import com.glia.widgets.core.notification.NotificationActionReceiver
-import com.glia.widgets.messagecenter.MessageCenterActivity
+import com.glia.widgets.entrywidget.EntryWidget
+import com.glia.widgets.launcher.EngagementLauncher
 import com.google.android.material.appbar.MaterialToolbar
 import kotlin.concurrent.thread
 import kotlin.properties.Delegates
 
 class MainFragment : Fragment() {
+
     private var containerView: ConstraintLayout? = null
     private var authentication: Authentication? = null
 
@@ -53,11 +51,23 @@ class MainFragment : Fragment() {
 
     private val authToken: String
         get() {
-            val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
             val authTokenFromPrefs = getAuthTokenFromPrefs(sharedPreferences)
             return authTokenFromPrefs.ifEmpty { getString(R.string.glia_jwt) }
         }
 
+    private val sharedPreferences: SharedPreferences by lazy {
+        PreferenceManager.getDefaultSharedPreferences(requireContext())
+    }
+
+    private val engagementLauncher: EngagementLauncher by lazy {
+        ensureInitialized()
+        GliaWidgets.getEngagementLauncher(getQueueIdsFromPrefs(sharedPreferences))
+    }
+
+    private val entryWidget: EntryWidget by lazy {
+        GliaWidgets.getEntryWidget(getQueueIdsFromPrefs(sharedPreferences))
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -73,14 +83,23 @@ class MainFragment : Fragment() {
 
         view.findViewById<View>(R.id.settings_button)
             .setOnClickListener { navController.navigate(R.id.settings) }
+        view.findViewById<View>(R.id.entry_widget_button)
+            .setOnClickListener {
+                if ((view.findViewById<View>(R.id.entry_widget_switch) as SwitchCompat).isChecked) {
+                    showEntryWidgetInADedicatedView()
+                } else {
+                    entryWidget.show(requireActivity())
+                }
+            }
+        val visitorContextAssetId = getContextAssetIdFromPrefs(sharedPreferences)
         view.findViewById<View>(R.id.chat_activity_button)
-            .setOnClickListener { navigateToChat(ChatType.LIVE_CHAT) }
+            .setOnClickListener { engagementLauncher.startChat(requireActivity(), visitorContextAssetId) }
         view.findViewById<View>(R.id.audio_call_button)
-            .setOnClickListener { navigateToCall(GliaWidgets.MEDIA_TYPE_AUDIO) }
+            .setOnClickListener { engagementLauncher.startAudioCall(requireActivity(), visitorContextAssetId) }
         view.findViewById<View>(R.id.video_call_button)
-            .setOnClickListener { navigateToCall(GliaWidgets.MEDIA_TYPE_VIDEO) }
+            .setOnClickListener { engagementLauncher.startVideoCall(requireActivity(), visitorContextAssetId) }
         view.findViewById<View>(R.id.message_center_activity_button)
-            .setOnClickListener { navigateToMessageCenter() }
+            .setOnClickListener { engagementLauncher.startSecureMessaging(requireActivity(), visitorContextAssetId) }
         view.findViewById<View>(R.id.end_engagement_button)
             .setOnClickListener { GliaWidgets.endEngagement() }
         view.findViewById<View>(R.id.visitor_info_button)
@@ -193,9 +212,9 @@ class MainFragment : Fragment() {
             .handleOnMainActivityCreate(requireActivity().intent.extras) ?: return
 
         if (push.type == GliaPushMessage.PushType.QUEUED_MESSAGE) {
-            authenticate { navigateToChat(ChatType.SECURE_MESSAGING) }
+            authenticate { engagementLauncher.startSecureMessaging(requireActivity()) }
         } else {
-            navigateToChat(ChatType.LIVE_CHAT)
+            engagementLauncher.startChat(requireActivity())
         }
     }
 
@@ -272,52 +291,6 @@ class MainFragment : Fragment() {
         }
     }
 
-    private fun navigateToChat(chatType: ChatType) {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        val intent = ChatActivity.getIntent(
-            requireContext(),
-            getContextAssetIdFromPrefs(sharedPreferences),
-            getQueueIdsFromPrefs(sharedPreferences),
-            chatType
-        )
-        startActivity(intent)
-    }
-
-    private fun navigateToMessageCenter() {
-        val intent = Intent(requireContext(), MessageCenterActivity::class.java)
-        setNavigationIntentData(intent)
-        startActivity(intent)
-    }
-
-    private fun navigateToCall(mediaType: String) {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        val intent = Intent(context, CallActivity::class.java)
-            .putExtra(GliaWidgets.QUEUE_IDS, ArrayList(getQueueIdsFromPrefs(sharedPreferences)))
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, getContextAssetIdFromPrefs(sharedPreferences))
-            .putExtra(GliaWidgets.UI_THEME, getRuntimeThemeFromPrefs(sharedPreferences))
-//            .putExtra(GliaWidgets.USE_OVERLAY, true) // Use it to make sure this deprecated approach is still working
-            .putExtra(GliaWidgets.SCREEN_SHARING_MODE, getScreenSharingModeFromPrefs(sharedPreferences))
-            .putExtra(GliaWidgets.MEDIA_TYPE, Utils.toMediaType(mediaType))
-        startActivity(intent)
-    }
-
-    private fun setNavigationIntentData(intent: Intent) {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        intent.putExtra(GliaWidgets.QUEUE_IDS, ArrayList(getQueueIdsFromPrefs(sharedPreferences)))
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, getContextAssetIdFromPrefs(sharedPreferences))
-            .putExtra(GliaWidgets.UI_THEME, getRuntimeThemeFromPrefs(sharedPreferences))
-//            .putExtra(GliaWidgets.USE_OVERLAY, true) // Use it to make sure this deprecated approach is still working
-            .putExtra(GliaWidgets.SCREEN_SHARING_MODE, getScreenSharingModeFromPrefs(sharedPreferences))
-    }
-
-    private fun getScreenSharingModeFromPrefs(sharedPreferences: SharedPreferences): ScreenSharing.Mode {
-        return Utils.getScreenSharingModeFromPrefs(sharedPreferences, resources)
-    }
-
-    private fun getRuntimeThemeFromPrefs(sharedPreferences: SharedPreferences): UiTheme? {
-        return Utils.getRunTimeThemeByPrefs(sharedPreferences, resources)
-    }
-
     private fun getQueueIdsFromPrefs(sharedPreferences: SharedPreferences): List<String> {
         val defaultQueues = sharedPreferences.getBoolean(resources.getString(R.string.pref_default_queues), false)
         if (defaultQueues) {
@@ -344,24 +317,13 @@ class MainFragment : Fragment() {
         )
     }
 
-    private fun getCompanyNameFromPrefs(sharedPreferences: SharedPreferences): String {
-        return Utils.getStringFromPrefs(
-            R.string.pref_company_name,
-            "",
-            sharedPreferences,
-            resources
-        )
-    }
-
     private fun saveAuthToken(jwt: String) {
         if (jwt != getString(R.string.glia_jwt)) {
-            val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
             putAuthTokenToPrefs(sharedPreferences, jwt)
         }
     }
 
     private fun clearAuthToken() {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
         putAuthTokenToPrefs(sharedPreferences, null)
     }
 
@@ -436,8 +398,10 @@ class MainFragment : Fragment() {
         return container
     }
 
-    private fun prepareJwtInputViewEditText(builder: AlertDialog.Builder,
-                                            dialogTitle: Int): EditText {
+    private fun prepareJwtInputViewEditText(
+        builder: AlertDialog.Builder,
+        dialogTitle: Int
+    ): EditText {
         val input = EditText(context)
         input.setHint(R.string.authentication_dialog_jwt_input_hint)
         input.setSingleLine()
@@ -449,8 +413,10 @@ class MainFragment : Fragment() {
         return input
     }
 
-    private fun prepareExternalTokenInputViewEditText(builder: AlertDialog.Builder,
-                                                      dialogTitle: Int): EditText {
+    private fun prepareExternalTokenInputViewEditText(
+        builder: AlertDialog.Builder,
+        dialogTitle: Int
+    ): EditText {
         val input = EditText(context)
         input.setHint(R.string.authentication_dialog_external_token_input_hint)
         input.setSingleLine()
@@ -496,7 +462,7 @@ class MainFragment : Fragment() {
         if (externalToken!!.isEmpty()) externalToken = null
         authentication?.refresh(
             jwt, externalToken
-        ) { response, exception ->
+        ) { _, exception ->
             setupAuthButtonsVisibility()
             if (exception != null || !authentication!!.isAuthenticated) {
                 showToast("Error: $exception")
@@ -507,6 +473,12 @@ class MainFragment : Fragment() {
         saveAuthToken(jwt)
     }
 
+    private fun ensureInitialized() {
+        if (!Glia.isInitialized()) {
+            initGliaWidgets()
+        }
+    }
+
     private fun initGliaWidgets() {
         if (Glia.isInitialized()) {
             setupAuthButtonsVisibility()
@@ -517,8 +489,7 @@ class MainFragment : Fragment() {
         GliaWidgets.init(
             createDefaultConfig(
                 context = requireActivity().applicationContext,
-//                uiJsonRemoteConfig = UnifiedUiConfigurationLoader.fetchRemoteConfiguration(),
-//                runtimeConfig = createSampleRuntimeConfig(),
+//                uiJsonRemoteConfig = UnifiedUiConfigurationLoader.fetchLocalConfigSample(requireContext()),
 //                region = "us"
             )
         )
@@ -529,14 +500,9 @@ class MainFragment : Fragment() {
         view?.post { initMenu() }
     }
 
-    private fun createSampleRuntimeConfig(): UiTheme = UiTheme(
-        gvaQuickReplyTextColor = android.R.color.holo_green_dark,
-        gvaQuickReplyStrokeColor = android.R.color.holo_green_dark,
-        brandPrimaryColor = android.R.color.holo_green_dark
-    )
-
     private fun prepareAuthentication() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
+        authentication = GliaWidgets.getAuthentication(getAuthenticationBehaviorFromPrefs(sharedPreferences, resources))
         authentication =
             GliaWidgets.getAuthentication(getAuthenticationBehaviorFromPrefs(sharedPreferences, resources))
     }
@@ -585,12 +551,20 @@ class MainFragment : Fragment() {
         setupAuthButtonsVisibility()
     }
 
+    // For testing the embedded Entry Widget
+    private fun showEntryWidgetInADedicatedView() {
+        val entryWidgetView = entryWidget.getView(requireContext())
+        val container = containerView!!.findViewById<FrameLayout>(R.id.entry_widget_container)
+        container.removeAllViews()
+        container.addView(entryWidgetView)
+        container.visibility = View.VISIBLE
+    }
+
     private fun showVisitorCode() {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        val visitorContext = getContextAssetIdFromPrefs(sharedPreferences)
+        val visitorContextAssetId = getContextAssetIdFromPrefs(sharedPreferences)
         val cv = GliaWidgets.getCallVisualizer()
-        if (!visitorContext.isNullOrBlank()) {
-            cv.addVisitorContext(visitorContext)
+        if (!visitorContextAssetId.isNullOrBlank()) {
+            cv.addVisitorContext(visitorContextAssetId)
         }
         cv.showVisitorCodeDialog()
     }
@@ -598,14 +572,14 @@ class MainFragment : Fragment() {
     // For testing the integrated Visitor Code solution
     private fun showVisitorCodeInADedicatedView() {
         val visitorCodeView = GliaWidgets.getCallVisualizer().createVisitorCodeView(requireContext())
-        val cv = containerView!!.findViewById<CardView>(R.id.container)
+        val cv = containerView!!.findViewById<CardView>(R.id.visitor_code_container)
         cv.removeAllViews()
         cv.addView(visitorCodeView)
         cv.visibility = View.VISIBLE
     }
 
     private fun removeVisitorCodeFromDedicatedView() {
-        val cv = containerView!!.findViewById<CardView>(R.id.container)
+        val cv = containerView!!.findViewById<CardView>(R.id.visitor_code_container)
         cv.removeAllViews()
         cv.visibility = View.GONE
     }
diff --git a/app/src/main/java/com/glia/exampleapp/RuntimeThemeSettingsFragment.kt b/app/src/main/java/com/glia/exampleapp/RuntimeThemeSettingsFragment.kt
deleted file mode 100644
index 098a65a53..000000000
--- a/app/src/main/java/com/glia/exampleapp/RuntimeThemeSettingsFragment.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.glia.exampleapp
-
-import android.os.Bundle
-import androidx.preference.PreferenceFragmentCompat
-
-class RuntimeThemeSettingsFragment : PreferenceFragmentCompat() {
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.runtime_theme_prefs, rootKey)
-    }
-}
diff --git a/app/src/main/java/com/glia/exampleapp/SettingsFragment.java b/app/src/main/java/com/glia/exampleapp/SettingsFragment.java
index de5a65343..a2ea729dd 100644
--- a/app/src/main/java/com/glia/exampleapp/SettingsFragment.java
+++ b/app/src/main/java/com/glia/exampleapp/SettingsFragment.java
@@ -37,14 +37,11 @@ public boolean onPreferenceTreeClick(Preference preference) {
         // IllegalStateException: Fragment 'MyFragment' declared target fragment 'AnotherMyFragment'
         // that does not belong to this FragmentManager!
         String baseSettingsKey = getString(R.string.pref_glia_basic_settings);
-        String runtimeSettingsKey = getString(R.string.pref_glia_runtime_theme_settings);
         String remoteSettingsKey = getString(R.string.pref_glia_remote_theme_settings);
         String currentKey = preference.getKey();
         NavController navController = NavHostFragment.findNavController(this);
         if (currentKey.equals(baseSettingsKey)) {
             navController.navigate(R.id.base_settings);
-        } else if (currentKey.equals(runtimeSettingsKey)) {
-            navController.navigate(R.id.runtime_settings);
         } else if (currentKey.equals(remoteSettingsKey)) {
             navController.navigate(R.id.remote_settings);
         } else {
diff --git a/app/src/main/java/com/glia/exampleapp/Utils.java b/app/src/main/java/com/glia/exampleapp/Utils.java
index 169cbf86f..8038d634e 100644
--- a/app/src/main/java/com/glia/exampleapp/Utils.java
+++ b/app/src/main/java/com/glia/exampleapp/Utils.java
@@ -1,29 +1,16 @@
 package com.glia.exampleapp;
 
-import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.ColorStateList;
 import android.content.res.Resources;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
 
-import com.glia.androidsdk.Engagement;
-import com.glia.androidsdk.screensharing.ScreenSharing;
 import com.glia.androidsdk.visitor.Authentication;
-import com.glia.widgets.GliaWidgets;
-import com.glia.widgets.UiTheme;
-import com.glia.widgets.view.configuration.ButtonConfiguration;
-import com.glia.widgets.view.configuration.ChatHeadConfiguration;
-import com.glia.widgets.view.configuration.TextConfiguration;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.security.InvalidParameterException;
-
 class Utils {
 
     public static String getStringFromPrefs(@StringRes int keyValue, String defaultValue, SharedPreferences sharedPreferences, Resources resources) {
@@ -72,156 +59,6 @@ private static String toHexColor(Integer intColor, Resources resources) {
         // %08X gives you zero-padded hex that is 8 chars long)
         return String.format("#%08X", resources.getColor(intColor, null));
     }
-
-    @Nullable
-    public static UiTheme getRunTimeThemeByPrefs(SharedPreferences sharedPreferences, Resources resources) {
-        boolean isRunTimeThemeEnabled = sharedPreferences.getBoolean(resources.getString(R.string.pref_runtime_theme), false);
-        if (!isRunTimeThemeEnabled) {
-            return null;
-        }
-
-        String title = Utils.getStringFromPrefs(R.string.pref_header_title, null, sharedPreferences, resources);
-        Integer baseLightColor = getColorValueFromPrefs(R.string.pref_base_light_color, sharedPreferences, resources);
-        Integer baseDarkColor = getColorValueFromPrefs(R.string.pref_base_dark_color, sharedPreferences, resources);
-        Integer baseNormalColor = getColorValueFromPrefs(R.string.pref_base_normal_color, sharedPreferences, resources);
-        Integer baseShadeColor = getColorValueFromPrefs(R.string.pref_base_shade_color, sharedPreferences, resources);
-        Integer brandPrimaryColor = getColorValueFromPrefs(R.string.pref_brand_primary_color, sharedPreferences, resources);
-        Integer systemAgentBubbleColor = getColorValueFromPrefs(R.string.pref_system_agent_bubble_color, sharedPreferences, resources);
-        Integer chatSendMessageButtonTintColor = getColorValueFromPrefs(R.string.pref_send_message_button_tint_color, sharedPreferences, resources);
-        Integer chatHeaderTitleTintColor = getColorValueFromPrefs(R.string.pref_chat_header_title_tint_color, sharedPreferences, resources);
-        Integer chatHeaderHomeButtonTintColor = getColorValueFromPrefs(R.string.pref_chat_header_home_button_tint_color, sharedPreferences, resources);
-        Integer chatHeaderExitQueueButtonTintColor = getColorValueFromPrefs(R.string.pref_chat_header_exit_queue_button_tint_color, sharedPreferences, resources);
-        Integer chatStartingHeadingTextColorRes = getColorValueFromPrefs(R.string.pref_chat_starting_heading_text_color, sharedPreferences, resources);
-        Integer chatStartingCaptionTextColorRes = getColorValueFromPrefs(R.string.pref_chat_starting_caption_text_color, sharedPreferences, resources);
-        Integer chatStartedHeadingTextColorRes = getColorValueFromPrefs(R.string.pref_chat_started_heading_text_color, sharedPreferences, resources);
-        Integer chatStartedCaptionTextColorRes = getColorValueFromPrefs(R.string.pref_chat_started_caption_text_color, sharedPreferences, resources);
-        Integer fontFamily = getTypefaceFromPrefs(sharedPreferences, resources);
-        Integer systemNegativeColor = getColorValueFromPrefs(R.string.pref_system_negative_color, sharedPreferences, resources);
-        Integer visitorMessageBackgroundColor = getColorValueFromPrefs(R.string.pref_visitor_message_bg_color, sharedPreferences, resources);
-        Integer visitorMessageTextColor = getColorValueFromPrefs(R.string.pref_visitor_message_txt_color, sharedPreferences, resources);
-        Integer operatorMessageBackgroundColor = getColorValueFromPrefs(R.string.pref_operator_message_bg_color, sharedPreferences, resources);
-        Integer operatorMessageTextColor = getColorValueFromPrefs(R.string.pref_operator_message_txt_color, sharedPreferences, resources);
-        Integer botActionButtonBackgroundColor = getColorValueFromPrefs(R.string.pref_bot_action_button_bg_color, sharedPreferences, resources);
-        Integer botActionButtonTextColor = getColorValueFromPrefs(R.string.pref_bot_action_button_txt_color, sharedPreferences, resources);
-        Integer botActionButtonSelectedBackgroundColor = getColorValueFromPrefs(R.string.pref_bot_action_button_selected_bg_color, sharedPreferences, resources);
-        Integer botActionButtonSelectedTextColor = getColorValueFromPrefs(R.string.pref_bot_action_button_selected_txt_color, sharedPreferences, resources);
-
-        Boolean whiteLabel = sharedPreferences.getBoolean(resources.getString(R.string.pref_white_label), false);
-
-        Boolean gliaAlertDialogButtonUseVerticalAlignment = sharedPreferences.getBoolean(
-            resources.getString(R.string.pref_use_alert_dialog_button_vertical_alignment),
-            false
-        );
-
-        UiTheme.UiThemeBuilder builder = new UiTheme.UiThemeBuilder();
-
-        builder.setAppBarTitle(title);
-        builder.setBaseLightColor(baseLightColor);
-        builder.setBaseDarkColor(baseDarkColor);
-        builder.setBaseNormalColor(baseNormalColor);
-        builder.setBaseShadeColor(baseShadeColor);
-        builder.setSystemAgentBubbleColor(systemAgentBubbleColor);
-        builder.setBrandPrimaryColor(brandPrimaryColor);
-        builder.setFontRes(fontFamily);
-        builder.setSystemNegativeColor(systemNegativeColor);
-        builder.setVisitorMessageBackgroundColor(visitorMessageBackgroundColor);
-        builder.setVisitorMessageTextColor(visitorMessageTextColor);
-        builder.setOperatorMessageBackgroundColor(operatorMessageBackgroundColor);
-        builder.setOperatorMessageTextColor(operatorMessageTextColor);
-
-        builder.setWhiteLabel(whiteLabel);
-
-        // choice card attributes
-        builder.setChoiceCardContentTextConfiguration(null);
-        builder.setBotActionButtonBackgroundColor(botActionButtonBackgroundColor);
-        builder.setBotActionButtonTextColor(botActionButtonTextColor);
-        builder.setBotActionButtonSelectedBackgroundColor(botActionButtonSelectedBackgroundColor);
-        builder.setBotActionButtonSelectedTextColor(botActionButtonSelectedTextColor);
-
-        // to set alert buttons to align vertically in runtime
-        builder.setGliaAlertDialogButtonUseVerticalAlignment(gliaAlertDialogButtonUseVerticalAlignment);
-
-        // here goes header end engagement button configuration
-        builder.setHeaderEndButtonConfiguration(null);
-        builder.setPositiveButtonConfiguration(null);
-        builder.setNegativeButtonConfiguration(null);
-        builder.setNeutralButtonConfiguration(null);
-
-        builder.setChatHeadConfiguration(
-            getChatHeadConfiguration(
-                brandPrimaryColor,
-                baseLightColor
-            )
-        );
-
-        builder.setSendMessageButtonTintColor(chatSendMessageButtonTintColor);
-
-        builder.setGliaChatHeaderTitleTintColor(chatHeaderTitleTintColor);
-        builder.setGliaChatHeaderHomeButtonTintColor(chatHeaderHomeButtonTintColor);
-        builder.setGliaChatHeaderExitQueueButtonTintColor(chatHeaderExitQueueButtonTintColor);
-
-        builder.setChatStartingHeadingTextColor(chatStartingHeadingTextColorRes);
-        builder.setChatStartingCaptionTextColor(chatStartingCaptionTextColorRes);
-        builder.setChatStartedHeadingTextColor(chatStartedHeadingTextColorRes);
-        builder.setChatStartedCaptionTextColor(chatStartedCaptionTextColorRes);
-        return builder.build();
-    }
-
-    // Positive button configuration Example runtime
-    private static ButtonConfiguration getPositiveButtonTestingConfiguration(Context context) {
-        return ButtonConfiguration.builder()
-                .backgroundColor(
-                        ColorStateList.valueOf(ContextCompat.getColor(context, R.color.color_blue))
-                )
-                .textConfiguration(
-                        TextConfiguration.builder()
-                                .textColor(
-                                        ColorStateList.valueOf(ContextCompat.getColor(context, R.color.color_black))
-                                )
-                                .build()
-                )
-                .build();
-    }
-
-    // Negative button configuration Example runtime
-    private static ButtonConfiguration getNegativeButtonTestingConfiguration(Context context) {
-        return ButtonConfiguration.builder()
-                .backgroundColor(
-                        ColorStateList.valueOf(ContextCompat.getColor(context, R.color.color_white))
-                )
-                .textConfiguration(
-                        TextConfiguration.builder()
-                                .textColor(
-                                        ColorStateList.valueOf(ContextCompat.getColor(context, R.color.color_black))
-                                )
-                                .build()
-                )
-                .strokeWidth(1)
-                .strokeColor(ColorStateList.valueOf(ContextCompat.getColor(context, R.color.color_black)))
-                .build();
-    }
-
-    private static ChatHeadConfiguration getChatHeadConfiguration(
-            Integer colorPrimary,
-            Integer colorBright
-    ) {
-        return ChatHeadConfiguration.builder()
-                .backgroundColorRes(colorPrimary)
-                .operatorPlaceholderIconTintList(colorBright)
-                .operatorPlaceholderBackgroundColor(colorPrimary)
-                .badgeTextColor(colorBright)
-                .badgeBackgroundTintList(colorPrimary)
-                .build();
-    }
-
-    private static TextConfiguration getChoiceCardContentTextConfiguration(Context context) {
-        return TextConfiguration.builder()
-                .textSize(16f)      // in sp
-                .fontFamily(R.font.tangerine)
-                .textColor(ContextCompat.getColorStateList(context, R.color.color_dark_cyan))
-                .build();
-    }
-
     public static Integer getColorValueFromPrefs(@StringRes int keyValue, SharedPreferences sharedPreferences, Resources resources) {
         String colorGrey = resources.getString(R.string.color_grey_value);
         String colorRed = resources.getString(R.string.color_red_value);
@@ -267,44 +104,6 @@ public static Integer getColorValueFromPrefs(@StringRes int keyValue, SharedPref
         return null;
     }
 
-    public static Integer getTypefaceFromPrefs(SharedPreferences sharedPreferences, Resources resources) {
-        String delius = resources.getString(R.string.font_delius_value);
-        String expletus = resources.getString(R.string.font_expletus_value);
-        String tangerine = resources.getString(R.string.font_tangerine_value);
-        String defaultPrefValue = resources.getString(R.string.settings_value_default);
-
-        String typeFaceValue = sharedPreferences.getString(resources.getString(R.string.pref_font_family), defaultPrefValue);
-
-        if (!typeFaceValue.equals(defaultPrefValue)) {
-            if (typeFaceValue.equals(delius)) {
-                return R.font.delius;
-            } else if (typeFaceValue.equals(expletus)) {
-                return R.font.expletus;
-            } else if (typeFaceValue.equals(tangerine)) {
-                return R.font.tangerine;
-            }
-        }
-        return null;
-    }
-
-    public static ScreenSharing.Mode getScreenSharingModeFromPrefs(
-            SharedPreferences sharedPreferences,
-            Resources resources
-    ) {
-        String unboundedValue = resources.getString(R.string.screen_sharing_mode_unbounded);
-        String appBoundedValue = resources.getString(R.string.screen_sharing_mode_app_bounded);
-        String valueFromPrefs = sharedPreferences.getString(
-                resources.getString(R.string.pref_screen_sharing_mode),
-                unboundedValue
-        );
-
-        if (valueFromPrefs.equals(appBoundedValue)) {
-            return ScreenSharing.Mode.APP_BOUNDED;
-        } else {
-            return ScreenSharing.Mode.UNBOUNDED;
-        }
-    }
-
     public static Authentication.Behavior getAuthenticationBehaviorFromPrefs(
         SharedPreferences sharedPreferences,
         Resources resources
@@ -321,15 +120,4 @@ public static Authentication.Behavior getAuthenticationBehaviorFromPrefs(
             return Authentication.Behavior.FORBIDDEN_DURING_ENGAGEMENT;
         }
     }
-
-    public static Engagement.MediaType toMediaType(@NonNull String mediaType) {
-        switch (mediaType) {
-            case GliaWidgets.MEDIA_TYPE_VIDEO:
-                return Engagement.MediaType.VIDEO;
-            case GliaWidgets.MEDIA_TYPE_AUDIO:
-                return Engagement.MediaType.AUDIO;
-            default:
-                throw new InvalidParameterException("Invalid Media Type");
-        }
-    }
 }
diff --git a/app/src/main/res/drawable/bg_container.xml b/app/src/main/res/drawable/bg_container.xml
new file mode 100644
index 000000000..ddec48240
--- /dev/null
+++ b/app/src/main/res/drawable/bg_container.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/glia_base_shade_color" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_fragment.xml b/app/src/main/res/layout/chat_fragment.xml
deleted file mode 100644
index 915fa734e..000000000
--- a/app/src/main/res/layout/chat_fragment.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.glia.widgets.chat.ChatView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:id="@+id/chat_view"
-    android:layout_height="match_parent">
-
-</com.glia.widgets.chat.ChatView>
diff --git a/app/src/main/res/layout/main_fragment.xml b/app/src/main/res/layout/main_fragment.xml
index 31aaf060d..427d6188f 100644
--- a/app/src/main/res/layout/main_fragment.xml
+++ b/app/src/main/res/layout/main_fragment.xml
@@ -67,17 +67,61 @@
                 app:layout_constraintStart_toStartOf="@id/start_guideline"
                 app:layout_constraintTop_toBottomOf="@id/tool_bar_layout" />
 
-            <!-- https://salemove.atlassian.net/browse/MUIC-362
-            Button
-                android:id="@+id/integrator_chat"
+            <Button
+                android:id="@+id/entry_widget_button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_m"
-                android:text="@string/main_start_in_integrator_app"
-                app:icon="@drawable/ic_baseline_chat_bubble"
+                android:paddingEnd="36dp"
+                android:text="@string/main_start_entry_widget"
+                app:icon="@drawable/ic_chat"
+                app:layout_constraintEnd_toEndOf="@id/end_guideline"
+                app:layout_constraintStart_toStartOf="@id/start_guideline"
+                app:layout_constraintTop_toBottomOf="@id/settings_button" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/entry_widget_switch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="-10dp"
+                app:layout_constraintTop_toBottomOf="@id/entry_widget_button"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <TextView
+                android:id="@+id/entry_widget_bottom_sheet_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Application.Glia.Subtitle2"
+                android:textColor="@color/glia_black_color"
+                android:text="@string/main_start_entry_widget_bottom_sheet"
+                android:layout_marginEnd="@dimen/glia_medium"
+                app:layout_constraintTop_toTopOf="@id/entry_widget_switch"
+                app:layout_constraintBottom_toBottomOf="@id/entry_widget_switch"
+                app:layout_constraintEnd_toStartOf="@+id/entry_widget_switch" />
+
+            <TextView
+                android:id="@+id/entry_widget_switch_view_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Application.Glia.Subtitle2"
+                android:textColor="@color/glia_black_color"
+                android:text="@string/main_start_entry_widget_embedded_view"
+                android:layout_marginStart="@dimen/glia_medium"
+                app:layout_constraintTop_toTopOf="@id/entry_widget_switch"
+                app:layout_constraintBottom_toBottomOf="@id/entry_widget_switch"
+                app:layout_constraintStart_toEndOf="@+id/entry_widget_switch" />
+
+            <FrameLayout
+                android:id="@+id/entry_widget_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/glia_large"
+                android:background="@drawable/bg_container"
+                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="@id/end_guideline"
                 app:layout_constraintStart_toStartOf="@id/start_guideline"
-                app:layout_constraintTop_toBottomOf="@id/settings_button" /-->
+                app:layout_constraintTop_toBottomOf="@id/entry_widget_switch" />
 
             <Button
                 android:id="@+id/chat_activity_button"
@@ -89,7 +133,7 @@
                 app:icon="@drawable/ic_baseline_chat_bubble"
                 app:layout_constraintEnd_toEndOf="@id/end_guideline"
                 app:layout_constraintStart_toStartOf="@id/start_guideline"
-                app:layout_constraintTop_toBottomOf="@id/settings_button" />
+                app:layout_constraintTop_toBottomOf="@id/entry_widget_container" />
 
             <Button
                 android:id="@+id/audio_call_button"
@@ -251,7 +295,7 @@
                 app:constraint_referenced_ids="visitor_code_switch, visitor_code_dialog_label, visitor_code_view_label"/>
 
             <androidx.cardview.widget.CardView
-                android:id="@+id/container"
+                android:id="@+id/visitor_code_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/glia_medium"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 15407e1d2..7ae33b09a 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -12,10 +12,6 @@
             android:id="@+id/base_settings"
             app:destination="@id/sdk_base_settings_fragment" />
 
-        <action
-            android:id="@+id/runtime_settings"
-            app:destination="@id/runtime_theme_settings_fragment" />
-
         <action
             android:id="@+id/remote_settings"
             app:destination="@id/remote_theme_settings_fragment" />
@@ -28,10 +24,6 @@
         android:id="@+id/sdk_base_settings_fragment"
         android:name="com.glia.exampleapp.SdkBasicSettingsFragment" />
 
-    <fragment
-        android:id="@+id/runtime_theme_settings_fragment"
-        android:name="com.glia.exampleapp.RuntimeThemeSettingsFragment" />
-
     <fragment
         android:id="@+id/remote_theme_settings_fragment"
         android:name="com.glia.exampleapp.RemoteThemeSettingsFragment" />
@@ -48,16 +40,8 @@
             android:id="@+id/visitor_info"
             app:destination="@id/visitor_info_fragment" />
 
-        <action
-            android:id="@+id/chat"
-            app:destination="@id/chat_fragment" />
-
     </fragment>
 
-    <fragment
-        android:id="@+id/chat_fragment"
-        android:name="com.glia.exampleapp.ChatFragment" />
-
     <fragment
         android:id="@+id/visitor_info_fragment"
         android:name="com.glia.exampleapp.VisitorInfoFragment" />
diff --git a/app/src/main/res/raw/sample_unified_config.json b/app/src/main/res/raw/sample_unified_config.json
index 841ec0b52..a9604b0c2 100644
--- a/app/src/main/res/raw/sample_unified_config.json
+++ b/app/src/main/res/raw/sample_unified_config.json
@@ -36,19 +36,25 @@
       "background": {
         "border": {
           "type": "fill",
-          "value": ["#FFFFFF"]
+          "value": [
+            "#FFFFFF"
+          ]
         },
         "borderWidth": 0,
         "color": {
           "type": "fill",
-          "value": ["#FFFFFF"]
+          "value": [
+            "#FFFFFF"
+          ]
         },
         "cornerRadius": 8
       },
       "shadow": {
         "color": {
           "type": "fill",
-          "value": ["#FF0000"]
+          "value": [
+            "#FF0000"
+          ]
         },
         "offset": 0,
         "opacity": 1,
@@ -58,7 +64,9 @@
         "alignment": "center",
         "background": {
           "type": "fill",
-          "value": ["#FF0000"]
+          "value": [
+            "#FF0000"
+          ]
         },
         "font": {
           "size": 16,
@@ -66,12 +74,16 @@
         },
         "foreground": {
           "type": "fill",
-          "value": ["#04728c"]
+          "value": [
+            "#04728c"
+          ]
         }
       },
       "tintColor": {
         "type": "fill",
-        "value": ["#ffd100"]
+        "value": [
+          "#ffd100"
+        ]
       }
     },
     "negativeButton": {
@@ -95,7 +107,7 @@
         "color": {
           "type": "fill",
           "value": [
-            "FF0000"
+            "#FF0000"
           ]
         },
         "offset": 0,
@@ -107,7 +119,7 @@
         "background": {
           "type": "fill",
           "value": [
-            "FF0000"
+            "#FF0000"
           ]
         },
         "font": {
@@ -128,6 +140,37 @@
         ]
       }
     },
+    "negativeNeutralButton": {
+      "background": {
+        "border": {
+          "type": "fill",
+          "value": [
+            "#99e5ea"
+          ]
+        },
+        "borderWidth": 1,
+        "color": {
+          "type": "fill",
+          "value": [
+            "#FFFFFF"
+          ]
+        },
+        "cornerRadius": 8
+      },
+      "text": {
+        "alignment": "center",
+        "font": {
+          "size": 16,
+          "style": "regular"
+        },
+        "foreground": {
+          "type": "fill",
+          "value": [
+            "#d32f2f"
+          ]
+        }
+      }
+    },
     "positiveButton": {
       "background": {
         "border": {
@@ -149,7 +192,7 @@
         "color": {
           "type": "fill",
           "value": [
-            "FF0000"
+            "#FF0000"
           ]
         },
         "offset": 0,
@@ -161,7 +204,7 @@
         "background": {
           "type": "fill",
           "value": [
-            "FF0000"
+            "#FF0000"
           ]
         },
         "font": {
@@ -276,7 +319,7 @@
       "border": {
         "type": "fill",
         "value": [
-          "FF0000"
+          "#FF0000"
         ]
       },
       "borderWidth": 2,
@@ -1134,10 +1177,9 @@
           },
           "borderWidth": 2,
           "color": {
-            "type": "gradient",
+            "type": "fill",
             "value": [
-              "#fdd42b",
-              "#ff0000"
+              "#000000"
             ]
           },
           "cornerRadius": 8
@@ -1188,10 +1230,9 @@
         },
         "borderWidth": 2,
         "color": {
-          "type": "gradient",
+          "type": "fill",
           "value": [
-            "#fdd42b",
-            "#ff0000"
+            "#f9d12b"
           ]
         },
         "cornerRadius": 8
@@ -1397,6 +1438,20 @@
         ]
       }
     },
+    "snackBar": {
+      "background": {
+        "type": "fill",
+        "value": [
+          "#FFFFFF"
+        ]
+      },
+      "text": {
+        "type": "fill",
+        "value": [
+          "#3B3B40"
+        ]
+      }
+    },
     "visitorVideo": {
       "flipCameraButton": {
         "background": {
@@ -1964,10 +2019,9 @@
         },
         "borderWidth": 2,
         "color": {
-          "type": "gradient",
+          "type": "fill",
           "value": [
-            "#fdd42b",
-            "#ff0000"
+            "#fdd42b"
           ]
         },
         "cornerRadius": 8
@@ -2649,7 +2703,7 @@
             "background": {
               "type": "fill",
               "value": [
-                "FF0000"
+                "#FF0000"
               ]
             },
             "font": {
@@ -2703,7 +2757,7 @@
             "background": {
               "type": "fill",
               "value": [
-                "FF0000"
+                "#FF0000"
               ]
             },
             "font": {
@@ -2757,7 +2811,7 @@
             "background": {
               "type": "fill",
               "value": [
-                "FF0000"
+                "#FF0000"
               ]
             },
             "font": {
@@ -2784,7 +2838,7 @@
         "background": {
           "type": "fill",
           "value": [
-            "8E8E93"
+            "#8E8E93"
           ]
         },
         "font": {
@@ -2998,7 +3052,9 @@
         "alignment": "center",
         "background": {
           "type": "fill",
-          "value": ["#FFFFFF"]
+          "value": [
+            "#FFFFFF"
+          ]
         },
         "font": {
           "size": 16,
@@ -3006,7 +3062,9 @@
         },
         "foreground": {
           "type": "fill",
-          "value": ["#FF0000"]
+          "value": [
+            "#FF0000"
+          ]
         }
       },
       "text": {
@@ -3303,6 +3361,125 @@
           "cornerRadius": 24
         }
       }
+    },
+    "secureMessaging": {
+      "unavailableStatusBackground": {
+        "color": {
+          "type": "fill",
+          "value": [
+            "#d32f2f"
+          ]
+        }
+      },
+      "unavailableStatusText": {
+        "alignment": "center",
+        "foreground": {
+          "type": "fill",
+          "value": [
+            "#FFFFFF"
+          ]
+        }
+      },
+      "bottomBannerBackground": {
+        "color": {
+          "type": "fill",
+          "value": [
+            "#99e5ea"
+          ]
+        }
+      },
+      "bottomBannerText": {
+        "alignment": "center",
+        "font": {
+          "size": 16,
+          "style": "regular"
+        },
+        "foreground": {
+          "type": "fill",
+          "value": [
+            "#8E8E93"
+          ]
+        }
+      },
+      "bottomBannerDividerColor": {
+        "type": "fill",
+        "value": [
+          "#8E8E93"
+        ]
+      },
+      "topBannerBackground": {
+        "color": {
+          "type": "fill",
+          "value": [
+            "#FFFFFF"
+          ]
+        }
+      },
+      "topBannerText": {
+        "alignment": "center",
+        "font": {
+          "size": 16,
+          "style": "regular"
+        },
+        "foreground": {
+          "type": "fill",
+          "value": [
+            "#04728c"
+          ]
+        }
+      },
+      "topBannerDividerColor": {
+        "type": "fill",
+        "value": [
+          "#8E8E93"
+        ]
+      },
+      "topBannerDropDownIconColor": {
+        "type": "fill",
+        "value": [
+          "#04728c"
+        ]
+      },
+      "mediaTypeItems": {
+        "mediaTypeItem": {
+          "background": {
+            "color": {
+              "type": "fill",
+              "value": [
+                "#ffffff"
+              ]
+            }
+          },
+          "iconColor": {
+            "type": "fill",
+            "value": [
+              "#ffd100"
+            ]
+          },
+          "title": {
+            "foreground": {
+              "type": "fill",
+              "value": [
+                "#04728c"
+              ]
+            }
+          },
+          "message": {
+            "foreground": {
+              "type": "fill",
+              "value": [
+                "#444444"
+              ]
+            }
+          }
+        },
+        "dividerColor": {
+          "type": "fill",
+          "value": [
+            "#04728c"
+          ]
+        }
+      }
     }
   },
   "surveyScreen": {
@@ -3993,10 +4170,9 @@
           },
           "borderWidth": 2,
           "color": {
-            "type": "gradient",
+            "type": "fill",
             "value": [
-              "#fdd42b",
-              "#ff0000"
+              "#fdd42b"
             ]
           },
           "cornerRadius": 8
@@ -4223,7 +4399,7 @@
           "color": {
             "type": "fill",
             "value": [
-              "FF0000"
+              "#FF0000"
             ]
           },
           "offset": 0,
@@ -4235,7 +4411,7 @@
           "background": {
             "type": "fill",
             "value": [
-              "FF0000"
+              "#FF0000"
             ]
           },
           "font": {
@@ -4295,7 +4471,7 @@
           "color": {
             "type": "fill",
             "value": [
-              "FF0000"
+              "#FF0000"
             ]
           },
           "offset": 0,
@@ -4307,7 +4483,7 @@
           "background": {
             "type": "fill",
             "value": [
-              "FF0000"
+              "#FF0000"
             ]
           },
           "font": {
@@ -4405,7 +4581,7 @@
       }
     }
   },
-  "secureConversationsConfirmationScreen": {
+  "secureMessagingConfirmationScreen": {
     "header": {
       "backButton": {
         "background": {
@@ -4417,10 +4593,9 @@
           },
           "borderWidth": 2,
           "color": {
-            "type": "gradient",
+            "type": "fill",
             "value": [
-              "#fdd42b",
-              "#ff0000"
+              "#000000"
             ]
           },
           "cornerRadius": 8
@@ -4471,10 +4646,9 @@
         },
         "borderWidth": 2,
         "color": {
-          "type": "gradient",
+          "type": "fill",
           "value": [
-            "#fdd42b",
-            "#ff0000"
+            "#f9d12b"
           ]
         },
         "cornerRadius": 8
@@ -4716,7 +4890,7 @@
       }
     }
   },
-  "secureConversationsWelcomeScreen": {
+  "secureMessagingWelcomeScreen": {
     "activityIndicatorColor": {
       "type": "fill",
       "value": [
@@ -4796,10 +4970,9 @@
           },
           "borderWidth": 2,
           "color": {
-            "type": "gradient",
+            "type": "fill",
             "value": [
-              "#fdd42b",
-              "#ff0000"
+              "#000000"
             ]
           },
           "cornerRadius": 8
@@ -4850,10 +5023,9 @@
         },
         "borderWidth": 2,
         "color": {
-          "type": "gradient",
+          "type": "fill",
           "value": [
-            "#fdd42b",
-            "#ff0000"
+            "#f9d12b"
           ]
         },
         "cornerRadius": 8
@@ -5209,6 +5381,20 @@
       }
     }
   },
+  "snackBar": {
+    "background": {
+      "type": "fill",
+      "value": [
+        "#3B3B40"
+      ]
+    },
+    "text": {
+      "type": "fill",
+      "value": [
+        "#FFFFFF"
+      ]
+    }
+  },
   "webBrowserScreen": {
     "header": {
       "background": {
@@ -5220,10 +5406,9 @@
         },
         "borderWidth": 2,
         "color": {
-          "type": "gradient",
+          "type": "fill",
           "value": [
-            "#fdd42b",
-            "#ff0000"
+            "#fdd42b"
           ]
         },
         "cornerRadius": 8
@@ -5302,5 +5487,88 @@
         }
       }
     }
+  },
+  "entryWidget": {
+    "background": {
+      "color": {
+        "type": "fill",
+        "value": [
+          "#ffffff"
+        ]
+      }
+    },
+    "mediaTypeItems": {
+      "mediaTypeItem": {
+        "background": {
+          "color": {
+            "type": "fill",
+            "value": [
+              "#ffffff"
+            ]
+          }
+        },
+        "iconColor": {
+          "type": "fill",
+          "value": [
+            "#ffd100"
+          ]
+        },
+        "title": {
+          "foreground": {
+            "type": "fill",
+            "value": [
+              "#04728c"
+            ]
+          }
+        },
+        "message": {
+          "foreground": {
+            "type": "fill",
+            "value": [
+              "#444444"
+            ]
+          }
+        }
+      },
+      "dividerColor": {
+        "type": "fill",
+        "value": [
+          "#04728c"
+        ]
+      }
+    },
+    "errorTitle": {
+      "alignment": "center",
+      "foreground": {
+        "type": "fill",
+        "value": [
+          "#d32f2f"
+        ]
+      }
+    },
+    "errorMessage": {
+      "alignment": "center",
+      "foreground": {
+        "type": "fill",
+        "value": [
+          "#8E8E93"
+        ]
+      }
+    },
+    "errorButton": {
+      "text": {
+        "alignment": "center",
+        "font": {
+          "size": 16,
+          "style": "regular"
+        },
+        "foreground": {
+          "type": "fill",
+          "value": [
+            "#04728c"
+          ]
+        }
+      }
+    }
   }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b19cce7bd..962f888e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,6 +81,9 @@
     <string name="main_launch_activity">Launch Chat in Activity</string>
     <string name="main_launch_fragment">Launch Chat in Fragment</string>
     <string name="main_start_in_integrator_app">Start Chat in integrator app</string>
+    <string name="main_start_entry_widget">Show Entry Widget</string>
+    <string name="main_start_entry_widget_bottom_sheet">Bottom Sheet</string>
+    <string name="main_start_entry_widget_embedded_view">Embedded View</string>
     <string name="main_start_chat_flow">Start new chat flow</string>
     <string name="main_start_message_center_flow">Start new messaging flow</string>
     <string name="main_start_audio_call">Start new audio call</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d358e3cff..da666c5ad 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,7 +11,7 @@
     <!-- Must be included for dialog styling -->
     <style name="Application.Glia.Activity.Style" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- example usage of compile time styling -->
-        <!-- <item name="gliaChatStyle">@style/Theme.GliaAndroidSdkWidgetsExample.Chat</item> -->
+        <!--        <item name="gliaChatStyle">@style/Theme.GliaAndroidSdkWidgetsExample.Chat</item>-->
     </style>
 
     <style name="Theme.GliaAndroidSdkWidgetsExample.Chat" parent="Application.Glia.Chat">
diff --git a/app/src/main/res/xml/all_prefs.xml b/app/src/main/res/xml/all_prefs.xml
index d3adb43f0..64c396935 100644
--- a/app/src/main/res/xml/all_prefs.xml
+++ b/app/src/main/res/xml/all_prefs.xml
@@ -7,10 +7,6 @@
             android:key="@string/pref_glia_basic_settings"
             android:title="SDK Basic Settings" />
 
-        <Preference
-            android:key="@string/pref_glia_runtime_theme_settings"
-            android:title="Runtime Theme Settings" />
-
         <Preference
             android:key="@string/pref_glia_remote_theme_settings"
             android:title="Remote Theme Settings" />
diff --git a/app/src/main/res/xml/runtime_theme_prefs.xml b/app/src/main/res/xml/runtime_theme_prefs.xml
deleted file mode 100644
index 602567c74..000000000
--- a/app/src/main/res/xml/runtime_theme_prefs.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        android:title="N.B: For CV elements restart is needed"
-        android:selectable="false"
-        android:enabled="true"
-        android:summary="For live engagement and secure messaging should work without the restart but for Call Visualizer app restart is needed"/>
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="@string/pref_runtime_theme"
-        app:title="@string/settings_runtime_theme" />
-
-    <PreferenceCategory
-        app:title="Behavior"
-        android:dependency="@string/pref_runtime_theme">
-
-        <SwitchPreference
-            app:defaultValue="false"
-            app:key="@string/pref_white_label"
-            app:title="@string/settings_white_label" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        app:title="@string/settings_colors_title"
-        android:dependency="@string/pref_runtime_theme">
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_brand_primary_color"
-            android:title="@string/settings_chat_brand_primary_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_base_dark_color"
-            android:title="@string/settings_chat_base_dark_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_base_light_color"
-            android:title="@string/settings_chat_base_light_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_base_normal_color"
-            android:title="@string/settings_chat_base_normal_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_base_shade_color"
-            android:title="@string/settings_chat_base_shade_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_system_agent_bubble_color"
-            android:title="@string/settings_chat_system_agent_bubble_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_system_negative_color"
-            android:title="@string/settings_chat_negative_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_visitor_message_bg_color"
-            android:title="@string/settings_chat_visitor_message_bg_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_visitor_message_txt_color"
-            android:title="@string/settings_chat_visitor_message_txt_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_operator_message_bg_color"
-            android:title="@string/settings_chat_operator_message_bg_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_operator_message_txt_color"
-            android:title="@string/settings_chat_operator_message_txt_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_bot_action_button_bg_color"
-            android:title="@string/settings_chat_bot_action_button_bg_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_bot_action_button_txt_color"
-            android:title="@string/settings_chat_bot_action_button_txt_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_bot_action_button_selected_bg_color"
-            android:title="@string/settings_chat_bot_action_button_selected_bg_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_bot_action_button_selected_txt_color"
-            android:title="@string/settings_chat_bot_action_button_selected_txt_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_send_message_button_tint_color"
-            android:title="@string/settings_send_message_button_tint_color"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        app:title="@string/settings_operator_layout_styling"
-        android:dependency="@string/pref_runtime_theme">
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_chat_starting_heading_text_color"
-            android:title="@string/settings_chat_starting_heading_text_color"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_chat_starting_caption_text_color"
-            android:title="@string/settings_chat_starting_caption_text_color"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_chat_started_heading_text_color"
-            android:title="@string/settings_chat_started_heading_text_color"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_chat_started_caption_text_color"
-            android:title="@string/settings_chat_started_caption_text_color"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        app:title="@string/settings_header_styling"
-        android:dependency="@string/pref_runtime_theme">
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_chat_header_title_tint_color"
-            android:title="@string/settings_chat_header_title_tint_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_chat_header_home_button_tint_color"
-            android:title="@string/settings_chat_header_home_button_tint_color"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/colors"
-            android:entryValues="@array/color_values"
-            android:key="@string/pref_chat_header_exit_queue_button_tint_color"
-            android:title="@string/settings_chat_header_exit_queue_button_tint_color"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        app:title="@string/settings_typography"
-        android:dependency="@string/pref_runtime_theme">
-
-        <ListPreference
-            android:defaultValue="@string/default_value"
-            android:entries="@array/fonts"
-            android:entryValues="@array/font_values"
-            android:key="@string/pref_font_family"
-            android:title="@string/settings_chat_font_family"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/build.gradle b/build.gradle
index 334e5d3c3..198e4da61 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,6 +25,8 @@ allprojects {
 
     // Needed for some automated and manual testing (e.g: acceptance tests)
     mavenLocal()
+    //TODO switch to the release version before releasing core SDK
+    maven { url = "https://s01.oss.sonatype.org/content/repositories/comglia-1316" }
   }
 }
 
@@ -68,6 +70,26 @@ subprojects {
     dokkaPlugin(libs.java.dokka)
   }
 }
+// This is known bug in paparazzi 1.3.3 version.
+subprojects {
+  plugins.withId("app.cash.paparazzi") {
+    // Defer until afterEvaluate so that testImplementation is created by Android plugin.
+    afterEvaluate {
+      dependencies.constraints {
+        add("testImplementation", "com.google.guava:guava") {
+          attributes {
+            attribute(
+              TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
+              objects.named(TargetJvmEnvironment, TargetJvmEnvironment.STANDARD_JVM)
+            )
+          }
+          because("LayoutLib and sdk-common depend on Guava's -jre published variant." +
+            "See https://github.com/cashapp/paparazzi/issues/906.")
+        }
+      }
+    }
+  }
+}
 
 tasks.register('clean', Delete) {
   delete rootProject.layout.buildDirectory
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 07eaa94b2..41665dc7f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,44 +1,45 @@
 [versions]
 javaVersion = "17"
 
-kotlinVersion = "1.8.22" # Kotlin, Kotlin Reflect and Dokka versions should have the same minor version to support the same kotlin version
-dokkaVersion = "1.9.20" # Kotlin, Kotlin Reflect and Dokka versions should have the same minor version to support the same kotlin version
-agpVersion = "8.6.0"
+kotlinVersion = "1.9.25" # Kotlin and Dokka versions should have the same minor version to support the same kotlin version
+dokkaVersion = "1.9.20" # Kotlin and Dokka versions should have the same minor version to support the same kotlin version
+agpVersion = "8.6.1"
 nexusPublishVersion = "2.0.0"
 ktlintVersion = "11.5.0"
 
 # be carefully with updating this plugin, it may upgrade kotlin version for the entire project
 # check the release notes and set the version similar with the project kotlin version
 # https://github.com/cashapp/paparazzi/releases
-paparazziVersion = "1.3.1"
+paparazziVersion = "1.3.3"
 
 javaAppCompatVersion = "1.7.0"
 javaConstraintLayoutVersion = "2.1.4"
 javaCoreKtxVersion = "1.13.1"
-javaKtorVersion = "2.2.4"
-javaCoroutinesVersion = "1.8.1"
-javaDokkaVersion = "1.8.20"
-javaLifecycleProcessVersion = "2.8.4"
-javaLintVersion = "31.6.0"
+javaKtorVersion = "3.0.0"
+javaCoroutinesVersion = "1.9.0"
+javaDokkaVersion = "1.9.20"
+javaLifecycleProcessVersion = "2.8.6"
+javaLintVersion = "31.7.1"
 javaMaterialVersion = "1.12.0"
 javaPreferenceVersion = "1.2.1"
-javaRxAndroid3Version = "3.0.0"
-javaRxJava3Version = "3.1.8"
-javaNavVersion = "2.8.0"
-dataGsonVersion = "2.10.1"
-firebaseBomVersion = "33.2.0"
-mediaAudioswitch = "1.1.8"
-mediaPicassoVersion = "2.8"
-mediaLottieVersion = "5.2.0"
+javaRxAndroid3Version = "3.0.2"
+javaRxJava3Version = "3.1.9"
+javaNavVersion = "2.8.3"
+dataGsonVersion = "2.11.0"
+firebaseBomVersion = "33.4.0"
+mediaAudioswitch = "1.2.0"
+mediaPicassoVersion = "2.71828"
+mediaLottieVersion = "6.5.2"
+mediaExifInterfaceVersion = "1.3.7"
 testEspressoVersion = "3.6.1"
 testAndroidXTestVersion = "1.2.1"
 archCoreVersion = "2.2.0"
-testMockkVersion = "1.13.12"
+testMockkVersion = "1.13.13"
 testMockitoKotlinVersion = "5.4.0"
 testRulesVersion = "1.6.1"
-testRobolectricVersion = "4.12.2"
+testRobolectricVersion = "4.13"
 testJunitVersion = "4.13.2"
-testJsonVersion = "20220924"
+testJsonVersion = "20240303"
 
 [libraries]
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agpVersion" }
@@ -46,11 +47,11 @@ android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref
 data-gson = { module = "com.google.code.gson:gson", version.ref = "dataGsonVersion" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBomVersion" }
 firebase-messaging = { module = "com.google.firebase:firebase-messaging" }
-java-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "javaAppCompatVersion"}
+java-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "javaAppCompatVersion" }
 java-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "javaConstraintLayoutVersion" }
 java-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "javaCoroutinesVersion" }
 java-core-ktx = { module = "androidx.core:core-ktx", version.ref = "javaCoreKtxVersion" }
-java-dokka = { module = "org.jetbrains.dokka:android-documentation-plugin", version.ref = "javaDokkaVersion"}
+java-dokka = { module = "org.jetbrains.dokka:android-documentation-plugin", version.ref = "javaDokkaVersion" }
 java-lint = { module = "com.android.tools.lint:lint-api", version.ref = "javaLintVersion" }
 java-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "javaLintVersion" }
 java-ktor-android = { module = "io.ktor:ktor-client-android", version.ref = "javaKtorVersion" }
@@ -65,12 +66,13 @@ lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.r
 media-lottie = { module = "com.airbnb.android:lottie", version.ref = "mediaLottieVersion" }
 media-picasso = { module = "com.squareup.picasso:picasso", version.ref = "mediaPicassoVersion" }
 media-audioswitch = { module = "com.twilio:audioswitch", version.ref = "mediaAudioswitch" }
+media-exif-interface = { module = "androidx.exifinterface:exifinterface", version.ref = "mediaExifInterfaceVersion" }
 test-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "archCoreVersion" }
 test-junit = { module = "junit:junit", version.ref = "testJunitVersion" }
 test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "testEspressoVersion" }
 test-rules = { module = "androidx.test:rules", version.ref = "testRulesVersion" }
 test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "testAndroidXTestVersion" }
-test-json = { module = "org.json:json", version.ref = "testJsonVersion"}
+test-json = { module = "org.json:json", version.ref = "testJsonVersion" }
 test-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "testMockitoKotlinVersion" }
 test-robolectric = { module = "org.robolectric:robolectric", version.ref = "testRobolectricVersion" }
 test-mockk-android = { module = "io.mockk:mockk-android", version.ref = "testMockkVersion" }
diff --git a/version.properties b/version.properties
index 4f9ae6aa9..bb4307b4f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 #Mon Oct 07 09:29:14 UTC 2024
-dependency.coreSdk.version=1.8.0
+dependency.coreSdk.version=1.9.0
 widgets.versionCode=86
 widgets.versionName=2.8.2
diff --git a/widgetssdk/build.gradle b/widgetssdk/build.gradle
index 5a6c6ae87..07b548af2 100644
--- a/widgetssdk/build.gradle
+++ b/widgetssdk/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'app.cash.paparazzi'
 
 //Detailed information about advantages of Java toolchain https://developer.android.com/build/jdks#toolchain
 java {
@@ -32,6 +31,7 @@ android {
     }
     snapshot {
       // Build type used for snapshot testing.
+      apply plugin: 'app.cash.paparazzi'
     }
   }
 
@@ -97,6 +97,7 @@ dependencies {
   implementation libs.media.lottie
   implementation libs.data.gson
   implementation libs.java.core.ktx
+  implementation libs.media.exif.interface
 
   testImplementation libs.test.junit
   testImplementation libs.test.mockito.kotlin
diff --git a/widgetssdk/src/androidTest/java/com/glia/widgets/CallActivityTest.kt b/widgetssdk/src/androidTest/java/com/glia/widgets/CallActivityTest.kt
index 28574ee56..85c604f06 100644
--- a/widgetssdk/src/androidTest/java/com/glia/widgets/CallActivityTest.kt
+++ b/widgetssdk/src/androidTest/java/com/glia/widgets/CallActivityTest.kt
@@ -15,12 +15,10 @@ import com.glia.widgets.call.CallActivity
 import com.glia.widgets.call.CallContract
 import com.glia.widgets.call.CallStateHelper
 import com.glia.widgets.call.CallStatus
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.di.ControllerFactory
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.helper.ResourceProvider
 import com.glia.widgets.locale.LocaleProvider
-import com.glia.widgets.locale.StringKeyPair
 import com.glia.widgets.view.head.ChatHeadContract
 import io.mockk.CapturingSlot
 import io.mockk.every
@@ -28,6 +26,7 @@ import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.verify
 import org.hamcrest.Matchers
+import org.junit.After
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Rule
@@ -41,7 +40,6 @@ class CallActivityTest {
     private lateinit var callController: CallContract.Controller
     private lateinit var callView: CallContract.View
     private lateinit var serviceChatHeadController: ChatHeadContract.Controller
-    private lateinit var sdkConfigurationManager: GliaSdkConfigurationManager
     private lateinit var resourceProvider: ResourceProvider
     private lateinit var callStatus: CallStatus
     private lateinit var callViewSlot: CapturingSlot<CallContract.View>
@@ -67,11 +65,7 @@ class CallActivityTest {
         every { controllerFactory.chatHeadController } answers { serviceChatHeadController }
         Dependencies.controllerFactory = controllerFactory
 
-        // set up SdkConfigurationManager
-        sdkConfigurationManager = mockk(relaxed = true)
-        every { sdkConfigurationManager.uiTheme } answers { UiTheme() }
-        every { sdkConfigurationManager.companyName } answers { "Test Company" }
-        Dependencies.sdkConfigurationManager = sdkConfigurationManager
+        Dependencies.repositoryFactory = mockk(relaxed = true)
 
         // set up ResourceProvider
         resourceProvider = ResourceProvider(appContext)
@@ -87,6 +81,11 @@ class CallActivityTest {
         launchActivity()
     }
 
+    @After
+    fun tearDown() {
+        activityScenario.close()
+    }
+
     private fun launchActivity() {
         activityScenario = ActivityScenario.launch(CallActivity::class.java)
         verify { callController.setView(capture(callViewSlot)) }
@@ -279,6 +278,7 @@ class CallActivityTest {
         callView.emitState(callState.makeCallState())
         Thread.sleep(1000)
         Espresso.onView(ViewMatchers.withContentDescription(R.string.android_app_bar_nav_up_accessibility)).perform(ViewActions.click())
+        Thread.sleep(1000)
         Assert.assertEquals(Lifecycle.State.DESTROYED, activityScenario.state)
     }
 
diff --git a/widgetssdk/src/androidTest/java/com/glia/widgets/call/CallStateHelper.java b/widgetssdk/src/androidTest/java/com/glia/widgets/call/CallStateHelper.java
index b9b1f3a71..416d49595 100644
--- a/widgetssdk/src/androidTest/java/com/glia/widgets/call/CallStateHelper.java
+++ b/widgetssdk/src/androidTest/java/com/glia/widgets/call/CallStateHelper.java
@@ -113,7 +113,6 @@ public CallStateHelper.Builder copyFrom(CallState callState) {
             landscapeLayoutControlsVisible = callState.landscapeLayoutControlsVisible;
             isMuted = callState.isMuted;
             hasVideo = callState.hasVideo;
-            companyName = callState.companyName;
             requestedMediaType = callState.requestedMediaType;
             isSpeakerOn = callState.isSpeakerOn;
             return this;
@@ -159,7 +158,6 @@ public CallState makeCallState() {
                 .setLandscapeLayoutControlsVisible(landscapeLayoutControlsVisible)
                 .setIsMuted(isMuted)
                 .setHasVideo(hasVideo)
-                .setCompanyName(companyName)
                 .setRequestedMediaType(requestedMediaType)
                 .setIsSpeakerOn(isSpeakerOn)
                 .createCallState();
diff --git a/widgetssdk/src/main/AndroidManifest.xml b/widgetssdk/src/main/AndroidManifest.xml
index 99e15f78e..971f33b71 100644
--- a/widgetssdk/src/main/AndroidManifest.xml
+++ b/widgetssdk/src/main/AndroidManifest.xml
@@ -43,10 +43,10 @@
             android:theme="@style/Application.Glia.Chat.Activity"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".filepreview.ui.FilePreviewActivity"
+            android:name=".filepreview.ui.ImagePreviewActivity"
             android:launchMode="singleTop"
             android:parentActivityName=".chat.ChatActivity"
-            android:theme="@style/Application.Glia.FilePreview.Activity" />
+            android:theme="@style/Application.Glia.ImagePreview.Activity" />
         <activity
             android:name=".call.CallActivity"
             android:launchMode="singleTask"
@@ -70,6 +70,11 @@
             android:launchMode="singleTask"
             android:theme="@style/Application.Glia.Call.Activity" />
 
+        <activity
+            android:name=".entrywidget.EntryWidgetActivity"
+            android:launchMode="singleTask"
+            android:theme="@style/Application.Glia.Translucent.Activity" />
+
         <activity
             android:name=".helper.DialogHolderActivity"
             android:launchMode="singleTask"
diff --git a/widgetssdk/src/main/java/com/glia/widgets/GliaWidgets.java b/widgetssdk/src/main/java/com/glia/widgets/GliaWidgets.java
index d0b736d20..1998a5c43 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/GliaWidgets.java
+++ b/widgetssdk/src/main/java/com/glia/widgets/GliaWidgets.java
@@ -10,21 +10,18 @@
 import androidx.annotation.Nullable;
 
 import com.glia.androidsdk.GliaException;
-import com.glia.androidsdk.RequestCallback;
 import com.glia.androidsdk.visitor.Authentication;
-import com.glia.androidsdk.visitor.VisitorInfoUpdateRequest;
 import com.glia.widgets.chat.adapter.CustomCardAdapter;
 import com.glia.widgets.chat.adapter.WebViewCardAdapter;
 import com.glia.widgets.core.authentication.AuthenticationManager;
 import com.glia.widgets.core.callvisualizer.domain.CallVisualizer;
-import com.glia.widgets.core.visitor.GliaVisitorInfo;
-import com.glia.widgets.core.visitor.GliaWidgetException;
-import com.glia.widgets.core.visitor.VisitorInfoUpdate;
 import com.glia.widgets.di.Dependencies;
+import com.glia.widgets.entrywidget.EntryWidget;
 import com.glia.widgets.helper.Logger;
+import com.glia.widgets.launcher.EngagementLauncher;
 
 import java.io.IOException;
-import java.util.function.Consumer;
+import java.util.List;
 
 import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -35,99 +32,8 @@
  */
 public class GliaWidgets {
 
-    /**
-     * Use with {@link android.os.Bundle} to pass in a {@link UiTheme} as a navigation argument when
-     * navigating to {@link com.glia.widgets.chat.ChatActivity}
-     *
-     * @deprecated While UiTheme can still be used for UI customization,
-     * we strongly encourage adopting remote configurations {@link GliaWidgetsConfig.Builder#setUiJsonRemoteConfig(String)}.
-     * The remote configurations approach is more versatile and better suited for future development.
-     */
-    @Deprecated
-    public static final String UI_THEME = "ui_theme";
-    /**
-     * Use with {@link android.os.Bundle} to pass in the name of your company as a navigation
-     * argument when navigating to {@link com.glia.widgets.chat.ChatActivity}
-     *
-     * @deprecated Use {@link com.glia.widgets.GliaWidgetsConfig.Builder#companyName}
-     * or customize the strings from GliaHub
-     */
-    @Deprecated
-    public static final String COMPANY_NAME = "company_name";
-
-    /**
-     * Use with {@link android.os.Bundle} to pass in the ID of the queue you wish to enroll in
-     * as a navigation argument when navigating to {@link com.glia.widgets.chat.ChatActivity}
-     * or {@link com.glia.widgets.call.CallActivity}
-     *
-     * @deprecated Use {QUEUE_IDS} instead.
-     */
-    @Deprecated
-    public static final String QUEUE_ID = "queue_id";
-
-    /**
-     * Use with {@link android.os.Bundle} to pass in an {@link java.util.ArrayList} of {@link String} of the queues IDs
-     * you wish to enroll in as a navigation argument when navigating to {@link com.glia.widgets.chat.ChatActivity}
-     * or {@link com.glia.widgets.call.CallActivity}
-     */
-    public static final String QUEUE_IDS = "queue_ids";
-    /**
-     * Use with {@link android.os.Bundle} to pass in a context url as a navigation
-     * argument when navigating to {@link com.glia.widgets.chat.ChatActivity}
-     *
-     * @deprecated Use {@link com.glia.widgets.GliaWidgets#CONTEXT_ASSET_ID}
-     */
-    @Deprecated
-    public static final String CONTEXT_URL = "context_url";
-    /**
-     * Use with {@link android.os.Bundle} to pass in a context asset ID as a navigation
-     * argument when navigating to {@link com.glia.widgets.chat.ChatActivity}
-     */
-    public static final String CONTEXT_ASSET_ID = "context_asset_id";
-    /**
-     * It's recommended to use {@link GliaWidgetsConfig.Builder#setUseOverlay(boolean)} ()} instead of this constant directly.
-     * Use with {@link android.os.Bundle}  to pass in a boolean which represents if you would like to use the chat head bubble
-     * as an overlay outside your application for navigating to {@link com.glia.widgets.chat.ChatActivity}.
-     * If set to true then the SDK will ask for overlay permissions and try to always show the navigation bubble outside
-     * the application. However, it will be shown only if the user has accepted the permissions.
-     * If false, then overlay permission is not requested and the navigation bubble is shown when the application is active.
-     * Default value is true.
-     * @deprecated Use {@link com.glia.widgets.GliaWidgetsConfig#isEnableBubbleOutsideApp() and
-     * @link GliaWidgetsConfig#isEnableBubbleInsideApp()}
-     */
-    @Deprecated
-    public static final String USE_OVERLAY = "use_overlay";
-    /**
-     * Use with {@link android.os.Bundle} to pass an input parameter to the call activity to
-     * tell it which type of engagement you would like to start. Can be one of:
-     * {@link MEDIA_TYPE_AUDIO} or {@link MEDIA_TYPE_VIDEO}.
-     * If no parameter is passed then will default to {@link MEDIA_TYPE_AUDIO}
-     */
-    public static final String MEDIA_TYPE = "media_type";
-    /**
-     * Pass this parameter as an input parameter with {@link MEDIA_TYPE} as its key to
-     * {@link com.glia.widgets.call.CallActivity} to start an audio call media engagement.
-     */
-    public static final String MEDIA_TYPE_AUDIO = "media_type_audio";
-    /**
-     * Pass this parameter as an input parameter with {@link MEDIA_TYPE} as its key to
-     * {@link com.glia.widgets.call.CallActivity} to start a video call media engagement.
-     */
-    public static final String MEDIA_TYPE_VIDEO = "media_type_video";
-    /**
-     * Pass this parameter to call activity to tell it that upgrade to audio/video call is ongoing
-     * If no parameter is passed then will default to false
-     */
-    public static final String IS_UPGRADE_TO_CALL = "upgrade_to_call";
-    public static final String SURVEY = "survey";
-    /**
-     * Use with {@link android.os.Bundle} to pass in
-     * {@link com.glia.androidsdk.screensharing.ScreenSharing.Mode} as a navigation
-     * argument when navigating to {@link com.glia.widgets.chat.ChatActivity}
-     */
-    public static final String SCREEN_SHARING_MODE = "screens_haring_mode";
-    public static final String CHAT_TYPE = "chat_type";
     private final static String TAG = "GliaWidgets";
+
     @Nullable
     private static CustomCardAdapter customCardAdapter = new WebViewCardAdapter();
 
@@ -155,6 +61,45 @@ public synchronized static void init(GliaWidgetsConfig gliaWidgetsConfig) {
         Dependencies.getGliaThemeManager().applyJsonConfig(gliaWidgetsConfig.uiJsonRemoteConfig);
     }
 
+    /**
+     * Retrieves an instance of {@link EngagementLauncher}.
+     *
+     * @param queueIds A list of queue IDs to be used for the engagement launcher.
+     *                 When empty or invalid, the default queues will be used.
+     * @return An instance of {@link EngagementLauncher}.
+     * @throws GliaException with the {@link GliaException.Cause#INVALID_INPUT} if the SDK is not initialized.
+     */
+    @NonNull
+    public synchronized static EngagementLauncher getEngagementLauncher(@NonNull List<String> queueIds) {
+        setupQueueIds(queueIds);
+
+        return Dependencies.getEngagementLauncher();
+    }
+
+    /**
+     * Retrieves an instance of {@link EntryWidget}.
+     *
+     * @param queueIds A list of queue IDs to be used for the entry widget.
+     *                 When empty or invalid, the default queues will be used.
+     * @return An instance of {@link EntryWidget}.
+     * @throws GliaException with the {@link GliaException.Cause#INVALID_INPUT} if the SDK is not initialized.
+     */
+    @NonNull
+    public synchronized static EntryWidget getEntryWidget(@NonNull List<String> queueIds) {
+        if (!Dependencies.glia().isInitialized()) {
+            Logger.e(TAG, "Attempt to get EntryWidget before SDK initialization");
+        }
+
+        Dependencies.getConfigurationManager().setQueueIds(queueIds);
+        return Dependencies.getEntryWidget();
+    }
+
+    private static void setupQueueIds(@NonNull List<String> queueIds) {
+        Dependencies.glia().ensureInitialized();
+
+        Dependencies.getConfigurationManager().setQueueIds(queueIds);
+    }
+
     /**
      * Accepts permissions request results.
      *
@@ -167,7 +112,9 @@ public synchronized static void init(GliaWidgetsConfig gliaWidgetsConfig) {
      * Your activity in turn must call this method to pass the results of the request to Glia SDK.</p>
      *
      * <p>This method is no-op for other non-Glia triggered results.</p>
+     * @deprecated This method is no longer required, as all the required permissions are now managed internally.
      */
+    @Deprecated(forRemoval = true)
     public static void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         Logger.d(TAG, "onRequestPermissionsResult");
         Dependencies.glia().onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -185,7 +132,9 @@ public static void onRequestPermissionsResult(int requestCode, String[] permissi
      * Your activity in turn must call this method to pass the results of the request to Glia SDK.</p>
      *
      * <p>This method is no-op for other non-Glia triggered results.</p>
+     * @deprecated This method is no longer required, as required activity results are now managed internally.
      */
+    @Deprecated(forRemoval = true)
     public static void onActivityResult(int requestCode, int resultCode, Intent data) {
         Logger.d(TAG, "onActivityResult");
         Dependencies.getRepositoryFactory().getEngagementRepository().onActivityResult(requestCode, resultCode, data);
@@ -210,53 +159,6 @@ public static void endEngagement() {
         Dependencies.getUseCaseFactory().getEndEngagementUseCase().invoke(true);
     }
 
-    /**
-     * Updates the visitor's information
-     * <p>
-     * Updates the visitor's information stored on the server. This information will also be displayed to the operator.
-     *
-     * @deprecated since 1.9.0 use @see {@link com.glia.androidsdk.Glia#updateVisitorInfo(VisitorInfoUpdateRequest, Consumer)}
-     */
-    @Deprecated
-    public static void updateVisitorInfo(VisitorInfoUpdate visitorInfoUpdate, Consumer<GliaWidgetException> exceptionConsumer) {
-        Logger.logDeprecatedMethodUse(TAG, "updateVisitorInfo(VisitorInfoUpdate, Consumer<GliaWidgetException>)");
-        Dependencies.glia().updateVisitorInfo(new VisitorInfoUpdateRequest.Builder()
-            .setName(visitorInfoUpdate.getName())
-            .setEmail(visitorInfoUpdate.getEmail())
-            .setPhone(visitorInfoUpdate.getPhone())
-            .setNote(visitorInfoUpdate.getNote())
-            .setCustomAttributes(visitorInfoUpdate.getCustomAttributes())
-            .setCustomAttrsUpdateMethod(visitorInfoUpdate.getCustomAttrsUpdateMethod())
-            .setNoteUpdateMethod(visitorInfoUpdate.getNoteUpdateMethod())
-            .build(), e -> {
-            if (e != null) {
-                exceptionConsumer.accept(new GliaWidgetException(e.debugMessage, e.cause));
-            } else {
-                exceptionConsumer.accept(null);
-            }
-        });
-    }
-
-    /**
-     * Fetches the visitor's information
-     * <p>
-     * If a visitor is authenticated, the response will include the attributes and tokens fetched from the authentication provider.
-     *
-     * @deprecated since 1.9.0 use @see {@link com.glia.androidsdk.Glia#getVisitorInfo(RequestCallback)}
-     */
-    @Deprecated
-    public static void getVisitorInfo(Consumer<GliaVisitorInfo> visitorCallback, Consumer<GliaWidgetException> exceptionConsumer) {
-        Logger.logDeprecatedMethodUse(TAG, "getVisitorInfo(Consumer<GliaVisitorInfo>, Consumer<GliaWidgetException>)");
-        Dependencies.glia().getVisitorInfo((visitorInfo, e) -> {
-            if (visitorInfo != null) {
-                visitorCallback.accept(new GliaVisitorInfo(visitorInfo));
-            }
-            if (e != null) {
-                exceptionConsumer.accept(new GliaWidgetException(e.debugMessage, e.cause));
-            }
-        });
-    }
-
     /**
      * @return current instance of {@link CustomCardAdapter}
      */
diff --git a/widgetssdk/src/main/java/com/glia/widgets/GliaWidgetsConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/GliaWidgetsConfig.kt
index ed7eb8bc2..6c2b7229e 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/GliaWidgetsConfig.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/GliaWidgetsConfig.kt
@@ -43,9 +43,6 @@ class GliaWidgetsConfig private constructor(builder: Builder) {
     @JvmField
     val enableBubbleInsideApp: Boolean?
 
-    @JvmField
-    val uiTheme: UiTheme?
-
     @JvmField
     val manualLocaleOverride: String?
 
@@ -58,10 +55,9 @@ class GliaWidgetsConfig private constructor(builder: Builder) {
         requestCode = builder.requestCode
         uiJsonRemoteConfig = builder.uiJsonRemoteConfig
         companyName = builder.companyName
-        screenSharingMode = builder.screenSharingMode ?: DEFAULT_SCREEN_SHARING_MODE
+        screenSharingMode = builder.screenSharingMode
         enableBubbleOutsideApp = builder.enableBubbleOutsideApp
         enableBubbleInsideApp = builder.enableBubbleInsideApp
-        uiTheme = builder.uiTheme
         manualLocaleOverride = builder.manualLocaleOverride
     }
 
@@ -134,8 +130,6 @@ class GliaWidgetsConfig private constructor(builder: Builder) {
             private set
         var enableBubbleInsideApp: Boolean? = null
             private set
-        var uiTheme: UiTheme? = null
-            private set
         var manualLocaleOverride: String? = null
             private set
 
@@ -244,19 +238,6 @@ class GliaWidgetsConfig private constructor(builder: Builder) {
             return this
         }
 
-        /**
-         * @param uiTheme - uiTheme resource for UI configuration
-         * @return Builder instance
-         */
-        @Deprecated(
-            "While UiTheme can still be used for UI customization, we strongly encourage adopting remote configurations(GliaWidgetsConfig.Builder.setUiJsonRemoteConfig). " +
-                "The remote configurations approach is more versatile and better suited for future development."
-        )
-        fun setUiTheme(uiTheme: UiTheme?): Builder {
-            this.uiTheme = uiTheme
-            return this
-        }
-
         /**
          * @param manualLocaleOverride - manual locale override if you wish not to use the default locale
          * @return Builder instance
@@ -275,8 +256,4 @@ class GliaWidgetsConfig private constructor(builder: Builder) {
             return GliaWidgetsConfig(this)
         }
     }
-
-    internal companion object {
-        val DEFAULT_SCREEN_SHARING_MODE = ScreenSharing.Mode.APP_BOUNDED
-    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/UiTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/UiTheme.kt
index a7d8525b0..114422736 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/UiTheme.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/UiTheme.kt
@@ -29,11 +29,7 @@ import kotlinx.parcelize.Parcelize
     "While this class can still be used for UI customization, we strongly encourage adopting remote configurations(GliaWidgetsConfig.Builder.setUiJsonRemoteConfig). " +
         "The remote configurations approach is more versatile and better suited for future development."
 )
-data class UiTheme(
-    /**
-     * Text to be shown on the top of the app bar in the chat
-     */
-    val appBarTitle: String? = null,
+internal data class UiTheme(
 
     /**
      * Primary color for your brand. Used for example to set the color of the appbar
@@ -372,7 +368,6 @@ data class UiTheme(
 ) : Parcelable, Mergeable<UiTheme> {
 
     private constructor(builder: UiThemeBuilder) : this(
-        appBarTitle = builder.appBarTitle,
         brandPrimaryColor = builder.brandPrimaryColor,
         baseLightColor = builder.baseLightColor,
         baseDarkColor = builder.baseDarkColor,
@@ -439,7 +434,6 @@ data class UiTheme(
     )
 
     override fun merge(other: UiTheme): UiTheme = UiTheme(
-        appBarTitle = appBarTitle merge other.appBarTitle,
         brandPrimaryColor = brandPrimaryColor merge other.brandPrimaryColor,
         baseLightColor = baseLightColor merge other.baseLightColor,
         baseDarkColor = baseDarkColor merge other.baseDarkColor,
@@ -544,11 +538,6 @@ data class UiTheme(
             "The remote configurations approach is more versatile and better suited for future development."
     )
     class UiThemeBuilder {
-        /**
-         * Text to be shown on the top of the app bar in the chat
-         */
-        var appBarTitle: String? = null
-            private set
 
         /**
          * Primary color for your brand. Used for example to set the color of the appbar
@@ -932,10 +921,6 @@ data class UiTheme(
         var gvaQuickReplyTextColor: Int? = null
             private set
 
-        fun setAppBarTitle(appBarTitle: String?) {
-            this.appBarTitle = appBarTitle
-        }
-
         fun setFontRes(@FontRes fontRes: Int?) {
             this.fontRes = fontRes?.takeIf { it != 0 }
         }
@@ -1185,7 +1170,6 @@ data class UiTheme(
         }
 
         fun setTheme(theme: UiTheme) {
-            appBarTitle = theme.appBarTitle
             brandPrimaryColor = theme.brandPrimaryColor
             baseLightColor = theme.baseLightColor
             baseDarkColor = theme.baseDarkColor
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.java b/widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.java
deleted file mode 100644
index 974beb585..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.glia.widgets.call;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-import com.glia.widgets.GliaWidgets;
-import com.glia.widgets.R;
-import com.glia.widgets.base.FadeTransitionActivity;
-import com.glia.widgets.chat.ChatActivity;
-import com.glia.widgets.core.configuration.EngagementConfiguration;
-import com.glia.widgets.di.Dependencies;
-import com.glia.widgets.helper.Logger;
-import com.glia.widgets.helper.Utils;
-import com.glia.widgets.locale.LocaleString;
-import com.glia.widgets.webbrowser.WebBrowserActivity;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-/**
- * This activity is used for engagements that include audio and/or video calls.
- * <p>
- * Main features:
- * - Requests required permissions and enqueues for audio and/or video engagements if no ongoing engagements are found.
- * - Provides video feeds from operator and visitor cameras.
- * - Provides controls for managing ongoing engagements, including video and audio.
- * - Allows switching between chat and call activities.
- * <p>
- * Before this activity is launched, make sure that Glia Widgets SDK is set up correctly.
- * <p>
- * Data that can be passed together with the Activity intent:
- * - {@link GliaWidgets#QUEUE_IDS}: IDs list of the queues you would like to use for your engagements.
- * For a full list of optional parameters, see the constants defined in {@link GliaWidgets}.
- * <p>
- * Code example:
- * <pre>
- * Intent intent = new Intent(requireContext(), CallActivity.class);
- * intent.putExtra(GliaWidgets.QUEUE_IDS, new ArrayList<>(List.of("AUDIO_QUEUE_ID")));
- * intent.putExtra(GliaWidgets.MEDIA_TYPE, Engagement.MediaType.VIDEO);
- * startActivity(intent);
- * </pre>
- */
-public final class CallActivity extends FadeTransitionActivity {
-    private static final String TAG = CallActivity.class.getSimpleName();
-
-    private CallConfiguration callConfiguration;
-
-    private CallView callView;
-    private CallView.OnBackClickedListener onBackClickedListener = this::finish;
-    private CallView.OnNavigateToChatListener onNavigateToChatListener = () -> {
-        navigateToChat();
-        finish();
-    };
-    private final CallView.OnNavigateToWebBrowserListener onNavigateToWebBrowserListener = this::navigateToWebBrowser;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Logger.i(TAG, "Create Call screen");
-        setContentView(R.layout.call_activity);
-        callView = findViewById(R.id.call_view);
-
-        // Legacy company name support
-        Dependencies.getSdkConfigurationManager().setLegacyCompanyName(getIntent().getStringExtra(GliaWidgets.COMPANY_NAME));
-
-        callConfiguration = CallActivityIntentHelper.readConfiguration(this);
-        if (this.getIntent().hasExtra(GliaWidgets.USE_OVERLAY)) {
-            // Integrator has passed a deprecated GliaWidgets.USE_OVERLAY parameter with Intent
-            // Override bubble configuration with USE_OVERLAY value
-            boolean useOverlay = this.getIntent().getBooleanExtra(GliaWidgets.USE_OVERLAY, true);
-            Dependencies.getSdkConfigurationManager().setLegacyUseOverlay(useOverlay);
-        }
-
-        if (!callView.shouldShowMediaEngagementView(callConfiguration.isUpgradeToCall)) {
-            finishAndRemoveTask();
-            return;
-        }
-
-        callView.setOnTitleUpdatedListener(this::setTitle);
-        callView.setEngagementConfiguration(callConfiguration.engagementConfiguration);
-        callView.setUiTheme(callConfiguration.engagementConfiguration.getRunTimeTheme());
-        callView.setOnBackClickedListener(onBackClickedListener);
-
-        // In case the engagement ends, Activity is removed from the device's Recents menu
-        // to avoid app users to accidentally start queueing for another call when they resume
-        // the app from the Recents menu and the app's backstack was empty.
-        callView.setOnEndListener(this::finishAndRemoveTask);
-
-        callView.setOnMinimizeListener(this::finish);
-        callView.setOnNavigateToChatListener(onNavigateToChatListener);
-        callView.setOnNavigateToWebBrowserListener(onNavigateToWebBrowserListener);
-
-        if (savedInstanceState == null) {
-            startCall();
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        callView.onResume();
-        super.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        callView.onPause();
-        super.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        Logger.i(TAG, "Destroy Call screen");
-        onBackClickedListener = null;
-        onNavigateToChatListener = null;
-        callView.onDestroy();
-        super.onDestroy();
-    }
-
-    @Override
-    public void onUserInteraction() {
-        super.onUserInteraction();
-        callView.onUserInteraction();
-    }
-
-    private void startCall() {
-        EngagementConfiguration engagementConfiguration = Objects.requireNonNull(callConfiguration.engagementConfiguration);
-        callView.startCall(
-            Objects.requireNonNull(engagementConfiguration.getCompanyName()),
-            engagementConfiguration.getQueueIds(),
-            engagementConfiguration.getContextAssetId(),
-            Objects.requireNonNull(engagementConfiguration.getScreenSharingMode()),
-            callConfiguration.isUpgradeToCall,
-            callConfiguration.mediaType
-        );
-    }
-
-    private void navigateToChat() {
-        Logger.d(TAG, "navigateToChat");
-        EngagementConfiguration sdkConfiguration = Objects.requireNonNull(callConfiguration.engagementConfiguration);
-        ArrayList<String> queueIds;
-        if (sdkConfiguration.getQueueIds() != null) {
-            queueIds = new ArrayList<>(sdkConfiguration.getQueueIds());
-        } else {
-            queueIds = null;
-        }
-        Intent newIntent = new Intent(getApplicationContext(), ChatActivity.class)
-            .putExtra(GliaWidgets.QUEUE_IDS, queueIds)
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, sdkConfiguration.getContextAssetId())
-            .putExtra(GliaWidgets.UI_THEME, sdkConfiguration.getRunTimeTheme())
-            .putExtra(GliaWidgets.SCREEN_SHARING_MODE, sdkConfiguration.getScreenSharingMode());
-        startActivity(newIntent);
-    }
-
-    private void navigateToWebBrowser(LocaleString title, String url) {
-        Intent newIntent = WebBrowserActivity.Companion.intent(this, title, url);
-        startActivity(newIntent);
-    }
-
-    /**
-     * Creates and fills out Intent for starting CallActivity
-     * @deprecated use {@link #getIntent(Context, CallConfiguration)} since 1.8.2
-     * @param applicationContext - application context
-     * @param engagementConfiguration - widgets sdk configuration
-     * @param mediaType - media type that should be started (in case media engagement not ongoing)
-     * @return Intent for starting CallActivity
-     */
-    @Deprecated
-    public static Intent getIntent(
-        Context applicationContext,
-        EngagementConfiguration engagementConfiguration,
-        String mediaType
-    ) {
-        Logger.logDeprecatedMethodUse(TAG, "getIntent(Context, GliaSdkConfiguration, String)");
-        return getIntent(applicationContext,
-                new CallConfiguration.Builder()
-                        .setEngagementConfiguration(engagementConfiguration)
-                        .setMediaType(Utils.toMediaType(mediaType))
-                        .build()
-        );
-    }
-
-    /**
-     * Creates and fills out Intent for starting CallActivity
-     * @param context - Context object
-     * @param callConfiguration - CallActivity configuration
-     * @return - Intent for Starting CallActivity
-     */
-    public static Intent getIntent(
-        Context context,
-        CallConfiguration callConfiguration
-    ) {
-        return CallActivityIntentHelper.createIntent(context, callConfiguration);
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.kt
new file mode 100644
index 000000000..8a52e799f
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.kt
@@ -0,0 +1,106 @@
+package com.glia.widgets.call
+
+import android.os.Bundle
+import com.glia.androidsdk.Engagement.MediaType
+import com.glia.widgets.R
+import com.glia.widgets.base.FadeTransitionActivity
+import com.glia.widgets.call.CallView.OnNavigateToChatListener
+import com.glia.widgets.call.CallView.OnNavigateToWebBrowserListener
+import com.glia.widgets.di.Dependencies
+import com.glia.widgets.helper.ExtraKeys
+import com.glia.widgets.helper.Logger
+import com.glia.widgets.helper.TAG
+import com.glia.widgets.helper.getEnumExtra
+import com.glia.widgets.launcher.ActivityLauncher
+import com.glia.widgets.locale.LocaleString
+import kotlin.properties.Delegates
+
+/**
+ * This activity is used for engagements that include audio and/or video calls.
+ *
+ *
+ * Main features:
+ * - Requests required permissions and enqueues for audio and/or video engagements if no ongoing engagements are found.
+ * - Provides video feeds from operator and visitor cameras.
+ * - Provides controls for managing ongoing engagements, including video and audio.
+ * - Allows switching between chat and call activities.
+ *
+ *
+ * Before this activity is launched, make sure that Glia Widgets SDK is set up correctly.
+ */
+internal class CallActivity : FadeTransitionActivity() {
+    private val activityLauncher: ActivityLauncher by lazy { Dependencies.activityLauncher }
+    private var callView: CallView by Delegates.notNull()
+
+    private var onBackClickedListener: CallView.OnBackClickedListener? = CallView.OnBackClickedListener { this.finish() }
+    private var onNavigateToChatListener: OnNavigateToChatListener? = OnNavigateToChatListener {
+        navigateToChat()
+        finish()
+    }
+    private val onNavigateToWebBrowserListener = OnNavigateToWebBrowserListener(this::navigateToWebBrowser)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Logger.i(TAG, "Create Call screen")
+        setContentView(R.layout.call_activity)
+        callView = findViewById(R.id.call_view)
+
+        val isUpgradeToCall = intent.getBooleanExtra(ExtraKeys.IS_UPGRADE_TO_CALL, false)
+
+        if (!callView.shouldShowMediaEngagementView(isUpgradeToCall)) {
+            finishAndRemoveTask()
+            return
+        }
+
+        callView.setOnTitleUpdatedListener(this::setTitle)
+        onBackClickedListener?.also(callView::setOnBackClickedListener)
+
+        // In case the engagement ends, Activity is removed from the device's Recent menu
+        // to avoid app users to accidentally start queueing for another call when they resume
+        // the app from the Recent menu and the app's backstack was empty.
+        callView.setOnEndListener { this.finishAndRemoveTask() }
+
+        callView.setOnMinimizeListener { this.finish() }
+        onNavigateToChatListener?.also(callView::setOnNavigateToChatListener)
+        callView.setOnNavigateToWebBrowserListener(onNavigateToWebBrowserListener)
+
+        if (savedInstanceState == null) {
+
+            startCall(intent.getEnumExtra<MediaType>(ExtraKeys.MEDIA_TYPE), isUpgradeToCall)
+        }
+    }
+
+    override fun onResume() {
+        callView.onResume()
+        super.onResume()
+    }
+
+    override fun onPause() {
+        callView.onPause()
+        super.onPause()
+    }
+
+    override fun onDestroy() {
+        Logger.i(TAG, "Destroy Call screen")
+        onBackClickedListener = null
+        onNavigateToChatListener = null
+        callView.onDestroy()
+        super.onDestroy()
+    }
+
+    override fun onUserInteraction() {
+        super.onUserInteraction()
+        callView.onUserInteraction()
+    }
+
+    private fun startCall(mediaType: MediaType?, isUpgradeToCall: Boolean) {
+        callView.startCall(isUpgradeToCall, mediaType)
+    }
+
+    private fun navigateToChat() {
+        Logger.d(TAG, "navigateToChat")
+        activityLauncher.launchChat(this)
+    }
+
+    private fun navigateToWebBrowser(title: LocaleString, url: String) = activityLauncher.launchWebBrowser(this, title, url)
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallActivityIntentHelper.kt b/widgetssdk/src/main/java/com/glia/widgets/call/CallActivityIntentHelper.kt
deleted file mode 100644
index 1125d8e81..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/call/CallActivityIntentHelper.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.glia.widgets.call
-
-import android.content.Context
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
-import com.glia.androidsdk.Engagement
-import com.glia.widgets.GliaWidgets
-import com.glia.widgets.core.configuration.EngagementConfiguration
-import java.util.ArrayList
-
-internal object CallActivityIntentHelper {
-
-    @JvmStatic
-    fun createIntent(context: Context, callConfiguration: CallConfiguration): Intent {
-        val sdkConfiguration = callConfiguration.engagementConfiguration ?: throw NullPointerException("WidgetsSdk Configuration can't be null")
-
-        return Intent(context, CallActivity::class.java)
-            .putExtra(GliaWidgets.QUEUE_IDS, sdkConfiguration.queueIds?.let { ArrayList(it) })
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, sdkConfiguration.contextAssetId)
-            .putExtra(GliaWidgets.UI_THEME, sdkConfiguration.runTimeTheme)
-            .putExtra(GliaWidgets.SCREEN_SHARING_MODE, sdkConfiguration.screenSharingMode)
-            .putExtra(GliaWidgets.MEDIA_TYPE, callConfiguration.mediaType)
-            .putExtra(GliaWidgets.IS_UPGRADE_TO_CALL, callConfiguration.isUpgradeToCall)
-    }
-
-    @JvmStatic
-    fun readConfiguration(activity: AppCompatActivity): CallConfiguration {
-        val intent = activity.intent
-        val engagementConfiguration = EngagementConfiguration.Builder().intent(intent).build()
-        val mediaType = intent.getSerializableExtra(GliaWidgets.MEDIA_TYPE) as Engagement.MediaType?
-        val isUpgradeToCall = intent.getBooleanExtra(GliaWidgets.IS_UPGRADE_TO_CALL, false)
-        return CallConfiguration.Builder()
-            .setEngagementConfiguration(engagementConfiguration)
-            .setMediaType(mediaType)
-            .setIsUpgradeToCall(isUpgradeToCall)
-            .build()
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallConfiguration.kt b/widgetssdk/src/main/java/com/glia/widgets/call/CallConfiguration.kt
deleted file mode 100644
index df8052301..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/call/CallConfiguration.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.glia.widgets.call
-
-import com.glia.androidsdk.Engagement
-import com.glia.widgets.core.configuration.EngagementConfiguration
-import com.glia.widgets.helper.Utils
-
-internal class CallConfiguration private constructor(builder: Builder) {
-    @JvmField
-    val engagementConfiguration: EngagementConfiguration?
-    @JvmField
-    val mediaType: Engagement.MediaType?
-    @JvmField
-    val isUpgradeToCall: Boolean
-
-    init {
-        engagementConfiguration = builder.engagementConfiguration
-        mediaType = builder.mediaType
-        isUpgradeToCall = builder.isUpgradeToCall
-    }
-
-    class Builder {
-        var engagementConfiguration: EngagementConfiguration? = null
-            private set
-        var mediaType: Engagement.MediaType? = null
-            private set
-        var isUpgradeToCall = false
-            private set
-
-        fun setEngagementConfiguration(engagementConfiguration: EngagementConfiguration?) = apply {
-            this.engagementConfiguration = engagementConfiguration
-        }
-
-        fun setMediaType(mediaType: Engagement.MediaType?) = apply {
-            this.mediaType = mediaType
-        }
-
-        fun setMediaType(mediaType: String) = apply {
-            this.mediaType = Utils.toMediaType(mediaType)
-        }
-
-        fun setIsUpgradeToCall(isUpgradeToCall: Boolean) = apply {
-            this.isUpgradeToCall = isUpgradeToCall
-        }
-
-
-        fun build(): CallConfiguration {
-            return CallConfiguration(this)
-        }
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallContract.kt b/widgetssdk/src/main/java/com/glia/widgets/call/CallContract.kt
index c75420bee..fcfa070a5 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/call/CallContract.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/call/CallContract.kt
@@ -1,12 +1,11 @@
 package com.glia.widgets.call
 
 import com.glia.androidsdk.Engagement
-import com.glia.androidsdk.screensharing.ScreenSharing
-import com.glia.widgets.locale.LocaleString
 import com.glia.widgets.base.BaseController
 import com.glia.widgets.base.BaseView
 import com.glia.widgets.core.dialog.model.ConfirmationDialogLinks
 import com.glia.widgets.core.dialog.model.Link
+import com.glia.widgets.locale.LocaleString
 
 internal interface CallContract {
     interface Controller : BaseController {
@@ -21,14 +20,7 @@ internal interface CallContract {
         fun muteButtonClicked()
         fun videoButtonClicked()
         fun flipVideoButtonClicked()
-        fun startCall(
-            companyName: String,
-            queueIds: List<String>?,
-            visitorContextAssetId: String?,
-            mediaType: Engagement.MediaType?,
-            screenSharingMode: ScreenSharing.Mode,
-            upgradeToCall: Boolean
-        )
+        fun startCall(mediaType: Engagement.MediaType?, upgradeToCall: Boolean)
 
         fun onResume()
         fun onPause()
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallController.kt b/widgetssdk/src/main/java/com/glia/widgets/call/CallController.kt
index 90aa92b59..53dfc7c80 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/call/CallController.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/call/CallController.kt
@@ -8,7 +8,6 @@ import com.glia.androidsdk.comms.MediaDirection
 import com.glia.androidsdk.comms.MediaState
 import com.glia.androidsdk.comms.MediaUpgradeOffer
 import com.glia.androidsdk.comms.Video
-import com.glia.androidsdk.screensharing.ScreenSharing
 import com.glia.widgets.Constants
 import com.glia.widgets.call.CallStatus.EngagementOngoingAudioCallStarted
 import com.glia.widgets.call.CallStatus.EngagementOngoingVideoCallStarted
@@ -16,7 +15,6 @@ import com.glia.widgets.call.domain.HandleCallPermissionsUseCase
 import com.glia.widgets.chat.domain.DecideOnQueueingUseCase
 import com.glia.widgets.chat.domain.UpdateFromCallScreenUseCase
 import com.glia.widgets.core.audio.domain.TurnSpeakerphoneUseCase
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.dialog.domain.ConfirmationDialogLinksUseCase
 import com.glia.widgets.core.dialog.domain.IsShowOverlayPermissionRequestDialogUseCase
@@ -64,10 +62,8 @@ import java.util.concurrent.TimeUnit
 private const val MAX_IDLE_TIME = 3200
 private const val INACTIVITY_TIMER_TICKER_VALUE = 400
 private const val INACTIVITY_TIMER_DELAY_VALUE = 0
-private const val TAG = "CallController"
 
 internal class CallController(
-    private val sdkConfigurationManager: GliaSdkConfigurationManager,
     private val callTimer: TimeCounter,
     private val inactivityTimeCounter: TimeCounter,
     private val connectingTimerCounter: TimeCounter,
@@ -184,45 +180,21 @@ internal class CallController(
         emitViewState(callState.engagementStarted())
     }
 
-    override fun startCall(
-        companyName: String,
-        queueIds: List<String>?,
-        visitorContextAssetId: String?,
-        mediaType: Engagement.MediaType?,
-        screenSharingMode: ScreenSharing.Mode,
-        upgradeToCall: Boolean
-    ) {
+    override fun startCall(mediaType: Engagement.MediaType?, upgradeToCall: Boolean) {
         if (upgradeToCall || mediaType == null) {
-            initCall(
-                companyName,
-                queueIds,
-                visitorContextAssetId,
-                mediaType,
-                screenSharingMode)
+            initCall(mediaType)
             return
         }
         handleCallPermissionsUseCase.invoke(mediaType) { isPermissionsGranted: Boolean ->
             if (isPermissionsGranted) {
-                initCall(
-                    companyName,
-                    queueIds,
-                    visitorContextAssetId,
-                    mediaType,
-                    screenSharingMode)
+                initCall(mediaType)
             } else {
                 view?.showMissingPermissionsDialog()
             }
         }
     }
 
-    private fun initCall(
-        companyName: String,
-        queueIds: List<String>?,
-        visitorContextAssetId: String?,
-        mediaType: Engagement.MediaType?,
-        screenSharingMode: ScreenSharing.Mode
-    ) {
-        sdkConfigurationManager.screenSharingMode = screenSharingMode
+    private fun initCall(mediaType: Engagement.MediaType?) {
         if (isShowOverlayPermissionRequestDialogUseCase()) {
             dialogController.showOverlayPermissionsDialog()
         } else {
@@ -232,7 +204,7 @@ internal class CallController(
         if (callState.integratorCallStarted || dialogController.isShowingUnexpectedErrorDialog) {
             return
         }
-        emitViewState(callState.initCall(companyName, queueIds, visitorContextAssetId, mediaType))
+        emitViewState(callState.initCall(mediaType))
         createNewTimerStatusCallback()
         initMessagesNotSeenCallback()
         tryToQueueForEngagement()
@@ -288,7 +260,7 @@ internal class CallController(
     }
 
     private fun enqueueForEngagement() {
-        enqueueForEngagementUseCase(callState.queueIds, callState.requestedMediaType, callState.visitorContextAssetId)
+        enqueueForEngagementUseCase(callState.requestedMediaType ?: return)
     }
 
     override fun onDestroy(retained: Boolean) {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallState.java b/widgetssdk/src/main/java/com/glia/widgets/call/CallState.java
index e52d4143e..cf74450bd 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/call/CallState.java
+++ b/widgetssdk/src/main/java/com/glia/widgets/call/CallState.java
@@ -10,7 +10,6 @@
 import com.glia.widgets.helper.Logger;
 import com.glia.widgets.view.floatingvisitorvideoview.FloatingVisitorVideoContract.FlipButtonState;
 
-import java.util.List;
 import java.util.Objects;
 
 class CallState {
@@ -23,7 +22,6 @@ class CallState {
     public final boolean landscapeLayoutControlsVisible;
     public final boolean isMuted;
     public final boolean hasVideo;
-    public final String companyName;
     @Nullable
     public final Engagement.MediaType requestedMediaType;
     public final boolean isSpeakerOn;
@@ -31,8 +29,6 @@ class CallState {
     //    Need this to not update all views when only time is changed.
     public final boolean isOnlyTimeChanged;
     public final boolean isCallVisualizer;
-    public final List<String> queueIds;
-    public final String visitorContextAssetId;
 
     public final boolean isSharingScreen;
     public final FlipButtonState flipButtonState;
@@ -45,14 +41,11 @@ private CallState(Builder builder) {
         this.landscapeLayoutControlsVisible = builder.landscapeLayoutControlsVisible;
         this.isMuted = builder.isMuted;
         this.hasVideo = builder.hasVideo;
-        this.companyName = builder.companyName;
         this.requestedMediaType = builder.requestedMediaType;
         this.isSpeakerOn = builder.isSpeakerOn;
         this.isOnHold = builder.isOnHold;
         this.isOnlyTimeChanged = builder.isOnlyTimeChanged;
         this.isCallVisualizer = builder.isCallVisualizer;
-        this.queueIds = builder.queueIds;
-        this.visitorContextAssetId = builder.visitorContextAssetId;
         this.isSharingScreen = builder.isSharingScreen;
         this.flipButtonState = builder.flipButtonState;
     }
@@ -83,7 +76,6 @@ public boolean equals(Object o) {
             isMuted == callState.isMuted &&
             hasVideo == callState.hasVideo &&
             Objects.equals(callStatus, callState.callStatus) &&
-            Objects.equals(companyName, callState.companyName) &&
             Objects.equals(requestedMediaType, callState.requestedMediaType) &&
             isSpeakerOn == callState.isSpeakerOn &&
             isOnHold == callState.isOnHold &&
@@ -97,7 +89,7 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(integratorCallStarted, isVisible, messagesNotSeen,
             callStatus, landscapeLayoutControlsVisible, isMuted, hasVideo,
-            companyName, requestedMediaType, isSpeakerOn, isOnHold, isOnlyTimeChanged,
+            requestedMediaType, isSpeakerOn, isOnHold, isOnlyTimeChanged,
             isCallVisualizer, isSharingScreen, flipButtonState);
     }
 
@@ -163,7 +155,6 @@ public String toString() {
             ", landscapeLayoutControlsVisible=" + landscapeLayoutControlsVisible +
             ", isMuted=" + isMuted +
             ", hasVideo=" + hasVideo +
-            ", companyName: " + companyName +
             ", requestedMediaType: " + requestedMediaType +
             ", isSpeakerOn: " + isSpeakerOn +
             ", isOnHold: " + isOnHold +
@@ -481,15 +472,12 @@ private boolean isMuted(MediaState visitorMediaState) {
             visitorMediaState.getAudio().getStatus() != Media.Status.PLAYING;
     }
 
-    public CallState initCall(String companyName, List<String> queueIds, String visitorContextAssetId, @Nullable Engagement.MediaType requestedMediaType) {
+    public CallState initCall(@Nullable Engagement.MediaType requestedMediaType) {
         return new Builder()
             .copyFrom(this)
             .setIntegratorCallStarted(true)
             .setVisible(true)
             .setIsOnHold(false)
-            .setCompanyName(companyName)
-            .setQueueIds(queueIds)
-            .setVisitorContextAssetId(visitorContextAssetId)
             .setRequestedMediaType(requestedMediaType)
             .createCallState();
     }
@@ -506,15 +494,12 @@ public static class Builder {
         private boolean landscapeLayoutControlsVisible;
         private boolean isMuted;
         private boolean hasVideo;
-        private String companyName;
         private Engagement.MediaType requestedMediaType;
         private boolean isSpeakerOn;
         private boolean isOnHold;
         //Maybe helpful when converting to Kotlin, as an android studio makes fields nullable.
         private boolean isOnlyTimeChanged = false;
         private boolean isCallVisualizer;
-        private List<String> queueIds;
-        private String visitorContextAssetId;
         private boolean isSharingScreen;
         private FlipButtonState flipButtonState = FlipButtonState.HIDE;
 
@@ -553,11 +538,6 @@ public Builder setHasVideo(boolean hasVideo) {
             return this;
         }
 
-        public Builder setCompanyName(String companyName) {
-            this.companyName = companyName;
-            return this;
-        }
-
         public Builder setRequestedMediaType(Engagement.MediaType requestedMediaType) {
             this.requestedMediaType = requestedMediaType;
             return this;
@@ -583,16 +563,6 @@ public Builder setIsCallVisualizer(boolean isCallVisualizer) {
             return this;
         }
 
-        public Builder setQueueIds(List<String> queueIds) {
-            this.queueIds = queueIds;
-            return this;
-        }
-
-        public Builder setVisitorContextAssetId(String visitorContextAssetId) {
-            this.visitorContextAssetId = visitorContextAssetId;
-            return this;
-        }
-
         public Builder setIsSharingScreen(Boolean isSharingScreen) {
             this.isSharingScreen = isSharingScreen;
             return this;
@@ -611,15 +581,12 @@ Builder copyFrom(CallState callState) {
             landscapeLayoutControlsVisible = callState.landscapeLayoutControlsVisible;
             isMuted = callState.isMuted;
             hasVideo = callState.hasVideo;
-            companyName = callState.companyName;
             requestedMediaType = callState.requestedMediaType;
             isSpeakerOn = callState.isSpeakerOn;
             isOnHold = callState.isOnHold;
             //as we are updating this field only when only time is changed, so needs to make it false every time.
             isOnlyTimeChanged = false;
             isCallVisualizer = callState.isCallVisualizer;
-            queueIds = callState.queueIds;
-            visitorContextAssetId = callState.visitorContextAssetId;
             isSharingScreen = callState.isSharingScreen;
             flipButtonState = callState.flipButtonState;
             return this;
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallView.kt b/widgetssdk/src/main/java/com/glia/widgets/call/CallView.kt
index 7653629a0..a5321ffa6 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/call/CallView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/call/CallView.kt
@@ -22,13 +22,11 @@ import androidx.transition.TransitionSet
 import com.glia.androidsdk.Engagement
 import com.glia.androidsdk.comms.MediaState
 import com.glia.androidsdk.comms.VideoView
-import com.glia.androidsdk.screensharing.ScreenSharing
 import com.glia.widgets.Constants
 import com.glia.widgets.R
 import com.glia.widgets.UiTheme
 import com.glia.widgets.UiTheme.UiThemeBuilder
 import com.glia.widgets.call.CallState.ViewState
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.dialog.model.DialogState
 import com.glia.widgets.databinding.CallButtonsLayoutBinding
@@ -41,7 +39,6 @@ import com.glia.widgets.helper.Utils
 import com.glia.widgets.helper.getColorCompat
 import com.glia.widgets.helper.getColorStateListCompat
 import com.glia.widgets.helper.getFontCompat
-import com.glia.widgets.helper.getFullHybridTheme
 import com.glia.widgets.helper.hideKeyboard
 import com.glia.widgets.helper.insetsController
 import com.glia.widgets.helper.requireActivity
@@ -50,6 +47,7 @@ import com.glia.widgets.helper.setLocaleContentDescription
 import com.glia.widgets.helper.setLocaleHint
 import com.glia.widgets.helper.setLocaleText
 import com.glia.widgets.helper.showToast
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.locale.LocaleString
 import com.glia.widgets.locale.StringKey
 import com.glia.widgets.locale.StringKeyPair
@@ -86,6 +84,7 @@ internal class CallView(
     defStyleAttr,
     defStyleRes
 ), CallContract.View, DialogDelegate by DialogDelegateImpl() {
+    private val activityLauncher: ActivityLauncher by lazy { Dependencies.activityLauncher }
 
     private val callTheme: CallTheme? by lazy {
         Dependencies.gliaThemeManager.theme?.callTheme
@@ -174,22 +173,8 @@ internal class CallView(
         }
     }
 
-    fun startCall(
-        companyName: String,
-        queueIds: List<String>?,
-        visitorContextAssetId: String?,
-        screenSharingMode: ScreenSharing.Mode,
-        isUpgradeToCall: Boolean,
-        mediaType: Engagement.MediaType?
-    ) {
-        callController?.startCall(
-            companyName,
-            queueIds,
-            visitorContextAssetId,
-            mediaType,
-            screenSharingMode,
-            isUpgradeToCall
-        )
+    fun startCall(isUpgradeToCall: Boolean, mediaType: Engagement.MediaType?) {
+        callController?.startCall(mediaType, isUpgradeToCall)
     }
 
     fun onDestroy() {
@@ -513,12 +498,6 @@ internal class CallView(
 
     private fun setDefaultTheme(typedArray: TypedArray) {
         theme = Utils.getThemeFromTypedArray(typedArray, this.context)
-            .getFullHybridTheme(Dependencies.sdkConfigurationManager.uiTheme)
-    }
-
-    fun setUiTheme(uiTheme: UiTheme?) {
-        theme = theme.getFullHybridTheme(uiTheme ?: return)
-        setupViewAppearance()
     }
 
     fun setOnBackClickedListener(onBackClicked: OnBackClickedListener) {
@@ -609,8 +588,7 @@ internal class CallView(
             positiveButtonClickListener = {
                 resetDialogStateAndDismiss()
                 callController?.overlayPermissionsDialogDismissed()
-                val overlayIntent = Dependencies.intentConfigurationHelper.createForOverlayPermissionScreen(context)
-                this.context.startActivity(overlayIntent)
+                activityLauncher.launchOverlayPermission(context)
             },
             negativeButtonClickListener = {
                 resetDialogStateAndDismiss()
@@ -663,11 +641,6 @@ internal class CallView(
         callController?.onUserInteraction()
     }
 
-    fun setEngagementConfiguration(engagementConfiguration: EngagementConfiguration?) {
-        serviceChatHeadController?.setBuildTimeTheme(theme)
-        serviceChatHeadController?.setEngagementConfiguration(engagementConfiguration)
-    }
-
     override fun showToast(message: String) {
         post { context.showToast(message, Toast.LENGTH_SHORT) }
     }
@@ -696,12 +669,6 @@ internal class CallView(
         fun onTitleUpdated(title: LocaleString?)
     }
 
-    @Deprecated("", ReplaceWith("shouldShowMediaEngagementView(isUpgradeToCall)"))
-    fun shouldShowMediaEngagementView() {
-        Logger.logDeprecatedMethodUse(TAG, "shouldShowMediaEngagementView()")
-        shouldShowMediaEngagementView(false)
-    }
-
     fun shouldShowMediaEngagementView(isUpgradeToCall: Boolean) =
         callController?.shouldShowMediaEngagementView(isUpgradeToCall) ?: false
 
diff --git a/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/CallVisualizerActivityWatcher.kt b/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/CallVisualizerActivityWatcher.kt
index 678bb4420..a0c86e1c3 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/CallVisualizerActivityWatcher.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/CallVisualizerActivityWatcher.kt
@@ -2,7 +2,6 @@ package com.glia.widgets.callvisualizer
 
 import android.app.Activity
 import com.glia.widgets.R
-import com.glia.widgets.locale.LocaleString
 import com.glia.widgets.base.BaseSingleActivityWatcher
 import com.glia.widgets.callvisualizer.controller.CallVisualizerContract
 import com.glia.widgets.core.dialog.model.ConfirmationDialogLinks
@@ -11,7 +10,9 @@ import com.glia.widgets.helper.GliaActivityManager
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.OneTimeEvent
 import com.glia.widgets.helper.TAG
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.locale.LocaleProvider
+import com.glia.widgets.locale.LocaleString
 import com.glia.widgets.view.Dialogs
 import com.glia.widgets.view.snackbar.SnackBarDelegate
 import com.glia.widgets.view.snackbar.SnackBarDelegateFactory
@@ -25,7 +26,8 @@ internal class CallVisualizerActivityWatcher(
     private val controller: CallVisualizerContract.Controller,
     gliaActivityManager: GliaActivityManager,
     private val localeProvider: LocaleProvider,
-    private val themeManager: UnifiedThemeManager
+    private val themeManager: UnifiedThemeManager,
+    private val activityLauncher: ActivityLauncher
 ) : BaseSingleActivityWatcher(gliaActivityManager) {
 
     init {
@@ -89,8 +91,7 @@ internal class CallVisualizerActivityWatcher(
     }
 
     private fun openWebBrowser(activity: Activity, title: LocaleString, url: String) {
-        val intent = WebBrowserActivity.intent(activity, title, url)
-        activity.startActivity(intent)
+        activityLauncher.launchWebBrowser(activity, title, url)
     }
 
     private fun showSnackBar(activity: Activity) {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/EndScreenSharingView.kt b/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/EndScreenSharingView.kt
index 46b423730..43bde7f0c 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/EndScreenSharingView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/EndScreenSharingView.kt
@@ -9,15 +9,12 @@ import com.glia.widgets.R
 import com.glia.widgets.UiTheme
 import com.glia.widgets.databinding.EndScreenSharingViewBinding
 import com.glia.widgets.di.Dependencies
-import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.SimpleWindowInsetsAndAnimationHandler
-import com.glia.widgets.helper.TAG
 import com.glia.widgets.helper.Utils
 import com.glia.widgets.helper.applyButtonTheme
 import com.glia.widgets.helper.applyTextTheme
 import com.glia.widgets.helper.getColorCompat
 import com.glia.widgets.helper.getFontCompat
-import com.glia.widgets.helper.getFullHybridTheme
 import com.glia.widgets.helper.layoutInflater
 import com.glia.widgets.helper.setLocaleText
 import com.glia.widgets.locale.LocaleString
@@ -70,12 +67,7 @@ internal class EndScreenSharingView(
 
     private fun applyDefaultTheme(attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) {
         context.withStyledAttributes(attrs, R.styleable.GliaView, defStyleAttr, defStyleRes) {
-            var theme = Utils.getThemeFromTypedArray(this, context)
-            theme.iconEndScreenShare?.let {
-                binding.endSharingButton.icon = ResourcesCompat.getDrawable(context.resources, it, null)
-            }
-            theme = theme.getFullHybridTheme(Dependencies.sdkConfigurationManager.uiTheme)
-            applyRuntimeTheme(theme)
+            applyRuntimeTheme(Utils.getThemeFromTypedArray(this, context))
         }
     }
 
@@ -109,10 +101,9 @@ internal class EndScreenSharingView(
         binding.root.applyLayerTheme(theme.background)
     }
 
-    private fun applyRuntimeTheme(theme: UiTheme?) {
-        if (theme == null) {
-            Logger.d(TAG, "UiTheme is null!")
-            return
+    private fun applyRuntimeTheme(theme: UiTheme) {
+        theme.iconEndScreenShare?.let {
+            binding.endSharingButton.icon = ResourcesCompat.getDrawable(context.resources, it, null)
         }
 
         val systemNegativeColor = theme.systemNegativeColor?.let(::getColorCompat)
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatActivity.java b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatActivity.java
deleted file mode 100644
index d6b71d877..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatActivity.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package com.glia.widgets.chat;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Parcelable;
-
-import androidx.activity.EdgeToEdge;
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.glia.widgets.GliaWidgets;
-import com.glia.widgets.R;
-import com.glia.widgets.UiTheme;
-import com.glia.widgets.base.FadeTransitionActivity;
-import com.glia.widgets.call.CallActivity;
-import com.glia.widgets.call.CallConfiguration;
-import com.glia.widgets.core.configuration.EngagementConfiguration;
-import com.glia.widgets.di.Dependencies;
-import com.glia.widgets.helper.Logger;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * This activity is used to handle chat engagements.
- * <p>
- * Main features:
- * - Shows chat history to authenticated visitors before enqueuing for new engagements.
- * - Requests required permissions and enqueues for new chat engagements if no ongoing engagements are found.
- * - Provides controls for managing ongoing engagements.
- * - Enables message exchange between the visitor and the operator during ongoing engagements.
- * - Allows the operator to upgrade engagements.
- * <p>
- * Before this activity is launched, make sure that Glia Widgets SDK is set up correctly.
- * <p>
- * Data that can be passed together with the Activity intent:
- * - {@link GliaWidgets#QUEUE_IDS}: IDs list of the queues you would like to use for your engagements.
- * For a full list of optional parameters, see the constants defined in {@link GliaWidgets}.
- * <p>
- * Code example:
- * <pre>
- * Intent intent = new Intent(requireContext(), ChatActivity.class);
- * intent.putExtra(GliaWidgets.QUEUE_IDS, new ArrayList<>(List.of("CHAT_QUEUE_ID")));
- * startActivity(intent);
- * <pre/>
- */
-public final class ChatActivity extends FadeTransitionActivity {
-    private static final String TAG = ChatActivity.class.getSimpleName();
-    private ChatView chatView;
-
-    private EngagementConfiguration engagementConfiguration;
-
-    /**
-     * Creates and fills out Intent for starting ChatActivity
-     *
-     * @param context   - Android Context object
-     * @param contextId - Glia visitor context asset ID
-     * @param queueId   - Queue ID or `null` to use the default queues
-     * @return - Intent for Starting ChatActivity
-     * @deprecated use {@link #getIntent(Context, String, List)} instead.
-     */
-    @Deprecated
-    public static Intent getIntent(
-        @NonNull Context context,
-        @Nullable String contextId,
-        @Nullable String queueId
-    ) {
-        return new Intent(context, ChatActivity.class)
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, contextId)
-            .putExtra(GliaWidgets.QUEUE_ID, queueId);
-    }
-
-    /**
-     * Creates and fills out Intent for starting ChatActivity
-     *
-     * @param context   - Android Context object
-     * @param contextId - Glia visitor context asset ID
-     * @param queueIds  - Queue IDs of the queues you would like to use for your engagements
-     * @return - Intent for Starting ChatActivity
-     */
-    public static Intent getIntent(
-        @NonNull Context context,
-        @Nullable String contextId,
-        @NonNull List<String> queueIds
-    ) {
-        return new Intent(context, ChatActivity.class)
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, contextId)
-            .putStringArrayListExtra(GliaWidgets.QUEUE_IDS, new ArrayList<>(queueIds));
-    }
-
-    /**
-     * Creates and fills out Intent for starting ChatActivity
-     *
-     * @param context   - Android Context object
-     * @param contextId - Glia visitor context asset ID
-     * @param queueId   - Queue ID or `null` to use the default queues
-     * @param chatType  - Type of chat screen
-     * @return - Intent for Starting ChatActivity
-     * @deprecated use {@link #getIntent(Context, String, List, ChatType)} instead.
-     */
-    @Deprecated
-    public static Intent getIntent(
-        @NonNull Context context,
-        @Nullable String contextId,
-        @Nullable String queueId,
-        @Nullable ChatType chatType
-    ) {
-        return new Intent(context, ChatActivity.class)
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, contextId)
-            .putExtra(GliaWidgets.QUEUE_ID, queueId)
-            .putExtra(GliaWidgets.COMPANY_NAME, "Legacy company")
-            .putExtra(GliaWidgets.CHAT_TYPE, (Parcelable) chatType);
-    }
-
-    /**
-     * Creates and fills out Intent for starting ChatActivity
-     *
-     * @param context   - Android Context object
-     * @param contextId - Glia visitor context asset ID
-     * @param queueIds  - Queue IDs of the queues you would like to use for your engagements
-     * @param chatType  - Type of chat screen
-     * @return - Intent for Starting ChatActivity
-     */
-    public static Intent getIntent(
-        @NonNull Context context,
-        @Nullable String contextId,
-        @NonNull List<String> queueIds,
-        @Nullable ChatType chatType
-    ) {
-        return new Intent(context, ChatActivity.class)
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, contextId)
-            .putExtra(GliaWidgets.QUEUE_IDS, new ArrayList<>(queueIds))
-            .putExtra(GliaWidgets.COMPANY_NAME, "Legacy company")
-            .putExtra(GliaWidgets.CHAT_TYPE, (Parcelable) chatType);
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        EdgeToEdge.enable(this);
-        super.onCreate(savedInstanceState);
-        Logger.i(TAG, "Create Chat screen");
-        setContentView(R.layout.chat_activity);
-        chatView = findViewById(R.id.chat_view);
-
-        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-            @Override
-            public void handleOnBackPressed() {
-                chatView.onBackPressed();
-            }
-        });
-
-        // Legacy company name support
-        Dependencies.getSdkConfigurationManager().setLegacyCompanyName(getIntent().getStringExtra(GliaWidgets.COMPANY_NAME));
-
-        chatView.setOnTitleUpdatedListener(this::setTitle);
-        engagementConfiguration = createGliaSdkConfigurationFromIntent(getIntent());
-        if (getIntent().hasExtra(GliaWidgets.USE_OVERLAY)) {
-            // Integrator has passed a deprecated GliaWidgets.USE_OVERLAY parameter with Intent
-            // Override bubble configuration with USE_OVERLAY value
-            boolean useOverlay = getIntent().getBooleanExtra(GliaWidgets.USE_OVERLAY, true);
-            Dependencies.getSdkConfigurationManager().setLegacyUseOverlay(useOverlay);
-        }
-
-        if (!chatView.shouldShow()) {
-            finishAndRemoveTask();
-            return;
-        }
-
-        chatView.setConfiguration(engagementConfiguration);
-        chatView.setUiTheme(engagementConfiguration.getRunTimeTheme());
-        chatView.setOnBackClickedListener(this::finish);
-        chatView.setOnBackToCallListener(this::backToCallScreen);
-
-        // In case the engagement ends, Activity is removed from the device's Recents menu
-        // to avoid app users to accidentally start queueing for another call when they resume
-        // the app from the Recents menu and the app's backstack was empty.
-        chatView.setOnEndListener(this::finishAndRemoveTask);
-
-        chatView.setOnMinimizeListener(this::finish);
-        chatView.setOnNavigateToCallListener(this::startCallScreen);
-        chatView.startChat(
-            engagementConfiguration.getCompanyName(),
-            engagementConfiguration.getQueueIds(),
-            engagementConfiguration.getContextAssetId(),
-            engagementConfiguration.getScreenSharingMode(),
-            Objects.requireNonNull(engagementConfiguration.getChatType())
-        );
-    }
-
-    @Override
-    protected void onResume() {
-        chatView.onResume();
-        super.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        chatView.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        chatView.onDestroyView();
-        Logger.i(TAG, "Destroy Chat screen");
-        super.onDestroy();
-    }
-
-    private EngagementConfiguration createGliaSdkConfigurationFromIntent(Intent intent) {
-        return new EngagementConfiguration.Builder()
-            .intent(intent)
-            .build();
-    }
-
-    private void startCallScreen(UiTheme theme, String mediaType) {
-        startActivity(
-            CallActivity.getIntent(
-                getApplicationContext(),
-                getConfigurationBuilder().setMediaType(mediaType)
-                    .setIsUpgradeToCall(true)
-                    .build()
-            )
-        );
-        finish();
-    }
-
-    private void backToCallScreen() {
-        startActivity(CallActivity.getIntent(getApplicationContext(), getConfigurationBuilder().build()));
-        finish();
-    }
-
-    private CallConfiguration.Builder getConfigurationBuilder() {
-        return new CallConfiguration.Builder().setEngagementConfiguration(engagementConfiguration);
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatActivity.kt
new file mode 100644
index 000000000..9f80d750e
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatActivity.kt
@@ -0,0 +1,90 @@
+package com.glia.widgets.chat
+
+import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.enableEdgeToEdge
+import com.glia.widgets.R
+import com.glia.widgets.base.FadeTransitionActivity
+import com.glia.widgets.di.Dependencies
+import com.glia.widgets.helper.ExtraKeys
+import com.glia.widgets.helper.Logger
+import com.glia.widgets.helper.TAG
+import com.glia.widgets.helper.getEnumExtra
+import com.glia.widgets.launcher.ActivityLauncher
+import kotlin.properties.Delegates
+
+/**
+ * This activity is used to handle chat engagements.
+ *
+ *
+ * Main features:
+ * - Shows chat history to authenticated visitors before enqueuing for new engagements.
+ * - Requests required permissions and enqueues for new chat engagements if no ongoing engagements are found.
+ * - Provides controls for managing ongoing engagements.
+ * - Enables message exchange between the visitor and the operator during ongoing engagements.
+ * - Allows the operator to upgrade engagements.
+ *
+ *
+ * Before this activity is launched, make sure that Glia Widgets SDK is set up correctly.
+ */
+internal class ChatActivity : FadeTransitionActivity() {
+    private val activityLauncher: ActivityLauncher by lazy { Dependencies.activityLauncher }
+
+    private var chatView: ChatView by Delegates.notNull()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        this.enableEdgeToEdge()
+        super.onCreate(savedInstanceState)
+        Logger.i(TAG, "Create Chat screen")
+        setContentView(R.layout.chat_activity)
+        chatView = findViewById(R.id.chat_view)
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                chatView.onBackPressed()
+            }
+        })
+
+        chatView.setOnTitleUpdatedListener(this::setTitle)
+
+        if (!chatView.shouldShow()) {
+            finishAndRemoveTask()
+            return
+        }
+
+        chatView.setOnBackClickedListener(::finish)
+        chatView.setOnBackToCallListener(::backToCallScreen)
+
+        // In case the engagement ends, Activity is removed from the device's Recents menu
+        // to avoid app users to accidentally start queueing for another call when they resume
+        // the app from the Recents menu and the app's backstack was empty.
+        chatView.setOnEndListener(::finishAndRemoveTask)
+
+        chatView.setOnMinimizeListener(::finish)
+
+        val chatType = intent.getEnumExtra<ChatType>(ExtraKeys.CHAT_TYPE) ?: ChatType.LIVE_CHAT
+
+        chatView.startChat(chatType)
+    }
+
+    override fun onResume() {
+        chatView.onResume()
+        super.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        chatView.onPause()
+    }
+
+    override fun onDestroy() {
+        chatView.onDestroyView()
+        Logger.i(TAG, "Destroy Chat screen")
+        super.onDestroy()
+    }
+
+    private fun backToCallScreen() {
+        activityLauncher.launchCall(this, null, false)
+        finish()
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatContract.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatContract.kt
index 705d2fad1..fd5f19b06 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatContract.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatContract.kt
@@ -49,7 +49,7 @@ internal interface ChatContract {
         fun onLinkClicked(link: Link)
         fun getConfirmationDialogLinks(): ConfirmationDialogLinks
         fun onEngagementConfirmationDialogRequested()
-        fun initChat(companyName: String?, queueIds: List<String>?, visitorContextAssetId: String?, chatType: ChatType)
+        fun initChat(chatType: ChatType)
         fun show()
         fun onPause()
         fun onResume()
@@ -64,7 +64,6 @@ internal interface ChatContract {
         fun emitUploadAttachments(attachments: List<LocalAttachment>)
         fun emitState(chatState: ChatState)
         fun emitItems(items: List<ChatItem>)
-        fun navigateToCall(mediaType: String)
         fun backToCall()
         fun minimizeView()
         fun smoothScrollToBottom()
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatManager.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatManager.kt
index 033eb49bc..821a180fb 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatManager.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatManager.kt
@@ -202,7 +202,7 @@ internal class ChatManager(
     @VisibleForTesting
     fun mapAction(action: Action, state: State): State {
         return when (action) {
-            is Action.QueuingStarted -> mapInQueue(action.companyName, state)
+            Action.QueuingStarted -> mapInQueue(state)
             is Action.OperatorConnected -> mapOperatorConnected(action, state)
             Action.Transferring -> mapTransferring(state)
             is Action.OperatorJoined -> mapOperatorJoined(action, state)
@@ -346,7 +346,7 @@ internal class ChatManager(
     fun mapOperatorJoined(action: Action.OperatorJoined, state: State): State = state.apply {
         chatItems -= OperatorStatusItem.Transferring
         chatItems += action.run {
-            OperatorStatusItem.Joined(companyName, operatorFormattedName, operatorImageUrl)
+            OperatorStatusItem.Joined(operatorFormattedName, operatorImageUrl)
         }
     }
 
@@ -365,7 +365,7 @@ internal class ChatManager(
 
     @VisibleForTesting
     fun mapOperatorConnected(action: Action.OperatorConnected, state: State): State {
-        val operatorStatusItem = action.run { OperatorStatusItem.Connected(companyName, operatorFormattedName, operatorImageUrl) }
+        val operatorStatusItem = action.run { OperatorStatusItem.Connected(operatorFormattedName, operatorImageUrl) }
         val oldOperatorStatusItem: OperatorStatusItem? = state.operatorStatusItem
         state.operatorStatusItem = operatorStatusItem
 
@@ -395,8 +395,8 @@ internal class ChatManager(
     }
 
     @VisibleForTesting
-    fun mapInQueue(companyName: String, state: State): State = state.apply {
-        OperatorStatusItem.InQueue(companyName).also {
+    fun mapInQueue(state: State): State = state.apply {
+        OperatorStatusItem.InQueue.also {
             operatorStatusItem = it
             chatItems += it
         }
@@ -451,10 +451,10 @@ internal class ChatManager(
     }
 
     internal sealed interface Action {
-        data class QueuingStarted(val companyName: String) : Action
-        data class OperatorConnected(val companyName: String, val operatorFormattedName: String, val operatorImageUrl: String?) : Action
+        object QueuingStarted : Action
+        data class OperatorConnected(val operatorFormattedName: String, val operatorImageUrl: String?) : Action
         object Transferring : Action
-        data class OperatorJoined(val companyName: String, val operatorFormattedName: String, val operatorImageUrl: String?) : Action
+        data class OperatorJoined(val operatorFormattedName: String, val operatorImageUrl: String?) : Action
         data class ResponseCardClicked(val responseCard: OperatorMessageItem.ResponseCard) : Action
         data class OnMediaUpgradeStarted(val isVideo: Boolean) : Action
         data class OnMediaUpgradeTimerUpdated(val formattedValue: String) : Action
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatType.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatType.kt
index 169537189..2278e43ee 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatType.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatType.kt
@@ -1,28 +1,16 @@
 package com.glia.widgets.chat
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
 /**
  * Determines which type of chat engagement to launch.
- *
- * Code example:
- * ```
- * Intent intent = new Intent(requireContext(), ChatActivity.class);
- * intent.putExtra(GliaWidgets.QUEUE_ID, "MESSAGING_QUEUE_ID");
- * intent.putExtra(GliaWidgets.CHAT_TYPE, (Parcelable) ChatType.SECURE_MESSAGING);
- * startActivity(intent);
- * ```
  */
-@Parcelize
-enum class ChatType : Parcelable {
+internal enum class ChatType {
     /**
      * Regular engagements with live chat.
      */
     LIVE_CHAT,
 
     /**
-     * Secure conversations.
+     * Secure Messaging.
      *
      * It is a secure alternative to SMS and email, which also allows for asynchronous interactions.
      *
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatView.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatView.kt
index 6367c03df..c5662dfac 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatView.kt
@@ -1,11 +1,8 @@
 package com.glia.widgets.chat
 
-import android.content.ClipData
 import android.content.Context
-import android.content.Intent
 import android.content.res.TypedArray
 import android.net.Uri
-import android.provider.Settings
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.AttributeSet
@@ -18,15 +15,12 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.withStyledAttributes
 import androidx.core.view.ViewCompat
-import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
 import com.glia.androidsdk.chat.AttachmentFile
-import com.glia.androidsdk.screensharing.ScreenSharing
 import com.glia.widgets.Constants
 import com.glia.widgets.GliaWidgets
 import com.glia.widgets.R
@@ -42,13 +36,11 @@ import com.glia.widgets.chat.model.ChatItem
 import com.glia.widgets.chat.model.ChatState
 import com.glia.widgets.chat.model.CustomCardChatItem
 import com.glia.widgets.chat.model.RemoteAttachmentItem
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.dialog.model.DialogState
 import com.glia.widgets.core.fileupload.model.LocalAttachment
 import com.glia.widgets.databinding.ChatViewBinding
 import com.glia.widgets.di.Dependencies
-import com.glia.widgets.filepreview.ui.FilePreviewActivity
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.SimpleTextWatcher
 import com.glia.widgets.helper.SimpleWindowInsetsAndAnimationHandler
@@ -61,13 +53,14 @@ import com.glia.widgets.helper.getColorCompat
 import com.glia.widgets.helper.getColorStateListCompat
 import com.glia.widgets.helper.getContentUriCompat
 import com.glia.widgets.helper.getFontCompat
-import com.glia.widgets.helper.getFullHybridTheme
 import com.glia.widgets.helper.hideKeyboard
 import com.glia.widgets.helper.insetsController
 import com.glia.widgets.helper.layoutInflater
 import com.glia.widgets.helper.requireActivity
 import com.glia.widgets.helper.setLocaleContentDescription
 import com.glia.widgets.helper.setLocaleHint
+import com.glia.widgets.helper.setLocaleText
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.locale.LocaleString
 import com.glia.widgets.view.Dialogs
 import com.glia.widgets.view.SingleChoiceCardView.OnOptionClickedListener
@@ -82,7 +75,7 @@ import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
 import com.glia.widgets.view.unifiedui.theme.base.HeaderTheme
 import com.glia.widgets.view.unifiedui.theme.chat.InputTheme
 import com.glia.widgets.view.unifiedui.theme.chat.UnreadIndicatorTheme
-import com.glia.widgets.webbrowser.WebBrowserActivity
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingTheme
 import com.google.android.material.shape.MarkerEdgeTreatment
 import com.google.android.material.theme.overlay.MaterialThemeOverlay
 import java.util.concurrent.Executor
@@ -91,11 +84,7 @@ import kotlin.properties.Delegates
 internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : ConstraintLayout(
     MaterialThemeOverlay.wrap(context, attrs, defStyleAttr, defStyleRes), attrs, defStyleAttr, defStyleRes
 ), OnFileItemClickListener, OnImageItemClickListener, ChatContract.View, DialogDelegate by DialogDelegateImpl() {
-
-    @JvmOverloads
-    constructor(
-        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = R.attr.gliaChatStyle
-    ) : this(context, attrs, defStyleAttr, R.style.Application_Glia_Chat)
+    private val activityLauncher: ActivityLauncher by lazy { Dependencies.activityLauncher }
 
     private var controller: ChatContract.Controller? = null
     private var dialogCallback: DialogContract.Controller.Callback? = null
@@ -113,7 +102,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
     private var onTitleUpdatedListener: OnTitleUpdatedListener? = null
     private var onEndListener: OnEndListener? = null
     private var onMinimizeListener: OnMinimizeListener? = null
-    private var onNavigateToCallListener: OnNavigateToCallListener? = null
     private var onBackToCallListener: OnBackToCallListener? = null
     private val onRetryClickListener = ChatAdapter.OnRetryClickListener {
         controller?.onRetryClicked(it)
@@ -202,36 +190,15 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         SimpleWindowInsetsAndAnimationHandler(this, appBarOrToolBar = binding.appBarView)
     }
 
-    /**
-     * @param uiTheme sets this view's appearance using the parameters provided in the
-     * [com.glia.widgets.UiTheme]
-     */
-    fun setUiTheme(uiTheme: UiTheme?) {
-        if (uiTheme == null) return
-        theme = theme.getFullHybridTheme(uiTheme)
-        setupViewAppearance()
-    }
-
-    /**
-     * Used to start the chat functionality.
-     *
-     * @param companyName Text shown in the chat while waiting in a queue.
-     * @param queueIds    The queue ids to which you would like to queue to and speak to operators from.
-     * @param visitorContextAssetId  Provide some context asset ID as to from where are you initiating the chat from.
-     * @see [com.glia.widgets.GliaWidgets].USE_OVERLAY to see its full usage description.
-     * Important! This parameter is ignored if the view is not used in the sdk's [ChatActivity]
-     */
     @JvmOverloads
-    fun startChat(
-        companyName: String?,
-        queueIds: List<String>?,
-        visitorContextAssetId: String?,
-        screenSharingMode: ScreenSharing.Mode? = null,
-        chatType: ChatType = ChatType.LIVE_CHAT
-    ) {
-        Dependencies.sdkConfigurationManager.screenSharingMode = screenSharingMode
+    constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = R.attr.gliaChatStyle
+    ) : this(context, attrs, defStyleAttr, R.style.Application_Glia_Chat)
+
+
+    fun startChat(chatType: ChatType = ChatType.LIVE_CHAT) {
         dialogCallback?.also { dialogController?.addCallback(it) }
-        controller?.initChat(companyName, queueIds, visitorContextAssetId, chatType)
+        controller?.initChat(chatType)
     }
 
     /**
@@ -276,19 +243,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         this.onMinimizeListener = onMinimizeListener
     }
 
-    /**
-     * Add a listener here for when the user has accepted an audio or video call and should navigate
-     * to a call.
-     * Important! Should be used together with [.navigateToCallSuccess] to notify the view
-     * of a completed navigation.
-     *
-     * @param onNavigateToCallListener The callback which is fired when the user accepts a media
-     * upgrade offer.
-     */
-    fun setOnNavigateToCallListener(onNavigateToCallListener: OnNavigateToCallListener?) {
-        this.onNavigateToCallListener = onNavigateToCallListener
-    }
-
     fun setOnBackToCallListener(onBackToCallListener: OnBackToCallListener?) {
         this.onBackToCallListener = onBackToCallListener
     }
@@ -315,7 +269,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         resetDialogStateAndDismiss()
 
         onEndListener = null
-        onNavigateToCallListener = null
         destroyController()
         adapter.unregisterAdapterDataObserver(dataObserver)
         binding.chatRecyclerView.adapter = null
@@ -349,7 +302,7 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         // some state updates on core-sdk are coming from the computation thread
         // need to update state on uiThread
         post {
-            updateShowSendButton(chatState)
+            updateSendButtonState(chatState)
             updateChatEditText(chatState)
             updateAppBar(chatState)
             binding.newMessagesIndicatorLayout.isVisible = chatState.showMessagesUnseenIndicator
@@ -366,6 +319,7 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
             binding.operatorTypingAnimationView.isVisible = chatState.isOperatorTyping
             updateAttachmentButton(chatState)
             updateQuickRepliesState(chatState)
+            updateSecureMessagingState(chatState)
         }
     }
 
@@ -374,10 +328,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         post { adapter.submitList(updatedItems) }
     }
 
-    override fun navigateToCall(mediaType: String) {
-        onNavigateToCallListener?.call(theme, mediaType)
-    }
-
     override fun backToCall() {
         onBackToCallListener?.onBackToCall()
     }
@@ -411,7 +361,7 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
             context.requireActivity(), view, context.getString(R.string.glia_file_preview_transition_name) // Not translatable
         )
 
-        context.startActivity(FilePreviewActivity.intent(context, attachmentFile), options.toBundle())
+        activityLauncher.launchImagePreview(context, attachmentFile, options.toBundle())
         insetsController?.hideKeyboard()
     }
 
@@ -420,7 +370,7 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
             context.requireActivity(), view, context.getString(R.string.glia_file_preview_transition_name) // Not translatable
         )
 
-        context.startActivity(FilePreviewActivity.intent(context, attachmentFile), options.toBundle())
+        activityLauncher.launchImagePreview(context, attachmentFile, options.toBundle())
         insetsController?.hideKeyboard()
     }
 
@@ -433,9 +383,7 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
     }
 
     override fun navigateToWebBrowserActivity(title: LocaleString, url: String) {
-        context.startActivity(
-            WebBrowserActivity.intent(context, title, url)
-        )
+        activityLauncher.launchWebBrowser(context, title, url)
     }
 
     override fun showEngagementConfirmationDialog() {
@@ -464,36 +412,23 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
     }
 
     override fun requestOpenEmailClient(uri: Uri) {
-        val intent = Intent(Intent.ACTION_SENDTO).setData(Uri.parse("mailto:")) // This step makes sure that only email apps handle this.
-            .putExtra(Intent.EXTRA_EMAIL, arrayOf(uri.schemeSpecificPart))
-
-        if (intent.resolveActivity(context.packageManager) != null) {
-            context.startActivity(intent)
-        } else {
+        activityLauncher.launchEmailClient(context, uri) {
             Logger.e(TAG, "No email client, uri - $uri")
             showToast(localeProvider.getString(R.string.error_general))
         }
     }
 
     override fun requestOpenDialer(uri: Uri) {
-        val intent = Intent(Intent.ACTION_DIAL).setData(uri)
-
-        if (intent.resolveActivity(context.packageManager) != null) {
-            context.startActivity(intent)
-        } else {
+        activityLauncher.launchDialer(context, uri) {
             Logger.e(TAG, "No dialer uri - $uri")
             showToast(localeProvider.getString(R.string.error_general))
         }
     }
 
     override fun requestOpenUri(uri: Uri) {
-        Intent(Intent.ACTION_VIEW, uri).addCategory(Intent.CATEGORY_BROWSABLE).also {
-            if (it.resolveActivity(context.packageManager) != null) {
-                context.startActivity(it)
-            } else {
-                Logger.e(TAG, "No app to open url - $uri")
-                showToast(localeProvider.getString(R.string.error_general))
-            }
+        activityLauncher.launchUri(context, uri) {
+            Logger.e(TAG, "No app to open url - $uri")
+            showToast(localeProvider.getString(R.string.error_general))
         }
     }
 
@@ -512,7 +447,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
             if (updateDialogState(it)) {
                 when (it) {
                     DialogState.None -> resetDialogStateAndDismiss()
-                    DialogState.MessageCenterUnavailable -> post { showChatUnavailableView() }
                     DialogState.UnexpectedError -> post { showUnexpectedErrorDialog() }
                     DialogState.ExitQueue -> post { showExitQueueDialog() }
                     DialogState.OverlayPermission -> post { showOverlayPermissionsDialog() }
@@ -539,10 +473,11 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         else -> item
     }
 
-    private fun updateShowSendButton(chatState: ChatState) {
-        if (chatState.showSendButton == binding.sendButton.isVisible) return
-
-        binding.sendButton.isVisible = chatState.showSendButton
+    private fun updateSendButtonState(chatState: ChatState) {
+        binding.sendButton.apply {
+            isVisible = chatState.isSendButtonVisible
+            isEnabled = chatState.isSendButtonEnabled
+        }
     }
 
     private fun updateChatEditText(chatState: ChatState) {
@@ -550,7 +485,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
             ChatInputMode.ENABLED_NO_ENGAGEMENT -> binding.chatEditText.setLocaleHint(
                 R.string.chat_message_start_engagement_placeholder
             )
-
             else -> binding.chatEditText.setLocaleHint(R.string.chat_input_placeholder)
         }
         binding.chatEditText.isEnabled = chatState.chatInputMode.isEnabled
@@ -573,9 +507,11 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
             showToolbar(LocaleString(R.string.message_center_header))
             binding.appBarView.hideBackButton()
             binding.appBarView.showXButton()
+            binding.secureConversationsBottomBanner.visibility = View.VISIBLE
         } else {
             showToolbar(LocaleString(R.string.engagement_chat_title))
             binding.appBarView.showBackButton()
+            binding.secureConversationsBottomBanner.visibility = View.GONE
         }
     }
 
@@ -612,7 +548,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
 
     private fun setDefaultTheme(typedArray: TypedArray) {
         theme = Utils.getThemeFromTypedArray(typedArray, this.context)
-        theme = theme.getFullHybridTheme(Dependencies.sdkConfigurationManager.uiTheme)
     }
 
     private fun initConfigurations() {
@@ -667,33 +602,45 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         binding.newMessagesIndicatorImage.setShowRippleAnimation(false)
         binding.newMessagesIndicatorImage.setTheme(theme)
         binding.newMessagesIndicatorCard.shapeAppearanceModel = shapeAppearanceModel
-        theme.brandPrimaryColor?.let(::getColorStateListCompat)?.also {
-            binding.newMessagesBadgeView.backgroundTintList = it
-        }
-        theme.baseLightColor?.let(::getColorCompat)?.also(binding.newMessagesBadgeView::setTextColor)
 
-        // colors
-        theme.baseShadeColor?.let(::getColorCompat)?.also(binding.dividerView::setBackgroundColor)
+        // global colors
+        theme.brandPrimaryColor
+            ?.also(binding.operatorTypingAnimationView::addColorFilter)
+            ?.let(::getColorStateListCompat)
+            ?.also(binding.newMessagesBadgeView::setBackgroundTintList)
 
-        theme.brandPrimaryColor?.let(::getColorStateListCompat)?.also {
-            binding.newMessagesBadgeView.backgroundTintList = it
-        }
-        binding.sendButton.imageTintList = theme.sendMessageButtonTintColor?.let(::getColorStateListCompat)
+        theme.baseLightColor?.let(::getColorCompat)
+            ?.also(binding.newMessagesBadgeView::setTextColor)
+            ?.also(binding.scErrorLabel::setTextColor)
+        theme.baseLightColor?.let(::getColorStateListCompat)
+            ?.also(binding.scErrorLabel::setCompoundDrawableTintList)
+
+        theme.systemNegativeColor?.let(::getColorCompat)
+            ?.also(binding.scErrorLabel::setBackgroundColor)
+
+        theme.baseShadeColor?.let(::getColorCompat)
+            ?.also(binding.chatDivider::setBackgroundColor)
+            ?.also(binding.scBottomBannerDivider::setBackgroundColor)
 
         theme.baseDarkColor?.let(::getColorCompat)?.also(binding.chatEditText::setTextColor)
-        theme.baseNormalColor?.let(::getColorCompat)?.also(binding.chatEditText::setHintTextColor)
+        theme.baseNormalColor?.let(::getColorCompat)
+            ?.also(binding.chatEditText::setHintTextColor)
+            ?.also(binding.scBottomBannerLabel::setTextColor)
+        theme.systemAgentBubbleColor?.let(::getColorCompat)?.also(binding.scBottomBannerLabel::setBackgroundColor)
 
+        // other
+        theme.sendMessageButtonTintColor?.let(::getColorStateListCompat)?.also(binding.sendButton::setImageTintList)
         theme.gliaChatBackgroundColor?.let(::getColorCompat)?.also(::setBackgroundColor)
+        binding.gvaQuickRepliesLayout.updateTheme(theme)
 
         // fonts
         theme.fontRes?.also { binding.chatEditText.typeface = getFontCompat(it) }
 
-        theme.brandPrimaryColor?.also {
-            binding.operatorTypingAnimationView.addColorFilter(color = it)
-        }
-
-        binding.gvaQuickRepliesLayout.updateTheme(theme)
+        // remote locales
+        binding.scErrorLabel.setLocaleText(R.string.secure_messaging_chat_unavailable_message)
+        binding.scBottomBannerLabel.setLocaleText(R.string.secure_messaging_chat_banner_bottom)
         binding.sendButton.setLocaleContentDescription(R.string.general_send)
+
         applyTheme(Dependencies.gliaThemeManager.theme)
     }
 
@@ -773,11 +720,7 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         Dialogs.showOverlayPermissionsDialog(context = context, uiTheme = theme, positiveButtonClickListener = {
             controller?.overlayPermissionsDialogDismissed()
             resetDialogStateAndDismiss()
-            val overlayIntent = Intent(
-                Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + this.context.packageName)
-            )
-            overlayIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            this.context.startActivity(overlayIntent)
+            activityLauncher.launchOverlayPermission(context)
         }, negativeButtonClickListener = {
             controller?.overlayPermissionsDialogDismissed()
             resetDialogStateAndDismiss()
@@ -829,22 +772,15 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
     }
 
     override fun onFileOpenClick(file: AttachmentFile) {
-        val contentUri = getContentUriCompat(file.fileName, context)
-
-        with(Intent(Intent.ACTION_VIEW)) {
-            clipData = ClipData.newRawUri("", contentUri)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            setDataAndType(contentUri, file.contentType)
-            resolveActivity(context.packageManager)?.also { context.startActivity(this) }
-        } ?: showToast(message = localeProvider.getString(R.string.android_file_view_error))
+        activityLauncher.launchFileReader(context, getContentUriCompat(file.fileName, context), file.contentType) {
+            showToast(message = localeProvider.getString(R.string.android_file_view_error))
+        }
     }
 
     override fun onLocalFileOpenClick(attachment: LocalAttachment) {
-        with(Intent(Intent.ACTION_VIEW)) {
-            setDataAndType(attachment.uri, attachment.mimeType)
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-            resolveActivity(context.packageManager)?.also { context.startActivity(this) }
-        } ?: showToast(message = localeProvider.getString(R.string.android_file_view_error))
+        activityLauncher.launchFileReader(context, attachment.uri, attachment.mimeType.orEmpty()) {
+            showToast(message = localeProvider.getString(R.string.android_file_view_error))
+        }
     }
 
     override fun onImageItemClick(item: AttachmentFile, view: View) {
@@ -855,11 +791,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         controller?.onLocalImageItemClick(attachment, view)
     }
 
-    fun setConfiguration(configuration: EngagementConfiguration?) {
-        serviceChatHeadController?.setBuildTimeTheme(theme)
-        serviceChatHeadController?.setEngagementConfiguration(configuration)
-    }
-
     override fun showToast(message: String, duration: Int) {
         Toast.makeText(context, message, duration).show()
     }
@@ -876,6 +807,8 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         chatTheme.typingIndicator?.primaryColor?.also(binding.operatorTypingAnimationView::addColorFilter)
 
         chatTheme.unreadIndicator?.also(::applyUnreadMessagesTheme)
+
+        chatTheme.secureMessaging?.also(::applySecureMessagingTheme)
     }
 
     private fun applyHeaderTheme(headerTheme: HeaderTheme) {
@@ -885,7 +818,7 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
     private fun applyInputTheme(inputTheme: InputTheme) {
         binding.sendButton.applyButtonTheme(inputTheme.sendButton)
         binding.addAttachmentButton.applyButtonTheme(inputTheme.mediaButton)
-        binding.dividerView.applyColorTheme(inputTheme.divider)
+        binding.chatDivider.applyColorTheme(inputTheme.divider)
         binding.chatMessageLayout.applyLayerTheme(inputTheme.background)
         binding.chatEditText.applyTextTheme(textTheme = inputTheme.text, withAlignment = false)
         inputTheme.placeholder?.textColor?.primaryColor?.also(binding.chatEditText::setHintTextColor)
@@ -897,19 +830,16 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         unreadIndicatorTheme.background?.primaryColor?.also(binding.newMessagesIndicatorCard::setCardBackgroundColor)
     }
 
-    private fun showChatUnavailableView() = showDialog {
-        Dialogs.showMessageCenterUnavailableDialog(context, theme) {
-            hideChatControls(it.window?.decorView?.height ?: 0)
-        }
+    private fun applySecureMessagingTheme(secureMessagingTheme: SecureMessagingTheme) {
+        binding.scBottomBannerLabel.applyTextTheme(secureMessagingTheme.bottomBannerText)
+        binding.scBottomBannerLabel.applyLayerTheme(secureMessagingTheme.bottomBannerBackground)
+        binding.scBottomBannerDivider.applyColorTheme(secureMessagingTheme.bottomBannerDividerColor)
+        binding.scErrorLabel.applyLayerTheme(secureMessagingTheme.unavailableStatusBackground)
+        binding.scErrorLabel.applyTextTheme(secureMessagingTheme.unavailableStatusText)
     }
 
-    private fun hideChatControls(dialogHeight: Int) {
-        binding.apply {
-            chatRecyclerView.updatePadding(bottom = dialogHeight)
-            chatRecyclerView.scrollBy(0, dialogHeight)
-            chatMessageLayout.isGone = true
-            operatorTypingAnimationView.isGone = true
-        }
+    private fun updateSecureMessagingState(state: ChatState) {
+        binding.scErrorLabel.isVisible = state.isSecureMessagingUnavailableLabelVisible
     }
 
     @VisibleForTesting
@@ -939,17 +869,6 @@ internal class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         fun onMinimize()
     }
 
-    fun interface OnNavigateToCallListener {
-        /**
-         * Callback which is fired when the user has accepted a media upgrade offer and should be
-         * navigated to a view where they can visually see data about their media upgrade.
-         *
-         * @param theme Used to pass the finalized [UiTheme]
-         * to the activity which is being navigated to.
-         */
-        fun call(theme: UiTheme?, mediaType: String?)
-    }
-
     fun interface OnBackToCallListener {
         fun onBackToCall()
     }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/adapter/UploadAttachmentAdapter.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/adapter/UploadAttachmentAdapter.kt
index 720743099..d929b81e4 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/adapter/UploadAttachmentAdapter.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/adapter/UploadAttachmentAdapter.kt
@@ -93,7 +93,7 @@ internal class ViewHolder(
     private val theme: FileUploadBarTheme? by lazy {
         Dependencies.gliaThemeManager.theme?.run {
             if (isMessageCenter) {
-                secureConversationsWelcomeScreenTheme?.attachmentListTheme
+                secureMessagingWelcomeScreenTheme?.attachmentListTheme
             } else {
                 chatTheme?.input?.fileUploadBar
             }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolder.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolder.kt
index 4376560f6..8f9862a5f 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolder.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolder.kt
@@ -85,7 +85,7 @@ internal class OperatorStatusViewHolder(
         chatStartingHeadingView.setLocaleText(R.string.general_company_name)
         when (item) {
             is OperatorStatusItem.Connected -> applyConnectedState(item.operatorName, item.profileImgUrl)
-            is OperatorStatusItem.InQueue -> applyInQueueState(item.companyName)
+            is OperatorStatusItem.InQueue -> applyInQueueState()
             is OperatorStatusItem.Joined -> applyConnectedState(item.operatorName, item.profileImgUrl)
             is OperatorStatusItem.Transferring -> applyTransferringState()
         }
@@ -93,13 +93,13 @@ internal class OperatorStatusViewHolder(
         statusPictureView.setShowRippleAnimation(isShowStatusViewRippleAnimation(item))
     }
 
-    private fun applyInQueueState(companyName: String?) {
+    private fun applyInQueueState() {
         statusPictureView.showPlaceholder()
         applyChatStartingViewsVisibility()
         applyChatStartedViewsVisibility(false)
         itemView.setLocaleContentDescription(
             R.string.android_chat_queue_message_accessibility_label,
-            StringKeyPair(StringKey.COMPANY_NAME, companyName ?: "")
+            StringKeyPair(StringKey.COMPANY_NAME, "")
         )
 
         engagementStatesTheme?.queue.also(::applyEngagementState)
@@ -124,24 +124,6 @@ internal class OperatorStatusViewHolder(
         engagementStatesTheme?.connected.also(::applyEngagementState)
     }
 
-    private fun applyJoinedState(operatorName: String, profileImgUrl: String?) {
-        profileImgUrl?.let { statusPictureView.showProfileImage(it) }
-            ?: statusPictureView.showPlaceholder()
-        chatStartedNameView.text = operatorName
-        chatStartedCaptionView.setLocaleText(
-            R.string.chat_operator_joined_system_message, StringKeyPair(StringKey.OPERATOR_NAME, operatorName)
-        )
-        itemView.setLocaleContentDescription(
-            R.string.chat_operator_joined_system_message,
-            StringKeyPair(StringKey.OPERATOR_NAME, operatorName)
-        )
-
-        applyChatStartingViewsVisibility(false)
-        applyChatStartedViewsVisibility()
-
-        engagementStatesTheme?.connecting.also(::applyEngagementState)
-    }
-
     private fun applyTransferringState() {
         statusPictureView.showPlaceholder()
         chatStartingCaptionView.isVisible = true
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/controller/ChatController.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/controller/ChatController.kt
index 4ad9a42dd..41156f5bd 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/controller/ChatController.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/controller/ChatController.kt
@@ -54,7 +54,7 @@ import com.glia.widgets.core.notification.domain.CallNotificationUseCase
 import com.glia.widgets.core.permissions.domain.RequestNotificationPermissionIfPushNotificationsSetUpUseCase
 import com.glia.widgets.core.permissions.domain.WithCameraPermissionUseCase
 import com.glia.widgets.core.permissions.domain.WithReadWritePermissionsUseCase
-import com.glia.widgets.core.secureconversations.domain.GetAvailableQueueIdsForSecureMessagingUseCase
+import com.glia.widgets.core.secureconversations.domain.IsMessagingAvailableUseCase
 import com.glia.widgets.core.secureconversations.domain.IsSecureEngagementUseCase
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.engagement.EngagementUpdateState
@@ -112,7 +112,6 @@ internal class ChatController(
     private val updateFromCallScreenUseCase: UpdateFromCallScreenUseCase,
     private val isSecureEngagementUseCase: IsSecureEngagementUseCase,
     private val engagementConfigUseCase: SetEngagementConfigUseCase,
-    private val getAvailableQueueIdsForSecureMessagingUseCase: GetAvailableQueueIdsForSecureMessagingUseCase,
     private val isCurrentEngagementCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase,
     private val isFileReadyForPreviewUseCase: IsFileReadyForPreviewUseCase,
     private val determineGvaButtonTypeUseCase: DetermineGvaButtonTypeUseCase,
@@ -134,7 +133,8 @@ internal class ChatController(
     private val withReadWritePermissionsUseCase: WithReadWritePermissionsUseCase,
     private val requestNotificationPermissionIfPushNotificationsSetUpUseCase: RequestNotificationPermissionIfPushNotificationsSetUpUseCase,
     private val releaseResourcesUseCase: ReleaseResourcesUseCase,
-    private val getUrlFromLinkUseCase: GetUrlFromLinkUseCase
+    private val getUrlFromLinkUseCase: GetUrlFromLinkUseCase,
+    private val isMessagingAvailableUseCase: IsMessagingAvailableUseCase
 ) : ChatContract.Controller {
     private var backClickedListener: ChatView.OnBackClickedListener? = null
     private var view: ChatContract.View? = null
@@ -224,21 +224,23 @@ internal class ChatController(
         screenSharingUseCase.end()
     }
 
-    override fun initChat(companyName: String?, queueIds: List<String>?, visitorContextAssetId: String?, chatType: ChatType) {
-        engagementConfigUseCase(chatType, queueIds ?: emptyList())
+    override fun initChat(chatType: ChatType) {
+        engagementConfigUseCase(chatType)
         updateOperatorDefaultImageUrlUseCase()
 
-        ensureSecureMessagingAvailable()
 
-        if (chatState.integratorChatStarted || dialogController.isShowingUnexpectedErrorDialog) {
-            if (isSecureEngagement) {
-                emitViewState { chatState.setSecureMessagingState() }
-            }
+        if (chatState.isChatUnavailable || dialogController.isShowingUnexpectedErrorDialog) {
+            emitViewState { chatState.initChat().setSecureMessaging(isSecureEngagement) }
             chatManager.onChatAction(ChatManager.Action.ChatRestored)
             return
         }
 
-        emitViewState { chatState.initChat(companyName, queueIds, visitorContextAssetId) }
+        emitViewState {
+            chatState.initChat()
+                .setSecureMessaging(isSecureEngagement)
+        }
+        ensureSecureMessagingAvailable()
+
         initChatManager()
     }
 
@@ -249,22 +251,26 @@ internal class ChatController(
     }
 
     private fun ensureSecureMessagingAvailable() {
+        disposable.add(isMessagingAvailableUseCase().subscribe(::handleMessagingAvailableResult))
+    }
+
+    private fun handleMessagingAvailableResult(result: Result<Boolean>) {
         if (!isSecureEngagement) return
 
-        disposable.add(
-            getAvailableQueueIdsForSecureMessagingUseCase().subscribe({
-                if (it.result != null) {
-                    Logger.d(TAG, "Messaging is available")
-                    engagementConfigUseCase(ChatType.SECURE_MESSAGING, it.result)
-                } else {
-                    Logger.d(TAG, "Messaging is unavailable")
-                    dialogController.showMessageCenterUnavailableDialog()
-                }
-            }, {
-                Logger.e(TAG, "Checking for Messaging availability failed", it)
-                dialogController.showUnexpectedErrorDialog()
-            })
-        )
+        result.onFailure { error ->
+            Logger.e(TAG, "Checking for Messaging availability failed", error)
+            dialogController.showUnexpectedErrorDialog()
+        }
+
+        result.onSuccess { isMessagingAvailable ->
+            if (!isMessagingAvailable) {
+                Logger.d(TAG, "Messaging is unavailable")
+                emitViewState { chatState.setSecureMessagingUnavailable() }
+            } else {
+                Logger.d(TAG, "Messaging is available")
+                emitViewState { chatState.setSecureMessagingAvailable() }
+            }
+        }
     }
 
     private fun prepareChatComponents() {
@@ -301,14 +307,12 @@ internal class ChatController(
 
     override fun onLiveObservationDialogRejected() {
         Logger.d(TAG, "onLiveObservationDialogRejected")
-        stop()
+        endChat()
         dialogController.dismissDialogs()
     }
 
     private fun enqueueForEngagement() {
-        requestNotificationPermissionIfPushNotificationsSetUpUseCase {
-            enqueueForEngagementUseCase(queueIds = chatState.queueIds, visitorContextAssetId = chatState.visitorContextAssetId)
-        }
+        requestNotificationPermissionIfPushNotificationsSetUpUseCase(enqueueForEngagementUseCase::invoke)
     }
 
     @Synchronized
@@ -323,7 +327,6 @@ internal class ChatController(
 
     override fun onDestroy(retain: Boolean) {
         Logger.d(TAG, "onDestroy, retain:$retain")
-        dialogController.dismissMessageCenterUnavailableDialog()
 
         // view is accessed from multiple threads
         // and must be protected from race condition
@@ -442,19 +445,19 @@ internal class ChatController(
 
     override fun noMoreOperatorsAvailableDismissed() {
         Logger.d(TAG, "noMoreOperatorsAvailableDismissed")
-        stop()
+        endChat()
         dialogController.dismissCurrentDialog()
     }
 
     override fun unexpectedErrorDialogDismissed() {
         Logger.d(TAG, "unexpectedErrorDialogDismissed")
-        stop()
+        endChat()
         dialogController.dismissCurrentDialog()
     }
 
     override fun endEngagementDialogYesClicked() {
         Logger.d(TAG, "endEngagementDialogYesClicked")
-        stop()
+        endChat()
         dialogController.dismissDialogs()
     }
 
@@ -538,7 +541,7 @@ internal class ChatController(
             State.StartedOmniCore -> newEngagementLoaded()
             is State.Update -> handleEngagementStateUpdate(state.updateState)
             is State.PreQueuing, is State.Queuing -> queueForEngagementStarted()
-            is State.QueueUnstaffed, is State.UnexpectedErrorHappened, is State.QueueingCanceled -> emitViewState { chatState.stop() }
+            is State.QueueUnstaffed, is State.UnexpectedErrorHappened, is State.QueueingCanceled -> emitViewState { chatState.chatUnavailableState() }
 
             else -> {
                 // no op
@@ -599,14 +602,14 @@ internal class ChatController(
     private fun error(error: String) {
         Logger.e(TAG, error)
         dialogController.showUnexpectedErrorDialog()
-        emitViewState { chatState.stop() }
+        emitViewState { chatState.chatUnavailableState() }
     }
 
     private fun viewInitPreQueueing() {
         if (isQueueingOrOngoingEngagement) return
 
         Logger.d(TAG, "viewInitPreQueueing")
-        chatManager.onChatAction(ChatManager.Action.QueuingStarted(chatState.companyName.orEmpty()))
+        chatManager.onChatAction(ChatManager.Action.QueuingStarted)
         confirmationDialogUseCase { shouldShow ->
             if (shouldShow) {
                 dialogController.showEngagementConfirmationDialog()
@@ -627,28 +630,24 @@ internal class ChatController(
 
     private fun operatorConnected(formattedOperatorName: String, profileImgUrl: String?) {
         chatManager.onChatAction(
-            ChatManager.Action.OperatorConnected(
-                chatState.companyName.orEmpty(), formattedOperatorName, profileImgUrl
-            )
+            ChatManager.Action.OperatorConnected(formattedOperatorName, profileImgUrl)
         )
         emitViewState { chatState.operatorConnected(formattedOperatorName, profileImgUrl).setLiveChatState() }
     }
 
     private fun operatorChanged(formattedOperatorName: String, profileImgUrl: String?) {
         chatManager.onChatAction(
-            ChatManager.Action.OperatorJoined(
-                chatState.companyName.orEmpty(), formattedOperatorName, profileImgUrl
-            )
+            ChatManager.Action.OperatorJoined(formattedOperatorName, profileImgUrl)
         )
         emitViewState { chatState.operatorConnected(formattedOperatorName, profileImgUrl) }
     }
 
-    private fun stop() {
+    private fun endChat() {
         Logger.d(TAG, "Stop, engagement ended")
         endEngagementUseCase()
         chatManager.reset()
         mediaUpgradeDisposable.clear()
-        emitViewState { chatState.stop() }
+        emitViewState { chatState.chatUnavailableState() }
     }
 
     private fun addQuickReplyButtons(options: List<GvaButton>) {
@@ -747,14 +746,14 @@ internal class ChatController(
             if (!isSecureEngagement && !isQueueingOrOngoingEngagement) {
                 viewInitPreQueueing()
             } else {
-                Logger.d(TAG, "Opened empty Secure Conversations chat")
+                Logger.d(TAG, "Opened empty Secure Messaging chat")
             }
         }
 
         when {
-            isSecureEngagement -> emitViewState { chatState.setSecureMessagingState() }
+            isSecureEngagement -> { /* to prevent calling chatState.liveChatHistoryLoaded() */ }
             isQueueingOrEngagementUseCase.hasOngoingEngagement -> emitViewState { chatState.engagementStarted() }
-            else -> emitViewState { chatState.historyLoaded() }
+            else -> emitViewState { chatState.liveChatHistoryLoaded() }
         }
 
         prepareChatComponents()
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/data/GliaChatRepository.java b/widgetssdk/src/main/java/com/glia/widgets/chat/data/GliaChatRepository.java
index 4725d6e30..5e83647f6 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/data/GliaChatRepository.java
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/data/GliaChatRepository.java
@@ -11,6 +11,7 @@
 import com.glia.widgets.chat.domain.GliaSendMessageUseCase.Listener;
 import com.glia.widgets.di.GliaCore;
 
+import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -27,7 +28,7 @@ public GliaChatRepository(GliaCore gliaCore) {
      * @hide
      */
     public interface HistoryLoadedListener {
-        void loaded(ChatMessage[] messages, Throwable error);
+        void loaded(List<ChatMessage> messages, Throwable error);
     }
 
     public void loadHistory(HistoryLoadedListener historyLoadedListener) {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/domain/GliaLoadHistoryUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/domain/GliaLoadHistoryUseCase.kt
index 2fc0b5ca4..a555d4ac9 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/domain/GliaLoadHistoryUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/domain/GliaLoadHistoryUseCase.kt
@@ -32,7 +32,7 @@ internal class GliaLoadHistoryUseCase(
     ) { messages, count -> ChatHistoryResponse(messages, count) }
 
     private fun loadHistoryAndMapOperator(): Single<MutableList<ChatMessageInternal>> = loadHistory()
-        .flatMapPublisher { Flowable.fromArray(*it) }
+        .flatMapPublisher { Flowable.fromIterable(it) }
         .concatMapSingle { mapOperatorUseCase(chatMessage = it) }
         .toSortedList(Comparator.comparingLong { it.chatMessage.timestamp })
 
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/domain/GliaSendMessageUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/domain/GliaSendMessageUseCase.kt
index f6d90ba73..70df1dfc4 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/domain/GliaSendMessageUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/domain/GliaSendMessageUseCase.kt
@@ -20,7 +20,6 @@ internal class GliaSendMessageUseCase(
     private val chatRepository: GliaChatRepository,
     private val fileAttachmentRepository: FileAttachmentRepository,
     private val isOperatorPresentUseCase: IsOperatorPresentUseCase,
-    private val engagementConfigRepository: GliaEngagementConfigRepository,
     private val secureConversationsRepository: SecureConversationsRepository,
     private val isSecureEngagementUseCase: IsSecureEngagementUseCase
 ) {
@@ -38,7 +37,7 @@ internal class GliaSendMessageUseCase(
 
     private fun sendMessage(payload: SendMessagePayload, listener: Listener) {
         if (isSecureEngagement) {
-            secureConversationsRepository.send(payload, engagementConfigRepository.queueIds, listener)
+            secureConversationsRepository.send(payload, listener)
         } else {
             chatRepository.sendMessage(payload, listener)
         }
@@ -82,7 +81,7 @@ internal class GliaSendMessageUseCase(
         val messageItem = VisitorMessageItem(payload.content, payload.messageId)
         listener.onMessagePrepared(messageItem, payload)
         when {
-            isSecureEngagement -> secureConversationsRepository.send(payload, engagementConfigRepository.queueIds, listener)
+            isSecureEngagement -> secureConversationsRepository.send(payload, listener)
 
             isOperatorOnline -> chatRepository.sendMessage(payload, listener)
 
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/domain/SendUnsentMessagesUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/domain/SendUnsentMessagesUseCase.kt
index aa5216a2d..195c21934 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/domain/SendUnsentMessagesUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/domain/SendUnsentMessagesUseCase.kt
@@ -13,7 +13,6 @@ import com.glia.widgets.core.secureconversations.domain.IsSecureEngagementUseCas
 internal class SendUnsentMessagesUseCase(
     private val chatRepository: GliaChatRepository,
     private val secureConversationsRepository: SecureConversationsRepository,
-    private val engagementConfigRepository: GliaEngagementConfigRepository,
     private val isSecureEngagementUseCase: IsSecureEngagementUseCase
 ) {
     operator fun invoke(
@@ -33,7 +32,7 @@ internal class SendUnsentMessagesUseCase(
 
     private fun sendMessage(payload: SendMessagePayload, callback: RequestCallback<VisitorMessage?>) {
         if (isSecureEngagementUseCase()) {
-            secureConversationsRepository.send(payload, engagementConfigRepository.queueIds, callback)
+            secureConversationsRepository.send(payload, callback)
         } else {
             chatRepository.sendMessage(payload, callback)
         }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatItems.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatItems.kt
index e19cba94e..e40a5e18d 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatItems.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatItems.kt
@@ -169,25 +169,19 @@ internal sealed class OperatorStatusItem : ChatItem(ChatAdapter.OPERATOR_STATUS_
     override val id: String = "operator_status_item"
     override val timestamp: Long = -1
 
-    abstract val companyName: String?
-
-    data class InQueue(override val companyName: String?) : OperatorStatusItem()
+    object InQueue : OperatorStatusItem()
 
     data class Connected(
-        override val companyName: String?,
         val operatorName: String,
         val profileImgUrl: String?
     ) : OperatorStatusItem()
 
     data class Joined(
-        override val companyName: String?,
         val operatorName: String,
         val profileImgUrl: String?
     ) : OperatorStatusItem()
 
-    object Transferring : OperatorStatusItem() {
-        override val companyName: String? = null
-    }
+    object Transferring : OperatorStatusItem()
 }
 
 // Visitor
diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatState.kt b/widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatState.kt
index 3ee59b76f..158aca6f8 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatState.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/chat/model/ChatState.kt
@@ -1,21 +1,20 @@
 package com.glia.widgets.chat.model
 
 internal data class ChatState(
-    val integratorChatStarted: Boolean = false,
+    val isChatUnavailable: Boolean = false,
     val isVisible: Boolean = false,
     val isChatInBottom: Boolean = true,
     val messagesNotSeen: Int = 0,
     val formattedOperatorName: String? = null,
     val operatorProfileImgUrl: String? = null,
-    val companyName: String? = null,
-    val queueIds: List<String>? = null,
-    val visitorContextAssetId: String? = null,
     val isMediaUpgradeVide: Boolean? = null,
     val chatInputMode: ChatInputMode = ChatInputMode.ENABLED_NO_ENGAGEMENT,
     val lastTypedText: String = "",
     val engagementRequested: Boolean = false,
     val operatorStatusItem: OperatorStatusItem? = null,
-    val showSendButton: Boolean = false,
+    val isSendButtonVisible: Boolean = false,
+    val isSendButtonEnabled: Boolean = false,
+    val isSecureMessagingUnavailableLabelVisible: Boolean = false,
     val isAttachmentButtonEnabled: Boolean = false,
     val isAttachmentButtonNeeded: Boolean = false,
     val isOperatorTyping: Boolean = false,
@@ -35,15 +34,13 @@ internal data class ChatState(
 
     val isAttachmentButtonVisible: Boolean get() = isAttachmentButtonNeeded && isAttachmentAllowed
 
-    fun initChat(companyName: String?, queueIds: List<String>?, visitorContextAssetId: String?): ChatState = copy(
-        integratorChatStarted = true,
-        companyName = companyName,
-        queueIds = queueIds,
-        visitorContextAssetId = visitorContextAssetId,
+    fun initChat(): ChatState = copy(
+        isChatUnavailable = true,
         isVisible = true,
-        showSendButton = false,
-        isAttachmentButtonEnabled = true,
-        isAttachmentAllowed = true
+        isSendButtonVisible = false,
+        isSendButtonEnabled = true,
+        isAttachmentAllowed = true,
+        isAttachmentButtonEnabled = true
     )
 
     fun queueingStarted(): ChatState = copy(
@@ -53,13 +50,24 @@ internal data class ChatState(
         engagementRequested = true
     )
 
+    fun setSecureMessaging(isSecureMessaging: Boolean) =
+        if (isSecureMessaging) {
+            setSecureMessagingState()
+        } else {
+            setLiveChatState()
+        }
+
     fun setSecureMessagingState(): ChatState = copy(
         isSecureMessaging = true,
         chatInputMode = ChatInputMode.ENABLED,
         isAttachmentButtonNeeded = true
     )
 
-    fun setLiveChatState(): ChatState = copy(isSecureMessaging = false)
+    fun setLiveChatState(): ChatState = copy(
+        isSecureMessaging = false,
+        chatInputMode = ChatInputMode.ENABLED_NO_ENGAGEMENT,
+        isSecureMessagingUnavailableLabelVisible = false,
+    )
 
     fun allowSendAttachmentStateChanged(isAttachmentAllowed: Boolean): ChatState = copy(isAttachmentAllowed = isAttachmentAllowed)
 
@@ -75,7 +83,7 @@ internal data class ChatState(
         engagementRequested = false,
         operatorStatusItem = OperatorStatusItem.Transferring,
         chatInputMode = ChatInputMode.DISABLED,
-        showSendButton = false,
+        isSendButtonVisible = false,
         isAttachmentButtonNeeded = false
     )
 
@@ -89,7 +97,7 @@ internal data class ChatState(
         isAttachmentButtonNeeded = true
     )
 
-    fun historyLoaded(): ChatState = copy(
+    fun liveChatHistoryLoaded(): ChatState = copy(
         chatInputMode = ChatInputMode.ENABLED_NO_ENGAGEMENT,
         isAttachmentButtonNeeded = false
     )
@@ -104,17 +112,35 @@ internal data class ChatState(
 
     fun messagesNotSeenChanged(messagesNotSeen: Int): ChatState = copy(messagesNotSeen = messagesNotSeen)
 
-    fun setShowSendButton(isShow: Boolean): ChatState = copy(showSendButton = isShow)
+    fun setShowSendButton(isShow: Boolean): ChatState = copy(isSendButtonVisible = isShow)
+
+    fun setSecureMessagingUnavailable(): ChatState = copy(
+        isSecureMessagingUnavailableLabelVisible = true,
+        isAttachmentButtonNeeded = true,
+        isAttachmentButtonEnabled = false,
+        isSendButtonVisible = true,
+        isSendButtonEnabled = false,
+        chatInputMode = ChatInputMode.DISABLED
+    )
+
+    fun setSecureMessagingAvailable(): ChatState = copy(
+        isSecureMessagingUnavailableLabelVisible = false,
+        isAttachmentButtonNeeded = true,
+        isAttachmentButtonEnabled = true,
+        isSendButtonVisible = true,
+        isSendButtonEnabled = true,
+        chatInputMode = ChatInputMode.ENABLED
+    )
 
     fun setIsOperatorTyping(isOperatorTyping: Boolean): ChatState = copy(isOperatorTyping = isOperatorTyping)
 
     fun setIsAttachmentButtonEnabled(isAttachmentButtonEnabled: Boolean): ChatState = copy(isAttachmentButtonEnabled = isAttachmentButtonEnabled)
 
-    fun stop(): ChatState = copy(
+    fun chatUnavailableState(): ChatState = copy(
         formattedOperatorName = null,
         operatorProfileImgUrl = null,
         isVisible = false,
-        integratorChatStarted = false,
+        isChatUnavailable = false,
         isAttachmentButtonNeeded = false,
         isMediaUpgradeVide = null
     )
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/callvisualizer/CallVisualizerManager.kt b/widgetssdk/src/main/java/com/glia/widgets/core/callvisualizer/CallVisualizerManager.kt
index d6152726c..f0acc6426 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/callvisualizer/CallVisualizerManager.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/callvisualizer/CallVisualizerManager.kt
@@ -3,11 +3,9 @@ package com.glia.widgets.core.callvisualizer
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.View
-import com.glia.androidsdk.GliaException
 import com.glia.widgets.callvisualizer.controller.CallVisualizerContract
 import com.glia.widgets.core.callvisualizer.domain.CallVisualizer
 import com.glia.widgets.core.callvisualizer.domain.VisitorCodeViewBuilderUseCase
-import com.glia.widgets.di.Dependencies
 import com.glia.widgets.helper.unSafeSubscribe
 
 internal class CallVisualizerManager(
@@ -23,8 +21,8 @@ internal class CallVisualizerManager(
         callVisualizerController.showVisitorCodeDialog()
     }
 
-    override fun addVisitorContext(visitorContext: String) {
-        callVisualizerController.saveVisitorContextAssetId(visitorContext)
+    override fun addVisitorContext(visitorContextAssetId: String) {
+        callVisualizerController.saveVisitorContextAssetId(visitorContextAssetId)
     }
 
     @SuppressLint("CheckResult")
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleInsideAppUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleInsideAppUseCase.kt
index 9fbc2ed3d..0bc93064c 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleInsideAppUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleInsideAppUseCase.kt
@@ -1,18 +1,18 @@
 package com.glia.widgets.core.chathead.domain
 
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.core.permissions.PermissionManager
 import com.glia.widgets.engagement.domain.EngagementTypeUseCase
 import com.glia.widgets.engagement.domain.IsCurrentEngagementCallVisualizerUseCase
 import com.glia.widgets.engagement.domain.IsQueueingOrEngagementUseCase
 import com.glia.widgets.engagement.domain.ScreenSharingUseCase
+import com.glia.widgets.launcher.ConfigurationManager
 
 internal class IsDisplayBubbleInsideAppUseCase(
     isQueueingOrEngagementUseCase: IsQueueingOrEngagementUseCase,
     isCurrentEngagementCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase,
     screenSharingUseCase: ScreenSharingUseCase,
     permissionManager: PermissionManager,
-    configurationManager: GliaSdkConfigurationManager,
+    configurationManager: ConfigurationManager,
     engagementTypeUseCase: EngagementTypeUseCase
 ) : IsDisplayBubbleUseCase(
     isQueueingOrEngagementUseCase,
@@ -23,12 +23,12 @@ internal class IsDisplayBubbleInsideAppUseCase(
     engagementTypeUseCase
 ) {
     override fun isBubbleEnabled(): Boolean {
-        return configurationManager.isEnableBubbleInsideApp
+        return configurationManager.enableBubbleInsideApp
     }
 
     override fun isShowBasedOnForegroundBackground(viewName: String?): Boolean {
         return viewName != null && // App is in foreground
             // Use only ChatHeadService instead of ChatHeadService + app bubble if bubble is enabled outside and inside
-            (!configurationManager.isEnableBubbleOutsideApp || !configurationManager.isEnableBubbleInsideApp || !permissionManager.hasOverlayPermission())
+            (!configurationManager.enableBubbleOutsideApp || !configurationManager.enableBubbleInsideApp || !permissionManager.hasOverlayPermission())
     }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleOutsideAppUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleOutsideAppUseCase.kt
index 08ef94ec8..14fe24056 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleOutsideAppUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleOutsideAppUseCase.kt
@@ -1,7 +1,6 @@
 package com.glia.widgets.core.chathead.domain
 
 import com.glia.widgets.core.chathead.ChatHeadManager
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.core.permissions.PermissionManager
 import com.glia.widgets.engagement.domain.EngagementTypeUseCase
 import com.glia.widgets.engagement.domain.IsCurrentEngagementCallVisualizerUseCase
@@ -9,6 +8,7 @@ import com.glia.widgets.engagement.domain.IsQueueingOrEngagementUseCase
 import com.glia.widgets.engagement.domain.ScreenSharingUseCase
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.TAG
+import com.glia.widgets.launcher.ConfigurationManager
 
 /**
  * This use case:
@@ -21,7 +21,7 @@ internal class IsDisplayBubbleOutsideAppUseCase(
     screenSharingUseCase: ScreenSharingUseCase,
     private val chatHeadManager: ChatHeadManager,
     permissionManager: PermissionManager,
-    configurationManager: GliaSdkConfigurationManager,
+    configurationManager: ConfigurationManager,
     engagementTypeUseCase: EngagementTypeUseCase
 ) : IsDisplayBubbleUseCase(
     isQueueingOrEngagementUseCase,
@@ -50,13 +50,13 @@ internal class IsDisplayBubbleOutsideAppUseCase(
         // global device bubble is NOT turned off by integrator (turned ON by default)
         // AND
         // global device bubble is allowed by visitor (overlay permission).
-        return configurationManager.isEnableBubbleOutsideApp && permissionManager.hasOverlayPermission()
+        return configurationManager.enableBubbleOutsideApp && permissionManager.hasOverlayPermission()
     }
 
     override fun isShowBasedOnForegroundBackground(viewName: String?): Boolean {
         return viewName == null || // true when app is in background
             // Use only ChatHeadService instead of ChatHeadService + app bubble if bubble is enabled outside and inside
-            (configurationManager.isEnableBubbleOutsideApp && configurationManager.isEnableBubbleInsideApp && permissionManager.hasOverlayPermission())
+            (configurationManager.enableBubbleOutsideApp && configurationManager.enableBubbleInsideApp && permissionManager.hasOverlayPermission())
     }
 
     fun onDestroy() {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleUseCase.kt
index 9b24c945a..f876a9ffa 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/chathead/domain/IsDisplayBubbleUseCase.kt
@@ -3,14 +3,14 @@ package com.glia.widgets.core.chathead.domain
 import com.glia.widgets.call.CallView
 import com.glia.widgets.callvisualizer.EndScreenSharingView
 import com.glia.widgets.chat.ChatView
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.core.permissions.PermissionManager
 import com.glia.widgets.engagement.domain.EngagementTypeUseCase
 import com.glia.widgets.engagement.domain.IsCurrentEngagementCallVisualizerUseCase
 import com.glia.widgets.engagement.domain.IsQueueingOrEngagementUseCase
 import com.glia.widgets.engagement.domain.ScreenSharingUseCase
-import com.glia.widgets.filepreview.ui.FilePreviewView
+import com.glia.widgets.filepreview.ui.ImagePreviewView
 import com.glia.widgets.helper.DialogHolderView
+import com.glia.widgets.launcher.ConfigurationManager
 import com.glia.widgets.messagecenter.MessageCenterView
 
 internal abstract class IsDisplayBubbleUseCase(
@@ -18,7 +18,7 @@ internal abstract class IsDisplayBubbleUseCase(
     private val isCurrentEngagementCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase,
     private val screenSharingUseCase: ScreenSharingUseCase,
     val permissionManager: PermissionManager,
-    internal val configurationManager: GliaSdkConfigurationManager,
+    internal val configurationManager: ConfigurationManager,
     private val engagementTypeUseCase: EngagementTypeUseCase
 ) {
     open operator fun invoke(viewName: String?): Boolean {
@@ -52,7 +52,7 @@ internal abstract class IsDisplayBubbleUseCase(
     private fun isGliaView(viewName: String?): Boolean {
         return viewName == ChatView::class.java.simpleName ||
             viewName == CallView::class.java.simpleName ||
-            viewName == FilePreviewView::class.java.simpleName ||
+            viewName == ImagePreviewView::class.java.simpleName ||
             viewName == EndScreenSharingView::class.java.simpleName ||
             viewName == MessageCenterView::class.java.simpleName ||
             viewName == DialogHolderView::class.java.simpleName
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/configuration/EngagementConfiguration.kt b/widgetssdk/src/main/java/com/glia/widgets/core/configuration/EngagementConfiguration.kt
deleted file mode 100644
index e797c6451..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/core/configuration/EngagementConfiguration.kt
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.glia.widgets.core.configuration
-
-import android.content.Intent
-import com.glia.androidsdk.screensharing.ScreenSharing
-import com.glia.widgets.GliaWidgets
-import com.glia.widgets.UiTheme
-import com.glia.widgets.chat.ChatType
-import com.glia.widgets.di.Dependencies
-import com.glia.widgets.helper.Logger.logDeprecatedMethodUse
-import com.glia.widgets.helper.TAG
-
-internal class EngagementConfiguration private constructor(builder: Builder) {
-    val companyName: String?
-    val queueIds: List<String>?
-    val contextAssetId: String?
-    private val contextUrl: String?
-    val runTimeTheme: UiTheme?
-        get() = field ?: Dependencies.sdkConfigurationManager.uiTheme
-    val screenSharingMode: ScreenSharing.Mode?
-        get() = field ?: Dependencies.sdkConfigurationManager.screenSharingMode
-    val chatType: ChatType?
-    private val manualStringOverrideL: String?
-
-    init {
-        companyName = builder.companyName
-        queueIds = builder.queueIds
-        contextAssetId = builder.contextAssetId
-        contextUrl = builder.contextUrl
-        runTimeTheme = builder.runTimeTheme
-        screenSharingMode = builder.screenSharingMode
-        chatType = builder.chatType
-        manualStringOverrideL = builder.manualLocaleOverride
-    }
-
-    @Deprecated("")
-    fun getContextUrl(): String? {
-        logDeprecatedMethodUse(TAG, "getContextUrl()")
-        return contextUrl
-    }
-
-    class Builder {
-        var companyName: String? = null
-        var queueIds: List<String>? = null
-        var contextAssetId: String? = null
-        var contextUrl: String? = null
-        var runTimeTheme: UiTheme? = null
-        var screenSharingMode: ScreenSharing.Mode? = null
-        var chatType: ChatType? = null
-        var manualLocaleOverride: String? = null
-        fun companyName(companyName: String?): Builder {
-            this.companyName = companyName
-            return this
-        }
-
-        @Deprecated("")
-        fun queueId(queueId: String?): Builder {
-            this.queueIds = queueId?.let { listOf(queueId) }
-            return this
-        }
-
-        fun queueIds(queueIds: List<String>?): Builder {
-            this.queueIds = queueIds
-            return this
-        }
-
-        @Deprecated("")
-        fun contextUrl(contextUrl: String?): Builder {
-            logDeprecatedMethodUse(TAG, "contextUrl(String)")
-            this.contextUrl = contextUrl
-            return this
-        }
-
-        fun contextAssetId(contextAssetId: String?): Builder {
-            this.contextAssetId = contextAssetId
-            return this
-        }
-
-        @Deprecated(
-            "While UiTheme can still be used for UI customization, we strongly encourage adopting remote configurations(GliaWidgetsConfig.Builder.setUiJsonRemoteConfig). " +
-                "The remote configurations approach is more versatile and better suited for future development."
-        )
-        fun runTimeTheme(runTimeTheme: UiTheme?): Builder {
-            this.runTimeTheme = runTimeTheme
-            return this
-        }
-
-        fun screenSharingMode(screenSharingMode: ScreenSharing.Mode?): Builder {
-            this.screenSharingMode = screenSharingMode
-            return this
-        }
-
-        fun manualLocaleOverride(manualLocaleOverride: String?): Builder {
-            this.manualLocaleOverride = manualLocaleOverride
-            return this
-        }
-
-        fun intent(intent: Intent): Builder {
-            companyName = Dependencies.sdkConfigurationManager.companyName
-            val queueId = intent.getStringExtra(GliaWidgets.QUEUE_ID)
-            queueIds = intent.getStringArrayListExtra(GliaWidgets.QUEUE_IDS)
-            if (queueIds == null && queueId != null) {
-                queueIds = listOf(queueId)
-            }
-            val tempTheme = intent.getParcelableExtra<UiTheme>(GliaWidgets.UI_THEME)
-            runTimeTheme = tempTheme ?: Dependencies.sdkConfigurationManager.uiTheme
-            contextAssetId = intent.getStringExtra(GliaWidgets.CONTEXT_ASSET_ID)
-            val tempMode =
-                if (intent.hasExtra(GliaWidgets.SCREEN_SHARING_MODE)) intent.getSerializableExtra(
-                    GliaWidgets.SCREEN_SHARING_MODE
-                ) as ScreenSharing.Mode? else Dependencies.sdkConfigurationManager.screenSharingMode
-            screenSharingMode =
-                tempMode ?: Dependencies.sdkConfigurationManager.screenSharingMode
-            chatType =
-                if (intent.hasExtra(GliaWidgets.CHAT_TYPE)) intent.getParcelableExtra(GliaWidgets.CHAT_TYPE) else DEFAULT_CHAT_TYPE
-            return this
-        }
-
-        fun build(): EngagementConfiguration {
-            return EngagementConfiguration(this)
-        }
-    }
-
-    companion object {
-        private val DEFAULT_CHAT_TYPE = ChatType.LIVE_CHAT
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/configuration/GliaSdkConfigurationManager.java b/widgetssdk/src/main/java/com/glia/widgets/core/configuration/GliaSdkConfigurationManager.java
deleted file mode 100644
index 766791e4d..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/core/configuration/GliaSdkConfigurationManager.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.glia.widgets.core.configuration;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
-import com.glia.androidsdk.screensharing.ScreenSharing;
-import com.glia.widgets.GliaWidgetsConfig;
-import com.glia.widgets.UiTheme;
-import com.glia.widgets.di.Dependencies;
-import com.glia.widgets.helper.Logger;
-import com.glia.widgets.helper.ResourceProvider;
-
-import org.jetbrains.annotations.Nullable;
-
-/**
- * @hide
- */
-public class GliaSdkConfigurationManager {
-
-    private static final String TAG = GliaSdkConfigurationManager.class.getSimpleName();
-
-    private ScreenSharing.Mode screenSharingMode = null;
-    private String companyName = null;
-    private String legacyCompanyName = null;
-    private boolean enableBubbleOutsideApp = true; // default values
-    private boolean enableBubbleInsideApp = true; // default values
-
-    private UiTheme uiTheme = null;
-
-    public void fromConfiguration(@NonNull GliaWidgetsConfig configuration) {
-        this.screenSharingMode = configuration.screenSharingMode;
-        this.companyName = configuration.companyName;
-        this.uiTheme = configuration.uiTheme;
-
-        Boolean enableBubbleOutsideApp = configuration.enableBubbleOutsideApp;
-        if (enableBubbleOutsideApp != null) {
-            this.enableBubbleOutsideApp = enableBubbleOutsideApp;
-        }
-
-        Boolean enableBubbleInsideApp = configuration.enableBubbleInsideApp;
-        if (enableBubbleInsideApp != null) {
-            this.enableBubbleInsideApp = enableBubbleInsideApp;
-        }
-    }
-
-    public boolean isEnableBubbleOutsideApp() {
-        return this.enableBubbleOutsideApp;
-    }
-
-    public boolean isEnableBubbleInsideApp() {
-        return this.enableBubbleInsideApp;
-    }
-
-    /**
-     * @deprecated Should be removed together with GliaWidgetsConfig.USE_OVERLAY
-     */
-    @Deprecated
-    public void setLegacyUseOverlay(boolean useOverlay) {
-        Logger.logDeprecatedMethodUse(TAG, "setLegacyUseOverlay()");
-        this.enableBubbleOutsideApp = useOverlay;
-        this.enableBubbleInsideApp = useOverlay;
-    }
-
-    public void setLegacyCompanyName(String companyName) {
-        this.legacyCompanyName = companyName;
-    }
-
-    public String getCompanyName() {
-        if (companyName == null && legacyCompanyName != null) {
-                // Legacy company name configuration method used before local default
-                companyName = legacyCompanyName;
-        }
-        return companyName;
-    }
-
-    @VisibleForTesting
-    public ResourceProvider getResourceProvider() {
-        return Dependencies.getResourceProvider();
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public UiTheme getUiTheme() {
-        return uiTheme;
-    }
-
-    public void setUiTheme(UiTheme uiTheme) {
-        this.uiTheme = uiTheme;
-    }
-
-    public ScreenSharing.Mode getScreenSharingMode() {
-        return screenSharingMode;
-    }
-
-    public void setScreenSharingMode(ScreenSharing.Mode screenSharingMode) {
-        this.screenSharingMode = screenSharingMode;
-    }
-
-    @Nullable
-    public EngagementConfiguration buildEngagementConfiguration() {
-        return new EngagementConfiguration.Builder()
-                .companyName(companyName)
-                .screenSharingMode(screenSharingMode)
-                .runTimeTheme(uiTheme)
-                .build();
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/dialog/domain/IsShowOverlayPermissionRequestDialogUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/dialog/domain/IsShowOverlayPermissionRequestDialogUseCase.kt
index 04125e4d7..4533bf9ee 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/dialog/domain/IsShowOverlayPermissionRequestDialogUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/dialog/domain/IsShowOverlayPermissionRequestDialogUseCase.kt
@@ -1,8 +1,8 @@
 package com.glia.widgets.core.dialog.domain
 
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.core.dialog.PermissionDialogManager
 import com.glia.widgets.core.permissions.PermissionManager
+import com.glia.widgets.launcher.ConfigurationManager
 
 internal interface IsShowOverlayPermissionRequestDialogUseCase {
     operator fun invoke(): Boolean
@@ -11,11 +11,11 @@ internal interface IsShowOverlayPermissionRequestDialogUseCase {
 internal class IsShowOverlayPermissionRequestDialogUseCaseImpl(
     private val permissionManager: PermissionManager,
     private val permissionDialogManager: PermissionDialogManager,
-    private val gliaSdkConfigurationManager: GliaSdkConfigurationManager
+    private val gliaSdkConfigurationManager: ConfigurationManager
 ) : IsShowOverlayPermissionRequestDialogUseCase {
     private val hasNoOverlayPermissions: Boolean get() = !permissionManager.hasOverlayPermission()
     private val hasNotShownOverlayPermissionRequest: Boolean get() = !permissionDialogManager.hasOverlayPermissionDialogShown()
-    private val isUseOverlay: Boolean get() = gliaSdkConfigurationManager.isEnableBubbleOutsideApp
+    private val isUseOverlay: Boolean get() = gliaSdkConfigurationManager.enableBubbleOutsideApp
 
     override fun invoke(): Boolean = hasNoOverlayPermissions && hasNotShownOverlayPermissionRequest && isUseOverlay
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/engagement/GliaEngagementConfigRepository.kt b/widgetssdk/src/main/java/com/glia/widgets/core/engagement/GliaEngagementConfigRepository.kt
index 6b274b40d..2b4d1d654 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/engagement/GliaEngagementConfigRepository.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/engagement/GliaEngagementConfigRepository.kt
@@ -3,11 +3,9 @@ package com.glia.widgets.core.engagement
 import com.glia.widgets.chat.ChatType
 
 internal class GliaEngagementConfigRepository {
-    var queueIds = emptyList<String>()
     var chatType = ChatType.LIVE_CHAT
 
     fun reset() {
-        queueIds = emptyList()
         chatType = ChatType.LIVE_CHAT
     }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/engagement/domain/SetEngagementConfigUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/engagement/domain/SetEngagementConfigUseCase.kt
index d320a6a03..5c8fca567 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/engagement/domain/SetEngagementConfigUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/engagement/domain/SetEngagementConfigUseCase.kt
@@ -4,8 +4,7 @@ import com.glia.widgets.chat.ChatType
 import com.glia.widgets.core.engagement.GliaEngagementConfigRepository
 
 internal class SetEngagementConfigUseCase(private val engagementConfigRepository: GliaEngagementConfigRepository) {
-    operator fun invoke(chatType: ChatType, queueIds: List<String>) {
+    operator fun invoke(chatType: ChatType) {
         engagementConfigRepository.chatType = chatType
-        engagementConfigRepository.queueIds = queueIds
     }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/notification/Extensions.kt b/widgetssdk/src/main/java/com/glia/widgets/core/notification/Extensions.kt
index 798a3700e..991ff0996 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/notification/Extensions.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/notification/Extensions.kt
@@ -2,25 +2,9 @@ package com.glia.widgets.core.notification
 
 import android.app.NotificationManager
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
 import android.os.Build
-import android.provider.Settings
 import androidx.core.app.NotificationManagerCompat
 
-internal fun Context.openNotificationChannelScreen() {
-    val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            .putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
-    } else {
-        Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            .setData(Uri.fromParts("package", packageName, null))
-    }
-    startActivity(intent)
-}
-
 internal fun Context.areNotificationsEnabled(): Boolean =
     NotificationManagerCompat.from(this).areNotificationsEnabled()
 
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/queue/GliaQueueRepository.kt b/widgetssdk/src/main/java/com/glia/widgets/core/queue/GliaQueueRepository.kt
deleted file mode 100644
index 7cc48080d..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/core/queue/GliaQueueRepository.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.glia.widgets.core.queue
-
-import com.glia.androidsdk.queuing.Queue
-import com.glia.widgets.di.GliaCore
-import io.reactivex.rxjava3.core.Single
-
-internal class GliaQueueRepository(private val gliaCore: GliaCore) {
-    /**
-     * Emits a list of all Queues
-     */
-    val queues: Single<Array<Queue>>
-        get() = Single.create { emitter ->
-            gliaCore.getQueues { queues, exception ->
-                when {
-                    exception != null -> emitter.onError(exception)
-                    queues != null -> emitter.onSuccess(queues)
-                    else -> emitter.onError(RuntimeException("Fetching file failed"))
-                }
-            }
-        }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/queue/QueueRepository.kt b/widgetssdk/src/main/java/com/glia/widgets/core/queue/QueueRepository.kt
new file mode 100644
index 000000000..c2d60a29b
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/queue/QueueRepository.kt
@@ -0,0 +1,155 @@
+package com.glia.widgets.core.queue
+
+import com.glia.androidsdk.GliaException
+import com.glia.androidsdk.queuing.Queue
+import com.glia.widgets.di.GliaCore
+import com.glia.widgets.helper.Logger
+import com.glia.widgets.helper.TAG
+import com.glia.widgets.helper.unSafeSubscribe
+import com.glia.widgets.launcher.ConfigurationManager
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.processors.BehaviorProcessor
+import java.util.function.Consumer
+
+internal sealed interface QueuesState {
+    fun queuesOrEmpty(): List<Queue> = when (this) {
+        is Queues -> queues
+        else -> emptyList()
+    }
+
+    data object Loading : QueuesState
+    data object Empty : QueuesState
+    data class Queues(val queues: List<Queue>) : QueuesState
+    data class Error(val error: Throwable) : QueuesState
+}
+
+internal interface QueueRepository {
+    val queuesState: Flowable<QueuesState>
+    val relevantQueueIds: Single<List<String>>
+    fun initialize()
+    fun fetchQueues()
+}
+
+internal class QueueRepositoryImpl(private val gliaCore: GliaCore, private val configurationManager: ConfigurationManager) : QueueRepository {
+
+    private val queueUpdateCallback: Consumer<Queue> = Consumer { updateQueues(it) }
+    private val siteQueues: BehaviorProcessor<List<Queue>> = BehaviorProcessor.create()
+
+    private val _queuesState: BehaviorProcessor<QueuesState> = BehaviorProcessor.create()
+    override val queuesState = _queuesState.hide()
+        .doOnSubscribe { fetchQueues() }
+        .distinctUntilChanged()
+
+    private val _relevantQueueIds: Flowable<List<String>>
+        get() = queuesState
+            .filter { it !is QueuesState.Loading }
+            .map { it.queuesOrEmpty() }
+            .map { queues -> queues.map { it.id } }
+
+    override val relevantQueueIds: Single<List<String>>
+        get() = _relevantQueueIds.firstOrError()
+
+    override fun initialize() {
+        fetchQueues()
+    }
+
+    override fun fetchQueues() {
+        if (gliaCore.isInitialized && siteQueues.value == null) {
+            _queuesState.onNext(QueuesState.Loading)
+
+            gliaCore.getQueues { queues, exception ->
+                queues?.let { siteQueuesReceived(it) } ?: reportGetSiteQueuesError(exception)
+            }
+        }
+    }
+
+    private fun siteQueuesReceived(queues: List<Queue>) {
+        siteQueues.onNext(queues)
+        subscribeToQueues()
+        subscribeToQueueUpdates()
+    }
+
+    private fun reportGetSiteQueuesError(exception: GliaException?) {
+        val ex = exception ?: RuntimeException("Fetching queues failed: queues were null")
+        Logger.e(TAG, "Setting up queues. Failed to get site queues", ex)
+        _queuesState.onNext(QueuesState.Error(ex))
+    }
+
+    private fun subscribeToQueueUpdates() {
+        _relevantQueueIds
+            .filter { it.isNotEmpty() }
+            .distinctUntilChanged()
+            .unSafeSubscribe { gliaCore.subscribeToQueueStateUpdates(it, {}, queueUpdateCallback) }
+    }
+
+    private fun subscribeToQueues() {
+        Flowable.combineLatest(configurationManager.queueIdsObservable, siteQueues, ::Pair)
+            .distinctUntilChanged()
+            .unSafeSubscribe { (integratorQueueIds, siteQueues) ->
+                Logger.i(TAG, "Setting up queues. site has ${siteQueues.count()} queues")
+                onQueuesReceived(integratorQueueIds, siteQueues)
+            }
+    }
+
+    private fun onQueuesReceived(queueIds: List<String>, siteQueues: List<Queue>) {
+        when {
+            siteQueues.isEmpty() -> {
+                Logger.i(TAG, "Setting up queues. Site has no queues")
+                _queuesState.onNext(QueuesState.Empty)
+            }
+
+            queueIds.isEmpty() -> {
+                Logger.i(TAG, "Setting up queues. Integrator queues are empty")
+                setDefaultQueues(siteQueues)
+            }
+
+            else -> {
+                Logger.i(TAG, "Setting up queues. Matching queues")
+                matchQueues(queueIds, siteQueues)
+            }
+        }
+    }
+
+    private fun setDefaultQueues(siteQueues: List<Queue>) {
+        Logger.i(TAG, "Setting up queues. Falling back to default queues")
+
+        val defaultQueues = siteQueues.filter { it.isDefault == true }
+
+        if (defaultQueues.isEmpty()) {
+            Logger.w(TAG, "Setting up queues. No default queues")
+            _queuesState.onNext(QueuesState.Empty)
+        } else {
+            Logger.i(TAG, "Setting up queues. Using default ${defaultQueues.count()} queues")
+            _queuesState.onNext(QueuesState.Queues(defaultQueues))
+        }
+    }
+
+    private fun updateQueues(queue: Queue) {
+        val currentQueues = _queuesState.value
+            ?.let { it as? QueuesState.Queues }
+            ?.queues
+            ?.toMutableList() ?: return
+
+        val index = currentQueues.indexOfFirst { it.id == queue.id }.takeIf { it != -1 } ?: return
+
+        currentQueues[index] = queue
+
+        _queuesState.onNext(QueuesState.Queues(currentQueues.toList()))
+    }
+
+    private fun matchQueues(queueIds: List<String>, siteQueues: List<Queue>) {
+        val matchedQueues = siteQueues.filter { queueIds.contains(it.id) }
+
+        if (matchedQueues.isEmpty()) {
+            setDefaultQueues(siteQueues)
+        } else {
+            Logger.i(
+                TAG,
+                "Setting up queues. ${matchedQueues.count()} out of ${queueIds.count()} queues provided by an integrator match with site queues."
+            )
+            _queuesState.onNext(QueuesState.Queues(matchedQueues))
+        }
+    }
+
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/SecureConversationsRepository.kt b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/SecureConversationsRepository.kt
index 3efaf2adc..aaf2478fd 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/SecureConversationsRepository.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/SecureConversationsRepository.kt
@@ -7,30 +7,42 @@ import com.glia.androidsdk.chat.VisitorMessage
 import com.glia.androidsdk.secureconversations.SecureConversations
 import com.glia.widgets.chat.data.GliaChatRepository
 import com.glia.widgets.chat.domain.GliaSendMessageUseCase
+import com.glia.widgets.core.queue.QueueRepository
+import com.glia.widgets.di.GliaCore
+import com.glia.widgets.helper.unSafeSubscribe
 import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.subjects.BehaviorSubject
 import io.reactivex.rxjava3.subjects.Subject
 
-internal class SecureConversationsRepository(private val secureConversations: SecureConversations) {
-    private val _messageSendingObservable: Subject<Boolean> = BehaviorSubject.createDefault(false)
+internal class SecureConversationsRepository(private val core: GliaCore, private val queueRepository: QueueRepository) {
+    private val secureConversations: SecureConversations by lazy { core.secureConversations }
 
+    private val _messageSendingObservable: Subject<Boolean> = BehaviorSubject.createDefault(false)
     val messageSendingObservable: Observable<Boolean> = _messageSendingObservable
 
     fun fetchChatTranscript(listener: GliaChatRepository.HistoryLoadedListener) {
-        secureConversations.fetchChatTranscript(listener::loaded)
+        secureConversations.fetchChatTranscript { messages, exception ->
+            listener.loaded(messages?.toList(), exception)
+        }
     }
 
-    fun send(payload: SendMessagePayload, queueIds: List<String>, callback: RequestCallback<VisitorMessage?>) {
+    fun send(payload: SendMessagePayload, callback: RequestCallback<VisitorMessage?>) {
         _messageSendingObservable.onNext(true)
-        secureConversations.send(payload, queueIds.toTypedArray(), handleResult(callback))
-    }
+        queueRepository.relevantQueueIds.unSafeSubscribe { queueIds ->
+            if (queueIds.isNotEmpty()) {
+                secureConversations.send(payload, queueIds.toTypedArray(), handleResult(callback))
+            } else {
+                handleResult(callback).onResult(null, GliaException("relevant queues are empty", GliaException.Cause.INVALID_INPUT))
+            }
 
-    fun send(payload: SendMessagePayload, queueIds: List<String>, listener: GliaSendMessageUseCase.Listener) {
-        send(payload, queueIds) { visitorMessage, ex ->
-            onMessageReceived(visitorMessage, ex, listener, payload)
         }
     }
 
+    fun send(payload: SendMessagePayload, listener: GliaSendMessageUseCase.Listener) {
+        send(payload) { visitorMessage, ex -> onMessageReceived(visitorMessage, ex, listener, payload) }
+    }
+
     fun markMessagesRead(callback: RequestCallback<Void>) {
         secureConversations.markMessagesRead(callback)
     }
@@ -55,6 +67,13 @@ internal class SecureConversationsRepository(private val secureConversations: Se
         }
     }
 
-    fun getUnreadMessagesCount(callback: RequestCallback<Int>) =
-        secureConversations.getUnreadMessageCount(callback)
+    fun getUnreadMessagesCount(callback: RequestCallback<Int>) = secureConversations.getUnreadMessageCount(callback)
+
+    fun getHasPendingSecureConversations(): Single<Boolean> = Single.create { emitter ->
+        secureConversations.getPendingSecureConversationStatus { hasPendingSecureConversations, _ ->
+            if (!emitter.isDisposed) {
+                emitter.onSuccess(hasPendingSecureConversations ?: false)
+            }
+        }
+    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/GetAvailableQueueIdsForSecureMessagingUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/GetAvailableQueueIdsForSecureMessagingUseCase.kt
deleted file mode 100644
index 77c663ff6..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/GetAvailableQueueIdsForSecureMessagingUseCase.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.glia.widgets.core.secureconversations.domain
-
-import com.glia.androidsdk.GliaException
-import com.glia.androidsdk.RequestCallback
-import com.glia.androidsdk.queuing.Queue
-import com.glia.widgets.core.engagement.GliaEngagementConfigRepository
-import com.glia.widgets.core.queue.GliaQueueRepository
-import com.glia.widgets.helper.Data.Value
-import com.glia.widgets.helper.Logger
-import com.glia.widgets.helper.TAG
-import com.glia.widgets.helper.rx.Schedulers
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import java.util.UUID
-
-internal class GetAvailableQueueIdsForSecureMessagingUseCase(
-    private val engagementConfigRepository: GliaEngagementConfigRepository,
-    private val queueRepository: GliaQueueRepository,
-    private val isMessagingAvailableUseCase: IsMessagingAvailableUseCase,
-    private val schedulers: Schedulers
-) {
-    private val disposable = CompositeDisposable()
-
-    operator fun invoke() = queueRepository.queues
-        .map { queues ->
-            val queueIds = engagementConfigRepository.queueIds
-            validateIds(queueIds)
-
-            val matchedQueues = matchQueues(queueIds, queues)
-
-            if (matchedQueues.isEmpty()) {
-                if (queueIds.isNotEmpty()) {
-                    Logger.w(TAG, "Provided queue IDs do not match with any queue.")
-                }
-
-                val defaultQueues = queues
-                    .filter { it.isDefault == true }
-
-                return@map Value(
-                    if (isMessagingAvailableUseCase(defaultQueues)) {
-                        Logger.i(TAG, "Secure Messaging is available using queues that are set as **Default**.")
-                        defaultQueues.map { it.id }
-                    } else {
-                        Logger.w(TAG, "No default queues that have status other than closed and support messaging were found.")
-                        null
-                    }
-                )
-            }
-
-            Value(
-                if (isMessagingAvailableUseCase(matchedQueues)) {
-                    Logger.i(TAG, "Secure Messaging is available in queues with IDs: $queueIds.")
-                    queueIds
-                } else {
-                    Logger.w(TAG, "Provided queue IDs do not match with queues that have status other than closed and support messaging.")
-                    null
-                }
-            )
-        }
-        .subscribeOn(schedulers.computationScheduler)
-        .observeOn(schedulers.mainScheduler)
-
-    private fun validateIds(queueIds: List<String>) {
-        val invalidIds = queueIds.filter { queueId ->
-            try {
-                UUID.fromString(queueId)
-                false
-            } catch (e: IllegalArgumentException) {
-                true
-            }
-        }
-        if (invalidIds.isNotEmpty()) {
-            Logger.w(TAG, "Queue ID array for Secure Messaging contains invalid queue IDs: $invalidIds.")
-        }
-    }
-
-    private fun matchQueues(queueIds: List<String>, queues: Array<Queue>) = queues
-        .filter { queueIds.contains(it.id) }
-
-    operator fun invoke(callback: RequestCallback<List<String>>) {
-        disposable.add(
-            invoke().subscribe(
-                { callback.onResult(it.result, null) },
-                { callback.onResult(null, GliaException.from(it)) }
-            )
-        )
-    }
-
-    fun dispose() {
-        disposable.clear()
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/GetUnreadMessagesCountWithTimeoutUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/GetUnreadMessagesCountWithTimeoutUseCase.kt
index bb5e59e94..43d9de27c 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/GetUnreadMessagesCountWithTimeoutUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/GetUnreadMessagesCountWithTimeoutUseCase.kt
@@ -1,7 +1,9 @@
 package com.glia.widgets.core.secureconversations.domain
 
 import androidx.annotation.VisibleForTesting
+import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
 import com.glia.widgets.core.secureconversations.SecureConversationsRepository
+import com.glia.widgets.di.GliaCore
 import com.glia.widgets.helper.Logger
 import io.reactivex.rxjava3.core.Single
 import java.util.concurrent.TimeUnit
@@ -20,9 +22,16 @@ internal const val TIMEOUT_SEC = 3L
 
 internal const val NO_UNREAD_MESSAGES = 0
 
-internal class GetUnreadMessagesCountWithTimeoutUseCase(private val repository: SecureConversationsRepository) {
+internal class GetUnreadMessagesCountWithTimeoutUseCase(
+    private val repository: SecureConversationsRepository,
+    private val isAuthenticatedUseCase: IsAuthenticatedUseCase,
+    private val core: GliaCore
+) {
 
     /**
+     * This function provides a default value instead of an error.
+     * If error handling is needed, use the repository function directly.
+     *
      * @return [NO_UNREAD_MESSAGES] if the current socket doesn't signal a success value within the specified [TIMEOUT_SEC] window.
      *
      * This is combined with the chat transcript result to avoid "Jumping UI" when adding new messages'
@@ -30,7 +39,13 @@ internal class GetUnreadMessagesCountWithTimeoutUseCase(private val repository:
      * there is no warranty that it will return anything so timeout is added to make sure that it will return [NO_UNREAD_MESSAGES]
      * after the timeout if there is no answer from socket yet.
      */
-    operator fun invoke(): Single<Int> = Single.create {
+    operator fun invoke(): Single<Int> = when {
+        core.isInitialized.not() -> Single.just(NO_UNREAD_MESSAGES)
+        isAuthenticatedUseCase().not() -> Single.just(NO_UNREAD_MESSAGES)
+        else -> getUnreadMessagesCountWithTimeout()
+    }
+
+    private fun getUnreadMessagesCountWithTimeout() = Single.create {
         repository.getUnreadMessagesCount { count, exception ->
             if (it.isDisposed) return@getUnreadMessagesCount
             if (exception != null) {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/HasPendingSecureConversationsWithTimeoutUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/HasPendingSecureConversationsWithTimeoutUseCase.kt
new file mode 100644
index 000000000..c0e3da726
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/HasPendingSecureConversationsWithTimeoutUseCase.kt
@@ -0,0 +1,33 @@
+package com.glia.widgets.core.secureconversations.domain
+
+import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
+import com.glia.widgets.core.secureconversations.SecureConversationsRepository
+import com.glia.widgets.di.GliaCore
+import com.glia.widgets.entrywidget.EntryWidget
+import com.glia.widgets.launcher.EngagementLauncher
+import io.reactivex.rxjava3.core.Single
+import java.util.concurrent.TimeUnit
+
+internal class HasPendingSecureConversationsWithTimeoutUseCase(
+    private val secureConversationsRepository: SecureConversationsRepository,
+    private val isAuthenticatedUseCase: IsAuthenticatedUseCase,
+    private val core: GliaCore
+) {
+    /**
+     * This function provides a default value instead of an error.
+     * If error handling is needed, use the repository function directly.
+     *
+     * @return `false` if the SDk is not initialized, visitor is not authenticated or
+     * if the current socket doesn't signal a success value within the specified 1 sec window.
+     *
+     * Since we're using this function in [EntryWidget] and [EngagementLauncher] where we need the immediate UI response to the user interaction,
+     *  * it is important to to avoid delays for the user.
+     */
+    operator fun invoke(): Single<Boolean> = when {
+        core.isInitialized.not() -> Single.just(false)
+        isAuthenticatedUseCase().not() -> Single.just(false)
+        else -> secureConversationsRepository.getHasPendingSecureConversations()
+            .timeout(1, TimeUnit.SECONDS)
+            .onErrorReturnItem(false)
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/IsMessagingAvailableUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/IsMessagingAvailableUseCase.kt
index 571e84497..321d0c5da 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/IsMessagingAvailableUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/IsMessagingAvailableUseCase.kt
@@ -2,12 +2,25 @@ package com.glia.widgets.core.secureconversations.domain
 
 import com.glia.androidsdk.queuing.Queue
 import com.glia.androidsdk.queuing.QueueState
+import com.glia.widgets.core.queue.QueueRepository
+import com.glia.widgets.core.queue.QueuesState
 import com.glia.widgets.helper.supportMessaging
+import io.reactivex.rxjava3.core.Flowable
 
-internal class IsMessagingAvailableUseCase {
+internal class IsMessagingAvailableUseCase(private val queueRepository: QueueRepository) {
 
-    operator fun invoke(queues: List<Queue>): Boolean = queues
-        .asSequence()
+    operator fun invoke(): Flowable<Result<Boolean>> = queueRepository.queuesState
+        .filter { it !is QueuesState.Loading }
+        .map { mapResult(it) }
+        .distinctUntilChanged()
+
+    private fun mapResult(queueMonitorState: QueuesState): Result<Boolean> = when (queueMonitorState) {
+        is QueuesState.Error -> Result.failure(queueMonitorState.error)
+        is QueuesState.Queues -> Result.success(isMessagingAvailable(queueMonitorState.queues))
+        else -> Result.success(false)
+    }
+
+    private fun isMessagingAvailable(queues: List<Queue>): Boolean = queues.asSequence()
         .filterNot { it.state.status == QueueState.Status.CLOSED }
         .filterNot { it.state.status == QueueState.Status.UNKNOWN }
         .any { it.supportMessaging() }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/SendSecureMessageUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/SendSecureMessageUseCase.kt
index 5d069fd22..2773b5b50 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/SendSecureMessageUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/core/secureconversations/domain/SendSecureMessageUseCase.kt
@@ -13,7 +13,6 @@ import com.glia.widgets.core.secureconversations.SendMessageRepository
 import com.glia.widgets.engagement.domain.IsQueueingOrEngagementUseCase
 
 internal class SendSecureMessageUseCase(
-    private val engagementConfigRepository: GliaEngagementConfigRepository,
     private val sendMessageRepository: SendMessageRepository,
     private val secureConversationsRepository: SecureConversationsRepository,
     private val fileAttachmentRepository: SecureFileAttachmentRepository,
@@ -29,17 +28,16 @@ internal class SendSecureMessageUseCase(
     ) {
         val message = sendMessageRepository.value
         val fileAttachments = fileAttachmentRepository.getReadyToSendFileAttachments()
-        sendMessage(message, engagementConfigRepository.queueIds, fileAttachments, callback)
+        sendMessage(message, fileAttachments, callback)
     }
 
     private fun sendMessage(
         message: String,
-        queueIds: List<String>,
         localAttachments: List<LocalAttachment>,
         callback: RequestCallback<VisitorMessage?>
     ) {
         if (localAttachments.isNotEmpty()) {
-            sendMessageWithAttachments(message, queueIds, localAttachments) { result, ex ->
+            sendMessageWithAttachments(message, localAttachments) { result, ex ->
                 if (ex == null) {
                     sendMessageRepository.reset()
                     fileAttachmentRepository.detachFiles(localAttachments)
@@ -47,13 +45,12 @@ internal class SendSecureMessageUseCase(
                 callback.onResult(result, ex)
             }
         } else {
-            sendMessage(message, queueIds, callback)
+            sendMessage(message, callback)
         }
     }
 
     private fun sendMessage(
         message: String,
-        queueIds: List<String>,
         callback: RequestCallback<VisitorMessage?>
     ) {
         val payload = SendMessagePayload(content = message)
@@ -61,13 +58,12 @@ internal class SendSecureMessageUseCase(
         if (hasOngoingEngagement) {
             chatRepository.sendMessage(payload, callback)
         } else {
-            secureConversationsRepository.send(payload, queueIds, callback)
+            secureConversationsRepository.send(payload, callback)
         }
     }
 
     private fun sendMessageWithAttachments(
         message: String,
-        queueIds: List<String>,
         localAttachments: List<LocalAttachment>,
         callback: RequestCallback<VisitorMessage?>
     ) {
@@ -81,7 +77,7 @@ internal class SendSecureMessageUseCase(
         if (hasOngoingEngagement) {
             chatRepository.sendMessage(payload, callback)
         } else {
-            secureConversationsRepository.send(payload, queueIds, callback)
+            secureConversationsRepository.send(payload, callback)
         }
     }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/visitor/GliaVisitorInfo.kt b/widgetssdk/src/main/java/com/glia/widgets/core/visitor/GliaVisitorInfo.kt
deleted file mode 100644
index 3b36fbc1b..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/core/visitor/GliaVisitorInfo.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.glia.widgets.core.visitor
-
-import com.glia.androidsdk.visitor.VisitorInfo
-import com.glia.widgets.helper.Logger.logDeprecatedClassUse
-import com.glia.widgets.helper.TAG
-import com.google.gson.internal.LinkedTreeMap
-
-/**
- * Deprecated. Use [VisitorInfo] instead
- */
-@Deprecated("since 1.9.0 use @see {@link VisitorInfo}")
-class GliaVisitorInfo(visitorInfo: VisitorInfo) : VisitorInfo {
-    private var name: String
-    private var email: String
-    private var phone: String
-    private var note: String
-    private var customAttributes: Map<String, String>
-    private var generatedName: String
-    private var banned: Boolean
-    private var href: String
-    private var id: String
-    private var externalId: String?
-
-    init {
-        logDeprecatedClassUse(TAG)
-        name = visitorInfo.name
-        email = visitorInfo.email
-        phone = visitorInfo.phone
-        note = visitorInfo.note
-        customAttributes = visitorInfo.customAttributesMap
-        generatedName = visitorInfo.generatedName
-        banned = visitorInfo.banned
-        href = visitorInfo.href
-        id = visitorInfo.id
-        externalId = visitorInfo.externalId
-    }
-
-    override fun getName(): String {
-        return name
-    }
-
-    override fun getEmail(): String {
-        return email
-    }
-
-    override fun getPhone(): String {
-        return phone
-    }
-
-    override fun getNote(): String {
-        return note
-    }
-
-    /** @deprecated */
-    @Deprecated("Will be removed")
-    @Suppress("removal")
-    override fun getCustomAttributes(): LinkedTreeMap<String, String> {
-        val attrs = LinkedTreeMap<String, String>()
-        attrs.putAll(customAttributes)
-        return attrs
-    }
-
-    override fun getCustomAttributesMap(): Map<String, String> {
-        return customAttributes
-    }
-
-    override fun getGeneratedName(): String {
-        return generatedName
-    }
-
-    override fun getBanned(): Boolean {
-        return banned
-    }
-
-    override fun getHref(): String {
-        return href
-    }
-
-    override fun getId(): String {
-        return id
-    }
-
-    override fun getExternalId(): String? {
-        return externalId
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/core/visitor/VisitorInfoUpdate.java b/widgetssdk/src/main/java/com/glia/widgets/core/visitor/VisitorInfoUpdate.java
deleted file mode 100644
index fc942287f..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/core/visitor/VisitorInfoUpdate.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.glia.widgets.core.visitor;
-
-import com.glia.androidsdk.visitor.VisitorInfoUpdateRequest;
-import com.glia.widgets.helper.Logger;
-import com.google.gson.internal.LinkedTreeMap;
-
-import java.util.Map;
-
-/**
- * @deprecated since 1.9.0 use @see {@link VisitorInfoUpdateRequest}
- */
-@Deprecated
-public class VisitorInfoUpdate implements VisitorInfoUpdateRequest {
-    private final String TAG = VisitorInfoUpdate.class.getSimpleName();
-
-    public String name;
-    public String email;
-    public String phone;
-    public String note;
-    public Map<String, String> customAttributes;
-    public VisitorInfoUpdateRequest.NoteUpdateMethod noteUpdateMethod = VisitorInfoUpdateRequest.NoteUpdateMethod.APPEND;
-    public VisitorInfoUpdateRequest.CustomAttributesUpdateMethod customAttrsUpdateMethod = VisitorInfoUpdateRequest.CustomAttributesUpdateMethod.MERGE;
-    public String externalId;
-
-    public VisitorInfoUpdate() {
-        Logger.logDeprecatedClassUse(TAG);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-    public void setCustomAttributes(Map<String, String> customAttributes) {
-        this.customAttributes = customAttributes;
-    }
-
-    public void setNoteUpdateMethod(NoteUpdateMethod noteUpdateMethod) {
-        this.noteUpdateMethod = noteUpdateMethod;
-    }
-
-    public void setCustomAttrsUpdateMethod(CustomAttributesUpdateMethod customAttrsUpdateMethod) {
-        this.customAttrsUpdateMethod = customAttrsUpdateMethod;
-    }
-
-    public void setExternalId(String externalId) {
-        this.externalId = externalId;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String getEmail() {
-        return email;
-    }
-
-    @Override
-    public String getPhone() {
-        return phone;
-    }
-
-    @Override
-    public String getNote() {
-        return note;
-    }
-
-    @Override
-    public NoteUpdateMethod getNoteUpdateMethod() {
-        return noteUpdateMethod;
-    }
-
-    @Override
-    public CustomAttributesUpdateMethod getCustomAttrsUpdateMethod() {
-        return customAttrsUpdateMethod;
-    }
-
-    @Override
-    public LinkedTreeMap<String, String> getCustomAttributes() {
-        LinkedTreeMap<String, String> attrs = new LinkedTreeMap<>();
-        attrs.putAll(customAttributes);
-        return attrs;
-    }
-
-    @Override
-    public Map<String, String> getCustomAttributesMap() {
-        return customAttributes;
-    }
-
-    @Override
-    public String getExternalId() {
-        return externalId;
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/di/ControllerFactory.java b/widgetssdk/src/main/java/com/glia/widgets/di/ControllerFactory.java
index e06279666..1fe67a274 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/di/ControllerFactory.java
+++ b/widgetssdk/src/main/java/com/glia/widgets/di/ControllerFactory.java
@@ -12,13 +12,15 @@
 import com.glia.widgets.callvisualizer.controller.VisitorCodeController;
 import com.glia.widgets.chat.ChatContract;
 import com.glia.widgets.chat.controller.ChatController;
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager;
 import com.glia.widgets.core.dialog.DialogContract;
 import com.glia.widgets.core.dialog.DialogController;
 import com.glia.widgets.engagement.completion.EngagementCompletionContract;
 import com.glia.widgets.engagement.completion.EngagementCompletionController;
-import com.glia.widgets.filepreview.ui.FilePreviewContract;
-import com.glia.widgets.filepreview.ui.FilePreviewController;
+import com.glia.widgets.entrywidget.EntryWidgetContract;
+import com.glia.widgets.entrywidget.EntryWidgetController;
+import com.glia.widgets.entrywidget.EntryWidgetHideController;
+import com.glia.widgets.filepreview.ui.ImagePreviewContract;
+import com.glia.widgets.filepreview.ui.ImagePreviewController;
 import com.glia.widgets.helper.Logger;
 import com.glia.widgets.helper.TimeCounter;
 import com.glia.widgets.messagecenter.MessageCenterContract;
@@ -55,9 +57,9 @@ public class ControllerFactory {
     private final DialogContract.Controller dialogController;
     private final MessagesNotSeenHandler messagesNotSeenHandler;
     private final UseCaseFactory useCaseFactory;
-    private final GliaSdkConfigurationManager sdkConfigurationManager;
-    private final FilePreviewContract.Controller filePreviewController;
+    private final ImagePreviewContract.Controller filePreviewController;
     private final ManagerFactory managerFactory;
+    private final GliaCore core;
     private EngagementCompletionContract.Controller engagementCompletionController;
     private ChatContract.Controller retainedChatController;
     private CallContract.Controller retainedCallController;
@@ -65,12 +67,13 @@ public class ControllerFactory {
     private CallVisualizerContract.Controller callVisualizerController;
     private ActivityWatcherForChatHeadController activityWatcherForChatHeadController;
     private ActivityWatcherForLiveObservationController activityWatcherForLiveObservationController;
+    private EntryWidgetHideController entryWidgetHideController;
 
     public ControllerFactory(
         RepositoryFactory repositoryFactory,
         UseCaseFactory useCaseFactory,
-        GliaSdkConfigurationManager sdkConfigurationManager,
-        ManagerFactory managerFactory
+        ManagerFactory managerFactory,
+        GliaCore core
     ) {
         this.repositoryFactory = repositoryFactory;
         messagesNotSeenHandler = new MessagesNotSeenHandler(
@@ -78,13 +81,13 @@ public ControllerFactory(
         );
 
         this.useCaseFactory = useCaseFactory;
+        this.core = core;
         this.dialogController = new DialogController();
-        this.filePreviewController = new FilePreviewController(
+        this.filePreviewController = new ImagePreviewController(
             useCaseFactory.createGetImageFileFromDownloadsUseCase(),
             useCaseFactory.createGetImageFileFromCacheUseCase(),
             useCaseFactory.createPutImageFileToDownloadsUseCase()
         );
-        this.sdkConfigurationManager = sdkConfigurationManager;
         this.managerFactory = managerFactory;
     }
 
@@ -115,7 +118,6 @@ public ChatContract.Controller getChatController() {
                 useCaseFactory.createUpdateFromCallScreenUseCase(),
                 useCaseFactory.createIsSecureEngagementUseCase(),
                 useCaseFactory.createSetEngagementConfigUseCase(),
-                useCaseFactory.createSecureMessagingAvailableQueueIdsUseCase(),
                 useCaseFactory.getIsCurrentEngagementCallVisualizer(),
                 useCaseFactory.createIsFileReadyForPreviewUseCase(),
                 useCaseFactory.createDetermineGvaButtonTypeUseCase(),
@@ -137,7 +139,8 @@ public ChatContract.Controller getChatController() {
                 useCaseFactory.getWithReadWritePermissionsUseCase(),
                 useCaseFactory.getRequestNotificationPermissionIfPushNotificationsSetUpUseCase(),
                 useCaseFactory.getReleaseResourcesUseCase(getDialogController()),
-                useCaseFactory.createGetUrlFromLinkUseCase()
+                useCaseFactory.createGetUrlFromLinkUseCase(),
+                useCaseFactory.createIsMessagingAvailableUseCase()
             );
         }
 
@@ -148,7 +151,6 @@ public CallContract.Controller getCallController() {
         if (retainedCallController == null) {
             Logger.d(TAG, "new call controller");
             retainedCallController = new CallController(
-                sdkConfigurationManager,
                 sharedTimer,
                 new TimeCounter(),
                 new TimeCounter(),
@@ -227,7 +229,7 @@ public void init() {
         getActivityWatcherForChatHeadController().init();
     }
 
-    public FilePreviewContract.Controller getImagePreviewController() {
+    public ImagePreviewContract.Controller getImagePreviewController() {
         return filePreviewController;
     }
 
@@ -290,10 +292,8 @@ public CallVisualizerContract.Controller getCallVisualizerController() {
 
     public MessageCenterContract.Controller getMessageCenterController() {
         return new MessageCenterController(
-            serviceChatHeadController,
             useCaseFactory.createSetEngagementConfigUseCase(),
             useCaseFactory.createSendSecureMessageUseCase(),
-            useCaseFactory.createSecureMessagingAvailableQueueIdsUseCase(),
             useCaseFactory.createAddSecureFileAttachmentsObserverUseCase(),
             useCaseFactory.createAddSecureFileToAttachmentAndUploadUseCase(),
             useCaseFactory.createGetSecureFileAttachmentsUseCase(),
@@ -307,7 +307,8 @@ public MessageCenterContract.Controller getMessageCenterController() {
             createDialogController(),
             useCaseFactory.getTakePictureUseCase(),
             useCaseFactory.getUriToFileAttachmentUseCase(),
-            useCaseFactory.getRequestNotificationPermissionIfPushNotificationsSetUpUseCase()
+            useCaseFactory.getRequestNotificationPermissionIfPushNotificationsSetUpUseCase(),
+            useCaseFactory.createIsMessagingAvailableUseCase()
         );
     }
 
@@ -379,10 +380,24 @@ public OperatorRequestContract.Controller getOperatorRequestController() {
             useCaseFactory.getIsCurrentEngagementCallVisualizer(),
             useCaseFactory.createSetOverlayPermissionRequestDialogShownUseCase(),
             dialogController,
-            sdkConfigurationManager,
             useCaseFactory.getWithNotificationPermissionUseCase(),
             useCaseFactory.getPrepareToScreenSharingUseCase(),
             useCaseFactory.getReleaseScreenSharingResourcesUseCase()
         );
     }
+
+    public EntryWidgetContract.Controller getEntryWidgetController() {
+        return new EntryWidgetController(
+            repositoryFactory.getQueueRepository(),
+            useCaseFactory.createIsAuthenticatedUseCase(),
+            core
+        );
+    }
+
+    public EntryWidgetHideController getEntryWidgetHideController() {
+        if (entryWidgetHideController == null) {
+            entryWidgetHideController = new EntryWidgetHideController();
+        }
+        return entryWidgetHideController;
+    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/di/Dependencies.kt b/widgetssdk/src/main/java/com/glia/widgets/di/Dependencies.kt
index 2ecd9303b..81ff4b412 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/di/Dependencies.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/di/Dependencies.kt
@@ -5,7 +5,6 @@ import android.os.Build
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
 import com.glia.androidsdk.Glia
 import com.glia.androidsdk.GliaConfig
 import com.glia.widgets.GliaWidgetsConfig
@@ -16,20 +15,26 @@ import com.glia.widgets.core.audio.domain.OnAudioStartedUseCase
 import com.glia.widgets.core.authentication.AuthenticationManager
 import com.glia.widgets.core.callvisualizer.CallVisualizerManager
 import com.glia.widgets.core.chathead.ChatHeadManager
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.core.dialog.PermissionDialogManager
 import com.glia.widgets.core.notification.device.INotificationManager
 import com.glia.widgets.core.notification.device.NotificationManager
 import com.glia.widgets.core.permissions.PermissionManager
 import com.glia.widgets.engagement.completion.EngagementCompletionActivityWatcher
+import com.glia.widgets.entrywidget.EntryWidget
+import com.glia.widgets.entrywidget.EntryWidgetImpl
 import com.glia.widgets.filepreview.data.source.local.DownloadsFolderDataSource
 import com.glia.widgets.helper.ApplicationLifecycleManager
 import com.glia.widgets.helper.GliaActivityManagerImpl
-import com.glia.widgets.helper.IntentConfigurationHelper
-import com.glia.widgets.helper.IntentConfigurationHelperImpl
+import com.glia.widgets.helper.IntentHelperImpl
 import com.glia.widgets.helper.ResourceProvider
 import com.glia.widgets.helper.rx.GliaWidgetsSchedulers
 import com.glia.widgets.helper.rx.Schedulers
+import com.glia.widgets.launcher.ActivityLauncher
+import com.glia.widgets.launcher.ActivityLauncherImpl
+import com.glia.widgets.launcher.ConfigurationManager
+import com.glia.widgets.launcher.ConfigurationManagerImpl
+import com.glia.widgets.launcher.EngagementLauncher
+import com.glia.widgets.launcher.EngagementLauncherImpl
 import com.glia.widgets.locale.LocaleProvider
 import com.glia.widgets.operator.OperatorRequestActivityWatcher
 import com.glia.widgets.permissions.ActivityWatcherForPermissionsRequest
@@ -43,19 +48,23 @@ internal object Dependencies {
     @JvmStatic
     val gliaThemeManager = UnifiedThemeManager()
     private val authenticationManagerProvider = AuthenticationManagerProvider()
+
     @JvmStatic
     lateinit var controllerFactory: ControllerFactory
         @VisibleForTesting set
     private lateinit var notificationManager: INotificationManager
+
     @JvmStatic
     lateinit var callVisualizerManager: CallVisualizerManager
         private set
+
     @JvmStatic
     lateinit var useCaseFactory: UseCaseFactory
         @VisibleForTesting set
     private lateinit var managerFactory: ManagerFactory
     var gliaCore: GliaCore = GliaCoreImpl()
         @VisibleForTesting set
+
     @JvmStatic
     lateinit var resourceProvider: ResourceProvider
         @VisibleForTesting set
@@ -63,10 +72,26 @@ internal object Dependencies {
         @VisibleForTesting set
     var schedulers: Schedulers = GliaWidgetsSchedulers()
         @VisibleForTesting set
+
     @JvmStatic
-    var sdkConfigurationManager: GliaSdkConfigurationManager = GliaSdkConfigurationManager()
-        @VisibleForTesting set
-    val intentConfigurationHelper: IntentConfigurationHelper = IntentConfigurationHelperImpl()
+    val configurationManager: ConfigurationManager by lazy { ConfigurationManagerImpl() }
+
+    val activityLauncher: ActivityLauncher by lazy {
+        ActivityLauncherImpl(IntentHelperImpl())
+    }
+
+    @JvmStatic
+    val engagementLauncher: EngagementLauncher by lazy { EngagementLauncherImpl(activityLauncher, configurationManager) }
+
+    @JvmStatic
+    val entryWidget: EntryWidget
+        get() = EntryWidgetImpl(
+            activityLauncher,
+            gliaThemeManager,
+            controllerFactory.entryWidgetHideController,
+            useCaseFactory.hasPendingSecureConversationsWithTimeoutUseCase
+        )
+
     @JvmStatic
     lateinit var repositoryFactory: RepositoryFactory
         @VisibleForTesting set
@@ -77,7 +102,7 @@ internal object Dependencies {
         localeProvider = LocaleProvider(resourceProvider)
         notificationManager = NotificationManager(application)
         val downloadsFolderDataSource = DownloadsFolderDataSource(application)
-        repositoryFactory = RepositoryFactory(gliaCore, downloadsFolderDataSource)
+        repositoryFactory = RepositoryFactory(gliaCore, downloadsFolderDataSource, configurationManager)
 
         val permissionManager = PermissionManager(
             application,
@@ -91,7 +116,7 @@ internal object Dependencies {
             permissionManager,
             PermissionDialogManager(application),
             notificationManager,
-            sdkConfigurationManager,
+            configurationManager,
             ChatHeadManager(application),
             audioControlManager,
             authenticationManagerProvider,
@@ -107,8 +132,8 @@ internal object Dependencies {
         controllerFactory = ControllerFactory(
             repositoryFactory,
             useCaseFactory,
-            sdkConfigurationManager,
-            managerFactory
+            managerFactory,
+            gliaCore
         )
         initApplicationLifecycleObserver(
             ApplicationLifecycleManager(),
@@ -119,14 +144,16 @@ internal object Dependencies {
             controllerFactory.callVisualizerController,
             GliaActivityManagerImpl(),
             localeProvider,
-            gliaThemeManager
+            gliaThemeManager,
+            activityLauncher
         )
 
         application.registerActivityLifecycleCallbacks(callVisualizerActivityWatcher)
 
         val activityWatcherForChatHead = ActivityWatcherForChatHead(
-                controllerFactory.activityWatcherForChatHeadController
-            )
+            controllerFactory.activityWatcherForChatHeadController,
+            activityLauncher
+        )
         application.registerActivityLifecycleCallbacks(activityWatcherForChatHead)
 
         val activityWatcherForLiveObservation = ActivityWatcherForLiveObservation(
@@ -137,8 +164,8 @@ internal object Dependencies {
         application.registerActivityLifecycleCallbacks(activityWatcherForLiveObservation)
 
         val activityWatcherForPermissionsRequest = ActivityWatcherForPermissionsRequest(
-                controllerFactory.permissionsController
-            )
+            controllerFactory.permissionsController
+        )
         application.registerActivityLifecycleCallbacks(activityWatcherForPermissionsRequest)
 
         callVisualizerManager = CallVisualizerManager(
@@ -148,13 +175,14 @@ internal object Dependencies {
 
         val engagementCompletionActivityWatcher = EngagementCompletionActivityWatcher(
             controllerFactory.endEngagementController,
-            GliaActivityManagerImpl()
+            GliaActivityManagerImpl(),
+            activityLauncher
         )
         application.registerActivityLifecycleCallbacks(engagementCompletionActivityWatcher)
 
         val operatorRequestActivityWatcher = OperatorRequestActivityWatcher(
             controllerFactory.operatorRequestController,
-            intentConfigurationHelper,
+            activityLauncher,
             GliaActivityManagerImpl()
         )
         application.registerActivityLifecycleCallbacks(operatorRequestActivityWatcher)
@@ -166,7 +194,8 @@ internal object Dependencies {
         gliaCore.init(gliaConfig)
         controllerFactory.init()
         repositoryFactory.engagementRepository.initialize()
-        sdkConfigurationManager.fromConfiguration(gliaWidgetsConfig)
+        repositoryFactory.queueRepository.initialize()
+        configurationManager.applyConfiguration(gliaWidgetsConfig)
         localeProvider.setCompanyName(gliaWidgetsConfig.companyName)
     }
 
@@ -202,7 +231,7 @@ internal object Dependencies {
         lifecycleManager: ApplicationLifecycleManager,
         chatBubbleController: ChatHeadContract.Controller
     ) {
-        lifecycleManager.addObserver { source: LifecycleOwner?, event: Lifecycle.Event ->
+        lifecycleManager.addObserver { _, event: Lifecycle.Event ->
             if (event == Lifecycle.Event.ON_STOP) {
                 chatBubbleController.onApplicationStop()
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S && Glia.isInitialized()) {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/di/GliaCore.kt b/widgetssdk/src/main/java/com/glia/widgets/di/GliaCore.kt
index 8723a8322..9b91c31ad 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/di/GliaCore.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/di/GliaCore.kt
@@ -41,11 +41,11 @@ internal interface GliaCore {
     fun <T> off(event: OmnicoreEvent<T>, listener: Consumer<T>)
     fun <T> off(event: OmnicoreEvent<T>)
     fun fetchFile(attachmentFile: AttachmentFile, callback: RequestCallback<InputStream?>)
-    fun getChatHistory(callback: RequestCallback<Array<ChatMessage>?>)
-    fun getQueues(requestCallback: RequestCallback<Array<Queue>?>)
+    fun getChatHistory(callback: RequestCallback<List<ChatMessage>?>)
+    fun getQueues(requestCallback: RequestCallback<List<Queue>?>)
 
     fun queueForEngagement(
-        queueIds: Array<String>,
+        queueIds: List<String>,
         mediaType: Engagement.MediaType,
         visitorContextAssetId: String?,
         engagementOptions: EngagementOptions?,
@@ -62,4 +62,13 @@ internal interface GliaCore {
     fun getSiteInfo(callback: RequestCallback<SiteInfo?>)
     fun getOperator(operatorId: String, callback: RequestCallback<Operator?>)
     fun getAuthenticationManager(behavior: Authentication.Behavior): AuthenticationManager
+
+    fun ensureInitialized() {
+        if (!isInitialized) {
+            throw GliaException("Glia SDK is not initialized", GliaException.Cause.INVALID_INPUT)
+        }
+    }
+
+    fun subscribeToQueueStateUpdates(queueIds: List<String>, onError: Consumer<GliaException>, callback: Consumer<Queue>)
+    fun unsubscribeFromQueueUpdates(onError: Consumer<GliaException>?, callback: Consumer<Queue>)
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/di/GliaCoreImpl.kt b/widgetssdk/src/main/java/com/glia/widgets/di/GliaCoreImpl.kt
index 9065bb98b..5c6c1510e 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/di/GliaCoreImpl.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/di/GliaCoreImpl.kt
@@ -78,23 +78,23 @@ internal class GliaCoreImpl : GliaCore {
         Glia.fetchFile(attachmentFile, callback)
     }
 
-    override fun getChatHistory(callback: RequestCallback<Array<ChatMessage>?>) {
-        Glia.getChatHistory(callback)
+    override fun getChatHistory(callback: RequestCallback<List<ChatMessage>?>) {
+        Glia.getChatHistory { messages, exception -> callback.onResult(messages?.toList(), exception) }
     }
 
-    override fun getQueues(requestCallback: RequestCallback<Array<Queue>?>) {
-        Glia.getQueues(requestCallback)
+    override fun getQueues(requestCallback: RequestCallback<List<Queue>?>) {
+        Glia.getQueues { queues, exception -> requestCallback.onResult(queues?.toList(), exception) }
     }
 
     override fun queueForEngagement(
-        queueIds: Array<String>,
+        queueIds: List<String>,
         mediaType: Engagement.MediaType,
         visitorContextAssetId: String?,
         engagementOptions: EngagementOptions?,
         mediaPermissionRequestCode: Int,
         callback: Consumer<GliaException?>
     ) {
-        Glia.queueForEngagement(queueIds, mediaType, visitorContextAssetId, engagementOptions, mediaPermissionRequestCode, callback)
+        Glia.queueForEngagement(queueIds.toTypedArray(), mediaType, visitorContextAssetId, engagementOptions, mediaPermissionRequestCode, callback)
     }
 
     override fun cancelQueueTicket(queueTicketId: String, callback: Consumer<GliaException?>) {
@@ -128,4 +128,12 @@ internal class GliaCoreImpl : GliaCore {
     override fun getAuthenticationManager(behavior: Authentication.Behavior): AuthenticationManager {
         return AuthenticationManager(Glia.getAuthentication(behavior))
     }
+
+    override fun subscribeToQueueStateUpdates(queueIds: List<String>, onError: Consumer<GliaException>, callback: Consumer<Queue>) {
+        Glia.subscribeToQueueStateUpdates(queueIds.toTypedArray(), onError, callback)
+    }
+
+    override fun unsubscribeFromQueueUpdates(onError: Consumer<GliaException>?, callback: Consumer<Queue>) {
+        Glia.unsubscribeFromQueueUpdates(onError, callback)
+    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/di/RepositoryFactory.java b/widgetssdk/src/main/java/com/glia/widgets/di/RepositoryFactory.java
index 56d12b343..9d3064587 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/di/RepositoryFactory.java
+++ b/widgetssdk/src/main/java/com/glia/widgets/di/RepositoryFactory.java
@@ -9,7 +9,8 @@
 import com.glia.widgets.core.engagement.GliaOperatorRepositoryImpl;
 import com.glia.widgets.core.fileupload.FileAttachmentRepository;
 import com.glia.widgets.core.fileupload.SecureFileAttachmentRepository;
-import com.glia.widgets.core.queue.GliaQueueRepository;
+import com.glia.widgets.core.queue.QueueRepository;
+import com.glia.widgets.core.queue.QueueRepositoryImpl;
 import com.glia.widgets.core.secureconversations.SecureConversationsRepository;
 import com.glia.widgets.core.secureconversations.SendMessageRepository;
 import com.glia.widgets.core.survey.GliaSurveyRepository;
@@ -19,6 +20,7 @@
 import com.glia.widgets.filepreview.data.GliaFileRepositoryImpl;
 import com.glia.widgets.filepreview.data.source.local.DownloadsFolderDataSource;
 import com.glia.widgets.filepreview.data.source.local.InAppBitmapCache;
+import com.glia.widgets.launcher.ConfigurationManager;
 import com.glia.widgets.permissions.PermissionsRequestRepository;
 
 /**
@@ -27,7 +29,7 @@
 public class RepositoryFactory {
     private static SecureConversationsRepository secureConversationsRepository;
     private static SecureFileAttachmentRepository secureFileAttachmentRepository;
-    private static GliaQueueRepository gliaQueueRepository;
+    private static QueueRepository queueRepository;
     private static GliaFileRepository gliaFileRepository;
     private static FileAttachmentRepository fileAttachmentRepository;
     private static GliaOperatorRepository operatorRepository;
@@ -37,26 +39,29 @@ public class RepositoryFactory {
     private static PermissionsRequestRepository permissionsRequestRepository;
     private final GliaCore gliaCore;
     private final DownloadsFolderDataSource downloadsFolderDataSource;
+    private final ConfigurationManager configurationManager;
     private ChatScreenRepository chatScreenRepository;
     private EngagementRepository engagementRepository;
 
     public RepositoryFactory(
         GliaCore gliaCore,
-        DownloadsFolderDataSource downloadsFolderDataSource
+        DownloadsFolderDataSource downloadsFolderDataSource,
+        ConfigurationManager configurationManager
     ) {
         this.downloadsFolderDataSource = downloadsFolderDataSource;
         this.gliaCore = gliaCore;
+        this.configurationManager = configurationManager;
     }
 
     public GliaChatRepository getGliaMessageRepository() {
         return new GliaChatRepository(gliaCore);
     }
 
-    public GliaQueueRepository getGliaQueueRepository() {
-        if (gliaQueueRepository == null) {
-            gliaQueueRepository = new GliaQueueRepository(gliaCore);
+    public QueueRepository getQueueRepository() {
+        if (queueRepository == null) {
+            queueRepository = new QueueRepositoryImpl(gliaCore, configurationManager);
         }
-        return gliaQueueRepository;
+        return queueRepository;
     }
 
     public FileAttachmentRepository getGliaFileAttachmentRepository() {
@@ -109,7 +114,7 @@ public VisitorCodeRepository getVisitorCodeRepository() {
 
     public SecureConversationsRepository getSecureConversationsRepository() {
         if (secureConversationsRepository == null) {
-            secureConversationsRepository = new SecureConversationsRepository(gliaCore.getSecureConversations());
+            secureConversationsRepository = new SecureConversationsRepository(gliaCore, getQueueRepository());
         }
         return secureConversationsRepository;
     }
@@ -144,7 +149,12 @@ public PermissionsRequestRepository getPermissionsRequestRepository() {
 
     public EngagementRepository getEngagementRepository() {
         if (engagementRepository == null) {
-            engagementRepository = new EngagementRepositoryImpl(gliaCore, getOperatorRepository());
+            engagementRepository = new EngagementRepositoryImpl(
+                gliaCore,
+                getOperatorRepository(),
+                getQueueRepository(),
+                configurationManager
+            );
         }
         return engagementRepository;
     }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/di/UseCaseFactory.java b/widgetssdk/src/main/java/com/glia/widgets/di/UseCaseFactory.java
index 1d91c3c77..071a443aa 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/di/UseCaseFactory.java
+++ b/widgetssdk/src/main/java/com/glia/widgets/di/UseCaseFactory.java
@@ -66,9 +66,8 @@
 import com.glia.widgets.core.callvisualizer.domain.VisitorCodeViewBuilderUseCase;
 import com.glia.widgets.core.chathead.ChatHeadManager;
 import com.glia.widgets.core.chathead.domain.IsDisplayBubbleInsideAppUseCase;
-import com.glia.widgets.core.chathead.domain.ResolveChatHeadNavigationUseCase;
 import com.glia.widgets.core.chathead.domain.IsDisplayBubbleOutsideAppUseCase;
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager;
+import com.glia.widgets.core.chathead.domain.ResolveChatHeadNavigationUseCase;
 import com.glia.widgets.core.dialog.DialogContract;
 import com.glia.widgets.core.dialog.PermissionDialogManager;
 import com.glia.widgets.core.dialog.domain.ConfirmationDialogLinksUseCase;
@@ -107,13 +106,13 @@
 import com.glia.widgets.core.secureconversations.domain.AddSecureFileToAttachmentAndUploadUseCase;
 import com.glia.widgets.core.secureconversations.domain.GetSecureFileAttachmentsUseCase;
 import com.glia.widgets.core.secureconversations.domain.GetUnreadMessagesCountWithTimeoutUseCase;
+import com.glia.widgets.core.secureconversations.domain.HasPendingSecureConversationsWithTimeoutUseCase;
 import com.glia.widgets.core.secureconversations.domain.IsMessagingAvailableUseCase;
 import com.glia.widgets.core.secureconversations.domain.IsSecureEngagementUseCase;
 import com.glia.widgets.core.secureconversations.domain.MarkMessagesReadWithDelayUseCase;
 import com.glia.widgets.core.secureconversations.domain.OnNextMessageUseCase;
 import com.glia.widgets.core.secureconversations.domain.RemoveSecureFileAttachmentUseCase;
 import com.glia.widgets.core.secureconversations.domain.ResetMessageCenterUseCase;
-import com.glia.widgets.core.secureconversations.domain.GetAvailableQueueIdsForSecureMessagingUseCase;
 import com.glia.widgets.core.secureconversations.domain.SendMessageButtonStateUseCase;
 import com.glia.widgets.core.secureconversations.domain.SendSecureMessageUseCase;
 import com.glia.widgets.core.secureconversations.domain.ShowMessageLimitErrorUseCase;
@@ -150,14 +149,14 @@
 import com.glia.widgets.engagement.domain.IsOperatorPresentUseCaseImpl;
 import com.glia.widgets.engagement.domain.IsQueueingOrEngagementUseCase;
 import com.glia.widgets.engagement.domain.IsQueueingOrEngagementUseCaseImpl;
+import com.glia.widgets.engagement.domain.OnIncomingEngagementRequestTimeoutUseCase;
+import com.glia.widgets.engagement.domain.OnIncomingEngagementRequestTimeoutUseCaseImpl;
 import com.glia.widgets.engagement.domain.OperatorMediaUpgradeOfferUseCase;
 import com.glia.widgets.engagement.domain.OperatorMediaUpgradeOfferUseCaseImpl;
 import com.glia.widgets.engagement.domain.OperatorMediaUseCase;
 import com.glia.widgets.engagement.domain.OperatorMediaUseCaseImpl;
 import com.glia.widgets.engagement.domain.OperatorTypingUseCase;
 import com.glia.widgets.engagement.domain.OperatorTypingUseCaseImpl;
-import com.glia.widgets.engagement.domain.OnIncomingEngagementRequestTimeoutUseCase;
-import com.glia.widgets.engagement.domain.OnIncomingEngagementRequestTimeoutUseCaseImpl;
 import com.glia.widgets.engagement.domain.PrepareToScreenSharingUseCase;
 import com.glia.widgets.engagement.domain.PrepareToScreenSharingUseCaseImpl;
 import com.glia.widgets.engagement.domain.ReleaseResourcesUseCase;
@@ -185,6 +184,7 @@
 import com.glia.widgets.filepreview.domain.usecase.IsFileReadyForPreviewUseCase;
 import com.glia.widgets.filepreview.domain.usecase.PutImageFileToDownloadsUseCase;
 import com.glia.widgets.helper.rx.Schedulers;
+import com.glia.widgets.launcher.ConfigurationManager;
 import com.glia.widgets.locale.LocaleProvider;
 import com.glia.widgets.push.notifications.IsPushNotificationsSetUpUseCase;
 import com.glia.widgets.push.notifications.IsPushNotificationsSetUpUseCaseImpl;
@@ -208,7 +208,7 @@ public class UseCaseFactory {
     private final RepositoryFactory repositoryFactory;
     private final PermissionManager permissionManager;
     private final PermissionDialogManager permissionDialogManager;
-    private final GliaSdkConfigurationManager gliaSdkConfigurationManager;
+    private final ConfigurationManager configurationManager;
     private final INotificationManager notificationManager;
     private final ChatHeadManager chatHeadManager;
     private final AudioControlManager audioControlManager;
@@ -223,7 +223,7 @@ public class UseCaseFactory {
                    PermissionManager permissionManager,
                    PermissionDialogManager permissionDialogManager,
                    INotificationManager notificationManager,
-                   GliaSdkConfigurationManager gliaSdkConfigurationManager,
+                   ConfigurationManager configurationManager,
                    ChatHeadManager chatHeadManager,
                    AudioControlManager audioControlManager,
                    Dependencies.AuthenticationManagerProvider authenticationManagerProvider,
@@ -235,7 +235,7 @@ public class UseCaseFactory {
         this.permissionManager = permissionManager;
         this.permissionDialogManager = permissionDialogManager;
         this.notificationManager = notificationManager;
-        this.gliaSdkConfigurationManager = gliaSdkConfigurationManager;
+        this.configurationManager = configurationManager;
         this.chatHeadManager = chatHeadManager;
         this.audioControlManager = audioControlManager;
         this.schedulers = schedulers;
@@ -278,7 +278,7 @@ public IsDisplayBubbleOutsideAppUseCase getToggleChatHeadServiceUseCase() {
                 getScreenSharingUseCase(),
                 chatHeadManager,
                 permissionManager,
-                gliaSdkConfigurationManager,
+                configurationManager,
                 getEngagementTypeUseCase()
             );
         }
@@ -293,7 +293,7 @@ public IsDisplayBubbleInsideAppUseCase getIsDisplayApplicationChatHeadUseCase()
                 getIsCurrentEngagementCallVisualizer(),
                 getScreenSharingUseCase(),
                 permissionManager,
-                gliaSdkConfigurationManager,
+                configurationManager,
                 getEngagementTypeUseCase()
             );
         }
@@ -376,7 +376,6 @@ public GliaSendMessageUseCase createGliaSendMessageUseCase() {
             repositoryFactory.getGliaMessageRepository(),
             repositoryFactory.getGliaFileAttachmentRepository(),
             getIsOperatorPresentUseCase(),
-            repositoryFactory.getEngagementConfigRepository(),
             repositoryFactory.getSecureConversationsRepository(),
             createIsSecureEngagementUseCase()
         );
@@ -435,7 +434,7 @@ public IsShowSendButtonUseCase createIsShowSendButtonUseCase() {
 
     @NonNull
     public IsShowOverlayPermissionRequestDialogUseCase createIsShowOverlayPermissionRequestDialogUseCase() {
-        return new IsShowOverlayPermissionRequestDialogUseCaseImpl(permissionManager, permissionDialogManager, gliaSdkConfigurationManager);
+        return new IsShowOverlayPermissionRequestDialogUseCaseImpl(permissionManager, permissionDialogManager, configurationManager);
     }
 
     @NonNull
@@ -551,7 +550,6 @@ public IsCallVisualizerScreenSharingUseCase createIsCallVisualizerScreenSharingU
     @NonNull
     public SendSecureMessageUseCase createSendSecureMessageUseCase() {
         return new SendSecureMessageUseCase(
-            repositoryFactory.getEngagementConfigRepository(),
             repositoryFactory.getSendMessageRepository(),
             repositoryFactory.getSecureConversationsRepository(),
             repositoryFactory.getSecureFileAttachmentRepository(),
@@ -560,16 +558,6 @@ public SendSecureMessageUseCase createSendSecureMessageUseCase() {
         );
     }
 
-    @NonNull
-    public GetAvailableQueueIdsForSecureMessagingUseCase createSecureMessagingAvailableQueueIdsUseCase() {
-        return new GetAvailableQueueIdsForSecureMessagingUseCase(
-            repositoryFactory.getEngagementConfigRepository(),
-            repositoryFactory.getGliaQueueRepository(),
-            createIsMessagingAvailableUseCase(),
-            schedulers
-        );
-    }
-
     @NonNull
     public AddSecureFileToAttachmentAndUploadUseCase createAddSecureFileToAttachmentAndUploadUseCase() {
         return new AddSecureFileToAttachmentAndUploadUseCase(repositoryFactory.getSecureFileAttachmentRepository());
@@ -613,12 +601,16 @@ public SetEngagementConfigUseCase createSetEngagementConfigUseCase() {
 
     @NonNull
     public IsMessagingAvailableUseCase createIsMessagingAvailableUseCase() {
-        return new IsMessagingAvailableUseCase();
+        return new IsMessagingAvailableUseCase(repositoryFactory.getQueueRepository());
     }
 
     @NonNull
     public GetUnreadMessagesCountWithTimeoutUseCase createSubscribeToUnreadMessagesCountUseCase() {
-        return new GetUnreadMessagesCountWithTimeoutUseCase(repositoryFactory.getSecureConversationsRepository());
+        return new GetUnreadMessagesCountWithTimeoutUseCase(
+            repositoryFactory.getSecureConversationsRepository(),
+            createIsAuthenticatedUseCase(),
+            gliaCore
+        );
     }
 
     @NonNull
@@ -836,7 +828,6 @@ public SendUnsentMessagesUseCase createSendUnsentMessagesUseCase() {
         return new SendUnsentMessagesUseCase(
             repositoryFactory.getGliaMessageRepository(),
             repositoryFactory.getSecureConversationsRepository(),
-            repositoryFactory.getEngagementConfigRepository(),
             createIsSecureEngagementUseCase()
         );
     }
@@ -975,7 +966,7 @@ public EnqueueForEngagementUseCase getQueueForEngagementUseCase() {
 
     @NonNull
     public ScreenSharingUseCase getScreenSharingUseCase() {
-        return new ScreenSharingUseCaseImpl(repositoryFactory.getEngagementRepository(), getReleaseScreenSharingResourcesUseCase());
+        return new ScreenSharingUseCaseImpl(repositoryFactory.getEngagementRepository(), getReleaseScreenSharingResourcesUseCase(), configurationManager);
     }
 
     @NonNull
@@ -1100,4 +1091,12 @@ public FlipCameraButtonStateUseCase getFlipCameraButtonStateUseCase() {
         );
     }
 
+    @NonNull
+    public HasPendingSecureConversationsWithTimeoutUseCase getHasPendingSecureConversationsWithTimeoutUseCase() {
+        return new HasPendingSecureConversationsWithTimeoutUseCase(
+            repositoryFactory.getSecureConversationsRepository(),
+            createIsAuthenticatedUseCase(),
+            gliaCore
+        );
+    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/engagement/EngagementRepository.kt b/widgetssdk/src/main/java/com/glia/widgets/engagement/EngagementRepository.kt
index cc59fbbe9..c13f5a1b3 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/engagement/EngagementRepository.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/engagement/EngagementRepository.kt
@@ -45,7 +45,7 @@ internal interface EngagementRepository {
     fun reset()
     fun resetQueueing()
     fun endEngagement(silently: Boolean)
-    fun queueForEngagement(queueIds: List<String>, mediaType: MediaType, visitorContextAssetId: String?)
+    fun queueForEngagement(mediaType: MediaType)
     fun cancelQueuing()
     fun acceptCurrentEngagementRequest(visitorContextAssetId: String)
     fun declineCurrentEngagementRequest()
diff --git a/widgetssdk/src/main/java/com/glia/widgets/engagement/EngagementRepositoryImpl.kt b/widgetssdk/src/main/java/com/glia/widgets/engagement/EngagementRepositoryImpl.kt
index 43dac4332..3d7684aaa 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/engagement/EngagementRepositoryImpl.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/engagement/EngagementRepositoryImpl.kt
@@ -30,14 +30,17 @@ import com.glia.androidsdk.screensharing.ScreenSharing
 import com.glia.androidsdk.screensharing.ScreenSharingRequest
 import com.glia.androidsdk.screensharing.VisitorScreenSharingState
 import com.glia.widgets.core.engagement.GliaOperatorRepository
+import com.glia.widgets.core.queue.QueueRepository
 import com.glia.widgets.di.GliaCore
 import com.glia.widgets.helper.Data
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.isAudioOrVideo
 import com.glia.widgets.helper.isQueueUnavailable
 import com.glia.widgets.helper.unSafeSubscribe
+import com.glia.widgets.launcher.ConfigurationManager
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.processors.BehaviorProcessor
 import io.reactivex.rxjava3.processors.PublishProcessor
 import java.util.function.Consumer
@@ -50,7 +53,12 @@ internal const val MEDIA_PERMISSION_REQUEST_CODE = 0x3E9
 @VisibleForTesting
 internal const val SKIP_ASKING_SCREEN_SHARING_PERMISSION_RESULT_CODE = 0x1995
 
-internal class EngagementRepositoryImpl(private val core: GliaCore, private val operatorRepository: GliaOperatorRepository) : EngagementRepository {
+internal class EngagementRepositoryImpl(
+    private val core: GliaCore,
+    private val operatorRepository: GliaOperatorRepository,
+    private val queueRepository: QueueRepository,
+    private val configurationManager: ConfigurationManager
+) : EngagementRepository {
     private val engagementRequestCallback = Consumer<IncomingEngagementRequest>(::handleIncomingEngagementRequest)
     private val engagementOutcomeCallback = Consumer<Outcome>(::handleEngagementOutcome)
 
@@ -123,13 +131,14 @@ internal class EngagementRepositoryImpl(private val core: GliaCore, private val
     private val _screenSharingState: BehaviorProcessor<ScreenSharingState> = BehaviorProcessor.create()
     override val screenSharingState: Flowable<ScreenSharingState> = _screenSharingState.onBackpressureLatest()
 
-
     private val readyToShareScreenProcessor: PublishProcessor<Unit> = PublishProcessor.create()
     private val mediaProjectionActivityResultProcessor: PublishProcessor<Pair<Int, Intent?>> = PublishProcessor.create()
 
     private var currentScreenSharingRequest: ScreenSharingRequest? = null
     private var currentScreenSharingScreen: LocalScreen? = null
 
+    private val queueIngDisposable = CompositeDisposable()
+
     override val hasOngoingEngagement: Boolean
         get() = currentEngagement != null
 
@@ -196,17 +205,34 @@ internal class EngagementRepositoryImpl(private val core: GliaCore, private val
         }
     }
 
-    override fun queueForEngagement(queueIds: List<String>, mediaType: MediaType, visitorContextAssetId: String?) {
+    override fun queueForEngagement(mediaType: MediaType) {
         if (isQueueingOrEngagement) return
 
+        _engagementState.onNext(State.PreQueuing(mediaType))
+
         Logger.i(TAG, "Start queueing for media engagement")
-        core.queueForEngagement(queueIds.toTypedArray(), mediaType, visitorContextAssetId, null, MEDIA_PERMISSION_REQUEST_CODE) {
-            handleQueueingResponse(it, queueIds, mediaType)
-        }
+
+        queueIngDisposable.add(
+            queueRepository.relevantQueueIds.subscribe { ids ->
+                if (ids.isNotEmpty()) {
+                    core.queueForEngagement(
+                        ids,
+                        mediaType,
+                        configurationManager.visitorContextAssetId,
+                        null,
+                        MEDIA_PERMISSION_REQUEST_CODE) {
+                        handleQueueingResponse(it)
+                    }
+                } else {
+                    handleQueueingResponse(GliaException("relevant queues are empty", GliaException.Cause.INVALID_INPUT))
+                }
+            }
+        )
     }
 
     override fun cancelQueuing() {
         (_engagementState.value as? State.PreQueuing)?.apply {
+            queueIngDisposable.clear()
             _engagementState.onNext(State.QueueingCanceled)
             return
         }
@@ -320,7 +346,7 @@ internal class EngagementRepositoryImpl(private val core: GliaCore, private val
         }
 
         if (currentState is State.PreQueuing) {
-            _engagementState.onNext(State.Queuing(currentState.queueIds, ticket.id, currentState.mediaType))
+            _engagementState.onNext(State.Queuing(ticket.id, currentState.mediaType))
             trackQueueTicketUpdates(ticket)
         }
     }
@@ -334,10 +360,9 @@ internal class EngagementRepositoryImpl(private val core: GliaCore, private val
         }
     }
 
-    private fun handleQueueingResponse(exception: GliaException?, queueIds: List<String>, mediaType: MediaType) {
+    private fun handleQueueingResponse(exception: GliaException?) {
         when {
-            exception == null || exception.cause == GliaException.Cause.ALREADY_QUEUED ->
-                _engagementState.onNext(State.PreQueuing(queueIds, mediaType))
+            exception == null || exception.cause == GliaException.Cause.ALREADY_QUEUED -> return
 
             exception.isQueueUnavailable -> {
                 _engagementState.onNext(State.QueueUnstaffed)
diff --git a/widgetssdk/src/main/java/com/glia/widgets/engagement/States.kt b/widgetssdk/src/main/java/com/glia/widgets/engagement/States.kt
index 4703bb9e6..e25f978bd 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/engagement/States.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/engagement/States.kt
@@ -6,16 +6,16 @@ import com.glia.androidsdk.engagement.EngagementState
 import com.glia.androidsdk.engagement.Survey
 
 internal sealed interface State {
-    object NoEngagement : State
-    data class PreQueuing(val queueIds: List<String>, val mediaType: MediaType) : State
-    data class Queuing(val queueIds: List<String>, val queueTicketId: String, val mediaType: MediaType) : State
-    object QueueUnstaffed : State
-    object UnexpectedErrorHappened : State
-    object QueueingCanceled : State
-    object StartedOmniCore : State
-    object StartedCallVisualizer : State
-    object FinishedOmniCore : State
-    object FinishedCallVisualizer : State
+    data object NoEngagement : State
+    data class PreQueuing(val mediaType: MediaType) : State
+    data class Queuing(val queueTicketId: String, val mediaType: MediaType) : State
+    data object QueueUnstaffed : State
+    data object UnexpectedErrorHappened : State
+    data object QueueingCanceled : State
+    data object StartedOmniCore : State
+    data object StartedCallVisualizer : State
+    data object FinishedOmniCore : State
+    data object FinishedCallVisualizer : State
     data class Update(val state: EngagementState, val updateState: EngagementUpdateState) : State
 
     val queueingMediaType: MediaType?
@@ -27,23 +27,23 @@ internal sealed interface State {
 }
 
 internal sealed interface EngagementUpdateState {
-    object Transferring : EngagementUpdateState
+    data object Transferring : EngagementUpdateState
     data class Ongoing(val operator: Operator) : EngagementUpdateState
     data class OperatorConnected(val operator: Operator) : EngagementUpdateState
     data class OperatorChanged(val operator: Operator) : EngagementUpdateState
 }
 
 internal sealed interface SurveyState {
-    object Empty : SurveyState
-    object EmptyFromOperatorRequest : SurveyState
+    data object Empty : SurveyState
+    data object EmptyFromOperatorRequest : SurveyState
     data class Value(val survey: Survey) : SurveyState
 }
 
 internal sealed interface ScreenSharingState {
-    object Requested : ScreenSharingState
-    object Started : ScreenSharingState
-    object RequestAccepted : ScreenSharingState
-    object RequestDeclined : ScreenSharingState
+    data object Requested : ScreenSharingState
+    data object Started : ScreenSharingState
+    data object RequestAccepted : ScreenSharingState
+    data object RequestDeclined : ScreenSharingState
     data class FailedToAcceptRequest(val message: String) : ScreenSharingState
-    object Ended : ScreenSharingState
+    data object Ended : ScreenSharingState
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcher.kt b/widgetssdk/src/main/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcher.kt
index 2fa0a0666..6edb4591e 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcher.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcher.kt
@@ -1,24 +1,22 @@
 package com.glia.widgets.engagement.completion
 
 import android.app.Activity
-import android.content.Intent
-import android.os.Parcelable
 import com.glia.androidsdk.engagement.Survey
-import com.glia.widgets.GliaWidgets
-import com.glia.widgets.R
 import com.glia.widgets.base.BaseSingleActivityWatcher
 import com.glia.widgets.helper.GliaActivityManager
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.OneTimeEvent
 import com.glia.widgets.helper.TAG
-import com.glia.widgets.helper.withRuntimeTheme
-import com.glia.widgets.survey.SurveyActivity
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.view.Dialogs
 import io.reactivex.rxjava3.core.Flowable
 import java.lang.ref.WeakReference
 
-internal class EngagementCompletionActivityWatcher(controller: EngagementCompletionContract.Controller, gliaActivityManager: GliaActivityManager) :
-    BaseSingleActivityWatcher(gliaActivityManager) {
+internal class EngagementCompletionActivityWatcher(
+    controller: EngagementCompletionContract.Controller,
+    gliaActivityManager: GliaActivityManager,
+    private val activityLauncher: ActivityLauncher
+) : BaseSingleActivityWatcher(gliaActivityManager) {
 
     init {
         Flowable.combineLatest(resumedActivity, controller.state, ::handleState).subscribe()
@@ -44,16 +42,7 @@ internal class EngagementCompletionActivityWatcher(controller: EngagementComplet
         }
     }
 
-    private fun showSurvey(activity: Activity, survey: Survey) {
-        activity.withRuntimeTheme { _, uiTheme ->
-            val newIntent: Intent = Intent(activity, SurveyActivity::class.java)
-                .putExtra(GliaWidgets.UI_THEME, uiTheme)
-                .putExtra(GliaWidgets.SURVEY, survey as Parcelable)
-
-            activity.overridePendingTransition(R.anim.slide_up, 0)
-            activity.startActivity(newIntent)
-        }
-    }
+    private fun showSurvey(activity: Activity, survey: Survey) = activityLauncher.launchSurvey(activity, survey)
 
     private fun showOperatorEndedEngagementDialog(activity: Activity, consumeCallback: () -> Unit) {
         showAlertDialogWithStyledContext(activity) { context, theme ->
diff --git a/widgetssdk/src/main/java/com/glia/widgets/engagement/domain/EnqueueForEngagementUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/engagement/domain/EnqueueForEngagementUseCase.kt
index 9779fa67d..74e69d1bd 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/engagement/domain/EnqueueForEngagementUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/engagement/domain/EnqueueForEngagementUseCase.kt
@@ -4,12 +4,9 @@ import com.glia.androidsdk.Engagement
 import com.glia.widgets.engagement.EngagementRepository
 
 internal interface EnqueueForEngagementUseCase {
-    operator fun invoke(queueIds: List<String>?, mediaType: Engagement.MediaType? = null, visitorContextAssetId: String? = null)
+    operator fun invoke(mediaType: Engagement.MediaType = Engagement.MediaType.TEXT)
 }
 
 internal class EnqueueForEngagementUseCaseImpl(private val engagementRepository: EngagementRepository) : EnqueueForEngagementUseCase {
-    override fun invoke(queueIds: List<String>?, mediaType: Engagement.MediaType?, visitorContextAssetId: String?) {
-        val type = mediaType ?: Engagement.MediaType.TEXT
-        engagementRepository.queueForEngagement(queueIds ?: emptyList(), type, visitorContextAssetId)
-    }
+    override fun invoke(mediaType: Engagement.MediaType) = engagementRepository.queueForEngagement(mediaType)
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/engagement/domain/ScreenSharingUseCase.kt b/widgetssdk/src/main/java/com/glia/widgets/engagement/domain/ScreenSharingUseCase.kt
index b07ae147d..bc32a6270 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/engagement/domain/ScreenSharingUseCase.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/engagement/domain/ScreenSharingUseCase.kt
@@ -2,9 +2,9 @@ package com.glia.widgets.engagement.domain
 
 import android.app.Activity
 import android.content.Intent
-import com.glia.androidsdk.screensharing.ScreenSharing
 import com.glia.widgets.engagement.EngagementRepository
 import com.glia.widgets.engagement.ScreenSharingState
+import com.glia.widgets.launcher.ConfigurationManager
 import io.reactivex.rxjava3.core.Flowable
 
 internal interface ScreenSharingUseCase {
@@ -12,13 +12,14 @@ internal interface ScreenSharingUseCase {
     operator fun invoke(): Flowable<ScreenSharingState>
     fun end()
     fun declineRequest()
-    fun acceptRequestWithAskedPermission(activity: Activity, mode: ScreenSharing.Mode)
+    fun acceptRequestWithAskedPermission(activity: Activity)
     fun onActivityResultSkipPermissionRequest(resultCode: Int, intent: Intent?)
 }
 
 internal class ScreenSharingUseCaseImpl(
     private val engagementRepository: EngagementRepository,
-    private val releaseScreenSharingResourcesUseCase: ReleaseScreenSharingResourcesUseCase
+    private val releaseScreenSharingResourcesUseCase: ReleaseScreenSharingResourcesUseCase,
+    private val configurationManager: ConfigurationManager
 ) : ScreenSharingUseCase {
     override val isSharing: Boolean get() = engagementRepository.isSharingScreen
     override fun invoke(): Flowable<ScreenSharingState> = engagementRepository.screenSharingState
@@ -28,8 +29,8 @@ internal class ScreenSharingUseCaseImpl(
     }
 
     override fun declineRequest() = engagementRepository.declineScreenSharingRequest()
-    override fun acceptRequestWithAskedPermission(activity: Activity, mode: ScreenSharing.Mode) =
-        engagementRepository.acceptScreenSharingWithAskedPermission(activity, mode)
+    override fun acceptRequestWithAskedPermission(activity: Activity) =
+        engagementRepository.acceptScreenSharingWithAskedPermission(activity, configurationManager.screenSharingMode)
 
     override fun onActivityResultSkipPermissionRequest(resultCode: Int, intent: Intent?) =
         engagementRepository.onActivityResultSkipScreenSharingPermissionRequest(resultCode, intent)
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidget.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidget.kt
new file mode 100644
index 000000000..4d2a9140f
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidget.kt
@@ -0,0 +1,68 @@
+package com.glia.widgets.entrywidget
+
+import android.app.Activity
+import android.content.Context
+import android.view.View
+import com.glia.widgets.core.secureconversations.domain.HasPendingSecureConversationsWithTimeoutUseCase
+import com.glia.widgets.entrywidget.adapter.EntryWidgetAdapter
+import com.glia.widgets.helper.unSafeSubscribe
+import com.glia.widgets.launcher.ActivityLauncher
+import com.glia.widgets.view.unifiedui.theme.UnifiedThemeManager
+
+/**
+ * An interface for interacting with the entry widget(pre-built UI for engagement type selection).
+ */
+interface EntryWidget {
+    /**
+     * Shows the entry widget.
+     *
+     * @param activity The Activity used to show the entry widget
+     */
+    fun show(activity: Activity)
+
+    /**
+     * Creates the entry widget view that might be easily embedded in a custom UI.
+     *
+     * @return New instance of an entry widget view.
+     */
+    fun getView(context: Context): View
+
+    /**
+     * Hides the entry widget.
+     */
+    fun hide()
+}
+
+internal class EntryWidgetImpl(
+    private val activityLauncher: ActivityLauncher,
+    private val themeManager: UnifiedThemeManager,
+    private val entryWidgetHideController: EntryWidgetHideController,
+    private val hasPendingSecureConversationsWithTimeoutUseCase: HasPendingSecureConversationsWithTimeoutUseCase
+) : EntryWidget {
+
+    override fun show(activity: Activity) {
+        hasPendingSecureConversationsWithTimeoutUseCase().unSafeSubscribe {
+            handleShowWithPendingSecureConversations(it, activity)
+        }
+    }
+
+    private fun handleShowWithPendingSecureConversations(hasPendingSecureConversations: Boolean, activity: Activity) {
+        if (hasPendingSecureConversations) {
+            activityLauncher.launchSecureMessagingChat(activity)
+        } else {
+            activityLauncher.launchEntryWidget(activity)
+        }
+    }
+
+    override fun getView(context: Context): View {
+        val adapter = EntryWidgetAdapter(
+            EntryWidgetContract.ViewType.EMBEDDED_VIEW,
+            themeManager.theme?.entryWidgetTheme
+        )
+        return EntryWidgetView(context, adapter)
+    }
+
+    override fun hide() {
+        entryWidgetHideController.hide()
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetActivity.kt
new file mode 100644
index 000000000..2a21c8512
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetActivity.kt
@@ -0,0 +1,37 @@
+package com.glia.widgets.entrywidget
+
+import android.os.Bundle
+import com.glia.widgets.base.FadeTransitionActivity
+import com.glia.widgets.di.Dependencies
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+
+/**
+ * EntryWidgetActivity provides a way to display the EntryWidget bottom sheet.
+ */
+internal class EntryWidgetActivity : FadeTransitionActivity(), EntryWidgetFragment.OnDismissListener {
+
+    private var disposable: CompositeDisposable = CompositeDisposable()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (savedInstanceState == null) {
+            EntryWidgetFragment().show(supportFragmentManager)
+        }
+
+        disposable.add(Dependencies.controllerFactory.entryWidgetHideController.onHide.subscribe {
+            finish()
+        })
+    }
+
+    override fun onEntryWidgetDismiss() {
+        if (!isChangingConfigurations) {
+            finish()
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        disposable.dispose()
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetContract.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetContract.kt
new file mode 100644
index 000000000..439f61542
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetContract.kt
@@ -0,0 +1,37 @@
+package com.glia.widgets.entrywidget
+
+import android.app.Activity
+import com.glia.widgets.base.BaseController
+import com.glia.widgets.base.BaseView
+
+internal interface EntryWidgetContract {
+
+    enum class ViewType {
+        BOTTOM_SHEET,
+        EMBEDDED_VIEW,
+        MESSAGING_LIVE_SUPPORT
+    }
+
+    enum class ItemType {
+        CHAT,
+        AUDIO_CALL,
+        VIDEO_CALL,
+        SECURE_MESSAGE,
+        LOADING_STATE,
+        EMPTY_STATE,
+        SDK_NOT_INITIALIZED_STATE,
+        ERROR_STATE,
+        PROVIDED_BY
+    }
+
+    interface Controller : BaseController {
+        fun setView(view: View)
+        fun onItemClicked(itemType: ItemType, activity: Activity)
+    }
+
+    interface View : BaseView<Controller> {
+        fun showItems(items: List<ItemType>)
+        fun dismiss()
+        fun getActivity(): Activity
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetController.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetController.kt
new file mode 100644
index 000000000..8993f2e5a
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetController.kt
@@ -0,0 +1,111 @@
+package com.glia.widgets.entrywidget
+
+import android.app.Activity
+import androidx.annotation.VisibleForTesting
+import com.glia.androidsdk.Engagement
+import com.glia.androidsdk.queuing.Queue
+import com.glia.androidsdk.queuing.QueueState
+import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
+import com.glia.widgets.core.queue.QueueRepository
+import com.glia.widgets.core.queue.QueuesState
+import com.glia.widgets.di.Dependencies
+import com.glia.widgets.di.GliaCore
+import com.glia.widgets.helper.Logger
+import com.glia.widgets.helper.TAG
+import com.glia.widgets.helper.unSafeSubscribe
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+
+internal class EntryWidgetController(
+    private val queueRepository: QueueRepository,
+    private val isAuthenticatedUseCase: IsAuthenticatedUseCase,
+    private val core: GliaCore
+) : EntryWidgetContract.Controller {
+    private lateinit var view: EntryWidgetContract.View
+    private val engagementLauncher = Dependencies.engagementLauncher
+
+    override fun setView(view: EntryWidgetContract.View) {
+        this.view = view
+
+        if (core.isInitialized) {
+            subscribeToQueueState()
+        } else {
+            showSdkNotInitializedState()
+        }
+    }
+
+    private fun showSdkNotInitializedState() {
+        view.showItems(listOf(EntryWidgetContract.ItemType.SDK_NOT_INITIALIZED_STATE))
+    }
+
+    private fun subscribeToQueueState() {
+        queueRepository.queuesState
+            .map(::mapState)
+            .observeOn(AndroidSchedulers.mainThread())
+            .unSafeSubscribe(view::showItems)
+    }
+
+    @VisibleForTesting
+    fun mapState(state: QueuesState): List<EntryWidgetContract.ItemType> = when (state) {
+        QueuesState.Loading -> mapLoadingState()
+        QueuesState.Empty -> listOf(EntryWidgetContract.ItemType.EMPTY_STATE)
+        is QueuesState.Error -> listOf(EntryWidgetContract.ItemType.ERROR_STATE)
+        is QueuesState.Queues -> mapMediaTypes(state.queues)
+    }
+
+    private fun mapLoadingState() = listOf(
+        EntryWidgetContract.ItemType.LOADING_STATE,
+        EntryWidgetContract.ItemType.LOADING_STATE,
+        EntryWidgetContract.ItemType.LOADING_STATE,
+        EntryWidgetContract.ItemType.LOADING_STATE,
+        EntryWidgetContract.ItemType.PROVIDED_BY
+    )
+
+    private fun mapMediaTypes(queues: List<Queue>): List<EntryWidgetContract.ItemType> =
+        queues.map { it.state }
+            .filter { it.status == QueueState.Status.OPEN }
+            .flatMap { it.medias.toList() }
+            .distinct()
+            .let { allMedias ->
+                return buildList {
+                    if (allMedias.contains(Engagement.MediaType.TEXT)) add(EntryWidgetContract.ItemType.CHAT)
+                    if (allMedias.contains(Engagement.MediaType.AUDIO)) add(EntryWidgetContract.ItemType.AUDIO_CALL)
+                    if (allMedias.contains(Engagement.MediaType.VIDEO)) add(EntryWidgetContract.ItemType.VIDEO_CALL)
+                    if (allMedias.contains(Engagement.MediaType.MESSAGING) && isAuthenticatedUseCase()) add(EntryWidgetContract.ItemType.SECURE_MESSAGE)
+
+                    if (allMedias.isEmpty() || allMedias.hasOnlyMessagingAndIsNotAuthenticated()) {
+                        add(EntryWidgetContract.ItemType.EMPTY_STATE)
+                    } else {
+                        add(EntryWidgetContract.ItemType.PROVIDED_BY)
+                    }
+                }
+            }
+
+    private fun List<Engagement.MediaType>.hasOnlyMessagingAndIsNotAuthenticated(): Boolean =
+        this.size == 1 && this.contains(Engagement.MediaType.MESSAGING) && !isAuthenticatedUseCase()
+
+    override fun onItemClicked(itemType: EntryWidgetContract.ItemType, activity: Activity) {
+        Logger.d(TAG, "Item clicked: $itemType")
+
+        when (itemType) {
+            EntryWidgetContract.ItemType.CHAT -> engagementLauncher.startChat(activity)
+            EntryWidgetContract.ItemType.AUDIO_CALL -> engagementLauncher.startAudioCall(activity)
+            EntryWidgetContract.ItemType.VIDEO_CALL -> engagementLauncher.startVideoCall(activity)
+            EntryWidgetContract.ItemType.SECURE_MESSAGE -> engagementLauncher.startSecureMessaging(activity)
+            EntryWidgetContract.ItemType.ERROR_STATE -> onRetryButtonClicked()
+            else -> {}
+        }
+
+        if (itemType != EntryWidgetContract.ItemType.ERROR_STATE) {
+            // Dismiss the widget only if the clicked item is not a retry button
+            view.dismiss()
+        }
+    }
+
+    private fun onRetryButtonClicked() {
+        queueRepository.fetchQueues()
+    }
+
+    override fun onDestroy() {
+        // Clean up
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetFragment.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetFragment.kt
new file mode 100644
index 000000000..003199bc2
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetFragment.kt
@@ -0,0 +1,100 @@
+package com.glia.widgets.entrywidget
+
+import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.VisibleForTesting
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
+import com.glia.widgets.R
+import com.glia.widgets.databinding.EntryWidgetFragmentBinding
+import com.glia.widgets.di.Dependencies
+import com.glia.widgets.entrywidget.adapter.EntryWidgetAdapter
+import com.glia.widgets.helper.wrapWithMaterialThemeOverlay
+import com.glia.widgets.view.unifiedui.applyLayerTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.EntryWidgetTheme
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+/**
+ * EntryWidgetFragment (bottom sheet) provides a way to display the entry points for the user to start a chat, audio call, video call, or secure messaging.
+ */
+internal class EntryWidgetFragment : BottomSheetDialogFragment() {
+
+    interface OnDismissListener {
+        fun onEntryWidgetDismiss()
+    }
+
+    private var onDismissListener: (() -> Unit)? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val layoutInflater = LayoutInflater.from(requireContext().wrapWithMaterialThemeOverlay())
+        val binding = EntryWidgetFragmentBinding.inflate(layoutInflater, container, false)
+        val entryWidgetsTheme = Dependencies.gliaThemeManager.theme?.entryWidgetTheme
+
+        setupView(requireContext(), binding, entryWidgetsTheme)
+
+        return binding.root
+    }
+
+    @VisibleForTesting
+    fun setupView(
+        context: Context,
+        binding: EntryWidgetFragmentBinding,
+        entryWidgetsTheme: EntryWidgetTheme?
+    ) {
+        val entryWidgetAdapter = EntryWidgetAdapter(
+            EntryWidgetContract.ViewType.BOTTOM_SHEET,
+            entryWidgetsTheme
+        )
+
+        EntryWidgetView(
+            context = context,
+            viewAdapter = entryWidgetAdapter,
+            entryWidgetTheme = entryWidgetsTheme
+        ).also {
+            binding.container.addView(it)
+            it.onDismissListener = {
+                dismiss()
+            }
+        }
+
+        entryWidgetsTheme?.background?.let {
+            binding.root.applyLayerTheme(it)
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        setStyle(DialogFragment.STYLE_NO_FRAME, R.style.ThemeOverlay_Glia_BottomSheetDialog)
+        val dialog = super.onCreateDialog(savedInstanceState)
+        (dialog as? BottomSheetDialog)?.behavior?.state = BottomSheetBehavior.STATE_EXPANDED
+        return dialog
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        (activity as? OnDismissListener)?.let {
+            onDismissListener = it::onEntryWidgetDismiss
+        }
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+
+        onDismissListener?.invoke()
+    }
+
+    fun show(parentFragmentManager: FragmentManager) {
+        show(parentFragmentManager, tag)
+    }
+
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetHideController.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetHideController.kt
new file mode 100644
index 000000000..3ec6b3d84
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetHideController.kt
@@ -0,0 +1,12 @@
+package com.glia.widgets.entrywidget
+
+import io.reactivex.rxjava3.processors.PublishProcessor
+
+internal class EntryWidgetHideController {
+    private val _onHide: PublishProcessor<Unit> = PublishProcessor.create<Unit>()
+
+    val onHide = _onHide
+    fun hide() {
+        onHide.onNext(Unit)
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetView.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetView.kt
new file mode 100644
index 000000000..3ab2a9d19
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/EntryWidgetView.kt
@@ -0,0 +1,98 @@
+package com.glia.widgets.entrywidget
+
+import android.app.Activity
+import android.content.Context
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.glia.widgets.R
+import com.glia.widgets.di.Dependencies
+import com.glia.widgets.entrywidget.adapter.EntryWidgetAdapter
+import com.glia.widgets.entrywidget.adapter.EntryWidgetItemDecoration
+import com.glia.widgets.helper.getDrawableCompat
+import com.glia.widgets.helper.requireActivity
+import com.glia.widgets.helper.wrapWithMaterialThemeOverlay
+import com.glia.widgets.view.unifiedui.applyLayerTheme
+import com.glia.widgets.view.unifiedui.theme.base.LayerTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.EntryWidgetTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.MediaTypeItemsTheme
+
+/**
+ * EntryWidgetView provides a way to display the entry points for the user to start a chat, audio call, video call, or secure messaging.
+ */
+internal class EntryWidgetView(
+    context: Context,
+    private val viewAdapter: EntryWidgetAdapter,
+    backgroundTheme: LayerTheme? = null,
+    mediaTypeItemsTheme: MediaTypeItemsTheme? = null,
+) : RecyclerView(context.wrapWithMaterialThemeOverlay(), null, 0), EntryWidgetContract.View {
+
+    constructor(
+        context: Context,
+        viewAdapter: EntryWidgetAdapter,
+        entryWidgetTheme: EntryWidgetTheme?
+    ) : this(
+        context.wrapWithMaterialThemeOverlay(),
+        viewAdapter,
+        entryWidgetTheme?.background,
+        entryWidgetTheme?.mediaTypeItems,
+    )
+
+    var onDismissListener: (() -> Unit)? = null
+
+    private lateinit var controller: EntryWidgetContract.Controller
+
+    init {
+        setAdapter(viewAdapter)
+        viewAdapter.onItemClickListener = {
+            controller.onItemClicked(it, context.requireActivity())
+        }
+
+        val isBottomSheet = viewAdapter.viewType == EntryWidgetContract.ViewType.BOTTOM_SHEET
+        // Entry Widget might be embedded in scrolling views, disabling the scroll for
+        // itself would prevent unintended scrolling behavior in such cases.
+        // Scrolling is only applicable for bottom sheet view.
+        enableScrolling(isBottomSheet)
+
+        applyTheme(backgroundTheme, mediaTypeItemsTheme)
+        setController(Dependencies.controllerFactory.entryWidgetController)
+        itemAnimator = null
+    }
+
+    override fun setController(controller: EntryWidgetContract.Controller) {
+        this.controller = controller
+        controller.setView(this)
+    }
+
+    override fun showItems(items: List<EntryWidgetContract.ItemType>) {
+        viewAdapter.submitList(items)
+    }
+
+    override fun dismiss() {
+        onDismissListener?.invoke()
+    }
+
+    override fun getActivity(): Activity {
+        return context.requireActivity()
+    }
+
+    private fun enableScrolling(enable: Boolean) {
+        if (!enable) {
+            // setNestedScrollingEnabled() broke scrolling in some cases (bottom sheet).
+            // By default, it is enabled. So we can only disable it if needed.
+            isNestedScrollingEnabled = false
+        }
+        layoutManager = object : LinearLayoutManager(context) {
+            override fun canScrollVertically() = enable
+        }
+    }
+
+    private fun applyTheme(backgroundTheme: LayerTheme? = null, mediaTypeItemsTheme: MediaTypeItemsTheme? = null) {
+        backgroundTheme?.let { applyLayerTheme(it) }
+        getDrawableCompat(R.drawable.bg_entry_widget_divider)?.let {
+            mediaTypeItemsTheme?.dividerColor?.let { dividerColor ->
+                it.setTint(dividerColor.primaryColor)
+            }
+            addItemDecoration(EntryWidgetItemDecoration(it))
+        }
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetAdapter.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetAdapter.kt
new file mode 100644
index 000000000..de737102f
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetAdapter.kt
@@ -0,0 +1,106 @@
+package com.glia.widgets.entrywidget.adapter
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.glia.widgets.databinding.EntryWidgetErrorItemBinding
+import com.glia.widgets.databinding.EntryWidgetMediaTypeItemBinding
+import com.glia.widgets.databinding.EntryWidgetPoweredByItemBinding
+import com.glia.widgets.entrywidget.EntryWidgetContract
+import com.glia.widgets.helper.layoutInflater
+import com.glia.widgets.view.unifiedui.theme.base.ButtonTheme
+import com.glia.widgets.view.unifiedui.theme.base.TextTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.EntryWidgetTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.MediaTypeItemsTheme
+
+internal class EntryWidgetAdapter(
+    val viewType: EntryWidgetContract.ViewType,
+    private val mediaTypeItemsTheme: MediaTypeItemsTheme? = null,
+    private val errorTitleTheme: TextTheme? = null,
+    private val errorMessageTheme: TextTheme? = null,
+    private val errorButtonTheme: ButtonTheme? = null
+) : ListAdapter<EntryWidgetContract.ItemType, EntryWidgetAdapter.ViewHolder>(DIFF_CALLBACK) {
+
+    constructor(
+        viewType: EntryWidgetContract.ViewType,
+        entryWidgetTheme: EntryWidgetTheme?
+    ) : this(
+        viewType,
+        entryWidgetTheme?.mediaTypeItems,
+        entryWidgetTheme?.errorTitle,
+        entryWidgetTheme?.errorMessage,
+        entryWidgetTheme?.errorButton
+    )
+
+    companion object {
+        private val DIFF_CALLBACK = object : DiffUtil.ItemCallback<EntryWidgetContract.ItemType>() {
+            override fun areItemsTheSame(
+                oldItem: EntryWidgetContract.ItemType,
+                newItem: EntryWidgetContract.ItemType
+            ): Boolean {
+                // Whether items are the same
+                return oldItem.ordinal == newItem.ordinal
+            }
+
+            override fun areContentsTheSame(
+                oldItem: EntryWidgetContract.ItemType,
+                newItem: EntryWidgetContract.ItemType
+            ): Boolean {
+                // Whether content is the same
+                return oldItem.ordinal == newItem.ordinal
+            }
+        }
+    }
+
+    enum class ViewType {
+        CONTACT_ITEM,
+        ERROR_ITEM,
+        PROVIDED_BY_ITEM
+    }
+
+    var onItemClickListener: ((EntryWidgetContract.ItemType) -> Unit)? = null
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return when (viewType) {
+            ViewType.ERROR_ITEM.ordinal -> EntryWidgetErrorStateViewHolder(
+                EntryWidgetErrorItemBinding.inflate(parent.layoutInflater, parent, false),
+                viewType = this.viewType,
+                errorTitleTheme = errorTitleTheme,
+                errorMessageTheme = errorMessageTheme,
+                errorButtonTheme = errorButtonTheme
+            )
+            ViewType.PROVIDED_BY_ITEM.ordinal -> EntryWidgetPoweredByViewHolder(
+                EntryWidgetPoweredByItemBinding.inflate(parent.layoutInflater, parent, false)
+            )
+            else -> EntryWidgetMediaTypeItemViewHolder(
+                EntryWidgetMediaTypeItemBinding.inflate(parent.layoutInflater, parent, false),
+                itemTheme = mediaTypeItemsTheme?.mediaTypeItem
+            )
+        }
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        getItem(position)?.let { item ->
+            holder.bind(item) {
+                onItemClickListener?.invoke(item)
+            }
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (getItem(position)) {
+            EntryWidgetContract.ItemType.EMPTY_STATE,
+            EntryWidgetContract.ItemType.SDK_NOT_INITIALIZED_STATE,
+            EntryWidgetContract.ItemType.ERROR_STATE -> ViewType.ERROR_ITEM.ordinal
+            EntryWidgetContract.ItemType.PROVIDED_BY -> ViewType.PROVIDED_BY_ITEM.ordinal
+            else -> ViewType.CONTACT_ITEM.ordinal
+        }
+    }
+
+    abstract class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        open fun bind(itemType: EntryWidgetContract.ItemType, onClickListener: View.OnClickListener) {}
+    }
+
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetErrorStateViewHolder.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetErrorStateViewHolder.kt
new file mode 100644
index 000000000..a349933b1
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetErrorStateViewHolder.kt
@@ -0,0 +1,58 @@
+package com.glia.widgets.entrywidget.adapter
+
+import android.view.View
+import androidx.core.view.isVisible
+import com.glia.widgets.R
+import com.glia.widgets.databinding.EntryWidgetErrorItemBinding
+import com.glia.widgets.entrywidget.EntryWidgetContract
+import com.glia.widgets.helper.setLocaleText
+import com.glia.widgets.view.unifiedui.applyButtonTheme
+import com.glia.widgets.view.unifiedui.applyTextTheme
+import com.glia.widgets.view.unifiedui.theme.base.ButtonTheme
+import com.glia.widgets.view.unifiedui.theme.base.TextTheme
+
+internal class EntryWidgetErrorStateViewHolder(
+    private val binding: EntryWidgetErrorItemBinding,
+    private val viewType: EntryWidgetContract.ViewType,
+    errorTitleTheme: TextTheme? = null,
+    errorMessageTheme: TextTheme? = null,
+    errorButtonTheme: ButtonTheme? = null
+) : EntryWidgetAdapter.ViewHolder(binding.root) {
+
+    init {
+        errorTitleTheme?.let { binding.title.applyTextTheme(it) }
+        errorMessageTheme?.let { binding.description.applyTextTheme(it) }
+        errorButtonTheme?.let { binding.button.applyButtonTheme(it) }
+    }
+
+    override fun bind(itemType: EntryWidgetContract.ItemType, onClickListener: View.OnClickListener) {
+        when (itemType) {
+            EntryWidgetContract.ItemType.EMPTY_STATE -> {
+                binding.title.setLocaleText(R.string.entry_widget_empty_state_title)
+                binding.description.setLocaleText(R.string.entry_widget_empty_state_description)
+                binding.button.isVisible = false
+            }
+            EntryWidgetContract.ItemType.ERROR_STATE -> {
+                binding.title.setLocaleText(R.string.entry_widget_error_state_title)
+                binding.description.setLocaleText(R.string.entry_widget_error_state_description)
+                binding.button.setLocaleText(R.string.entry_widget_error_state_try_again_button_label)
+                binding.button.setOnClickListener(onClickListener)
+                binding.button.isVisible = true
+            }
+            EntryWidgetContract.ItemType.SDK_NOT_INITIALIZED_STATE -> {
+                binding.title.setLocaleText(R.string.entry_widget_error_state_title)
+                binding.description.setLocaleText(R.string.entry_widget_error_state_description)
+                binding.button.setLocaleText(R.string.entry_widget_error_state_try_again_button_label)
+                binding.button.setOnClickListener(onClickListener)
+                binding.button.isVisible = false
+            }
+            else -> {
+                // Do nothing
+            }
+        }
+
+        if (viewType == EntryWidgetContract.ViewType.BOTTOM_SHEET) {
+            binding.root.minHeight = binding.root.resources.getDimensionPixelSize(R.dimen.entry_widget_error_item_min_height)
+        }
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetItemDecoration.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetItemDecoration.kt
new file mode 100644
index 000000000..b5ff8aee1
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetItemDecoration.kt
@@ -0,0 +1,62 @@
+package com.glia.widgets.entrywidget.adapter
+
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+internal class EntryWidgetItemDecoration(
+    private val divider: Drawable
+) : RecyclerView.ItemDecoration() {
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        super.onDraw(canvas, parent, state)
+
+        val left = parent.paddingLeft
+        val right = parent.width - parent.paddingRight
+        val childCount = parent.childCount
+
+        for (i in 0 until childCount) {
+            val child = parent.getChildAt(i)
+            val position = parent.getChildAdapterPosition(child)
+            if (position == RecyclerView.NO_POSITION) {
+                continue
+            }
+
+            val viewType = parent.adapter?.getItemViewType(position)
+
+            if (isContactItem(viewType)) {
+                val params = child.layoutParams as RecyclerView.LayoutParams
+
+                val top = child.bottom + params.bottomMargin
+                val bottom = top + divider.intrinsicHeight
+
+                divider.setBounds(left, top, right, bottom)
+                divider.draw(canvas)
+            }
+        }
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        val position = parent.getChildAdapterPosition(view)
+        if (position == RecyclerView.NO_POSITION) {
+            return
+        }
+        val viewType = parent.adapter?.getItemViewType(position)
+        if (isContactItem(viewType)) {
+            outRect.bottom = divider.intrinsicHeight
+        } else {
+            outRect.bottom = 0
+        }
+    }
+
+    private fun isContactItem(viewType: Int?): Boolean {
+        return viewType == EntryWidgetAdapter.ViewType.CONTACT_ITEM.ordinal
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetMediaTypeItemViewHolder.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetMediaTypeItemViewHolder.kt
new file mode 100644
index 000000000..505764eb7
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetMediaTypeItemViewHolder.kt
@@ -0,0 +1,76 @@
+package com.glia.widgets.entrywidget.adapter
+
+import android.view.View
+import androidx.core.view.isVisible
+import com.glia.widgets.R
+import com.glia.widgets.databinding.EntryWidgetMediaTypeItemBinding
+import com.glia.widgets.entrywidget.EntryWidgetContract
+import com.glia.widgets.helper.applyShadow
+import com.glia.widgets.helper.setLocaleContentDescription
+import com.glia.widgets.helper.setLocaleHint
+import com.glia.widgets.helper.setLocaleText
+import com.glia.widgets.view.unifiedui.applyImageColorTheme
+import com.glia.widgets.view.unifiedui.applyLayerTheme
+import com.glia.widgets.view.unifiedui.applyTextTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.MediaTypeItemTheme
+
+internal class EntryWidgetMediaTypeItemViewHolder(
+    private val binding: EntryWidgetMediaTypeItemBinding,
+    itemTheme: MediaTypeItemTheme?
+) : EntryWidgetAdapter.ViewHolder(binding.root) {
+
+    init {
+        itemTheme?.let {
+            binding.root.applyLayerTheme(it.background)
+            binding.title.applyTextTheme(it.title)
+            binding.description.applyTextTheme(it.message)
+            binding.icon.applyImageColorTheme(it.iconColor)
+            it.loadingTintColor?.primaryColorStateList?.let { tintList ->
+                binding.iconLoading.backgroundTintList = tintList
+                binding.titleLoading.backgroundTintList = tintList
+                binding.descriptionLoading.backgroundTintList = tintList
+            }
+        }
+    }
+
+    override fun bind(itemType: EntryWidgetContract.ItemType, onClickListener: View.OnClickListener) {
+        binding.root.setOnClickListener(onClickListener)
+        binding.root.contentDescription = null
+        when (itemType) {
+            EntryWidgetContract.ItemType.VIDEO_CALL -> {
+                binding.icon.setImageResource(R.drawable.ic_video)
+                binding.title.setLocaleText(R.string.entry_widget_video_button_label)
+                binding.description.setLocaleText(R.string.entry_widget_video_button_description)
+                binding.description.setLocaleHint(R.string.entry_widget_video_button_accessibility_hint)
+            }
+            EntryWidgetContract.ItemType.AUDIO_CALL -> {
+                binding.icon.setImageResource(R.drawable.ic_audio)
+                binding.title.setLocaleText(R.string.entry_widget_audio_button_label)
+                binding.description.setLocaleText(R.string.entry_widget_audio_button_description)
+                binding.description.setLocaleHint(R.string.entry_widget_audio_button_accessibility_hint)
+            }
+            EntryWidgetContract.ItemType.CHAT -> {
+                binding.icon.setImageResource(R.drawable.ic_chat)
+                binding.title.setLocaleText(R.string.entry_widget_live_chat_button_label)
+                binding.description.setLocaleText(R.string.entry_widget_live_chat_button_description)
+                binding.description.setLocaleHint(R.string.entry_widget_live_chat_button_accessibility_hint)
+            }
+            EntryWidgetContract.ItemType.SECURE_MESSAGE -> {
+                binding.icon.setImageResource(R.drawable.ic_secure_message)
+                binding.title.setLocaleText(R.string.entry_widget_secure_messaging_button_label)
+                binding.description.setLocaleText(R.string.entry_widget_secure_messaging_button_description)
+                binding.description.setLocaleHint(R.string.entry_widget_secure_messaging_button_accessibility_hint)
+            }
+            else -> {
+                binding.icon.setImageResource(0)
+                binding.title.text = null
+                binding.description.text = null
+                binding.description.hint = null
+                binding.root.setLocaleContentDescription(R.string.entry_widget_loading_accessibility_label)
+                binding.root.setOnClickListener(null)
+            }
+        }
+
+        binding.loadingGroup.isVisible = itemType == EntryWidgetContract.ItemType.LOADING_STATE
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetPoweredByViewHolder.kt b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetPoweredByViewHolder.kt
new file mode 100644
index 000000000..ebf3f94d1
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/entrywidget/adapter/EntryWidgetPoweredByViewHolder.kt
@@ -0,0 +1,14 @@
+package com.glia.widgets.entrywidget.adapter
+
+import com.glia.widgets.R
+import com.glia.widgets.databinding.EntryWidgetPoweredByItemBinding
+import com.glia.widgets.helper.setLocaleText
+
+internal class EntryWidgetPoweredByViewHolder(
+    private val binding: EntryWidgetPoweredByItemBinding
+) : EntryWidgetAdapter.ViewHolder(binding.root) {
+
+    init {
+        binding.title.setLocaleText(R.string.general_powered)
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewActivity.kt
similarity index 65%
rename from widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewActivity.kt
rename to widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewActivity.kt
index 650b0fa19..1f2f072d7 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewActivity.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewActivity.kt
@@ -8,30 +8,28 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import com.glia.androidsdk.chat.AttachmentFile
 import com.glia.widgets.R
-import com.glia.widgets.core.fileupload.model.LocalAttachment
-import com.glia.widgets.databinding.FilePreviewActivityBinding
+import com.glia.widgets.databinding.ImagePreviewActivityBinding
 import com.glia.widgets.di.Dependencies
+import com.glia.widgets.helper.ExtraKeys
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.SimpleWindowInsetsAndAnimationHandler
 import com.glia.widgets.helper.TAG
-import com.glia.widgets.helper.fileProviderAuthority
 import com.glia.widgets.helper.getParcelable
 import com.glia.widgets.helper.setLocaleContentDescription
 import com.glia.widgets.helper.showToast
-import java.io.File
+import com.glia.widgets.launcher.ActivityLauncher
+
+private const val WRITE_PERMISSION_REQUEST_CODE = 110011
 
 /**
  * Glia internal class.
@@ -40,12 +38,11 @@ import java.io.File
  *
  * This activity is used to preview images shared in chat in full-screen.
  */
-internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.View {
+internal class ImagePreviewActivity : AppCompatActivity(), ImagePreviewContract.View {
+    private val activityLauncher: ActivityLauncher by lazy { Dependencies.activityLauncher }
     private val localeProvider = Dependencies.localeProvider
 
-    private val binding: FilePreviewActivityBinding by lazy {
-        FilePreviewActivityBinding.inflate(layoutInflater)
-    }
+    private val binding: ImagePreviewActivityBinding by lazy { ImagePreviewActivityBinding.inflate(layoutInflater) }
 
     private val hasExternalStoragePermission: Boolean
         get() = ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
@@ -53,7 +50,7 @@ internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.Vi
     private var showDownloadIcon = false
     private var showShareIcon = false
 
-    private var filePreviewController: FilePreviewContract.Controller? = null
+    private var imagePreviewController: ImagePreviewContract.Controller? = null
 
     override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(newBase)
@@ -65,7 +62,7 @@ internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.Vi
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         SimpleWindowInsetsAndAnimationHandler(binding.root, binding.toolbar)
-        Logger.i(TAG, "Create File Preview screen")
+        Logger.i(TAG, "Create Image Preview screen")
         setContentView(binding.root)
         title = localeProvider.getString(R.string.android_preview_title)
 
@@ -78,13 +75,13 @@ internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.Vi
     }
 
     private fun onImageDataReceived(intent: Intent) {
-        if (intent.hasExtra(LOCAL_IMAGE_URI)) {
-            filePreviewController?.onLocalImageReceived(intent.getParcelable<Uri>(LOCAL_IMAGE_URI) ?: return)
+        if (intent.hasExtra(ExtraKeys.IMAGE_PREVIEW_LOCAL_IMAGE_URI)) {
+            imagePreviewController?.onLocalImageReceived(intent.getParcelable<Uri>(ExtraKeys.IMAGE_PREVIEW_LOCAL_IMAGE_URI) ?: return)
         } else {
-            val bitmapId = intent.getStringExtra(IMAGE_ID_KEY).orEmpty()
-            val bitmapName = intent.getStringExtra(IMAGE_ID_NAME).orEmpty()
-            filePreviewController?.onImageDataReceived(bitmapId, bitmapName)
-            filePreviewController?.onImageRequested()
+            val bitmapId = intent.getStringExtra(ExtraKeys.IMAGE_PREVIEW_IMAGE_ID).orEmpty()
+            val bitmapName = intent.getStringExtra(ExtraKeys.IMAGE_PREVIEW_IMAGE_NAME).orEmpty()
+            imagePreviewController?.onImageDataReceived(bitmapId, bitmapName)
+            imagePreviewController?.onImageRequested()
         }
     }
 
@@ -132,8 +129,8 @@ internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.Vi
     }
 
     override fun onDestroy() {
-        Logger.i(TAG, "Destroy File Preview screen")
-        filePreviewController?.onDestroy()
+        Logger.i(TAG, "Destroy Image Preview screen")
+        imagePreviewController?.onDestroy()
         super.onDestroy()
     }
 
@@ -144,18 +141,18 @@ internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.Vi
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (requestCode == WRITE_PERMISSION_REQUEST_CODE && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            filePreviewController?.onDownloadPressed()
+            imagePreviewController?.onDownloadPressed()
         }
     }
 
     private fun onShareClicked() {
-        filePreviewController?.onSharePressed()
+        imagePreviewController?.onSharePressed()
     }
 
     private fun onDownloadClicked() {
         when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> filePreviewController?.onDownloadPressed()
-            hasExternalStoragePermission -> filePreviewController?.onDownloadPressed()
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> imagePreviewController?.onDownloadPressed()
+            hasExternalStoragePermission -> imagePreviewController?.onDownloadPressed()
             else -> requestStoragePermission()
         }
     }
@@ -166,15 +163,15 @@ internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.Vi
     }
 
     private fun setImageBitmap(loadedImage: Bitmap) {
-        binding.filePreviewView.setImageBitmap(loadedImage)
+        binding.previewView.setImageBitmap(loadedImage)
     }
 
     private fun setImageUri(uri: Uri) {
-        binding.filePreviewView.setImageURI(uri)
+        binding.previewView.setImageURI(uri)
     }
 
-    override fun setController(controller: FilePreviewContract.Controller) {
-        filePreviewController = controller
+    override fun setController(controller: ImagePreviewContract.Controller) {
+        imagePreviewController = controller
         controller.setView(this)
     }
 
@@ -187,12 +184,7 @@ internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.Vi
     }
 
     override fun shareImageFile(fileName: String) {
-        val file = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).toString(), fileName)
-        val contentUri = FileProvider.getUriForFile(this, this.fileProviderAuthority, file)
-        val shareIntent = Intent(Intent.ACTION_SEND)
-        shareIntent.putExtra(Intent.EXTRA_STREAM, contentUri)
-        shareIntent.type = "image/jpeg"
-        startActivity(shareIntent)
+        activityLauncher.launchShareImage(this, fileName)
     }
 
     override fun shareImageFile(uri: Uri) {
@@ -217,24 +209,4 @@ internal class FilePreviewActivity : AppCompatActivity(), FilePreviewContract.Vi
     override fun engagementEnded() {
         finishAfterTransition()
     }
-
-    companion object {
-        private const val WRITE_PERMISSION_REQUEST_CODE = 110011
-        private const val IMAGE_ID_KEY = "image_id"
-        private const val IMAGE_ID_NAME = "image_name"
-        private const val LOCAL_IMAGE_URI = "local_image_uri"
-
-        fun intent(context: Context, attachment: AttachmentFile): Intent {
-            return Intent(context, FilePreviewActivity::class.java)
-                .putExtra(IMAGE_ID_KEY, attachment.id)
-                .putExtra(IMAGE_ID_NAME, attachment.name)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        }
-
-        fun intent(context: Context, attachment: LocalAttachment): Intent {
-            return Intent(context, FilePreviewActivity::class.java)
-                .putExtra(LOCAL_IMAGE_URI, attachment.uri)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        }
-    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewContract.kt b/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewContract.kt
similarity index 94%
rename from widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewContract.kt
rename to widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewContract.kt
index ffc0ba329..12ad6fd41 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewContract.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewContract.kt
@@ -4,7 +4,7 @@ import android.net.Uri
 import com.glia.widgets.base.BaseController
 import com.glia.widgets.base.BaseView
 
-internal interface FilePreviewContract {
+internal interface ImagePreviewContract {
     interface Controller : BaseController {
         fun onSharePressed()
         fun onDownloadPressed()
diff --git a/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewController.kt b/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewController.kt
similarity index 92%
rename from widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewController.kt
rename to widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewController.kt
index 8ca29e897..b899cde79 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewController.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewController.kt
@@ -6,16 +6,16 @@ import com.glia.widgets.filepreview.domain.usecase.GetImageFileFromDownloadsUseC
 import com.glia.widgets.filepreview.domain.usecase.PutImageFileToDownloadsUseCase
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 
-internal class FilePreviewController @JvmOverloads constructor(
+internal class ImagePreviewController @JvmOverloads constructor(
     private val getImageFileFromDownloadsUseCase: GetImageFileFromDownloadsUseCase,
     private val getImageFileFromCacheUseCase: GetImageFileFromCacheUseCase,
     private val putImageFileToDownloadsUseCase: PutImageFileToDownloadsUseCase,
     private val disposables: CompositeDisposable = CompositeDisposable()
-) : FilePreviewContract.Controller {
-    private var view: FilePreviewContract.View? = null
+) : ImagePreviewContract.Controller {
+    private var view: ImagePreviewContract.View? = null
     private var state: State = State()
 
-    override fun setView(view: FilePreviewContract.View) {
+    override fun setView(view: ImagePreviewContract.View) {
         this.view = view
         state = State()
     }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewView.kt b/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewView.kt
similarity index 91%
rename from widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewView.kt
rename to widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewView.kt
index 9dd9a62b0..1eda106f9 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/FilePreviewView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/filepreview/ui/ImagePreviewView.kt
@@ -6,7 +6,7 @@ import androidx.appcompat.widget.AppCompatImageView
 import com.glia.widgets.R
 import com.glia.widgets.di.Dependencies
 
-internal class FilePreviewView @JvmOverloads constructor(
+internal class ImagePreviewView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null
 ) : AppCompatImageView(context, attrs) {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/helper/CommonExtensions.kt b/widgetssdk/src/main/java/com/glia/widgets/helper/CommonExtensions.kt
index fa0ba2efa..44bbaf134 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/helper/CommonExtensions.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/helper/CommonExtensions.kt
@@ -20,7 +20,6 @@ import com.glia.androidsdk.comms.MediaState
 import com.glia.androidsdk.comms.MediaUpgradeOffer
 import com.glia.androidsdk.queuing.Queue
 import com.glia.widgets.UiTheme
-import com.glia.widgets.di.Dependencies
 import com.glia.widgets.view.unifiedui.merge
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Completable
@@ -56,9 +55,6 @@ internal fun UiTheme?.isAlertDialogButtonUseVerticalAlignment(): Boolean = this?
 
 internal fun UiTheme?.getFullHybridTheme(newTheme: UiTheme?): UiTheme = merge(newTheme) ?: UiTheme.UiThemeBuilder().build()
 
-internal val UiTheme?.withConfigurationTheme: UiTheme
-    get() = getFullHybridTheme(Dependencies.sdkConfigurationManager.uiTheme)
-
 /**
  * Returns styled text from the provided HTML string. Replaces \n to <br> regardless of the operating system where the string was created.
  */
diff --git a/widgetssdk/src/main/java/com/glia/widgets/helper/ContextExtensions.kt b/widgetssdk/src/main/java/com/glia/widgets/helper/ContextExtensions.kt
index 06756c054..a566b1601 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/helper/ContextExtensions.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/helper/ContextExtensions.kt
@@ -1,9 +1,14 @@
+@file:JvmName("ContextExtensions")
 package com.glia.widgets.helper
 
 import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
+import android.content.Intent
+import android.os.Build
+import android.os.Parcelable
 import android.util.AttributeSet
+import android.util.TypedValue
 import android.view.View
 import android.widget.Toast
 import androidx.annotation.AttrRes
@@ -12,11 +17,12 @@ import androidx.annotation.IntRange
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.withStyledAttributes
+import androidx.core.util.TypedValueCompat
 import com.glia.widgets.BuildConfig
-import com.glia.widgets.GliaWidgets
 import com.glia.widgets.R
 import com.glia.widgets.UiTheme
 import com.google.android.material.theme.overlay.MaterialThemeOverlay
+import java.io.Serializable
 
 internal fun Context.asActivity(): Activity? = (this as? ContextWrapper)?.let {
     it as? Activity ?: it.baseContext.asActivity()
@@ -25,7 +31,7 @@ internal fun Context.asActivity(): Activity? = (this as? ContextWrapper)?.let {
 internal fun Context.requireActivity(): Activity =
     asActivity() ?: throw IllegalStateException("Context $this is not an Activity.")
 
-internal fun Context.pxToSp(pixels: Float): Float = pixels / resources.displayMetrics.scaledDensity
+internal fun Context.pxToSp(pixels: Float): Float = TypedValueCompat.deriveDimension(TypedValue.COMPLEX_UNIT_SP, pixels, resources.displayMetrics)
 internal fun Context.getDimenRes(@DimenRes dimenId: Int): Float = resources.getDimension(dimenId)
 internal fun Context.getDimenResPx(@DimenRes dimenId: Int): Int =
     resources.getDimensionPixelSize(dimenId)
@@ -55,11 +61,8 @@ internal val Activity.rootView: View
 
 internal fun Activity.withRuntimeTheme(callback: (themedContext: Context, uiTheme: UiTheme) -> Unit) {
     val themedContext = wrapWithMaterialThemeOverlay()
-
-    intent.getParcelableExtra<UiTheme>(GliaWidgets.UI_THEME)?.also {
-        callback(themedContext, it.withConfigurationTheme)
-    } ?: themedContext.withStyledAttributes(R.style.Application_Glia_Chat, R.styleable.GliaView) {
-        callback(themedContext, Utils.getThemeFromTypedArray(this, themedContext).withConfigurationTheme)
+    themedContext.withStyledAttributes(R.style.Application_Glia_Chat, R.styleable.GliaView) {
+        callback(themedContext, Utils.getThemeFromTypedArray(this, themedContext))
     }
 }
 
@@ -70,3 +73,35 @@ internal val Activity.isGlia: Boolean
     get() = qualifiedName.startsWith(BuildConfig.LIBRARY_PACKAGE_NAME + ".")
 
 internal val AlertDialog.parentActivity: Activity? get() = context.asActivity()
+
+internal fun Context.safeStartActivity(intent: Intent, onFailure: () -> Unit, onSuccess: () -> Unit = {}) {
+    if (intent.resolveActivity(packageManager) != null) {
+        startActivity(intent)
+        onSuccess()
+    } else {
+        onFailure()
+    }
+}
+
+internal fun Intent.setSafeFlags(context: Context): Intent = context.asActivity()?.let { this } ?: addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+internal inline fun <reified T : Serializable> Intent.getSerializableExtraCompat(key: String): T? =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getSerializableExtra(key, T::class.java)
+    } else {
+        @Suppress("DEPRECATION")
+        getSerializableExtra(key) as? T
+    }
+
+internal inline fun <reified T : Parcelable> Intent.getParcelableExtraCompat(key: String): T? =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getParcelableExtra(key, T::class.java)
+    } else {
+        @Suppress("DEPRECATION")
+        getParcelableExtra(key) as? T
+    }
+
+internal inline fun <reified T : Enum<T>> Intent.putEnumExtra(key: String, value: T?): Intent = putExtra(key, value?.ordinal)
+
+internal inline fun <reified T : Enum<T>> Intent.getEnumExtra(key: String): T? = getIntExtra(key, -1).takeIf { it != -1 }
+    ?.let { T::class.java.enumConstants?.getOrNull(it) }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/helper/Data.kt b/widgetssdk/src/main/java/com/glia/widgets/helper/Data.kt
index 9ee4260ac..91f556875 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/helper/Data.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/helper/Data.kt
@@ -2,7 +2,15 @@ package com.glia.widgets.helper
 
 internal sealed class Data<out T> {
     val hasValue: Boolean get() = this is Value
+    val valueOrNull: T? get() = (this as? Value)?.result
 
     data class Value<out T>(val result: T) : Data<T>()
     object Empty : Data<Nothing>()
+
+    companion object
+}
+
+internal fun <T : Any> Data.Companion.from(value: T?): Data<T> = when (value) {
+    null -> Data.Empty
+    else -> Data.Value(value)
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/helper/Insets.kt b/widgetssdk/src/main/java/com/glia/widgets/helper/Insets.kt
index 00eab7bf1..524bd52a7 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/helper/Insets.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/helper/Insets.kt
@@ -24,6 +24,7 @@ internal val View.insetsController: WindowInsetsControllerCompat?
     get() = context.asActivity()?.let {
         WindowCompat.getInsetsController(it.window, this)
     }
+
 internal val View.rootWindowInsetsCompat: WindowInsetsCompat?
     get() = ViewCompat.getRootWindowInsets(this)
 
@@ -76,16 +77,8 @@ internal class SimpleWindowInsetsAndAnimationHandler(
         keyboardAnimationInProgress = false
     }
 
-    override fun onProgress(
-        insets: WindowInsetsCompat,
-        runningAnimations: MutableList<WindowInsetsAnimationCompat>
-    ): WindowInsetsCompat {
-        val combinedInsets = insets.run {
-            Insets.max(
-                getInsets(WindowInsetsCompat.Type.ime()),
-                getInsets(WindowInsetsCompat.Type.systemBars())
-            )
-        }
+    override fun onProgress(insets: WindowInsetsCompat, runningAnimations: MutableList<WindowInsetsAnimationCompat>): WindowInsetsCompat {
+        val combinedInsets = getCombinedInsets(insets)
 
         target.updateLayoutParams<ViewGroup.MarginLayoutParams> {
             updateMargins(bottom = combinedInsets.bottom)
@@ -97,7 +90,7 @@ internal class SimpleWindowInsetsAndAnimationHandler(
 
     override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
         if (!keyboardAnimationInProgress) {
-            insets.getInsets(WindowInsetsCompat.Type.systemBars()).apply {
+            getCombinedInsets(insets).apply {
                 v.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                     updateMargins(left, appBarOrToolBar?.let { 0 } ?: top, right, bottom)
                 }
@@ -107,4 +100,11 @@ internal class SimpleWindowInsetsAndAnimationHandler(
 
         return WindowInsetsCompat.CONSUMED
     }
+
+    private fun getCombinedInsets(insets: WindowInsetsCompat): Insets = insets.run {
+        Insets.max(
+            getInsets(WindowInsetsCompat.Type.ime()),
+            getInsets(WindowInsetsCompat.Type.systemBars())
+        )
+    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/helper/IntentConfigurationHelper.kt b/widgetssdk/src/main/java/com/glia/widgets/helper/IntentConfigurationHelper.kt
deleted file mode 100644
index a1b6ef1a2..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/helper/IntentConfigurationHelper.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.glia.widgets.helper
-
-import android.content.Context
-import android.content.Intent
-import android.provider.Settings
-import androidx.core.net.toUri
-import com.glia.androidsdk.Engagement.MediaType
-import com.glia.widgets.call.CallActivity
-import com.glia.widgets.call.CallConfiguration
-import com.glia.widgets.di.Dependencies
-
-internal interface IntentConfigurationHelper {
-    fun createForCall(context: Context, mediaType: MediaType, upgradeToCall: Boolean = true): Intent
-
-    fun createForOverlayPermissionScreen(context: Context): Intent
-}
-
-internal class IntentConfigurationHelperImpl : IntentConfigurationHelper {
-    private val defaultBuilder: CallConfiguration.Builder
-        get() = Dependencies.sdkConfigurationManager
-            .buildEngagementConfiguration()
-            .let(CallConfiguration.Builder()::setEngagementConfiguration)
-
-    override fun createForCall(context: Context, mediaType: MediaType, upgradeToCall: Boolean): Intent = defaultBuilder
-        .setMediaType(mediaType)
-        .setIsUpgradeToCall(upgradeToCall)
-        .run { CallActivity.getIntent(context, build()) }
-
-    override fun createForOverlayPermissionScreen(context: Context): Intent = context.run {
-        Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, "package:${packageName}".toUri()).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/helper/IntentHelper.kt b/widgetssdk/src/main/java/com/glia/widgets/helper/IntentHelper.kt
new file mode 100644
index 000000000..73a28570a
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/helper/IntentHelper.kt
@@ -0,0 +1,155 @@
+package com.glia.widgets.helper
+
+import android.app.Activity
+import android.content.ClipData
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Environment
+import android.os.Parcelable
+import android.provider.Settings
+import androidx.core.content.FileProvider
+import androidx.core.net.toUri
+import com.glia.androidsdk.Engagement.MediaType
+import com.glia.androidsdk.chat.AttachmentFile
+import com.glia.androidsdk.engagement.Survey
+import com.glia.widgets.call.CallActivity
+import com.glia.widgets.callvisualizer.EndScreenSharingActivity
+import com.glia.widgets.chat.ChatActivity
+import com.glia.widgets.chat.ChatType
+import com.glia.widgets.core.fileupload.model.LocalAttachment
+import com.glia.widgets.entrywidget.EntryWidgetActivity
+import com.glia.widgets.filepreview.ui.ImagePreviewActivity
+import com.glia.widgets.locale.LocaleString
+import com.glia.widgets.messagecenter.MessageCenterActivity
+import com.glia.widgets.survey.SurveyActivity
+import com.glia.widgets.webbrowser.WebBrowserActivity
+import java.io.File
+
+internal object ExtraKeys {
+    const val WEB_BROWSER_TITLE = "web_browser_title"
+    const val WEB_BROWSER_URL = "web_browser_url"
+
+    const val IMAGE_PREVIEW_IMAGE_ID = "image_preview_image_id"
+    const val IMAGE_PREVIEW_IMAGE_NAME = "image_preview_image_name"
+    const val IMAGE_PREVIEW_LOCAL_IMAGE_URI = "image_preview_local_image_uri"
+
+    const val CHAT_TYPE = "chat_screen_chat_type"
+    const val MEDIA_TYPE = "media_type"
+    const val SURVEY = "survey"
+    const val IS_UPGRADE_TO_CALL = "call_screen_is_upgrade_to_call"
+}
+
+internal interface IntentHelper {
+    fun chatIntent(context: Context): Intent
+
+    fun secureMessagingChatIntent(activity: Activity): Intent
+
+    fun secureMessagingWelcomeScreenIntent(activity: Activity): Intent
+
+    fun callIntent(context: Context, mediaType: MediaType?, upgradeToCall: Boolean): Intent
+
+    fun imagePreviewIntent(context: Context, attachment: AttachmentFile): Intent
+
+    fun imagePreviewIntent(context: Context, attachment: LocalAttachment): Intent
+
+    fun shareImageIntent(context: Context, fileName: String): Intent
+
+    fun surveyIntent(context: Context, survey: Survey): Intent
+
+    fun endScreenSharingIntent(context: Context): Intent
+
+    fun webBrowserIntent(context: Context, title: LocaleString, url: String): Intent
+
+    fun overlayPermissionIntent(context: Context): Intent
+
+    fun openEmailIntent(uri: Uri): Intent
+
+    fun dialerIntent(uri: Uri): Intent
+
+    fun openUriIntent(uri: Uri): Intent
+
+    fun openFileIntent(contentUri: Uri, fileContentType: String?): Intent
+    fun entryWidgetIntent(activity: Activity): Intent
+}
+
+internal class IntentHelperImpl : IntentHelper {
+
+    override fun chatIntent(context: Context): Intent =
+        Intent(context, ChatActivity::class.java).apply {
+            setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            setSafeFlags(context)
+        }
+
+    override fun secureMessagingChatIntent(activity: Activity): Intent = Intent(activity, ChatActivity::class.java)
+        .putEnumExtra(ExtraKeys.CHAT_TYPE, ChatType.SECURE_MESSAGING)
+        .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+
+    override fun secureMessagingWelcomeScreenIntent(activity: Activity): Intent = Intent(activity, MessageCenterActivity::class.java)
+        .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+
+    override fun callIntent(context: Context, mediaType: MediaType?, upgradeToCall: Boolean): Intent = Intent(context, CallActivity::class.java)
+        .putEnumExtra(ExtraKeys.MEDIA_TYPE, mediaType)
+        .putExtra(ExtraKeys.IS_UPGRADE_TO_CALL, upgradeToCall)
+        .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        .setSafeFlags(context)
+
+    override fun imagePreviewIntent(context: Context, attachment: AttachmentFile): Intent {
+        return Intent(context, ImagePreviewActivity::class.java)
+            .putExtra(ExtraKeys.IMAGE_PREVIEW_IMAGE_ID, attachment.id)
+            .putExtra(ExtraKeys.IMAGE_PREVIEW_IMAGE_NAME, attachment.name)
+            .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+    }
+
+    override fun imagePreviewIntent(context: Context, attachment: LocalAttachment): Intent {
+        return Intent(context, ImagePreviewActivity::class.java)
+            .putExtra(ExtraKeys.IMAGE_PREVIEW_LOCAL_IMAGE_URI, attachment.uri)
+            .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+    }
+
+    override fun shareImageIntent(context: Context, fileName: String): Intent {
+        val file = File(
+            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+                .toString(),
+            fileName
+        )
+        val contentUri = FileProvider.getUriForFile(context, context.fileProviderAuthority, file)
+        return Intent(Intent.ACTION_SEND)
+            .putExtra(Intent.EXTRA_STREAM, contentUri)
+            .setType("image/jpeg")
+    }
+
+    override fun surveyIntent(context: Context, survey: Survey): Intent = Intent(context, SurveyActivity::class.java)
+        .putExtra(ExtraKeys.SURVEY, survey as Parcelable)
+        .setSafeFlags(context)
+
+    override fun endScreenSharingIntent(context: Context): Intent = Intent(context, EndScreenSharingActivity::class.java)
+        .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        .setSafeFlags(context)
+
+    override fun webBrowserIntent(context: Context, title: LocaleString, url: String): Intent = Intent(context, WebBrowserActivity::class.java)
+        .putExtra(ExtraKeys.WEB_BROWSER_TITLE, title)
+        .putExtra(ExtraKeys.WEB_BROWSER_URL, url)
+        .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+
+    override fun overlayPermissionIntent(context: Context): Intent = context.run {
+        Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, "package:${packageName}".toUri()).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setSafeFlags(this)
+    }
+
+    override fun openEmailIntent(uri: Uri): Intent = Intent(Intent.ACTION_SENDTO)
+        .setData(Uri.parse("mailto:")) // This step makes sure that only email apps handle this.
+        .putExtra(Intent.EXTRA_EMAIL, arrayOf(uri.schemeSpecificPart))
+
+    override fun dialerIntent(uri: Uri): Intent = Intent(Intent.ACTION_DIAL).setData(uri)
+
+    override fun openUriIntent(uri: Uri): Intent = Intent(Intent.ACTION_VIEW, uri).addCategory(Intent.CATEGORY_BROWSABLE)
+
+    override fun openFileIntent(contentUri: Uri, fileContentType: String?): Intent = with(Intent(Intent.ACTION_VIEW)) {
+        clipData = ClipData.newRawUri("", contentUri)
+        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        setDataAndType(contentUri, fileContentType)
+    }
+
+    override fun entryWidgetIntent(activity: Activity): Intent = Intent(activity, EntryWidgetActivity::class.java)
+        .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/helper/TimeCounter.kt b/widgetssdk/src/main/java/com/glia/widgets/helper/TimeCounter.kt
index 30b097852..4df607449 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/helper/TimeCounter.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/helper/TimeCounter.kt
@@ -18,10 +18,11 @@ internal class TimeCounter {
 
     fun stop() {
         Logger.d(TAG, "stop")
-        timerTask?.cancel()
-        timerTask = null
         timer?.cancel()
         timer = null
+
+        timerTask?.cancel()
+        timerTask = null
     }
 
     fun clear() {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/helper/Utils.kt b/widgetssdk/src/main/java/com/glia/widgets/helper/Utils.kt
index a9cc027d8..9796491b9 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/helper/Utils.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/helper/Utils.kt
@@ -7,26 +7,14 @@ import android.util.TypedValue
 import androidx.annotation.AttrRes
 import androidx.annotation.StyleableRes
 import androidx.core.content.res.ResourcesCompat
-import com.glia.androidsdk.Engagement
-import com.glia.widgets.GliaWidgets
 import com.glia.widgets.R
 import com.glia.widgets.UiTheme
 import com.glia.widgets.UiTheme.UiThemeBuilder
-import java.security.InvalidParameterException
 
 internal object Utils {
-    @JvmStatic
-    fun toMediaType(mediaType: String): Engagement.MediaType {
-        return when (mediaType) {
-            GliaWidgets.MEDIA_TYPE_VIDEO -> Engagement.MediaType.VIDEO
-            GliaWidgets.MEDIA_TYPE_AUDIO -> Engagement.MediaType.AUDIO
-            else -> throw InvalidParameterException("Invalid Media Type")
-        }
-    }
 
     fun getThemeFromTypedArray(typedArray: TypedArray, context: Context): UiTheme {
         val defaultThemeBuilder = UiThemeBuilder().apply {
-            setAppBarTitle(getAppBarTitleValue(typedArray))
             setBrandPrimaryColor(
                 getTypedArrayIntegerValue(
                     typedArray,
@@ -424,14 +412,6 @@ internal object Utils {
         return typedArray.hasValue(index) && typedArray.getBoolean(index, false)
     }
 
-    private fun getAppBarTitleValue(typedArray: TypedArray): String? {
-        return if (typedArray.hasValue(R.styleable.GliaView_appBarTitle)) {
-            typedArray.getString(R.styleable.GliaView_appBarTitle)
-        } else {
-            null
-        }
-    }
-
     fun getTypedArrayStringValue(
         typedArray: TypedArray,
         @StyleableRes index: Int
diff --git a/widgetssdk/src/main/java/com/glia/widgets/launcher/ActivityLauncher.kt b/widgetssdk/src/main/java/com/glia/widgets/launcher/ActivityLauncher.kt
new file mode 100644
index 000000000..233b21ac3
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/launcher/ActivityLauncher.kt
@@ -0,0 +1,80 @@
+package com.glia.widgets.launcher
+
+import android.app.Activity
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import com.glia.androidsdk.Engagement.MediaType
+import com.glia.androidsdk.chat.AttachmentFile
+import com.glia.androidsdk.engagement.Survey
+import com.glia.widgets.core.fileupload.model.LocalAttachment
+import com.glia.widgets.helper.IntentHelper
+import com.glia.widgets.helper.safeStartActivity
+import com.glia.widgets.locale.LocaleString
+
+
+internal interface ActivityLauncher {
+    fun launchChat(activity: Activity)
+    fun launchChat(context: Context)
+    fun launchCall(context: Context, mediaType: MediaType?, upgradeToCall: Boolean)
+    fun launchSecureMessagingChat(activity: Activity)
+    fun launchSecureMessagingWelcomeScreen(activity: Activity)
+    fun launchEndScreenSharing(context: Context)
+    fun launchWebBrowser(context: Context, title: LocaleString, url: String)
+    fun launchOverlayPermission(context: Context, onSuccess: () -> Unit = {}, onFailure: () -> Unit = {})
+    fun launchImagePreview(context: Context, attachment: AttachmentFile, options: Bundle? = null)
+    fun launchImagePreview(context: Context, attachment: LocalAttachment, options: Bundle? = null)
+    fun launchEmailClient(context: Context, uri: Uri, onFailure: () -> Unit)
+    fun launchDialer(context: Context, uri: Uri, onFailure: () -> Unit)
+    fun launchUri(context: Context, uri: Uri, onFailure: () -> Unit)
+    fun launchFileReader(context: Context, contentUri: Uri, fileContentType: String?, onFailure: () -> Unit)
+    fun launchShareImage(activity: Activity, fileName: String)
+    fun launchEntryWidget(activity: Activity)
+    fun launchSurvey(activity: Activity, survey: Survey)
+}
+
+internal class ActivityLauncherImpl(private val intentHelper: IntentHelper) : ActivityLauncher {
+
+    override fun launchChat(activity: Activity) = activity.startActivity(intentHelper.chatIntent(activity))
+
+    override fun launchChat(context: Context) = context.startActivity(intentHelper.chatIntent(context))
+
+    override fun launchCall(context: Context, mediaType: MediaType?, upgradeToCall: Boolean) =
+        context.startActivity(intentHelper.callIntent(context, mediaType, upgradeToCall))
+
+    override fun launchSecureMessagingChat(activity: Activity) = activity.startActivity(intentHelper.secureMessagingChatIntent(activity))
+
+    override fun launchSecureMessagingWelcomeScreen(activity: Activity) =
+        activity.startActivity(intentHelper.secureMessagingWelcomeScreenIntent(activity))
+
+    override fun launchEndScreenSharing(context: Context) = context.startActivity(intentHelper.endScreenSharingIntent(context))
+
+    override fun launchWebBrowser(context: Context, title: LocaleString, url: String) =
+        context.startActivity(intentHelper.webBrowserIntent(context, title, url))
+
+    override fun launchOverlayPermission(context: Context, onSuccess: () -> Unit, onFailure: () -> Unit) =
+        context.safeStartActivity(intentHelper.overlayPermissionIntent(context), onFailure, onSuccess)
+
+    override fun launchImagePreview(context: Context, attachment: AttachmentFile, options: Bundle?) =
+        context.startActivity(intentHelper.imagePreviewIntent(context, attachment), options)
+
+    override fun launchImagePreview(context: Context, attachment: LocalAttachment, options: Bundle?) =
+        context.startActivity(intentHelper.imagePreviewIntent(context, attachment), options)
+
+    override fun launchEmailClient(context: Context, uri: Uri, onFailure: () -> Unit) =
+        context.safeStartActivity(intentHelper.openEmailIntent(uri), onFailure)
+
+    override fun launchDialer(context: Context, uri: Uri, onFailure: () -> Unit) =
+        context.safeStartActivity(intentHelper.dialerIntent(uri), onFailure)
+
+    override fun launchUri(context: Context, uri: Uri, onFailure: () -> Unit) = context.safeStartActivity(intentHelper.openUriIntent(uri), onFailure)
+
+    override fun launchFileReader(context: Context, contentUri: Uri, fileContentType: String?, onFailure: () -> Unit) =
+        context.safeStartActivity(intentHelper.openFileIntent(contentUri, fileContentType), onFailure)
+
+    override fun launchShareImage(activity: Activity, fileName: String) = activity.startActivity(intentHelper.shareImageIntent(activity, fileName))
+
+    override fun launchEntryWidget(activity: Activity) = activity.startActivity(intentHelper.entryWidgetIntent(activity))
+
+    override fun launchSurvey(activity: Activity, survey: Survey) = activity.startActivity(intentHelper.surveyIntent(activity, survey))
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/launcher/ConfigurationManager.kt b/widgetssdk/src/main/java/com/glia/widgets/launcher/ConfigurationManager.kt
new file mode 100644
index 000000000..3e604e68b
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/launcher/ConfigurationManager.kt
@@ -0,0 +1,72 @@
+package com.glia.widgets.launcher
+
+import com.glia.androidsdk.screensharing.ScreenSharing
+import com.glia.widgets.GliaWidgets
+import com.glia.widgets.GliaWidgetsConfig
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.processors.BehaviorProcessor
+
+internal interface ConfigurationManager {
+    val screenSharingMode: ScreenSharing.Mode
+
+    val enableBubbleOutsideApp: Boolean
+    val enableBubbleInsideApp: Boolean
+
+    val queueIdsObservable: Flowable<List<String>>
+
+    val visitorContextAssetId: String?
+
+    /**
+     * Applies [GliaWidgetsConfig] from the [GliaWidgets.init] configuration step
+     */
+    fun applyConfiguration(config: GliaWidgetsConfig)
+
+    /**
+     * Sets queue IDs
+     * [queueIds] A list of queue IDs to be used for the engagement launcher.
+     * When empty or invalid, the default queues will be used.
+     */
+    fun setQueueIds(queueIds: List<String>)
+
+    /**
+     * Sets the visitor context for the engagement.
+     *
+     * @param visitorContextAssetId a visitor context id from Glia Hub.
+     */
+    fun setVisitorContextAssetId(visitorContextAssetId: String)
+}
+
+internal class ConfigurationManagerImpl : ConfigurationManager {
+    private var _screenSharingMode: ScreenSharing.Mode = ScreenSharing.Mode.APP_BOUNDED
+    override val screenSharingMode: ScreenSharing.Mode
+        get() = _screenSharingMode
+
+    private var _enableBubbleOutsideApp: Boolean = true
+    override val enableBubbleOutsideApp: Boolean
+        get() = _enableBubbleOutsideApp
+
+    private var _enableBubbleInsideApp: Boolean = true
+    override val enableBubbleInsideApp: Boolean
+        get() = _enableBubbleInsideApp
+
+    private var _queueIdsObservable: BehaviorProcessor<List<String>> = BehaviorProcessor.create()
+    override val queueIdsObservable: Flowable<List<String>> = _queueIdsObservable.onBackpressureLatest()
+
+    private var _visitorContextAssetId: String? = null
+    override val visitorContextAssetId: String?
+        get() = _visitorContextAssetId
+
+    override fun applyConfiguration(config: GliaWidgetsConfig) {
+        config.screenSharingMode?.also { _screenSharingMode = it }
+        config.enableBubbleInsideApp?.also { _enableBubbleInsideApp = it }
+        config.enableBubbleOutsideApp?.also { _enableBubbleOutsideApp = it }
+    }
+
+    override fun setQueueIds(queueIds: List<String>) {
+        _queueIdsObservable.onNext(queueIds)
+    }
+
+    override fun setVisitorContextAssetId(visitorContextAssetId: String) {
+        _visitorContextAssetId = visitorContextAssetId
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/launcher/EngagementLauncher.kt b/widgetssdk/src/main/java/com/glia/widgets/launcher/EngagementLauncher.kt
new file mode 100644
index 000000000..a3c873309
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/launcher/EngagementLauncher.kt
@@ -0,0 +1,92 @@
+package com.glia.widgets.launcher
+
+import android.app.Activity
+import com.glia.androidsdk.Engagement
+
+/**
+ * An interface for launching different types of engagements, such as chat,
+ * audio calls, video calls, and secure messaging
+ */
+interface EngagementLauncher {
+    /**
+     * Starts a chat engagement.
+     *
+     * @param activity The Activity used to launch the chat screen
+     * @param visitorContextAssetId Optional visitor context id from Glia Hub
+     */
+    fun startChat(activity: Activity, visitorContextAssetId: String? = null)
+
+    /**
+     * Starts an audio engagement.
+     *
+     * @param activity The Activity used to launch the call screen
+     * @param visitorContextAssetId Optional visitor context id from Glia Hub
+     */
+    fun startAudioCall(activity: Activity, visitorContextAssetId: String? = null)
+
+    /**
+     * Starts a video engagement.
+     *
+     * @param activity The Activity used to launch the call screen
+     * @param visitorContextAssetId Optional visitor context id from Glia Hub
+     */
+    fun startVideoCall(activity: Activity, visitorContextAssetId: String? = null)
+
+    /**
+     * Starts a secure messaging.
+     *
+     * @param activity The Activity used to launch the secure messaging welcome or chat screen
+     * @param visitorContextAssetId Optional visitor context id from Glia Hub
+     */
+    fun startSecureMessaging(activity: Activity, visitorContextAssetId: String? = null)
+}
+
+internal class EngagementLauncherImpl(
+    private val activityLauncher: ActivityLauncher,
+    private val configurationManager: ConfigurationManager
+) : EngagementLauncher {
+
+    /**
+     * Starts a chat engagement.
+     *
+     * @param activity The Activity used to launch the chat screen
+     * @param visitorContextAssetId Optional visitor context id from Glia Hub
+     */
+    override fun startChat(activity: Activity, visitorContextAssetId: String?) {
+        visitorContextAssetId?.let { configurationManager.setVisitorContextAssetId(it) }
+        activityLauncher.launchChat(activity)
+    }
+
+    /**
+     * Starts an audio engagement.
+     *
+     * @param activity The Activity used to launch the call screen
+     * @param visitorContextAssetId Optional visitor context id from Glia Hub
+     */
+    override fun startAudioCall(activity: Activity, visitorContextAssetId: String?) {
+        visitorContextAssetId?.let { configurationManager.setVisitorContextAssetId(it) }
+        activityLauncher.launchCall(activity, Engagement.MediaType.AUDIO, false)
+    }
+
+    /**
+     * Starts a video engagement.
+     *
+     * @param activity The Activity used to launch the call screen
+     * @param visitorContextAssetId Optional visitor context id from Glia Hub
+     */
+    override fun startVideoCall(activity: Activity, visitorContextAssetId: String?) {
+        visitorContextAssetId?.let { configurationManager.setVisitorContextAssetId(it) }
+        activityLauncher.launchCall(activity, Engagement.MediaType.VIDEO, false)
+    }
+
+    /**
+     * Starts a secure messaging engagement.
+     *
+     * @param activity The Activity used to launch the secure messaging screen
+     * @param visitorContextAssetId Optional visitor context id from Glia Hub
+     */
+    override fun startSecureMessaging(activity: Activity, visitorContextAssetId: String?) {
+        visitorContextAssetId?.let { configurationManager.setVisitorContextAssetId(it) }
+        activityLauncher.launchSecureMessagingWelcomeScreen(activity)
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/locale/LocaleProvider.kt b/widgetssdk/src/main/java/com/glia/widgets/locale/LocaleProvider.kt
index 8448a897c..8b8d1391a 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/locale/LocaleProvider.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/locale/LocaleProvider.kt
@@ -17,7 +17,6 @@ import io.reactivex.rxjava3.core.Observer
 import io.reactivex.rxjava3.schedulers.Schedulers
 import io.reactivex.rxjava3.subjects.PublishSubject
 import kotlinx.parcelize.Parcelize
-import java.lang.Exception
 
 /**
  * @hide
@@ -26,7 +25,7 @@ import java.lang.Exception
 data class LocaleString(
     @StringRes val stringKey: Int,
     val values: List<StringKeyPair> = emptyList()
-): Parcelable {
+) : Parcelable {
 
     constructor(@StringRes stringKey: Int, vararg values: StringKeyPair) : this(stringKey, values.toList())
 
@@ -86,10 +85,10 @@ internal open class LocaleProvider @JvmOverloads constructor(
     }
 
     fun getString(stringKey: Int, values: List<StringKeyPair>): String {
-        if (stringKey == R.string.general_company_name) {
-            return getCompanyName()
+        return if (stringKey == R.string.general_company_name) {
+            getCompanyName()
         } else {
-            return getStringInternal(stringKey, values)
+            getStringInternal(stringKey, values)
         }
     }
 
@@ -103,10 +102,10 @@ internal open class LocaleProvider @JvmOverloads constructor(
         return try {
             getLocaleManager().getRemoteString(key)?.let {
                 values.fold(it, ::replaceInsertedValues).run(::cleanupRemainingReferences)
-            } ?: resourceProvider.getString(stringKey, *values.map { pair -> pair.value }.toTypedArray())
+            } ?: resourceProvider.getString(stringKey, *values.map { pair -> valueOrCompanyName(pair) }.toTypedArray())
         } catch (e: GliaException) {
             Logger.d(TAG, "Remote locale string failed to load : ${e.message}")
-            resourceProvider.getString(stringKey, *values.map { pair -> pair.value }.toTypedArray())
+            resourceProvider.getString(stringKey, *values.map { pair -> valueOrCompanyName(pair) }.toTypedArray())
         }
     }
 
@@ -118,18 +117,21 @@ internal open class LocaleProvider @JvmOverloads constructor(
         hardcodedCompanyName = companyName
     }
 
-    // Priority for remote company name but not found or no locales it will fall back to hardcoded one or "" if no hardcoded one
-    fun getCompanyName(): String {
-        var companyName = getStringInternal(R.string.general_company_name)
-        if (companyName.isBlank()) {
-            companyName = hardcodedCompanyName ?: ""
+    fun valueOrCompanyName(stringKeyPair: StringKeyPair): String {
+        return if (stringKeyPair.key == StringKey.COMPANY_NAME) {
+            getCompanyName()
+        } else {
+            stringKeyPair.value
         }
-        return companyName
     }
 
+    // Priority for remote company name but not found or no locales it will fall back to hardcoded one or "" if no hardcoded one
+    private fun getCompanyName(): String = getStringInternal(R.string.general_company_name)
+        .takeIf { it.isNotBlank() } ?: hardcodedCompanyName.orEmpty()
+
     private fun replaceInsertedValues(string: String, pair: StringKeyPair): String {
         return if (string.contains(pair.key.value, false)) {
-            string.replace("{${pair.key.value}}", pair.value)
+            string.replace("{${pair.key.value}}", valueOrCompanyName(pair))
         } else {
             string
         }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/locale/StringKeyPair.kt b/widgetssdk/src/main/java/com/glia/widgets/locale/StringKeyPair.kt
index 556b80e92..da5a3b6cd 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/locale/StringKeyPair.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/locale/StringKeyPair.kt
@@ -13,7 +13,6 @@ data class StringKeyPair(val key: StringKey, val value: String): Parcelable {
         deprecatedStringKeyPair.value
     )
 }
-
 /**
  * @hide
  */
diff --git a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/ConfirmationScreenView.kt b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/ConfirmationScreenView.kt
index 47a41fec3..354ee0382 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/ConfirmationScreenView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/ConfirmationScreenView.kt
@@ -22,7 +22,7 @@ import com.glia.widgets.view.unifiedui.applyButtonTheme
 import com.glia.widgets.view.unifiedui.applyColorTheme
 import com.glia.widgets.view.unifiedui.applyImageColorTheme
 import com.glia.widgets.view.unifiedui.applyTextTheme
-import com.glia.widgets.view.unifiedui.theme.secureconversations.SecureConversationsConfirmationScreenTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingConfirmationScreenTheme
 import com.google.android.material.transition.MaterialFadeThrough
 
 internal class ConfirmationScreenView(
@@ -37,8 +37,8 @@ internal class ConfirmationScreenView(
     defStyleRes
 ) {
 
-    private val unifiedTheme: SecureConversationsConfirmationScreenTheme? by lazy {
-        Dependencies.gliaThemeManager.theme?.secureConversationsConfirmationScreenTheme
+    private val unifiedTheme: SecureMessagingConfirmationScreenTheme? by lazy {
+        Dependencies.gliaThemeManager.theme?.secureMessagingConfirmationScreenTheme
     }
 
     private val binding: MessageCenterConfirmationViewBinding by lazy {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterActivity.kt
index 9cb7e1720..86314251b 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterActivity.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterActivity.kt
@@ -1,55 +1,35 @@
 package com.glia.widgets.messagecenter
 
 import android.Manifest
-import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.os.Parcelable
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts.GetContent
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.activity.result.contract.ActivityResultContracts.TakePicture
-import com.glia.widgets.GliaWidgets
-import com.glia.widgets.GliaWidgets.CHAT_TYPE
 import com.glia.widgets.base.FadeTransitionActivity
-import com.glia.widgets.chat.ChatActivity
-import com.glia.widgets.chat.ChatType
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.databinding.MessageCenterActivityBinding
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.TAG
 
 /**
- * This activity is used for displaying the welcome screen for secure conversations.
+ * This activity is used for displaying the welcome screen for secure messaging.
  *
  * Main features:
- * - Returns an error if the visitor is not authenticated or the specified queue does not support secure conversations.
+ * - Returns an error if the visitor is not authenticated or the specified queue does not support secure messaging.
  * - Allows sending asynchronous messages.
  * - Offers the option to access chat history.
  *
  * Before this activity is launched, make sure that Glia Widgets SDK is set up correctly.
- *
- * Required data that should be passed together with the Activity intent:
- * - {@link GliaWidgets#QUEUE_IDS}: IDs of the queues you would like to use for your engagements.
- * For a full list of optional parameters, see the constants defined in {@link GliaWidgets}.
- *
- * Code example:
- * ```
- * Intent intent = new Intent(requireContext(), MessageCenterActivity.class);
- * intent.putExtra(GliaWidgets.QUEUE_IDS, new ArrayList<>(List.of("MESSAGING_QUEUE_ID")));
- * startActivity(intent);
- * ```
  */
-class MessageCenterActivity :
-    FadeTransitionActivity(),
+internal class MessageCenterActivity : FadeTransitionActivity(),
     MessageCenterView.OnFinishListener,
     MessageCenterView.OnNavigateToMessagingListener,
     MessageCenterView.OnAttachFileListener {
 
     private lateinit var binding: MessageCenterActivityBinding
     private val messageCenterView get() = binding.messageCenterView
-    private var engagementConfiguration: EngagementConfiguration? = null
 
     private val controller: MessageCenterContract.Controller by lazy {
         Dependencies.controllerFactory.messageCenterController
@@ -76,20 +56,11 @@ class MessageCenterActivity :
         binding = MessageCenterActivityBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        engagementConfiguration = createConfiguration(intent)
-        if (intent.hasExtra(GliaWidgets.USE_OVERLAY)) {
-            // Integrator has passed a deprecated GliaWidgets.USE_OVERLAY parameter with Intent
-            // Override bubble configuration with USE_OVERLAY value
-            val useOverlay = intent.getBooleanExtra(GliaWidgets.USE_OVERLAY, true)
-            Dependencies.sdkConfigurationManager.setLegacyUseOverlay(useOverlay)
-        }
-
         messageCenterView.onFinishListener = this
         messageCenterView.onNavigateToMessagingListener = this
         messageCenterView.onAttachFileListener = this
 
         messageCenterView.setController(controller)
-        messageCenterView.setConfiguration(engagementConfiguration)
         onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 messageCenterView.onSystemBack()
@@ -130,16 +101,8 @@ class MessageCenterActivity :
     }
 
     override fun navigateToMessaging() {
-        val intent = Intent(this, ChatActivity::class.java)
-        intent.putExtras(getIntent())
-        intent.putExtra(CHAT_TYPE, ChatType.SECURE_MESSAGING as Parcelable)
-        startActivity(intent)
+        Dependencies.activityLauncher.launchSecureMessagingChat(this)
         finish()
     }
 
-    private fun createConfiguration(intent: Intent): EngagementConfiguration {
-        return EngagementConfiguration.Builder()
-            .intent(intent)
-            .build()
-    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterContract.kt b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterContract.kt
index 673b8ac91..804123316 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterContract.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterContract.kt
@@ -1,16 +1,13 @@
 package com.glia.widgets.messagecenter
 
 import android.net.Uri
-import com.glia.widgets.UiTheme
 import com.glia.widgets.base.BaseController
 import com.glia.widgets.base.BaseView
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.fileupload.model.LocalAttachment
 
 internal interface MessageCenterContract {
     interface Controller : BaseController {
-        fun setConfiguration(uiTheme: UiTheme?, configuration: EngagementConfiguration?)
         fun setView(view: View)
         fun initialize()
         fun onCheckMessagesClicked()
diff --git a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterController.kt b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterController.kt
index 8648a9e22..427456293 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterController.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterController.kt
@@ -3,18 +3,15 @@ package com.glia.widgets.messagecenter
 import android.net.Uri
 import androidx.annotation.VisibleForTesting
 import com.glia.androidsdk.GliaException
-import com.glia.androidsdk.RequestCallback
 import com.glia.androidsdk.chat.VisitorMessage
 import com.glia.androidsdk.engagement.EngagementFile
 import com.glia.androidsdk.site.SiteInfo
 import com.glia.widgets.Constants
-import com.glia.widgets.UiTheme
 import com.glia.widgets.chat.ChatType
 import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
 import com.glia.widgets.chat.domain.SiteInfoUseCase
 import com.glia.widgets.chat.domain.TakePictureUseCase
 import com.glia.widgets.chat.domain.UriToFileAttachmentUseCase
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.engagement.domain.SetEngagementConfigUseCase
 import com.glia.widgets.core.fileupload.domain.AddFileToAttachmentAndUploadUseCase
@@ -22,8 +19,8 @@ import com.glia.widgets.core.fileupload.model.LocalAttachment
 import com.glia.widgets.core.permissions.domain.RequestNotificationPermissionIfPushNotificationsSetUpUseCase
 import com.glia.widgets.core.secureconversations.domain.AddSecureFileAttachmentsObserverUseCase
 import com.glia.widgets.core.secureconversations.domain.AddSecureFileToAttachmentAndUploadUseCase
-import com.glia.widgets.core.secureconversations.domain.GetAvailableQueueIdsForSecureMessagingUseCase
 import com.glia.widgets.core.secureconversations.domain.GetSecureFileAttachmentsUseCase
+import com.glia.widgets.core.secureconversations.domain.IsMessagingAvailableUseCase
 import com.glia.widgets.core.secureconversations.domain.OnNextMessageUseCase
 import com.glia.widgets.core.secureconversations.domain.RemoveSecureFileAttachmentUseCase
 import com.glia.widgets.core.secureconversations.domain.ResetMessageCenterUseCase
@@ -32,14 +29,11 @@ import com.glia.widgets.core.secureconversations.domain.SendSecureMessageUseCase
 import com.glia.widgets.core.secureconversations.domain.ShowMessageLimitErrorUseCase
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.TAG
-import com.glia.widgets.view.head.ChatHeadContract
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 
 internal class MessageCenterController(
-    private var serviceChatHeadController: ChatHeadContract.Controller,
-    private val engagementConfigUseCase: SetEngagementConfigUseCase,
+    engagementConfigUseCase: SetEngagementConfigUseCase,
     private val sendSecureMessageUseCase: SendSecureMessageUseCase,
-    private val getAvailableQueueIdsForSecureMessagingUseCase: GetAvailableQueueIdsForSecureMessagingUseCase,
     private val addFileAttachmentsObserverUseCase: AddSecureFileAttachmentsObserverUseCase,
     private val addFileToAttachmentAndUploadUseCase: AddSecureFileToAttachmentAndUploadUseCase,
     private val getFileAttachmentsUseCase: GetSecureFileAttachmentsUseCase,
@@ -53,7 +47,8 @@ internal class MessageCenterController(
     private val dialogController: DialogContract.Controller,
     private val takePictureUseCase: TakePictureUseCase,
     private val uriToFileAttachmentUseCase: UriToFileAttachmentUseCase,
-    private val requestNotificationPermissionIfPushNotificationsSetUpUseCase: RequestNotificationPermissionIfPushNotificationsSetUpUseCase
+    private val requestNotificationPermissionIfPushNotificationsSetUpUseCase: RequestNotificationPermissionIfPushNotificationsSetUpUseCase,
+    private val isMessagingAvailableUseCase: IsMessagingAvailableUseCase
 ) : MessageCenterContract.Controller {
     private var view: MessageCenterContract.View? = null
     private val disposables = CompositeDisposable()
@@ -61,15 +56,8 @@ internal class MessageCenterController(
     @Volatile
     private var state = MessageCenterState()
 
-    override fun setConfiguration(uiTheme: UiTheme?, configuration: EngagementConfiguration?) {
-        setQueueIds(configuration?.queueIds)
-
-        serviceChatHeadController.setBuildTimeTheme(uiTheme)
-        serviceChatHeadController.setEngagementConfiguration(configuration)
-    }
-
-    private fun setQueueIds(queueIds: List<String>?) {
-        engagementConfigUseCase(ChatType.SECURE_MESSAGING, queueIds ?: emptyList())
+    init {
+        engagementConfigUseCase(ChatType.SECURE_MESSAGING)
     }
 
     override fun setView(view: MessageCenterContract.View) {
@@ -201,26 +189,21 @@ internal class MessageCenterController(
     }
 
     override fun ensureMessageCenterAvailability() {
-        getAvailableQueueIdsForSecureMessagingUseCase(
-            RequestCallback { queueIds, exception ->
-                setQueueIds(queueIds)
-
-                val showSendMessageGroup = when {
-                    exception != null -> {
-                        dialogController.showUnexpectedErrorDialog()
-                        false
-                    }
-
-                    queueIds == null -> {
-                        dialogController.showMessageCenterUnavailableDialog()
-                        false
-                    }
-
-                    else -> true
-                }
-                setState(state.copy(showSendMessageGroup = showSendMessageGroup))
+        disposables.add(isMessagingAvailableUseCase().subscribe(::handleMessagingAvailableResult))
+    }
+
+    private fun handleMessagingAvailableResult(result: Result<Boolean>) {
+        result.onFailure {
+            dialogController.showUnexpectedErrorDialog()
+            setState(state.copy(showSendMessageGroup = false))
+        }
+
+        result.onSuccess {
+            setState(state.copy(showSendMessageGroup = it))
+            if (!it) {
+                dialogController.showMessageCenterUnavailableDialog()
             }
-        )
+        }
     }
 
     fun onAttachmentReceived(file: LocalAttachment) {
@@ -257,7 +240,6 @@ internal class MessageCenterController(
     }
 
     override fun onDestroy() {
-        getAvailableQueueIdsForSecureMessagingUseCase.dispose()
         disposables.dispose()
     }
 
diff --git a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterView.kt b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterView.kt
index d1cad6d74..9a047dd26 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterView.kt
@@ -17,7 +17,6 @@ import androidx.core.view.isVisible
 import com.glia.widgets.Constants
 import com.glia.widgets.R
 import com.glia.widgets.UiTheme
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.dialog.model.DialogState
 import com.glia.widgets.core.fileupload.model.LocalAttachment
@@ -108,7 +107,7 @@ internal class MessageCenterView(
         SimpleWindowInsetsAndAnimationHandler(this, appBar) { onKeyboardAnimation(it) }
 
         controller?.ensureMessageCenterAvailability()
-        setupAppBarUnifiedTheme(unifiedTheme?.secureConversationsWelcomeScreenTheme?.headerTheme)
+        setupAppBarUnifiedTheme(unifiedTheme?.secureMessagingWelcomeScreenTheme?.headerTheme)
         appBar?.hideBackButton()
         appBar?.setTitle(LocaleString(R.string.engagement_secure_messaging_title))
         initCallbacks()
@@ -157,10 +156,6 @@ internal class MessageCenterView(
         }
     }
 
-    fun setConfiguration(configuration: EngagementConfiguration?) {
-        controller?.setConfiguration(theme, configuration)
-    }
-
     private fun showUnAuthenticatedDialog() {
         showDialog {
             Dialogs.showUnAuthenticatedDialog(context, theme) {
@@ -212,7 +207,7 @@ internal class MessageCenterView(
             ColorTheme(getColorCompat(primaryColorId)),
             ColorTheme(getColorCompat(baseLightColorId)),
             null
-        ) merge unifiedTheme?.secureConversationsConfirmationScreenTheme?.headerTheme
+        ) merge unifiedTheme?.secureMessagingConfirmationScreenTheme?.headerTheme
 
         appBar?.resetTheme()
         setupAppBarUnifiedTheme(appBarTheme)
diff --git a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageView.kt b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageView.kt
index d4462e38d..8ed0a4fd4 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageView.kt
@@ -37,7 +37,7 @@ import com.glia.widgets.helper.wrapWithMaterialThemeOverlay
 import com.glia.widgets.view.unifiedui.applyColorTheme
 import com.glia.widgets.view.unifiedui.applyImageColorTheme
 import com.glia.widgets.view.unifiedui.applyTextTheme
-import com.glia.widgets.view.unifiedui.theme.secureconversations.SecureConversationsWelcomeScreenTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingWelcomeScreenTheme
 import com.google.android.material.button.MaterialButton
 import java.util.concurrent.Executor
 import kotlin.properties.Delegates
@@ -70,12 +70,10 @@ internal class MessageView(
     private val sendMessageGroup: Group get() = binding.sendMessageGroup
     private val bottomSpace: Space get() = binding.bottomSpace
 
-    private val unifiedTheme: SecureConversationsWelcomeScreenTheme? by lazy {
-        Dependencies.gliaThemeManager.theme?.secureConversationsWelcomeScreenTheme
+    private val unifiedTheme: SecureMessagingWelcomeScreenTheme? by lazy {
+        Dependencies.gliaThemeManager.theme?.secureMessagingWelcomeScreenTheme
     }
 
-    private var theme: UiTheme by Delegates.notNull()
-
     private val attachmentPopup by lazy {
         AttachmentPopup(addAttachmentButton, unifiedTheme?.pickMediaTheme)
     }
@@ -116,12 +114,12 @@ internal class MessageView(
     }
 
     private fun setDefaultTheme(typedArray: TypedArray) {
-        theme = Utils.getThemeFromTypedArray(typedArray, this.context)
-        setupAttachmentIconTheme()
-        setupMessageErrorTextTheme()
+        val theme = Utils.getThemeFromTypedArray(typedArray, this.context)
+        setupAttachmentIconTheme(theme)
+        setupMessageErrorTextTheme(theme)
     }
 
-    private fun setupMessageErrorTextTheme() {
+    private fun setupMessageErrorTextTheme(theme: UiTheme) {
         val systemNegativeColorId = theme.systemNegativeColor ?: return
 
         TextViewCompat.setCompoundDrawableTintList(
@@ -185,7 +183,7 @@ internal class MessageView(
         attachmentRecyclerView.adapter = uploadAttachmentAdapter
     }
 
-    private fun setupAttachmentIconTheme() {
+    private fun setupAttachmentIconTheme(theme: UiTheme) {
         val normalColor = unifiedTheme?.filePickerButtonTheme?.primaryColor
             ?: theme.baseNormalColor?.let { getColorCompat(it) }
         val disabledColor = unifiedTheme?.filePickerButtonDisabledTheme?.primaryColor
diff --git a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/ProgressButton.kt b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/ProgressButton.kt
index a9805cfac..ec22f2e4d 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/ProgressButton.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/ProgressButton.kt
@@ -11,6 +11,7 @@ import androidx.transition.TransitionManager
 import com.glia.widgets.R
 import com.glia.widgets.databinding.ProgressButtonBinding
 import com.glia.widgets.di.Dependencies
+import com.glia.widgets.helper.ResourceProvider
 import com.glia.widgets.helper.applyShadow
 import com.glia.widgets.helper.getAttr
 import com.glia.widgets.helper.getColorCompat
@@ -18,6 +19,7 @@ import com.glia.widgets.helper.getDimenRes
 import com.glia.widgets.helper.getDrawableCompat
 import com.glia.widgets.helper.layoutInflater
 import com.glia.widgets.helper.setLocaleContentDescription
+import com.glia.widgets.locale.LocaleProvider
 import com.glia.widgets.view.unifiedui.applyIndicatorColorTheme
 import com.glia.widgets.view.unifiedui.applyLayerTheme
 import com.glia.widgets.view.unifiedui.applyTextTheme
@@ -55,7 +57,7 @@ internal class ProgressButton @JvmOverloads constructor(context: Context, attrs:
     private val progressBar get() = binding.progressBar
 
     // End Widgets + Binding
-    private val localeProvider = Dependencies.localeProvider
+    private val localeProvider get() = Dependencies.localeProvider
 
     @get:ColorInt
     private val gliaBrandPrimaryColor: Int by lazy { // btn bg
@@ -157,7 +159,8 @@ internal class ProgressButton @JvmOverloads constructor(context: Context, attrs:
             text = defaultText.copy(textColor = ColorTheme(gliaDisabledTextColor)),
             background = defaultLayer.copy(
                 fill = ColorTheme(gliaDisabledBackgroundColor),
-                stroke = gliaDisabledBorderColor
+                stroke = gliaDisabledBorderColor,
+                borderWidth = context.getDimenRes(R.dimen.glia_px),
             ),
             elevation = 0f
         )
diff --git a/widgetssdk/src/main/java/com/glia/widgets/operator/OperatorRequestActivityWatcher.kt b/widgetssdk/src/main/java/com/glia/widgets/operator/OperatorRequestActivityWatcher.kt
index 734f94b81..767b779b7 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/operator/OperatorRequestActivityWatcher.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/operator/OperatorRequestActivityWatcher.kt
@@ -13,11 +13,11 @@ import com.glia.androidsdk.Engagement
 import com.glia.widgets.base.BaseSingleActivityWatcher
 import com.glia.widgets.call.CallActivity
 import com.glia.widgets.helper.GliaActivityManager
-import com.glia.widgets.helper.IntentConfigurationHelper
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.OneTimeEvent
 import com.glia.widgets.helper.isGlia
 import com.glia.widgets.helper.showToast
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.view.Dialogs
 import io.reactivex.rxjava3.core.Flowable
 import java.lang.ref.WeakReference
@@ -27,7 +27,7 @@ private const val TAG = "RequestHandlerActivityWatcher"
 
 internal class OperatorRequestActivityWatcher(
     private val controller: OperatorRequestContract.Controller,
-    private val intentConfigurationHelper: IntentConfigurationHelper,
+    private val activityLauncher: ActivityLauncher,
     gliaActivityManager: GliaActivityManager
 ) : BaseSingleActivityWatcher(gliaActivityManager) {
 
@@ -82,14 +82,13 @@ internal class OperatorRequestActivityWatcher(
     }
 
     private fun openOverlayPermissionsScreen(activity: Activity) {
-        val overlayIntent = intentConfigurationHelper.createForOverlayPermissionScreen(activity)
-
-        if (overlayIntent.resolveActivity(activity.packageManager) != null) {
-            activity.startActivity(overlayIntent)
-            controller.overlayPermissionScreenOpened()
-        } else {
-            controller.failedToOpenOverlayPermissionScreen()
-        }
+        activityLauncher.launchOverlayPermission(
+            context = activity,
+            onSuccess = {
+                controller.overlayPermissionScreenOpened()
+            }, onFailure = {
+                controller.failedToOpenOverlayPermissionScreen()
+            })
     }
 
     private fun enforceComponentActivity(activity: Activity, callback: () -> Unit) {
@@ -137,7 +136,7 @@ internal class OperatorRequestActivityWatcher(
             activity.isGlia -> finishActivities()
         }
 
-        activity.startActivity(intentConfigurationHelper.createForCall(activity, mediaType))
+        activityLauncher.launchCall(activity, mediaType, true)
     }
 
     private fun showUpgradeDialog(state: ControllerState.RequestMediaUpgrade, activity: Activity, consumeCallback: () -> Unit) {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/operator/OperatorRequestController.kt b/widgetssdk/src/main/java/com/glia/widgets/operator/OperatorRequestController.kt
index 801736a20..ca224b3eb 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/operator/OperatorRequestController.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/operator/OperatorRequestController.kt
@@ -7,7 +7,6 @@ import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResult
 import com.glia.androidsdk.Engagement
 import com.glia.androidsdk.comms.MediaUpgradeOffer
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.dialog.domain.IsShowOverlayPermissionRequestDialogUseCase
 import com.glia.widgets.core.dialog.domain.SetOverlayPermissionRequestDialogShownUseCase
@@ -48,7 +47,6 @@ internal class OperatorRequestController(
     private val isCurrentEngagementCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase,
     private val setOverlayPermissionRequestDialogShownUseCase: SetOverlayPermissionRequestDialogShownUseCase,
     private val dialogController: DialogContract.Controller,
-    private val gliaSdkConfigurationManager: GliaSdkConfigurationManager,
     private val withNotificationPermissionUseCase: WithNotificationPermissionUseCase,
     private val prepareToScreenSharingUseCase: PrepareToScreenSharingUseCase,
     private val releaseScreenSharingResourcesUseCase: ReleaseScreenSharingResourcesUseCase
@@ -160,7 +158,7 @@ internal class OperatorRequestController(
 
         withNotificationPermissionUseCase {
             _state.onNext(State.AcquireMediaProjectionToken)
-            screenSharingUseCase.acceptRequestWithAskedPermission(activity, gliaSdkConfigurationManager.screenSharingMode)
+            screenSharingUseCase.acceptRequestWithAskedPermission(activity)
         }
     }
 
diff --git a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyActivity.java b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyActivity.java
deleted file mode 100644
index 174220e78..000000000
--- a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyActivity.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.glia.widgets.survey;
-
-import android.os.Bundle;
-
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.view.WindowCompat;
-import androidx.core.view.WindowInsetsControllerCompat;
-
-import com.glia.androidsdk.engagement.Survey;
-import com.glia.widgets.GliaWidgets;
-import com.glia.widgets.R;
-import com.glia.widgets.UiTheme;
-import com.glia.widgets.di.Dependencies;
-import com.glia.widgets.helper.Insets;
-import com.glia.widgets.helper.Logger;
-
-/**
- * Glia internal class.
- * <p>
- * It will be automatically added to the integrator's manifest file by the manifest merger during compilation.
- * <p>
- * This activity is used to display post-engagement surveys.
- */
-public class SurveyActivity extends AppCompatActivity implements SurveyView.OnFinishListener {
-    private static final String TAG = SurveyActivity.class.getSimpleName();
-
-    private SurveyView surveyView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        EdgeToEdge.enable(this);
-        Insets.insetsControllerCompat(getWindow()).setAppearanceLightStatusBars(false);
-        super.onCreate(savedInstanceState);
-        Logger.i(TAG, "Create Survey screen");
-        setContentView(R.layout.survey_activity);
-        prepareSurveyView();
-    }
-
-    @Override
-    protected void onDestroy() {
-        Logger.i(TAG, "Destroy Survey screen");
-        hideSoftKeyboard();
-        if (surveyView != null) {
-            surveyView.onDestroyView();
-        }
-        super.onDestroy();
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-
-        // Back press behaves the same way as Callback.onFinish(). See the comment below.
-        finishAndRemoveTask();
-    }
-
-    @Override
-    public void onFinish() {
-
-        // In case the engagement ends, Activity is removed from the device's Recents menu
-        // to avoid app users to accidentally start queueing for another call when they resume
-        // the app from the Recents menu and the app's backstack was empty.
-        finishAndRemoveTask();
-    }
-
-    @Override
-    public void finishAndRemoveTask() {
-        overridePendingTransition(0, R.anim.slide_down);
-        super.finishAndRemoveTask();
-    }
-
-    private void hideSoftKeyboard() {
-        WindowInsetsControllerCompat insetsController = WindowCompat.getInsetsController(getWindow(), findViewById(R.id.survey_view));
-        Insets.hideKeyboard(insetsController);
-    }
-
-    private void prepareSurveyView() {
-        surveyView = findViewById(R.id.survey_view);
-        surveyView.setOnTitleUpdatedListener(this::setTitle);
-        surveyView.setOnFinishListener(this);
-        SurveyContract.Controller surveyController = Dependencies.getControllerFactory().getSurveyController();
-        surveyView.setController(surveyController);
-        Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            UiTheme uiTheme = extras.getParcelable(GliaWidgets.UI_THEME);
-            surveyView.setTheme(uiTheme);
-            Survey survey = extras.getParcelable(GliaWidgets.SURVEY);
-            surveyController.init(survey);
-        }
-    }
-}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyActivity.kt
new file mode 100644
index 000000000..79073062b
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyActivity.kt
@@ -0,0 +1,116 @@
+package com.glia.widgets.survey
+
+import android.os.Build
+import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.enableEdgeToEdge
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import com.glia.androidsdk.engagement.Survey
+import com.glia.widgets.R
+import com.glia.widgets.di.Dependencies.controllerFactory
+import com.glia.widgets.helper.ExtraKeys
+import com.glia.widgets.helper.Logger.i
+import com.glia.widgets.helper.TAG
+import com.glia.widgets.helper.getParcelableExtraCompat
+import com.glia.widgets.helper.hideKeyboard
+import com.glia.widgets.helper.insetsController
+import com.glia.widgets.helper.insetsControllerCompat
+
+/**
+ * Glia internal class.
+ *
+ *
+ * It will be automatically added to the integrator's manifest file by the manifest merger during compilation.
+ *
+ *
+ * This activity is used to display post-engagement surveys.
+ */
+internal class SurveyActivity : AppCompatActivity(), SurveyView.OnFinishListener {
+    private val surveyView: SurveyView by lazy { findViewById(R.id.survey_view) }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        this.enableEdgeToEdge()
+        window.insetsControllerCompat.isAppearanceLightStatusBars = false
+
+        overrideEnterAnimation()
+        super.onCreate(savedInstanceState)
+
+        i(TAG, "Create Survey screen")
+        setContentView(R.layout.survey_activity)
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                finishAndRemoveTask()
+            }
+        })
+
+        prepareSurveyView()
+    }
+
+    override fun onDestroy() {
+        i(TAG, "Destroy Survey screen")
+        hideSoftKeyboard()
+        surveyView.onDestroyView()
+        super.onDestroy()
+    }
+
+    override fun onFinish() {
+        // In case the engagement ends, Activity is removed from the device's Recents menu
+        // to avoid app users to accidentally start queueing for another call when they resume
+        // the app from the Recents menu and the app's backstack was empty.
+
+        finishAndRemoveTask()
+    }
+
+    override fun finishAndRemoveTask() {
+        overrideExitAnimation()
+        super.finishAndRemoveTask()
+    }
+
+    private fun hideSoftKeyboard() {
+        surveyView.insetsController?.hideKeyboard()
+    }
+
+    private fun prepareSurveyView() {
+        surveyView.setOnTitleUpdatedListener(object : SurveyView.OnTitleUpdatedListener {
+            override fun onTitleUpdated(title: String?) {
+                updateTitle(title)
+            }
+        })
+
+        surveyView.setOnFinishListener(this)
+        val surveyController = controllerFactory.surveyController
+        surveyView.setController(surveyController)
+
+        intent.getParcelableExtraCompat<Survey>(ExtraKeys.SURVEY)?.let {
+            surveyController.init(it)
+        }
+    }
+
+    private fun updateTitle(title: String?) {
+        this.title = title
+    }
+
+    @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+    private fun overrideAnimations() {
+        overrideActivityTransition(OVERRIDE_TRANSITION_OPEN, R.anim.slide_up, 0)
+        overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, 0, R.anim.slide_down)
+    }
+
+    private fun overrideEnterAnimation() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            overrideAnimations()
+            return
+        }
+
+        overridePendingTransition(R.anim.slide_up, 0)
+    }
+
+    @Suppress("DEPRECATION")
+    private fun overrideExitAnimation() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            overridePendingTransition(0, R.anim.slide_down)
+        }
+    }
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyAdapter.kt b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyAdapter.kt
index 585d2db15..4f2004836 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyAdapter.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyAdapter.kt
@@ -16,20 +16,16 @@ import com.glia.widgets.survey.viewholder.SingleQuestionViewHolder
 import com.glia.widgets.survey.viewholder.SurveyViewHolder
 import com.glia.widgets.view.configuration.survey.SurveyStyle
 
-internal class SurveyAdapter(private val listener: SurveyAdapterListener) :
-    RecyclerView.Adapter<SurveyViewHolder>() {
+internal class SurveyAdapter(
+    private val listener: SurveyAdapterListener,
+    private val style: SurveyStyle
+) : RecyclerView.Adapter<SurveyViewHolder>() {
     interface SurveyAdapterListener {
         fun onAnswer(answer: Survey.Answer)
     }
 
-    private var style: SurveyStyle
     private val questionItems: MutableList<QuestionItem> = ArrayList()
 
-    init {
-        // initialize style with default empty SurveyStyle, to make sure that style usage is safe even if new style is not set.
-        style = SurveyStyle.Builder().build()
-    }
-
     fun submitList(items: List<QuestionItem>?) {
         questionItems.clear()
         if (items == null) {
@@ -40,10 +36,6 @@ internal class SurveyAdapter(private val listener: SurveyAdapterListener) :
 
     private fun getItem(position: Int): QuestionItem = questionItems[position]
 
-    fun setStyle(style: SurveyStyle) {
-        this.style = style
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SurveyViewHolder {
         val inflater = LayoutInflater.from(parent.context)
         return when (viewType) {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyController.java b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyController.java
index 7dbb9d81e..99a1c0f71 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyController.java
+++ b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyController.java
@@ -177,8 +177,7 @@ public void onSubmitClicked() {
                     resetController();
                 }
                 return;
-            } else if (exception instanceof GliaException) {
-                GliaException gliaException = (GliaException) exception;
+            } else if (exception instanceof GliaException gliaException) {
                 if (gliaException.cause == GliaException.Cause.NETWORK_TIMEOUT) {
                     view.onNetworkTimeout();
                 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyView.kt b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyView.kt
index f7b4bb03e..6669c8dd5 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyView.kt
@@ -14,12 +14,10 @@ import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import com.glia.androidsdk.engagement.Survey
 import com.glia.widgets.R
-import com.glia.widgets.UiTheme
 import com.glia.widgets.databinding.SurveyViewBinding
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.helper.SimpleWindowInsetsAndAnimationHandler
 import com.glia.widgets.helper.Utils
-import com.glia.widgets.helper.getFullHybridTheme
 import com.glia.widgets.helper.hideKeyboard
 import com.glia.widgets.helper.insetsController
 import com.glia.widgets.helper.layoutInflater
@@ -37,7 +35,6 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
-import kotlin.properties.Delegates
 
 internal class SurveyView(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) :
     FrameLayout(
@@ -52,8 +49,6 @@ internal class SurveyView(context: Context, attrs: AttributeSet?, defStyleAttr:
     private var onFinishListener: OnFinishListener? = null
     private var controller: SurveyContract.Controller? = null
 
-    private var uiTheme: UiTheme by Delegates.notNull()
-
     private val surveyTheme: SurveyTheme? by lazy {
         Dependencies.gliaThemeManager.theme?.surveyTheme
     }
@@ -80,16 +75,10 @@ internal class SurveyView(context: Context, attrs: AttributeSet?, defStyleAttr:
     ) : this(context, attrs, defStyleAttr, R.style.Application_Glia_Chat)
 
     init {
+        SimpleWindowInsetsAndAnimationHandler(this)
         readTypedArray(attrs, defStyleAttr, defStyleRes)
         setupViewAppearance()
         initCallbacks()
-        initAdapter()
-        SimpleWindowInsetsAndAnimationHandler(this)
-    }
-
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        applyStyle(uiTheme.surveyStyle)
     }
 
     private fun setupViewAppearance() {
@@ -206,24 +195,15 @@ internal class SurveyView(context: Context, attrs: AttributeSet?, defStyleAttr:
 
     private fun setDefaultTheme(attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) {
         @SuppressLint("CustomViewStyleable")
-        val typedArray = this.context.obtainStyledAttributes(
-            attrs,
-            R.styleable.GliaView,
-            defStyleAttr,
-            defStyleRes
-        )
-        uiTheme = Utils.getThemeFromTypedArray(typedArray, this.context)
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.GliaView, defStyleAttr, defStyleRes)
+        val surveyStyle = Utils.getThemeFromTypedArray(typedArray, this.context).surveyStyle
+        initAdapter(surveyStyle)
+        applyStyle(surveyStyle)
         typedArray.recycle()
     }
 
-    fun setTheme(uiTheme: UiTheme?) {
-        if (uiTheme == null) return
-        this.uiTheme = this.uiTheme.getFullHybridTheme(uiTheme)
-        this.uiTheme.surveyStyle?.also { surveyAdapter?.setStyle(it) }
-    }
-
-    private fun initAdapter() {
-        surveyAdapter = SurveyAdapter(this)
+    private fun initAdapter(surveyStyle: SurveyStyle?) {
+        surveyAdapter = SurveyAdapter(this, surveyStyle ?: SurveyStyle.Builder().build())
         recyclerView.adapter = surveyAdapter
 
         recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/CharCodeView.kt b/widgetssdk/src/main/java/com/glia/widgets/view/CharCodeView.kt
index 3a94dd8d4..06ebb42fc 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/CharCodeView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/CharCodeView.kt
@@ -35,7 +35,7 @@ private data class ViewDefaultProperties(
 /**
  * @hide
  */
-class CharCodeView @JvmOverloads constructor(
+internal class CharCodeView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/VisitorCodeView.kt b/widgetssdk/src/main/java/com/glia/widgets/view/VisitorCodeView.kt
index 9c7d2c68e..7f6e783df 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/VisitorCodeView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/VisitorCodeView.kt
@@ -28,7 +28,6 @@ import com.glia.widgets.helper.applyTextTheme
 import com.glia.widgets.helper.combineStringWith
 import com.glia.widgets.helper.getColorCompat
 import com.glia.widgets.helper.getFontCompat
-import com.glia.widgets.helper.getFullHybridTheme
 import com.glia.widgets.helper.layoutInflater
 import com.glia.widgets.helper.separateStringWithSymbol
 import com.glia.widgets.helper.setLocaleContentDescription
@@ -56,7 +55,6 @@ internal class VisitorCodeView internal constructor(
     private val uiThreadExecutor: Executor? = null
 ) : FrameLayout(context.wrapWithMaterialThemeOverlay(), null, 0), VisitorCodeContract.View {
     private lateinit var controller: VisitorCodeContract.Controller
-    private var theme: UiTheme? = null
 
     private var timer: CountDownTimer? = null
 
@@ -139,10 +137,7 @@ internal class VisitorCodeView internal constructor(
     }
 
     private fun setDefaultTheme(typedArray: TypedArray) {
-        val typedArrayTheme = Utils.getThemeFromTypedArray(typedArray, this.context)
-        val runtimeGlobalTheme = Dependencies.sdkConfigurationManager.uiTheme
-        theme = typedArrayTheme.getFullHybridTheme(runtimeGlobalTheme)
-        applyRuntimeThemeConfig(theme)
+        applyRuntimeThemeConfig(Utils.getThemeFromTypedArray(typedArray, this.context))
     }
 
     override fun startLoading() {
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/head/ActivityWatcherForChatHead.kt b/widgetssdk/src/main/java/com/glia/widgets/view/head/ActivityWatcherForChatHead.kt
index a66dac9d4..457a28d8c 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/head/ActivityWatcherForChatHead.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/head/ActivityWatcherForChatHead.kt
@@ -2,7 +2,6 @@ package com.glia.widgets.view.head
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.Intent
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -11,25 +10,22 @@ import androidx.core.util.Pair
 import androidx.core.view.contains
 import com.glia.widgets.R
 import com.glia.widgets.base.BaseActivityStackWatcher
-import com.glia.widgets.call.CallActivity
-import com.glia.widgets.call.CallConfiguration
-import com.glia.widgets.callvisualizer.EndScreenSharingActivity
 import com.glia.widgets.callvisualizer.EndScreenSharingView
-import com.glia.widgets.chat.ChatActivity
 import com.glia.widgets.chat.ChatView
-import com.glia.widgets.di.Dependencies
-import com.glia.widgets.filepreview.ui.FilePreviewView
+import com.glia.widgets.filepreview.ui.ImagePreviewView
 import com.glia.widgets.helper.DialogHolderView
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.TAG
 import com.glia.widgets.helper.WeakReferenceDelegate
 import com.glia.widgets.helper.hasChildOfType
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.messagecenter.MessageCenterView
 import com.glia.widgets.view.head.controller.ActivityWatcherForChatHeadContract
 
 @SuppressLint("CheckResult")
 internal class ActivityWatcherForChatHead(
-    val controller: ActivityWatcherForChatHeadContract.Controller
+    val controller: ActivityWatcherForChatHeadContract.Controller,
+    private val activityLauncher: ActivityLauncher
 ) : BaseActivityStackWatcher(), ActivityWatcherForChatHeadContract.Watcher {
 
     init {
@@ -69,7 +65,7 @@ internal class ActivityWatcherForChatHead(
     }
 
     private fun createChatHeadLayout(activity: Activity) {
-        val chatHeadLayout = ChatHeadLayout(activity.baseContext)
+        val chatHeadLayout = ChatHeadLayout(activity)
         chatHeadLayout.layoutParams = ConstraintLayout.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.MATCH_PARENT
@@ -135,7 +131,7 @@ internal class ActivityWatcherForChatHead(
     }
 
     private fun saveBubblePosition() {
-        chatHeadLayout?.getPosition()?.let {
+        chatHeadLayout?.position?.let {
             if (it.first == null || it.second == null) return
             chatHeadViewPosition = Pair(it.first, it.second)
         }
@@ -154,7 +150,7 @@ internal class ActivityWatcherForChatHead(
         var gliaView: View? = null
         activity?.let {
             gliaView = it.findViewById(R.id.call_view)
-                ?: it.findViewById<FilePreviewView>(R.id.file_preview_view)
+                ?: it.findViewById<ImagePreviewView>(R.id.preview_view)
                     ?: it.findViewById<EndScreenSharingView>(R.id.screen_sharing_screen_view)
         }
         return gliaView != null
@@ -163,7 +159,7 @@ internal class ActivityWatcherForChatHead(
     override fun fetchGliaOrRootView(): View? {
         return resumedActivity?.let {
             return it.findViewById(R.id.call_view)
-                ?: it.findViewById<FilePreviewView>(R.id.file_preview_view)
+                ?: it.findViewById<ImagePreviewView>(R.id.preview_view)
                 ?: it.findViewById<ChatView>(R.id.chat_view)
                 ?: it.findViewById<EndScreenSharingView>(R.id.screen_sharing_screen_view)
                 ?: it.findViewById<MessageCenterView>(R.id.message_center_view)
@@ -173,35 +169,15 @@ internal class ActivityWatcherForChatHead(
         }
     }
 
-    private fun geCallConfigurationBuilder(): CallConfiguration.Builder {
-        val configuration = Dependencies.sdkConfigurationManager.buildEngagementConfiguration()
-        return CallConfiguration.Builder().setEngagementConfiguration(configuration)
-    }
-
     private fun navigateToChat(activity: Activity?) {
-        activity?.let {
-            val intent = ChatActivity.getIntent(
-                it,
-                null, // No need to set contextId because engagement is already ongoing
-                null // No need to set queueId because engagement is already ongoing
-            )
-            it.startActivity(intent)
-        }
+        activity?.also(activityLauncher::launchChat)
     }
 
     private fun navigateToEndScreenSharing(activity: Activity?) {
-        val intent = Intent(activity, EndScreenSharingActivity::class.java)
-        // No need to set contextId because engagement is already ongoing
-        activity?.startActivity(intent)
+        activity?.also(activityLauncher::launchEndScreenSharing)
     }
 
     private fun navigateToCall(activity: Activity?) {
-        activity?.let {
-            val intent = CallActivity.getIntent(
-                it,
-                geCallConfigurationBuilder().setIsUpgradeToCall(true).build()
-            )
-            it.startActivity(intent)
-        }
+        activity?.also { activityLauncher.launchCall(it, null, false) }
     }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadContract.kt b/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadContract.kt
index de55d3cdb..3c2a0611f 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadContract.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadContract.kt
@@ -1,9 +1,7 @@
 package com.glia.widgets.view.head
 
-import com.glia.widgets.UiTheme
 import com.glia.widgets.base.BaseController
 import com.glia.widgets.base.BaseView
-import com.glia.widgets.core.configuration.EngagementConfiguration
 
 internal interface ChatHeadContract {
     interface Controller : BaseController {
@@ -12,8 +10,6 @@ internal interface ChatHeadContract {
         fun onResume(view: android.view.View?)
         fun onApplicationStop()
         fun onChatHeadPositionChanged(x: Int, y: Int)
-        fun setBuildTimeTheme(uiTheme: UiTheme?)
-        fun setEngagementConfiguration(configuration: EngagementConfiguration?)
         fun onPause(gliaOrRootView: android.view.View?)
         fun updateChatHeadView()
         fun onSetChatHeadView(view: View)
@@ -30,6 +26,5 @@ internal interface ChatHeadContract {
         fun navigateToChat()
         fun navigateToCall()
         fun navigateToEndScreenSharing()
-        fun updateConfiguration(buildTimeTheme: UiTheme, engagementConfiguration: EngagementConfiguration?)
     }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadLayout.kt b/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadLayout.kt
index 963f5e6de..2963997fe 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadLayout.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadLayout.kt
@@ -8,11 +8,8 @@ import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
 import com.glia.widgets.Constants
 import com.glia.widgets.R
-import com.glia.widgets.UiTheme
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.databinding.ChatHeadLayoutBinding
 import com.glia.widgets.di.Dependencies
-import com.glia.widgets.helper.Utils
 import com.glia.widgets.helper.layoutInflater
 import com.glia.widgets.helper.wrapWithMaterialThemeOverlay
 import com.glia.widgets.view.ViewHelpers
@@ -33,12 +30,12 @@ internal class ChatHeadLayout @JvmOverloads constructor(
     private var chatHeadController: ChatHeadLayoutContract.Controller by Delegates.notNull()
 
     private var navigationCallback: NavigationCallback? = null
-    private var chatHeadClickedListener: OnChatHeadClickedListener? = null
-    private var uiTheme: UiTheme by Delegates.notNull()
 
-    private val chatHeadViewPosition: Pair<Int?, Int?>
+    private val _chatHeadViewPosition: Pair<Int?, Int?>
         get() = Pair(chatHeadView.x.roundToInt(), chatHeadView.y.roundToInt())
 
+    val position: Pair<Int?, Int?> get() = _chatHeadViewPosition
+
     private val chatHeadSize: Float by lazy { resources.getDimension(R.dimen.glia_chat_head_size) }
     private val chatHeadMargin: Float by lazy { resources.getDimension(R.dimen.glia_chat_head_content_padding) }
 
@@ -49,7 +46,7 @@ internal class ChatHeadLayout @JvmOverloads constructor(
     private val chatHeadView: ChatHeadView by lazy { binding.chatHeadView }
 
     init {
-        init(attrs, defStyleAttr, defStyleRes)
+        initialize()
     }
 
     override fun showOperatorImage(operatorImgUrl: String) {
@@ -133,16 +130,6 @@ internal class ChatHeadLayout @JvmOverloads constructor(
         super.onDetachedFromWindow()
     }
 
-    /**
-     * Method for the integrator to override if they want to do custom logic when the chat head is
-     * clicked.
-     *
-     * @param listener
-     */
-    fun setOnChatHeadClickedListener(listener: OnChatHeadClickedListener) {
-        chatHeadClickedListener = listener
-    }
-
     /**
      * Method that allows integrator to override navigation on click with using own paths
      *
@@ -155,11 +142,10 @@ internal class ChatHeadLayout @JvmOverloads constructor(
         navigationCallback = callback
     }
 
-    private fun init(attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) {
+    private fun initialize() {
         visibility = GONE
         initConfigurations()
         setupViewActions()
-        readTypedArray(attrs, defStyleAttr, defStyleRes)
         setController(Dependencies.controllerFactory.chatHeadLayoutController)
         chatHeadController.setView(this)
     }
@@ -174,45 +160,19 @@ internal class ChatHeadLayout @JvmOverloads constructor(
     private fun setupViewActions() {
         chatHeadView.setOnTouchListener(
             ViewHelpers.OnTouchListener(
-                { chatHeadViewPosition },
+                { _chatHeadViewPosition },
                 ::onChatHeadDragged
             ) { onChatHeadClicked() }
         )
     }
 
-    private fun readTypedArray(attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) {
-        @SuppressLint("CustomViewStyleable")
-        val typedArray =
-            context.obtainStyledAttributes(attrs, R.styleable.GliaView, defStyleAttr, defStyleRes)
-        setBuildTimeTheme(Utils.getThemeFromTypedArray(typedArray, context))
-        typedArray.recycle()
-    }
-
-    private fun setBuildTimeTheme(theme: UiTheme) {
-        uiTheme = theme
-        updateChatHeadConfiguration(uiTheme)
-    }
-
-    private fun updateChatHeadConfiguration(
-        buildTimeTheme: UiTheme,
-        engagementConfiguration: EngagementConfiguration? = null
-    ) {
-        chatHeadView.updateConfiguration(buildTimeTheme, engagementConfiguration)
-    }
-
     private fun onChatHeadDragged(x: Float, y: Float) {
         chatHeadView.x = x
         chatHeadView.y = y
         chatHeadView.invalidate()
     }
 
-    private fun onChatHeadClicked() {
-        chatHeadClickedListener?.onClicked(null) ?: chatHeadController.onChatHeadClicked()
-    }
-
-    fun getPosition(): Pair<Int?, Int?> {
-        return chatHeadViewPosition
-    }
+    private fun onChatHeadClicked() = chatHeadController.onChatHeadClicked()
 
     fun setPosition(x: Float, y: Float) {
         chatHeadView.x = x
@@ -220,10 +180,6 @@ internal class ChatHeadLayout @JvmOverloads constructor(
         chatHeadView.invalidate()
     }
 
-    fun interface OnChatHeadClickedListener {
-        fun onClicked(engagementConfiguration: EngagementConfiguration?)
-    }
-
     interface NavigationCallback {
         fun onNavigateToChat()
         fun onNavigateToCall()
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadView.kt b/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadView.kt
index 9b4d96e33..f8a3470c4 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/head/ChatHeadView.kt
@@ -2,7 +2,6 @@ package com.glia.widgets.view.head
 
 import android.app.Service
 import android.content.Context
-import android.content.Intent
 import android.content.res.TypedArray
 import android.graphics.PorterDuff
 import android.util.AttributeSet
@@ -14,15 +13,9 @@ import androidx.core.view.AccessibilityDelegateCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.core.view.isVisible
-import com.glia.widgets.GliaWidgets
 import com.glia.widgets.R
 import com.glia.widgets.UiTheme
-import com.glia.widgets.call.CallActivity
-import com.glia.widgets.call.CallConfiguration
-import com.glia.widgets.callvisualizer.EndScreenSharingActivity
-import com.glia.widgets.chat.ChatActivity
 import com.glia.widgets.core.callvisualizer.domain.IsCallVisualizerScreenSharingUseCase
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.databinding.ChatHeadViewBinding
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.engagement.domain.IsCurrentEngagementCallVisualizerUseCase
@@ -33,6 +26,7 @@ import com.glia.widgets.helper.getColorStateListCompat
 import com.glia.widgets.helper.layoutInflater
 import com.glia.widgets.helper.load
 import com.glia.widgets.helper.setLocaleContentDescription
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.view.configuration.ChatHeadConfiguration
 import com.glia.widgets.view.unifiedui.applyColorTheme
 import com.glia.widgets.view.unifiedui.applyImageColorTheme
@@ -53,22 +47,19 @@ internal class ChatHeadView @JvmOverloads constructor(
     defStyleAttr,
     defStyleRes
 ), ChatHeadContract.View {
+    private val activityLauncher: ActivityLauncher by lazy { Dependencies.activityLauncher }
     private val binding by lazy { ChatHeadViewBinding.inflate(layoutInflater, this) }
-    private var engagementConfiguration: EngagementConfiguration? = null
     private var configuration: ChatHeadConfiguration by Delegates.notNull()
 
     private val isService by lazy { context is Service }
 
     private val bubbleTheme: BubbleTheme?
-        get() = Dependencies.gliaThemeManager.theme?.run {
-            if (isService) bubbleTheme else chatTheme?.bubble
-        }
+        get() = Dependencies.gliaThemeManager.theme?.run { if (isService) bubbleTheme else chatTheme?.bubble }
 
     @Suppress("JoinDeclarationAndAssignment")
     private var serviceChatHeadController: ChatHeadContract.Controller
     private var isCallVisualizerScreenSharingUseCase: IsCallVisualizerScreenSharingUseCase
     private var isCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase
-    private var theme: UiTheme? = null
 
     init {
         serviceChatHeadController = Dependencies.controllerFactory.chatHeadController
@@ -79,27 +70,25 @@ internal class ChatHeadView @JvmOverloads constructor(
     }
 
     private fun readTypedArray() {
-        context.withStyledAttributes(
-            set = null,
-            attrs = R.styleable.GliaView,
-            defStyleAttr = 0
-        ) {
+        context.withStyledAttributes(set = null, attrs = R.styleable.GliaView, defStyleAttr = 0) {
             setDefaultTheme(this)
         }
     }
+
     private fun setDefaultTheme(typedArray: TypedArray) {
-        theme = Utils.getThemeFromTypedArray(typedArray, this.context)
-        serviceChatHeadController.setBuildTimeTheme(theme)
+        configuration = createConfiguration(Utils.getThemeFromTypedArray(typedArray, this.context))
+        post { updateView() }
+        updateView()
     }
 
-    override fun showUnreadMessageCount(unreadMessageCount: Int) {
+    override fun showUnreadMessageCount(count: Int) {
         post {
-            if (isCallVisualizerUseCase.invoke()) {
+            if (isCallVisualizerUseCase()) {
                 binding.chatBubbleBadge.isVisible = false
             } else {
                 binding.chatBubbleBadge.apply {
-                    text = unreadMessageCount.toString()
-                    isVisible = isDisplayUnreadMessageBadge(unreadMessageCount)
+                    text = count.toString()
+                    isVisible = isDisplayUnreadMessageBadge(count)
                 }
             }
         }
@@ -109,12 +98,12 @@ internal class ChatHeadView @JvmOverloads constructor(
         // Unused
     }
 
-    override fun showOperatorImage(operatorProfileImgUrl: String) {
+    override fun showOperatorImage(operatorImgUrl: String) {
         post {
             binding.apply {
                 queueingLottieAnimation.visibility = GONE
                 placeholderView.visibility = GONE
-                profilePictureView.load(operatorProfileImgUrl)
+                profilePictureView.load(operatorImgUrl)
             }
         }
     }
@@ -162,16 +151,6 @@ internal class ChatHeadView @JvmOverloads constructor(
         post { binding.onHoldIcon.visibility = GONE }
     }
 
-    override fun updateConfiguration(
-        buildTimeTheme: UiTheme,
-        engagementConfiguration: EngagementConfiguration?
-    ) {
-        this.engagementConfiguration = engagementConfiguration
-        serviceChatHeadController.setBuildTimeTheme(buildTimeTheme)
-        createHybridConfiguration(buildTimeTheme, engagementConfiguration)
-        post { updateView() }
-    }
-
     private fun applyBubbleTheme() {
         bubbleTheme?.badge?.also(binding.chatBubbleBadge::applyBadgeTheme)
         bubbleTheme?.onHoldOverlay?.also {
@@ -189,61 +168,31 @@ internal class ChatHeadView @JvmOverloads constructor(
     }
 
     override fun navigateToChat() {
-        engagementConfiguration?.let {
-            context.startActivity(getNavigationIntent(context, ChatActivity::class.java, it))
-        }
+        activityLauncher.launchChat(context)
     }
 
     override fun navigateToCall() {
-        val activityConfig =
-            CallConfiguration.Builder().setEngagementConfiguration(engagementConfiguration).build()
-
-        val intent = CallActivity.getIntent(context, activityConfig)
-        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        context.startActivity(intent)
+        activityLauncher.launchCall(context, null, false)
     }
 
     override fun navigateToEndScreenSharing() {
-        val intent = Intent(context, EndScreenSharingActivity::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        context.startActivity(intent)
-    }
-
-    private fun createBuildTimeConfiguration(buildTimeTheme: UiTheme): ChatHeadConfiguration {
-        return ChatHeadConfiguration.builder()
-            .operatorPlaceholderBackgroundColor(buildTimeTheme.brandPrimaryColor)
-            .operatorPlaceholderIcon(buildTimeTheme.iconPlaceholder)
-            .operatorPlaceholderIconTintList(buildTimeTheme.baseLightColor)
-            .badgeTextColor(buildTimeTheme.baseLightColor)
-            .badgeBackgroundTintList(buildTimeTheme.brandPrimaryColor)
-            .backgroundColorRes(buildTimeTheme.brandPrimaryColor)
-            .iconOnHold(buildTimeTheme.iconOnHold)
-            .iconOnHoldTintList(buildTimeTheme.baseLightColor)
-            .iconScreenSharingDialog(buildTimeTheme.iconScreenSharingDialog)
-            .build()
+        activityLauncher.launchEndScreenSharing(context)
     }
 
-    private fun createHybridConfiguration(
-        buildTimeTheme: UiTheme,
-        engagementConfiguration: com.glia.widgets.core.configuration.EngagementConfiguration?
-    ) {
-        configuration = createBuildTimeConfiguration(buildTimeTheme)
-        val runTimeTheme = engagementConfiguration?.runTimeTheme ?: return
-
-        val builder = ChatHeadConfiguration.builder(configuration)
-
-        runTimeTheme.chatHeadConfiguration?.apply {
-            operatorPlaceholderBackgroundColor?.also(builder::operatorPlaceholderBackgroundColor)
-            operatorPlaceholderIcon?.also(builder::operatorPlaceholderIcon)
-            operatorPlaceholderIconTintList?.also(builder::operatorPlaceholderIconTintList)
-            badgeBackgroundTintList?.also(builder::badgeBackgroundTintList)
-            badgeTextColor?.also(builder::badgeTextColor)
-            backgroundColorRes?.also(builder::backgroundColorRes)
-            iconOnHold?.also(builder::iconOnHold)
-            iconOnHoldTintList?.also(builder::iconOnHoldTintList)
-            iconScreenSharingDialog?.also(builder::iconScreenSharingDialog)
+    private fun createConfiguration(buildTimeTheme: UiTheme): ChatHeadConfiguration {
+        return buildTimeTheme.chatHeadConfiguration.let {
+            ChatHeadConfiguration.builder()
+                .operatorPlaceholderBackgroundColor(it?.operatorPlaceholderBackgroundColor ?: buildTimeTheme.brandPrimaryColor)
+                .operatorPlaceholderIcon(it?.operatorPlaceholderIcon ?: buildTimeTheme.iconPlaceholder)
+                .operatorPlaceholderIconTintList(it?.operatorPlaceholderIconTintList ?: buildTimeTheme.baseLightColor)
+                .badgeTextColor(it?.badgeTextColor ?: buildTimeTheme.baseLightColor)
+                .badgeBackgroundTintList(it?.badgeBackgroundTintList ?: buildTimeTheme.brandPrimaryColor)
+                .backgroundColorRes(it?.backgroundColorRes ?: buildTimeTheme.brandPrimaryColor)
+                .iconOnHold(it?.iconOnHold ?: buildTimeTheme.iconOnHold)
+                .iconOnHoldTintList(it?.iconOnHoldTintList ?: buildTimeTheme.baseLightColor)
+                .iconScreenSharingDialog(it?.iconScreenSharingDialog ?: buildTimeTheme.iconScreenSharingDialog)
+                .build()
         }
-        configuration = builder.build()
     }
 
     private fun setAccessibilityLabels() {
@@ -310,6 +259,7 @@ internal class ChatHeadView @JvmOverloads constructor(
         updateQueueingAnimationView()
 
         applyBubbleTheme()
+        invalidate()
     }
 
     private fun isDisplayUnreadMessageBadge(unreadMessageCount: Int): Boolean =
@@ -325,17 +275,5 @@ internal class ChatHeadView @JvmOverloads constructor(
     companion object {
         @JvmStatic
         fun getInstance(context: Context): ChatHeadView = ChatHeadView(context)
-
-        @JvmStatic
-        private fun getNavigationIntent(
-            context: Context,
-            cls: Class<*>,
-            engagementConfiguration: EngagementConfiguration
-        ): Intent = Intent(context, cls)
-            .putExtra(GliaWidgets.QUEUE_IDS, engagementConfiguration.queueIds?.let { ArrayList(it) })
-            .putExtra(GliaWidgets.CONTEXT_ASSET_ID, engagementConfiguration.contextAssetId)
-            .putExtra(GliaWidgets.UI_THEME, engagementConfiguration.runTimeTheme)
-            .putExtra(GliaWidgets.SCREEN_SHARING_MODE, engagementConfiguration.screenSharingMode)
-            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/head/controller/ServiceChatHeadController.kt b/widgetssdk/src/main/java/com/glia/widgets/view/head/controller/ServiceChatHeadController.kt
index 118ec23ae..3c8ffdbcc 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/head/controller/ServiceChatHeadController.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/head/controller/ServiceChatHeadController.kt
@@ -2,13 +2,10 @@ package com.glia.widgets.view.head.controller
 
 import android.view.View
 import com.glia.androidsdk.Operator
-import com.glia.widgets.UiTheme
 import com.glia.widgets.core.callvisualizer.domain.IsCallVisualizerScreenSharingUseCase
+import com.glia.widgets.core.chathead.domain.IsDisplayBubbleOutsideAppUseCase
 import com.glia.widgets.core.chathead.domain.ResolveChatHeadNavigationUseCase
 import com.glia.widgets.core.chathead.domain.ResolveChatHeadNavigationUseCase.Destinations
-import com.glia.widgets.core.chathead.domain.IsDisplayBubbleOutsideAppUseCase
-import com.glia.widgets.core.configuration.EngagementConfiguration
-import com.glia.widgets.di.Dependencies
 import com.glia.widgets.engagement.domain.CurrentOperatorUseCase
 import com.glia.widgets.engagement.domain.EngagementStateUseCase
 import com.glia.widgets.engagement.domain.ScreenSharingUseCase
@@ -38,8 +35,6 @@ internal class ServiceChatHeadController(
     private var operatorProfileImgUrl: String? = null
     private var unreadMessagesCount = 0
     private var isOnHold = false
-    private var engagementConfiguration: EngagementConfiguration? = null
-    private var buildTimeTheme: UiTheme? = null
 
     /*
      * We need to keep track of the currently active (topmost) view. This can be either ChatView
@@ -101,9 +96,6 @@ internal class ServiceChatHeadController(
         updateChatHeadView()
     }
 
-    override fun setEngagementConfiguration(engagementConfiguration: EngagementConfiguration?) {
-        this.engagementConfiguration = engagementConfiguration
-    }
 
     private fun handleEngagementState(state: com.glia.widgets.engagement.State) {
         when (state) {
@@ -138,18 +130,13 @@ internal class ServiceChatHeadController(
     }
 
     override fun updateChatHeadView() {
-        if (chatHeadView != null && buildTimeTheme != null) {
+        if (chatHeadView != null) {
             updateChatHeadViewState()
             updateOnHold()
             chatHeadView!!.showUnreadMessageCount(unreadMessagesCount)
-            chatHeadView!!.updateConfiguration(buildTimeTheme!!, engagementConfiguration)
         }
     }
 
-    override fun setBuildTimeTheme(uiTheme: UiTheme?) {
-        buildTimeTheme = uiTheme
-    }
-
     private fun engagementEnded() {
         isDisplayBubbleOutsideAppUseCase.onDestroy()
         isOnHold = false
@@ -164,18 +151,12 @@ internal class ServiceChatHeadController(
         isOnHold = false
         state = State.ENGAGEMENT
         isDisplayBubbleOutsideAppUseCase(resumedViewName)
-        if (engagementConfiguration == null) setEngagementConfiguration(
-            Dependencies.sdkConfigurationManager.buildEngagementConfiguration()
-        )
         updateChatHeadView()
     }
 
     private fun queueingStarted() {
         state = State.QUEUEING
         isDisplayBubbleOutsideAppUseCase(resumedViewName)
-        if (engagementConfiguration == null) setEngagementConfiguration(
-            Dependencies.sdkConfigurationManager.buildEngagementConfiguration()
-        )
         updateChatHeadView()
     }
 
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/textview/BaseConfigurableTextView.java b/widgetssdk/src/main/java/com/glia/widgets/view/textview/BaseConfigurableTextView.java
index efdd7eb7d..8680dda7c 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/textview/BaseConfigurableTextView.java
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/textview/BaseConfigurableTextView.java
@@ -1,7 +1,6 @@
 package com.glia.widgets.view.textview;
 
 
-import static com.glia.widgets.helper.ContextExtensionsKt.pxToSp;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -13,6 +12,7 @@
 
 import com.glia.widgets.R;
 import com.glia.widgets.UiTheme;
+import com.glia.widgets.helper.ContextExtensions;
 import com.glia.widgets.view.configuration.TextConfiguration;
 import com.google.android.material.textview.MaterialTextView;
 
@@ -48,7 +48,7 @@ private void createBuildTimeConfiguration() {
                 .textColor(getTextColors())
                 .textColorHighlight(getHighlightColor())
                 .hintColor(getHintTextColors())
-                .textSize(pxToSp(getContext(), getTextSize()))
+            .textSize(ContextExtensions.pxToSp(getContext(), getTextSize()))
                 .build();
     }
 
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/UnifiedUiExtensions.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/UnifiedUiExtensions.kt
index 44d19cac5..9cf24819a 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/UnifiedUiExtensions.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/UnifiedUiExtensions.kt
@@ -129,6 +129,10 @@ internal fun TextView.applyTextColorTheme(color: ColorTheme?) {
         paint.shader = null
         setTextColor(color.primaryColor)
     }
+
+    // Line below apply text color to any drawable that are part of this TextVIew
+    // e.g.: app:drawableStartCompat="@drawable/ic_attention"
+    color.primaryColorStateList.let(::setCompoundDrawableTintList)
 }
 
 internal fun TextView.applyTextTheme(
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/RemoteConfiguration.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/RemoteConfiguration.kt
index 2b1500981..189ec4615 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/RemoteConfiguration.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/RemoteConfiguration.kt
@@ -5,8 +5,9 @@ import com.glia.widgets.view.unifiedui.config.bubble.BubbleRemoteConfig
 import com.glia.widgets.view.unifiedui.config.call.CallRemoteConfig
 import com.glia.widgets.view.unifiedui.config.callvisualizer.CallVisualizerConfig
 import com.glia.widgets.view.unifiedui.config.chat.ChatRemoteConfig
-import com.glia.widgets.view.unifiedui.config.secureconversations.SecureConversationsConfirmationScreenRemoteConfig
-import com.glia.widgets.view.unifiedui.config.secureconversations.SecureConversationsWelcomeScreenRemoteConfig
+import com.glia.widgets.view.unifiedui.config.entrywidget.EntryWidgetRemoteConfig
+import com.glia.widgets.view.unifiedui.config.securemessaging.SecureMessagingConfirmationScreenRemoteConfig
+import com.glia.widgets.view.unifiedui.config.securemessaging.SecureMessagingWelcomeScreenRemoteConfig
 import com.glia.widgets.view.unifiedui.config.snackbar.SnackBarRemoteConfig
 import com.glia.widgets.view.unifiedui.config.survey.SurveyRemoteConfig
 import com.glia.widgets.view.unifiedui.config.webbrowser.WebBrowserRemoteConfig
@@ -37,17 +38,20 @@ internal data class RemoteConfiguration(
     @SerializedName("callVisualizer")
     val callVisualizerRemoteConfig: CallVisualizerConfig?,
 
-    @SerializedName("secureConversationsWelcomeScreen")
-    val secureConversationsWelcomeScreenRemoteConfig: SecureConversationsWelcomeScreenRemoteConfig?,
+    @SerializedName("secureMessagingWelcomeScreen")
+    val secureMessagingWelcomeScreenRemoteConfig: SecureMessagingWelcomeScreenRemoteConfig?,
 
-    @SerializedName("secureConversationsConfirmationScreen")
-    val secureConversationsConfirmationScreenRemoteConfig: SecureConversationsConfirmationScreenRemoteConfig?,
+    @SerializedName("secureMessagingConfirmationScreen")
+    val secureMessagingConfirmationScreenRemoteConfig: SecureMessagingConfirmationScreenRemoteConfig?,
 
     @SerializedName("snackBar")
     val snackBarRemoteConfig: SnackBarRemoteConfig?,
 
     @SerializedName("webBrowserScreen")
-    val webBrowserRemoteConfig: WebBrowserRemoteConfig?
+    val webBrowserRemoteConfig: WebBrowserRemoteConfig?,
+
+    @SerializedName("entryWidget")
+    val entryWidgetRemoteConfig: EntryWidgetRemoteConfig?
 ) {
     fun toUnifiedTheme(): UnifiedTheme? {
         val defaultTheme = DefaultTheme(globalColorsConfig?.toColorPallet())
@@ -59,11 +63,12 @@ internal data class RemoteConfiguration(
             chatTheme = chatRemoteConfig?.toChatTheme(),
             surveyTheme = surveyRemoteConfig?.toSurveyTheme(),
             callVisualizerTheme = callVisualizerRemoteConfig?.toCallVisualizerTheme(),
-            secureConversationsWelcomeScreenTheme = secureConversationsWelcomeScreenRemoteConfig?.toSecureConversationsWelcomeScreenTheme(),
-            secureConversationsConfirmationScreenTheme = secureConversationsConfirmationScreenRemoteConfig
-                ?.toSecureConversationsConfirmationScreenTheme(),
+            secureMessagingWelcomeScreenTheme = secureMessagingWelcomeScreenRemoteConfig?.toSecureMessagingWelcomeScreenTheme(),
+            secureMessagingConfirmationScreenTheme = secureMessagingConfirmationScreenRemoteConfig
+                ?.toSecureMessagingConfirmationScreenTheme(),
             snackBarTheme = snackBarRemoteConfig?.toSnackBarTheme(),
-            webBrowserTheme = webBrowserRemoteConfig?.toWebBrowserTheme()
+            webBrowserTheme = webBrowserRemoteConfig?.toWebBrowserTheme(),
+            entryWidgetTheme = entryWidgetRemoteConfig?.toEntryWidgetTheme()
         )
 
         return defaultTheme merge unifiedTheme
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/alert/AlertRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/alert/AlertRemoteConfig.kt
index 102fe5d05..21c8639e6 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/alert/AlertRemoteConfig.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/alert/AlertRemoteConfig.kt
@@ -32,6 +32,9 @@ internal data class AlertRemoteConfig(
     @SerializedName("negativeButton")
     val negativeButtonRemoteConfig: ButtonRemoteConfig?,
 
+    @SerializedName("negativeNeutralButton")
+    val negativeNeutralButtonRemoteConfig: ButtonRemoteConfig?,
+
     @SerializedName("buttonAxis")
     val buttonAxisRemoteConfig: AxisRemoteConfig?
 ) {
@@ -44,6 +47,7 @@ internal data class AlertRemoteConfig(
         linkButton = linkButtonRemoteConfig?.toButtonTheme(),
         positiveButton = positiveButtonRemoteConfig?.toButtonTheme(),
         negativeButton = negativeButtonRemoteConfig?.toButtonTheme(),
+        negativeNeutralButton = negativeNeutralButtonRemoteConfig?.toButtonTheme(),
         isVerticalAxis = buttonAxisRemoteConfig?.isVertical
     )
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/chat/ChatRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/chat/ChatRemoteConfig.kt
index 5eb49170e..bc3d650eb 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/chat/ChatRemoteConfig.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/chat/ChatRemoteConfig.kt
@@ -6,6 +6,7 @@ import com.glia.widgets.view.unifiedui.config.base.LayerRemoteConfig
 import com.glia.widgets.view.unifiedui.config.base.TextRemoteConfig
 import com.glia.widgets.view.unifiedui.config.bubble.BubbleRemoteConfig
 import com.glia.widgets.view.unifiedui.config.gva.GvaRemoteConfig
+import com.glia.widgets.view.unifiedui.config.securemessaging.SecureMessagingRemoteConfig
 import com.glia.widgets.view.unifiedui.theme.chat.ChatTheme
 import com.google.gson.annotations.SerializedName
 
@@ -56,7 +57,10 @@ internal data class ChatRemoteConfig(
     val newMessagesDividerTextRemoteConfig: TextRemoteConfig?,
 
     @SerializedName("gva")
-    val gvaRemoteConfig: GvaRemoteConfig?
+    val gvaRemoteConfig: GvaRemoteConfig?,
+
+    @SerializedName("secureMessaging")
+    val secureMessagingRemoteConfig: SecureMessagingRemoteConfig?
 ) {
     fun toChatTheme(): ChatTheme = ChatTheme(
         background = background?.toLayerTheme(),
@@ -74,6 +78,7 @@ internal data class ChatRemoteConfig(
         typingIndicator = typingIndicator?.toColorTheme(),
         newMessagesDividerColorTheme = newMessagesDividerColorRemoteConfig?.toColorTheme(),
         newMessagesDividerTextTheme = newMessagesDividerTextRemoteConfig?.toTextTheme(),
-        gva = gvaRemoteConfig?.toGvaTheme()
+        gva = gvaRemoteConfig?.toGvaTheme(),
+        secureMessaging = secureMessagingRemoteConfig?.toSecureMessagingTheme()
     )
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/EntryWidgetRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/EntryWidgetRemoteConfig.kt
new file mode 100644
index 000000000..84478d27b
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/EntryWidgetRemoteConfig.kt
@@ -0,0 +1,28 @@
+package com.glia.widgets.view.unifiedui.config.entrywidget
+
+import com.glia.widgets.view.unifiedui.config.base.LayerRemoteConfig
+import com.glia.widgets.view.unifiedui.config.base.TextRemoteConfig
+import com.glia.widgets.view.unifiedui.config.base.ButtonRemoteConfig
+import com.google.gson.annotations.SerializedName
+import com.glia.widgets.view.unifiedui.theme.entrywidget.EntryWidgetTheme
+
+internal data class EntryWidgetRemoteConfig(
+    @SerializedName("background")
+    val background: LayerRemoteConfig?,
+    @SerializedName("mediaTypeItems")
+    val mediaTypeItems: MediaTypeItemsRemoteConfig?,
+    @SerializedName("errorTitle")
+    val errorTitle: TextRemoteConfig?,
+    @SerializedName("errorMessage")
+    val errorMessage: TextRemoteConfig?,
+    @SerializedName("errorButton")
+    val errorButton: ButtonRemoteConfig?
+) {
+    fun toEntryWidgetTheme(): EntryWidgetTheme = EntryWidgetTheme(
+        background = background?.toLayerTheme(),
+        mediaTypeItems = mediaTypeItems?.toMediaTypeItemsTheme(),
+        errorTitle = errorTitle?.toTextTheme(),
+        errorMessage = errorMessage?.toTextTheme(),
+        errorButton = errorButton?.toButtonTheme()
+    )
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/MediaTypeItemRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/MediaTypeItemRemoteConfig.kt
new file mode 100644
index 000000000..76db67456
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/MediaTypeItemRemoteConfig.kt
@@ -0,0 +1,28 @@
+package com.glia.widgets.view.unifiedui.config.entrywidget
+
+import com.glia.widgets.view.unifiedui.config.base.ColorLayerRemoteConfig
+import com.glia.widgets.view.unifiedui.config.base.LayerRemoteConfig
+import com.glia.widgets.view.unifiedui.config.base.TextRemoteConfig
+import com.glia.widgets.view.unifiedui.theme.entrywidget.MediaTypeItemTheme
+import com.google.gson.annotations.SerializedName
+
+internal data class MediaTypeItemRemoteConfig(
+    @SerializedName("background")
+    val background: LayerRemoteConfig?,
+    @SerializedName("iconColor")
+    val iconColor: ColorLayerRemoteConfig?,
+    @SerializedName("title")
+    val title: TextRemoteConfig?,
+    @SerializedName("message")
+    val message: TextRemoteConfig?,
+    @SerializedName("loadingTintColor")
+    val loadingTintColor: ColorLayerRemoteConfig?
+) {
+    fun toMediaTypeItemTheme(): MediaTypeItemTheme = MediaTypeItemTheme(
+        background = background?.toLayerTheme(),
+        iconColor = iconColor?.toColorTheme(),
+        title = title?.toTextTheme(),
+        message = message?.toTextTheme(),
+        loadingTintColor = loadingTintColor?.toColorTheme()
+    )
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/MediaTypeItemsRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/MediaTypeItemsRemoteConfig.kt
new file mode 100644
index 000000000..cbb1d69df
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/entrywidget/MediaTypeItemsRemoteConfig.kt
@@ -0,0 +1,17 @@
+package com.glia.widgets.view.unifiedui.config.entrywidget
+
+import com.glia.widgets.view.unifiedui.config.base.ColorLayerRemoteConfig
+import com.glia.widgets.view.unifiedui.theme.entrywidget.MediaTypeItemsTheme
+import com.google.gson.annotations.SerializedName
+
+internal data class MediaTypeItemsRemoteConfig(
+    @SerializedName("mediaTypeItem")
+    val mediaTypeItem: MediaTypeItemRemoteConfig?,
+    @SerializedName("dividerColor")
+    val dividerColor: ColorLayerRemoteConfig?
+) {
+    fun toMediaTypeItemsTheme(): MediaTypeItemsTheme = MediaTypeItemsTheme(
+        mediaTypeItem = mediaTypeItem?.toMediaTypeItemTheme(),
+        dividerColor = dividerColor?.toColorTheme()
+    )
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/secureconversations/SecureConversationsConfirmationScreenRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingConfirmationScreenRemoteConfig.kt
similarity index 74%
rename from widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/secureconversations/SecureConversationsConfirmationScreenRemoteConfig.kt
rename to widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingConfirmationScreenRemoteConfig.kt
index df8fc225f..430317f66 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/secureconversations/SecureConversationsConfirmationScreenRemoteConfig.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingConfirmationScreenRemoteConfig.kt
@@ -1,13 +1,13 @@
-package com.glia.widgets.view.unifiedui.config.secureconversations
+package com.glia.widgets.view.unifiedui.config.securemessaging
 
 import com.glia.widgets.view.unifiedui.config.base.ButtonRemoteConfig
 import com.glia.widgets.view.unifiedui.config.base.ColorLayerRemoteConfig
 import com.glia.widgets.view.unifiedui.config.base.HeaderRemoteConfig
 import com.glia.widgets.view.unifiedui.config.base.TextRemoteConfig
-import com.glia.widgets.view.unifiedui.theme.secureconversations.SecureConversationsConfirmationScreenTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingConfirmationScreenTheme
 import com.google.gson.annotations.SerializedName
 
-internal data class SecureConversationsConfirmationScreenRemoteConfig(
+internal data class SecureMessagingConfirmationScreenRemoteConfig(
     @SerializedName("header")
     val header: HeaderRemoteConfig?,
     @SerializedName("background")
@@ -21,8 +21,8 @@ internal data class SecureConversationsConfirmationScreenRemoteConfig(
     @SerializedName("checkMessagesButton")
     val checkMessagesButton: ButtonRemoteConfig?
 ) {
-    fun toSecureConversationsConfirmationScreenTheme(): SecureConversationsConfirmationScreenTheme =
-        SecureConversationsConfirmationScreenTheme(
+    fun toSecureMessagingConfirmationScreenTheme(): SecureMessagingConfirmationScreenTheme =
+        SecureMessagingConfirmationScreenTheme(
             headerTheme = header?.toHeaderTheme(),
             backgroundTheme = background?.toColorTheme(),
             iconColorTheme = iconColor?.toColorTheme(),
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingRemoteConfig.kt
new file mode 100644
index 000000000..c610e6287
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingRemoteConfig.kt
@@ -0,0 +1,44 @@
+package com.glia.widgets.view.unifiedui.config.securemessaging
+
+import com.glia.widgets.view.unifiedui.config.base.ColorLayerRemoteConfig
+import com.glia.widgets.view.unifiedui.config.base.LayerRemoteConfig
+import com.glia.widgets.view.unifiedui.config.base.TextRemoteConfig
+import com.glia.widgets.view.unifiedui.config.entrywidget.MediaTypeItemsRemoteConfig
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingTheme
+import com.google.gson.annotations.SerializedName
+
+internal data class SecureMessagingRemoteConfig(
+    @SerializedName("unavailableStatusBackground")
+    val unavailableStatusBackground: LayerRemoteConfig?,
+    @SerializedName("unavailableStatusText")
+    val unavailableStatusText: TextRemoteConfig?,
+    @SerializedName("bottomBannerBackground")
+    val bottomBannerBackground: LayerRemoteConfig?,
+    @SerializedName("bottomBannerText")
+    val bottomBannerText: TextRemoteConfig?,
+    @SerializedName("bottomBannerDividerColor")
+    val bottomBannerDividerColor: ColorLayerRemoteConfig?,
+    @SerializedName("topBannerBackground")
+    val topBannerBackground: LayerRemoteConfig?,
+    @SerializedName("topBannerText")
+    val topBannerText: TextRemoteConfig?,
+    @SerializedName("topBannerDividerColor")
+    val topBannerDividerColor: ColorLayerRemoteConfig?,
+    @SerializedName("topBannerDropDownIconColor")
+    val topBannerDropDownIconColor: ColorLayerRemoteConfig?,
+    @SerializedName("mediaTypeItems")
+    val mediaTypeItems: MediaTypeItemsRemoteConfig?
+) {
+    fun toSecureMessagingTheme(): SecureMessagingTheme = SecureMessagingTheme(
+        unavailableStatusBackground = unavailableStatusBackground?.toLayerTheme(),
+        unavailableStatusText = unavailableStatusText?.toTextTheme(),
+        bottomBannerBackground = bottomBannerBackground?.toLayerTheme(),
+        bottomBannerText = bottomBannerText?.toTextTheme(),
+        bottomBannerDividerColor = bottomBannerDividerColor?.toColorTheme(),
+        topBannerBackground = topBannerBackground?.toLayerTheme(),
+        topBannerText = topBannerText?.toTextTheme(),
+        topBannerDividerColor = topBannerDividerColor?.toColorTheme(),
+        topBannerDropDownIconColor = topBannerDropDownIconColor?.toColorTheme(),
+        mediaTypeItems = mediaTypeItems?.toMediaTypeItemsTheme()
+    )
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/secureconversations/SecureConversationsWelcomeScreenRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingWelcomeScreenRemoteConfig.kt
similarity index 92%
rename from widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/secureconversations/SecureConversationsWelcomeScreenRemoteConfig.kt
rename to widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingWelcomeScreenRemoteConfig.kt
index 3d24025c7..8a9711886 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/secureconversations/SecureConversationsWelcomeScreenRemoteConfig.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/securemessaging/SecureMessagingWelcomeScreenRemoteConfig.kt
@@ -1,4 +1,4 @@
-package com.glia.widgets.view.unifiedui.config.secureconversations
+package com.glia.widgets.view.unifiedui.config.securemessaging
 
 import com.glia.widgets.view.unifiedui.config.base.ButtonRemoteConfig
 import com.glia.widgets.view.unifiedui.config.base.ColorLayerRemoteConfig
@@ -7,10 +7,10 @@ import com.glia.widgets.view.unifiedui.config.base.TextInputRemoteConfig
 import com.glia.widgets.view.unifiedui.config.base.TextRemoteConfig
 import com.glia.widgets.view.unifiedui.config.chat.AttachmentSourceListRemoteConfig
 import com.glia.widgets.view.unifiedui.config.chat.FileUploadBarRemoteConfig
-import com.glia.widgets.view.unifiedui.theme.secureconversations.SecureConversationsWelcomeScreenTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingWelcomeScreenTheme
 import com.google.gson.annotations.SerializedName
 
-internal data class SecureConversationsWelcomeScreenRemoteConfig(
+internal data class SecureMessagingWelcomeScreenRemoteConfig(
     @SerializedName("header")
     val headerRemoteConfig: HeaderRemoteConfig?,
     @SerializedName("welcomeTitle")
@@ -56,8 +56,8 @@ internal data class SecureConversationsWelcomeScreenRemoteConfig(
     @SerializedName("background")
     val backgroundRemoteConfig: ColorLayerRemoteConfig?
 ) {
-    fun toSecureConversationsWelcomeScreenTheme(): SecureConversationsWelcomeScreenTheme =
-        SecureConversationsWelcomeScreenTheme(
+    fun toSecureMessagingWelcomeScreenTheme(): SecureMessagingWelcomeScreenTheme =
+        SecureMessagingWelcomeScreenTheme(
             headerTheme = headerRemoteConfig?.toHeaderTheme(),
             welcomeTitleTheme = welcomeTitleRemoteConfig?.toTextTheme(),
             titleImageTheme = titleImageRemoteConfig?.toColorTheme(),
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/webbrowser/WebBrowserRemoteConfig.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/webbrowser/WebBrowserRemoteConfig.kt
index 4b88ed417..a418157fe 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/webbrowser/WebBrowserRemoteConfig.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/config/webbrowser/WebBrowserRemoteConfig.kt
@@ -1,7 +1,7 @@
 package com.glia.widgets.view.unifiedui.config.webbrowser
 
 import com.glia.widgets.view.unifiedui.config.base.HeaderRemoteConfig
-import com.glia.widgets.view.unifiedui.webbrowser.WebBrowserTheme
+import com.glia.widgets.view.unifiedui.theme.webbrowser.WebBrowserTheme
 import com.google.gson.annotations.SerializedName
 
 internal data class WebBrowserRemoteConfig(
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedTheme.kt
index 943dfac18..6ec8bda91 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedTheme.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedTheme.kt
@@ -7,10 +7,11 @@ import com.glia.widgets.view.unifiedui.theme.bubble.BubbleTheme
 import com.glia.widgets.view.unifiedui.theme.call.CallTheme
 import com.glia.widgets.view.unifiedui.theme.callvisulaizer.CallVisualizerTheme
 import com.glia.widgets.view.unifiedui.theme.chat.ChatTheme
-import com.glia.widgets.view.unifiedui.theme.secureconversations.SecureConversationsConfirmationScreenTheme
-import com.glia.widgets.view.unifiedui.theme.secureconversations.SecureConversationsWelcomeScreenTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.EntryWidgetTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingConfirmationScreenTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingWelcomeScreenTheme
 import com.glia.widgets.view.unifiedui.theme.survey.SurveyTheme
-import com.glia.widgets.view.unifiedui.webbrowser.WebBrowserTheme
+import com.glia.widgets.view.unifiedui.theme.webbrowser.WebBrowserTheme
 
 internal data class UnifiedTheme(
     val alertTheme: AlertTheme? = null,
@@ -19,10 +20,11 @@ internal data class UnifiedTheme(
     val chatTheme: ChatTheme? = null,
     val surveyTheme: SurveyTheme? = null,
     val callVisualizerTheme: CallVisualizerTheme? = null,
-    val secureConversationsWelcomeScreenTheme: SecureConversationsWelcomeScreenTheme? = null,
-    val secureConversationsConfirmationScreenTheme: SecureConversationsConfirmationScreenTheme? = null,
+    val secureMessagingWelcomeScreenTheme: SecureMessagingWelcomeScreenTheme? = null,
+    val secureMessagingConfirmationScreenTheme: SecureMessagingConfirmationScreenTheme? = null,
     val snackBarTheme: SnackBarTheme? = null,
-    val webBrowserTheme: WebBrowserTheme? = null
+    val webBrowserTheme: WebBrowserTheme? = null,
+    val entryWidgetTheme: EntryWidgetTheme? = null
 ) : Mergeable<UnifiedTheme> {
     override fun merge(other: UnifiedTheme): UnifiedTheme = UnifiedTheme(
         alertTheme = alertTheme merge other.alertTheme,
@@ -31,10 +33,11 @@ internal data class UnifiedTheme(
         chatTheme = chatTheme merge other.chatTheme,
         surveyTheme = surveyTheme merge other.surveyTheme,
         callVisualizerTheme = callVisualizerTheme merge other.callVisualizerTheme,
-        secureConversationsWelcomeScreenTheme = secureConversationsWelcomeScreenTheme merge other.secureConversationsWelcomeScreenTheme,
-        secureConversationsConfirmationScreenTheme = secureConversationsConfirmationScreenTheme merge other.secureConversationsConfirmationScreenTheme,
+        secureMessagingWelcomeScreenTheme = secureMessagingWelcomeScreenTheme merge other.secureMessagingWelcomeScreenTheme,
+        secureMessagingConfirmationScreenTheme = secureMessagingConfirmationScreenTheme merge other.secureMessagingConfirmationScreenTheme,
         snackBarTheme = snackBarTheme merge other.snackBarTheme,
-        webBrowserTheme = webBrowserTheme merge other.webBrowserTheme
+        webBrowserTheme = webBrowserTheme merge other.webBrowserTheme,
+        entryWidgetTheme = entryWidgetTheme merge other.entryWidgetTheme
     )
 
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedThemeManager.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedThemeManager.kt
index 367afa7bf..c93838068 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedThemeManager.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedThemeManager.kt
@@ -5,7 +5,7 @@ import com.glia.widgets.view.unifiedui.parse.RemoteConfigurationParser
 internal class UnifiedThemeManager {
     private val parser: RemoteConfigurationParser by lazy { RemoteConfigurationParser() }
 
-    internal var theme: UnifiedTheme? = null
+    var theme: UnifiedTheme? = null
 
     fun applyJsonConfig(jsonConfig: String?) {
         theme = jsonConfig?.let(parser::parseRemoteConfiguration)?.toUnifiedTheme()
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/alert/AlertTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/alert/AlertTheme.kt
index 6fb8e613d..52b9b27a6 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/alert/AlertTheme.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/alert/AlertTheme.kt
@@ -15,6 +15,7 @@ internal data class AlertTheme(
     val linkButton: ButtonTheme? = null,
     val positiveButton: ButtonTheme? = null,
     val negativeButton: ButtonTheme? = null,
+    val negativeNeutralButton: ButtonTheme? = null,
     val isVerticalAxis: Boolean? = null
 ) : Mergeable<AlertTheme> {
     override fun merge(other: AlertTheme): AlertTheme = AlertTheme(
@@ -26,6 +27,7 @@ internal data class AlertTheme(
         linkButton = linkButton merge other.linkButton,
         positiveButton = positiveButton merge other.positiveButton,
         negativeButton = negativeButton merge other.negativeButton,
+        negativeNeutralButton = negativeNeutralButton merge other.negativeNeutralButton,
         isVerticalAxis = isVerticalAxis merge other.isVerticalAxis
     )
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/chat/ChatTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/chat/ChatTheme.kt
index 8d2eff1d6..239d2ad69 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/chat/ChatTheme.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/chat/ChatTheme.kt
@@ -8,6 +8,7 @@ import com.glia.widgets.view.unifiedui.theme.base.LayerTheme
 import com.glia.widgets.view.unifiedui.theme.base.TextTheme
 import com.glia.widgets.view.unifiedui.theme.bubble.BubbleTheme
 import com.glia.widgets.view.unifiedui.theme.gva.GvaTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingTheme
 
 internal data class ChatTheme(
     val background: LayerTheme? = null,
@@ -25,7 +26,8 @@ internal data class ChatTheme(
     val typingIndicator: ColorTheme? = null,
     val newMessagesDividerColorTheme: ColorTheme? = null,
     val newMessagesDividerTextTheme: TextTheme? = null,
-    val gva: GvaTheme? = null
+    val gva: GvaTheme? = null,
+    val secureMessaging: SecureMessagingTheme? = null
 ) : Mergeable<ChatTheme> {
     override fun merge(other: ChatTheme): ChatTheme = ChatTheme(
         background = background merge other.background,
@@ -43,6 +45,7 @@ internal data class ChatTheme(
         typingIndicator = typingIndicator merge other.typingIndicator,
         newMessagesDividerColorTheme = newMessagesDividerColorTheme merge other.newMessagesDividerColorTheme,
         newMessagesDividerTextTheme = newMessagesDividerTextTheme merge other.newMessagesDividerTextTheme,
-        gva = gva merge other.gva
+        gva = gva merge other.gva,
+        secureMessaging = secureMessaging merge other.secureMessaging
     )
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Base.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Base.kt
index 0340a3a04..90d5f3e05 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Base.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Base.kt
@@ -16,9 +16,10 @@ internal fun DefaultTheme(pallet: ColorPallet?): UnifiedTheme? = pallet?.let {
         chatTheme = ChatTheme(it),
         surveyTheme = SurveyTheme(it),
         callVisualizerTheme = CallVisualizerTheme(it),
-        secureConversationsWelcomeScreenTheme = SecureConversationsWelcomeScreenTheme(it),
-        secureConversationsConfirmationScreenTheme = SecureConversationsConfirmationScreenTheme(it),
+        secureMessagingWelcomeScreenTheme = SecureMessagingWelcomeScreenTheme(it),
+        secureMessagingConfirmationScreenTheme = SecureMessagingConfirmationScreenTheme(it),
         snackBarTheme = DefaultSnackBarTheme(it),
-        webBrowserTheme = WebBrowserTheme(it)
+        webBrowserTheme = WebBrowserTheme(it),
+        entryWidgetTheme = EntryWidgetTheme(it)
     )
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Chat.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Chat.kt
index 13523fb3f..5bf2fa9a8 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Chat.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Chat.kt
@@ -37,7 +37,8 @@ internal fun ChatTheme(pallet: ColorPallet): ChatTheme = ChatTheme(
     typingIndicator = pallet.primaryColorTheme,
     newMessagesDividerColorTheme = pallet.primaryColorTheme,
     newMessagesDividerTextTheme = TextTheme(textColor = pallet.primaryColorTheme),
-    gva = GvaTheme(pallet)
+    gva = GvaTheme(pallet),
+    secureMessaging = SecureMessagingTheme(pallet)
 )
 
 /**
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/EntryWidget.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/EntryWidget.kt
new file mode 100644
index 000000000..0f0f5e1f6
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/EntryWidget.kt
@@ -0,0 +1,46 @@
+@file:Suppress("FunctionName")
+
+package com.glia.widgets.view.unifiedui.theme.defaulttheme
+
+import com.glia.widgets.view.unifiedui.theme.ColorPallet
+import com.glia.widgets.view.unifiedui.theme.base.LayerTheme
+import com.glia.widgets.view.unifiedui.theme.base.TextTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.EntryWidgetTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.MediaTypeItemTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.MediaTypeItemsTheme
+
+internal fun EntryWidgetTheme(pallet: ColorPallet?): EntryWidgetTheme? = pallet?.run {
+    EntryWidgetTheme(
+        background = LayerTheme(baseLightColorTheme),
+        mediaTypeItems = DefaultMediaTypeItemsTheme(this),
+        errorTitle = TextTheme(
+            textColor = baseDarkColorTheme
+        ),
+        errorMessage = TextTheme(
+            textColor = baseShadeColorTheme
+        ),
+        errorButton = LinkDefaultButtonTheme(this)
+    )
+}
+
+internal fun DefaultMediaTypeItemsTheme(pallet: ColorPallet?): MediaTypeItemsTheme? =
+    pallet?.run {
+        MediaTypeItemsTheme(
+            mediaTypeItem = DefaultMediaItemTypeTheme(this),
+            dividerColor = baseShadeColorTheme
+        )
+    }
+
+internal fun DefaultMediaItemTypeTheme(pallet: ColorPallet?): MediaTypeItemTheme? =
+    pallet?.run {
+        MediaTypeItemTheme(
+            iconColor = primaryColorTheme,
+            title = TextTheme(
+                textColor = baseDarkColorTheme
+            ),
+            message = TextTheme(
+                textColor = baseNormalColorTheme
+            ),
+            loadingTintColor = baseShadeColorTheme
+        )
+    }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/SecureConversations.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/SecureConversations.kt
index 0fea611ee..2b4ae1289 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/SecureConversations.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/SecureConversations.kt
@@ -10,15 +10,16 @@ import com.glia.widgets.view.unifiedui.theme.base.ColorTheme
 import com.glia.widgets.view.unifiedui.theme.base.LayerTheme
 import com.glia.widgets.view.unifiedui.theme.base.TextInputTheme
 import com.glia.widgets.view.unifiedui.theme.base.TextTheme
-import com.glia.widgets.view.unifiedui.theme.secureconversations.SecureConversationsConfirmationScreenTheme
-import com.glia.widgets.view.unifiedui.theme.secureconversations.SecureConversationsWelcomeScreenTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingConfirmationScreenTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingTheme
+import com.glia.widgets.view.unifiedui.theme.securemessaging.SecureMessagingWelcomeScreenTheme
 
-internal fun SecureConversationsWelcomeScreenTheme(pallet: ColorPallet):
-    SecureConversationsWelcomeScreenTheme {
+internal fun SecureMessagingWelcomeScreenTheme(pallet: ColorPallet):
+    SecureMessagingWelcomeScreenTheme {
     return pallet.let {
         val baseDarkColorText = TextTheme(textColor = pallet.baseDarkColorTheme)
 
-        SecureConversationsWelcomeScreenTheme(
+        SecureMessagingWelcomeScreenTheme(
             headerTheme = PrimaryColorHeaderTheme(it),
             welcomeTitleTheme = baseDarkColorText,
             titleImageTheme = it.primaryColorTheme,
@@ -77,10 +78,10 @@ private fun DefaultInputTheme(
     )
 }
 
-internal fun SecureConversationsConfirmationScreenTheme(pallet: ColorPallet):
-    SecureConversationsConfirmationScreenTheme {
+internal fun SecureMessagingConfirmationScreenTheme(pallet: ColorPallet):
+    SecureMessagingConfirmationScreenTheme {
     return pallet.let {
-        SecureConversationsConfirmationScreenTheme(
+        SecureMessagingConfirmationScreenTheme(
             headerTheme = PrimaryColorHeaderTheme(it),
             backgroundTheme = it.baseLightColorTheme,
             iconColorTheme = it.primaryColorTheme,
@@ -90,3 +91,21 @@ internal fun SecureConversationsConfirmationScreenTheme(pallet: ColorPallet):
         )
     }
 }
+
+internal fun SecureMessagingTheme(pallet: ColorPallet): SecureMessagingTheme {
+    return pallet.let {
+        SecureMessagingTheme(
+            unavailableStatusBackground = LayerTheme(fill = it.systemNegativeColorTheme),
+            unavailableStatusText = BaseLightColorTextTheme(it),
+            bottomBannerBackground = LayerTheme(fill = it.baseNeutralColorTheme),
+            bottomBannerText = BaseNormalColorTextTheme(it),
+            bottomBannerDividerColor = it.baseShadeColorTheme,
+            topBannerBackground = LayerTheme(fill = it.baseNeutralColorTheme),
+            topBannerText = BaseDarkColorTextTheme(it),
+            topBannerDividerColor = it.baseShadeColorTheme,
+            topBannerDropDownIconColor = it.baseNormalColorTheme,
+            mediaTypeItems = DefaultMediaTypeItemsTheme(it)
+        )
+    }
+}
+
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/WebBrowser.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/WebBrowser.kt
index 4b7587aaa..026ee1e43 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/WebBrowser.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/WebBrowser.kt
@@ -1,7 +1,7 @@
 package com.glia.widgets.view.unifiedui.theme.defaulttheme
 
 import com.glia.widgets.view.unifiedui.theme.ColorPallet
-import com.glia.widgets.view.unifiedui.webbrowser.WebBrowserTheme
+import com.glia.widgets.view.unifiedui.theme.webbrowser.WebBrowserTheme
 
 /**
  * Default theme for Chat screen
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/EntryWidgetTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/EntryWidgetTheme.kt
new file mode 100644
index 000000000..69baab64e
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/EntryWidgetTheme.kt
@@ -0,0 +1,23 @@
+package com.glia.widgets.view.unifiedui.theme.entrywidget
+
+import com.glia.widgets.view.unifiedui.Mergeable
+import com.glia.widgets.view.unifiedui.merge
+import com.glia.widgets.view.unifiedui.theme.base.ButtonTheme
+import com.glia.widgets.view.unifiedui.theme.base.LayerTheme
+import com.glia.widgets.view.unifiedui.theme.base.TextTheme
+
+internal data class EntryWidgetTheme(
+    val background: LayerTheme? = null,
+    val mediaTypeItems: MediaTypeItemsTheme? = null,
+    val errorTitle: TextTheme? = null,
+    val errorMessage: TextTheme? = null,
+    val errorButton: ButtonTheme? = null
+) : Mergeable<EntryWidgetTheme> {
+    override fun merge(other: EntryWidgetTheme): EntryWidgetTheme = EntryWidgetTheme(
+        background = background merge other.background,
+        mediaTypeItems = mediaTypeItems merge other.mediaTypeItems,
+        errorTitle = errorTitle merge other.errorTitle,
+        errorMessage = errorMessage merge other.errorMessage,
+        errorButton = errorButton merge other.errorButton
+    )
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/MediaTypeItemTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/MediaTypeItemTheme.kt
new file mode 100644
index 000000000..9b4f2d32c
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/MediaTypeItemTheme.kt
@@ -0,0 +1,23 @@
+package com.glia.widgets.view.unifiedui.theme.entrywidget
+
+import com.glia.widgets.view.unifiedui.Mergeable
+import com.glia.widgets.view.unifiedui.merge
+import com.glia.widgets.view.unifiedui.theme.base.ColorTheme
+import com.glia.widgets.view.unifiedui.theme.base.LayerTheme
+import com.glia.widgets.view.unifiedui.theme.base.TextTheme
+
+internal data class MediaTypeItemTheme(
+    val background: LayerTheme? = null,
+    val iconColor: ColorTheme? = null,
+    val title: TextTheme? = null,
+    val message: TextTheme? = null,
+    val loadingTintColor: ColorTheme? = null
+) : Mergeable<MediaTypeItemTheme> {
+    override fun merge(other: MediaTypeItemTheme): MediaTypeItemTheme = MediaTypeItemTheme(
+        background = background merge other.background,
+        iconColor = iconColor merge other.iconColor,
+        title = title merge other.title,
+        message = message merge other.message,
+        loadingTintColor = loadingTintColor merge other.loadingTintColor
+    )
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/MediaTypeItemsTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/MediaTypeItemsTheme.kt
new file mode 100644
index 000000000..eae4dc646
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/entrywidget/MediaTypeItemsTheme.kt
@@ -0,0 +1,15 @@
+package com.glia.widgets.view.unifiedui.theme.entrywidget
+
+import com.glia.widgets.view.unifiedui.Mergeable
+import com.glia.widgets.view.unifiedui.merge
+import com.glia.widgets.view.unifiedui.theme.base.ColorTheme
+
+internal data class MediaTypeItemsTheme(
+    val mediaTypeItem: MediaTypeItemTheme? = null,
+    val dividerColor: ColorTheme? = null
+) : Mergeable<MediaTypeItemsTheme> {
+    override fun merge(other: MediaTypeItemsTheme): MediaTypeItemsTheme = MediaTypeItemsTheme(
+        mediaTypeItem = mediaTypeItem merge other.mediaTypeItem,
+        dividerColor = dividerColor merge other.dividerColor
+    )
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/secureconversations/SecureConversationsConfirmationScreenTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingConfirmationScreenTheme.kt
similarity index 74%
rename from widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/secureconversations/SecureConversationsConfirmationScreenTheme.kt
rename to widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingConfirmationScreenTheme.kt
index c3f4eddce..c61f412d0 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/secureconversations/SecureConversationsConfirmationScreenTheme.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingConfirmationScreenTheme.kt
@@ -1,4 +1,4 @@
-package com.glia.widgets.view.unifiedui.theme.secureconversations
+package com.glia.widgets.view.unifiedui.theme.securemessaging
 
 import com.glia.widgets.view.unifiedui.Mergeable
 import com.glia.widgets.view.unifiedui.merge
@@ -7,16 +7,16 @@ import com.glia.widgets.view.unifiedui.theme.base.ColorTheme
 import com.glia.widgets.view.unifiedui.theme.base.HeaderTheme
 import com.glia.widgets.view.unifiedui.theme.base.TextTheme
 
-internal data class SecureConversationsConfirmationScreenTheme(
+internal data class SecureMessagingConfirmationScreenTheme(
     val headerTheme: HeaderTheme? = null,
     val backgroundTheme: ColorTheme? = null,
     val iconColorTheme: ColorTheme? = null,
     val titleTheme: TextTheme? = null,
     val subtitleTheme: TextTheme? = null,
     val checkMessagesButtonTheme: ButtonTheme? = null
-) : Mergeable<SecureConversationsConfirmationScreenTheme> {
-    override fun merge(other: SecureConversationsConfirmationScreenTheme): SecureConversationsConfirmationScreenTheme =
-        SecureConversationsConfirmationScreenTheme(
+) : Mergeable<SecureMessagingConfirmationScreenTheme> {
+    override fun merge(other: SecureMessagingConfirmationScreenTheme): SecureMessagingConfirmationScreenTheme =
+        SecureMessagingConfirmationScreenTheme(
             headerTheme = headerTheme merge other.headerTheme,
             backgroundTheme = backgroundTheme merge other.backgroundTheme,
             iconColorTheme = iconColorTheme merge other.iconColorTheme,
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingTheme.kt
new file mode 100644
index 000000000..09885d4d9
--- /dev/null
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingTheme.kt
@@ -0,0 +1,34 @@
+package com.glia.widgets.view.unifiedui.theme.securemessaging
+
+import com.glia.widgets.view.unifiedui.Mergeable
+import com.glia.widgets.view.unifiedui.merge
+import com.glia.widgets.view.unifiedui.theme.base.ColorTheme
+import com.glia.widgets.view.unifiedui.theme.base.LayerTheme
+import com.glia.widgets.view.unifiedui.theme.base.TextTheme
+import com.glia.widgets.view.unifiedui.theme.entrywidget.MediaTypeItemsTheme
+
+internal data class SecureMessagingTheme(
+    val unavailableStatusBackground: LayerTheme?,
+    val unavailableStatusText: TextTheme?,
+    val bottomBannerBackground: LayerTheme?,
+    val bottomBannerText: TextTheme?,
+    val bottomBannerDividerColor: ColorTheme?,
+    val topBannerBackground: LayerTheme?,
+    val topBannerText: TextTheme?,
+    val topBannerDividerColor: ColorTheme?,
+    val topBannerDropDownIconColor: ColorTheme?,
+    val mediaTypeItems: MediaTypeItemsTheme?
+) : Mergeable<SecureMessagingTheme> {
+    override fun merge(other: SecureMessagingTheme): SecureMessagingTheme = SecureMessagingTheme(
+        unavailableStatusBackground = unavailableStatusBackground merge other.unavailableStatusBackground,
+        unavailableStatusText = unavailableStatusText merge other.unavailableStatusText,
+        bottomBannerBackground = bottomBannerBackground merge other.bottomBannerBackground,
+        bottomBannerText = bottomBannerText merge other.bottomBannerText,
+        bottomBannerDividerColor = bottomBannerDividerColor merge other.bottomBannerDividerColor,
+        topBannerBackground = topBannerBackground merge other.topBannerBackground,
+        topBannerText = topBannerText merge other.topBannerText,
+        topBannerDividerColor = topBannerDividerColor merge other.topBannerDividerColor,
+        topBannerDropDownIconColor = topBannerDropDownIconColor merge other.topBannerDropDownIconColor,
+        mediaTypeItems = mediaTypeItems merge other.mediaTypeItems
+    )
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/secureconversations/SecureConversationsWelcomeScreenTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingWelcomeScreenTheme.kt
similarity index 91%
rename from widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/secureconversations/SecureConversationsWelcomeScreenTheme.kt
rename to widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingWelcomeScreenTheme.kt
index 84617339d..aa24d526c 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/secureconversations/SecureConversationsWelcomeScreenTheme.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/securemessaging/SecureMessagingWelcomeScreenTheme.kt
@@ -1,4 +1,4 @@
-package com.glia.widgets.view.unifiedui.theme.secureconversations
+package com.glia.widgets.view.unifiedui.theme.securemessaging
 
 import com.glia.widgets.view.unifiedui.Mergeable
 import com.glia.widgets.view.unifiedui.merge
@@ -10,7 +10,7 @@ import com.glia.widgets.view.unifiedui.theme.base.TextTheme
 import com.glia.widgets.view.unifiedui.theme.chat.AttachmentsPopupTheme
 import com.glia.widgets.view.unifiedui.theme.chat.FileUploadBarTheme
 
-internal data class SecureConversationsWelcomeScreenTheme(
+internal data class SecureMessagingWelcomeScreenTheme(
     val headerTheme: HeaderTheme? = null,
     val welcomeTitleTheme: TextTheme? = null,
     val titleImageTheme: ColorTheme? = null,
@@ -33,9 +33,9 @@ internal data class SecureConversationsWelcomeScreenTheme(
     val attachmentListTheme: FileUploadBarTheme? = null,
     val pickMediaTheme: AttachmentsPopupTheme? = null,
     val backgroundTheme: ColorTheme? = null
-) : Mergeable<SecureConversationsWelcomeScreenTheme> {
-    override fun merge(other: SecureConversationsWelcomeScreenTheme): SecureConversationsWelcomeScreenTheme =
-        SecureConversationsWelcomeScreenTheme(
+) : Mergeable<SecureMessagingWelcomeScreenTheme> {
+    override fun merge(other: SecureMessagingWelcomeScreenTheme): SecureMessagingWelcomeScreenTheme =
+        SecureMessagingWelcomeScreenTheme(
             headerTheme = headerTheme merge other.headerTheme,
             welcomeTitleTheme = welcomeTitleTheme merge other.welcomeTitleTheme,
             titleImageTheme = titleImageTheme merge other.titleImageTheme,
diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/webbrowser/WebBrowserTheme.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/webbrowser/WebBrowserTheme.kt
similarity index 87%
rename from widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/webbrowser/WebBrowserTheme.kt
rename to widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/webbrowser/WebBrowserTheme.kt
index 7fb7cfcac..f2299f455 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/webbrowser/WebBrowserTheme.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/webbrowser/WebBrowserTheme.kt
@@ -1,4 +1,4 @@
-package com.glia.widgets.view.unifiedui.webbrowser
+package com.glia.widgets.view.unifiedui.theme.webbrowser
 
 import com.glia.widgets.view.unifiedui.Mergeable
 import com.glia.widgets.view.unifiedui.merge
diff --git a/widgetssdk/src/main/java/com/glia/widgets/webbrowser/WebBrowserActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/webbrowser/WebBrowserActivity.kt
index 3ee454337..448d1db32 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/webbrowser/WebBrowserActivity.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/webbrowser/WebBrowserActivity.kt
@@ -1,11 +1,11 @@
 package com.glia.widgets.webbrowser
 
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import com.glia.widgets.base.FadeTransitionActivity
 import com.glia.widgets.databinding.WebBrowserAvtivityBinding
+import com.glia.widgets.helper.ExtraKeys
 import com.glia.widgets.helper.getParcelable
 import com.glia.widgets.locale.LocaleString
 
@@ -33,8 +33,8 @@ internal class WebBrowserActivity :
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
-        val title = intent.getParcelable<LocaleString>(TITLE_KEY)
-        val url = intent.getStringExtra(URL_KEY).orEmpty()
+        val title = intent.getParcelable<LocaleString>(ExtraKeys.WEB_BROWSER_TITLE)
+        val url = intent.getStringExtra(ExtraKeys.WEB_BROWSER_URL).orEmpty()
 
         webBrowserView.onLinkClickListener = this
         webBrowserView.onFinishListener = this
@@ -45,15 +45,4 @@ internal class WebBrowserActivity :
     override fun onLinkClick(url: Uri) {
         startActivity(Intent(Intent.ACTION_VIEW, url))
     }
-
-    companion object {
-        private const val TITLE_KEY = "title"
-        private const val URL_KEY = "url"
-
-        fun intent(context: Context, title: LocaleString, url: String): Intent {
-            return Intent(context, WebBrowserActivity::class.java)
-                .putExtra(TITLE_KEY, title)
-                .putExtra(URL_KEY, url)
-        }
-    }
 }
diff --git a/widgetssdk/src/main/java/com/glia/widgets/webbrowser/WebBrowserView.kt b/widgetssdk/src/main/java/com/glia/widgets/webbrowser/WebBrowserView.kt
index f39369b33..b6380b2a2 100644
--- a/widgetssdk/src/main/java/com/glia/widgets/webbrowser/WebBrowserView.kt
+++ b/widgetssdk/src/main/java/com/glia/widgets/webbrowser/WebBrowserView.kt
@@ -13,7 +13,6 @@ import androidx.core.content.withStyledAttributes
 import androidx.core.view.ViewCompat
 import com.glia.widgets.Constants
 import com.glia.widgets.R
-import com.glia.widgets.UiTheme
 import com.glia.widgets.databinding.WebBrowserViewBinding
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.helper.SimpleWindowInsetsAndAnimationHandler
@@ -24,7 +23,6 @@ import com.glia.widgets.view.header.AppBarView
 import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
 import com.glia.widgets.view.unifiedui.theme.base.HeaderTheme
 import com.google.android.material.theme.overlay.MaterialThemeOverlay
-import kotlin.properties.Delegates
 
 internal class WebBrowserView(
     context: Context,
@@ -38,7 +36,6 @@ internal class WebBrowserView(
     defStyleRes
 ) {
 
-    private var theme: UiTheme by Delegates.notNull()
     private val unifiedTheme: UnifiedTheme? by lazy { Dependencies.gliaThemeManager.theme }
 
     var onFinishListener: OnFinishListener? = null
@@ -108,7 +105,7 @@ internal class WebBrowserView(
     }
 
     private fun setDefaultTheme(typedArray: TypedArray) {
-        theme = Utils.getThemeFromTypedArray(typedArray, this.context)
+        binding?.appBarView?.setTheme(Utils.getThemeFromTypedArray(typedArray, this.context))
     }
 
     private fun initCallbacks() {
diff --git a/widgetssdk/src/main/res/color/call_fab_bg_color_states.xml b/widgetssdk/src/main/res/color/call_fab_bg_color_states.xml
index e0b39be3a..f599f3d7f 100644
--- a/widgetssdk/src/main/res/color/call_fab_bg_color_states.xml
+++ b/widgetssdk/src/main/res/color/call_fab_bg_color_states.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:alpha="0.2" android:color="@color/glia_call_control_buttons_color" android:state_enabled="false" />
-    <item android:alpha="0.9" android:color="@color/glia_base_light_color" android:state_activated="true" />
+    <item android:alpha="0.9" android:color="?attr/gliaBaseLightColor" android:state_activated="true" />
     <item android:alpha="0.4" android:color="@color/glia_call_control_buttons_color" />
 </selector>
diff --git a/widgetssdk/src/main/res/color/call_fab_icon_color_states.xml b/widgetssdk/src/main/res/color/call_fab_icon_color_states.xml
index 505210ca0..056ec12d3 100644
--- a/widgetssdk/src/main/res/color/call_fab_icon_color_states.xml
+++ b/widgetssdk/src/main/res/color/call_fab_icon_color_states.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.2" android:color="@color/glia_base_light_color" android:state_enabled="false" />
-    <item android:color="@color/glia_base_dark_color" android:state_activated="true" />
-    <item android:color="@color/glia_base_light_color" />
+    <item android:alpha="0.2" android:color="?attr/gliaBaseLightColor" android:state_enabled="false" />
+    <item android:color="?attr/gliaBaseDarkColor" android:state_activated="true" />
+    <item android:color="?attr/gliaBaseLightColor" />
 </selector>
diff --git a/widgetssdk/src/main/res/color/call_fab_ripple_color_states.xml b/widgetssdk/src/main/res/color/call_fab_ripple_color_states.xml
index 51c96480b..7a75c511c 100644
--- a/widgetssdk/src/main/res/color/call_fab_ripple_color_states.xml
+++ b/widgetssdk/src/main/res/color/call_fab_ripple_color_states.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/glia_call_control_buttons_color" android:state_activated="true" />
-    <item android:color="@color/glia_base_light_color" />
+    <item android:color="?attr/gliaBaseLightColor" />
 </selector>
diff --git a/widgetssdk/src/main/res/drawable/bg_bottom_sheet.xml b/widgetssdk/src/main/res/drawable/bg_bottom_sheet.xml
new file mode 100644
index 000000000..3b4ccaece
--- /dev/null
+++ b/widgetssdk/src/main/res/drawable/bg_bottom_sheet.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/cardview_light_background" />
+    <corners
+        android:topLeftRadius="28dp"
+        android:topRightRadius="28dp" />
+</shape>
diff --git a/widgetssdk/src/main/res/drawable/bg_circle.xml b/widgetssdk/src/main/res/drawable/bg_circle.xml
new file mode 100644
index 000000000..09e4e7abd
--- /dev/null
+++ b/widgetssdk/src/main/res/drawable/bg_circle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+</shape>
diff --git a/widgetssdk/src/main/res/drawable/bg_entry_widget_divider.xml b/widgetssdk/src/main/res/drawable/bg_entry_widget_divider.xml
new file mode 100644
index 000000000..0d17fd84d
--- /dev/null
+++ b/widgetssdk/src/main/res/drawable/bg_entry_widget_divider.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="@dimen/glia_large"
+        android:right="@dimen/glia_large">
+
+        <shape
+            android:shape="rectangle">
+            <size android:height="@dimen/glia_px" />
+            <solid android:color="?attr/gliaBaseShadeColor" />
+        </shape>
+
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/widgetssdk/src/main/res/drawable/bg_entry_widget_loading.xml b/widgetssdk/src/main/res/drawable/bg_entry_widget_loading.xml
new file mode 100644
index 000000000..8a165034e
--- /dev/null
+++ b/widgetssdk/src/main/res/drawable/bg_entry_widget_loading.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="4dp" />
+</shape>
diff --git a/widgetssdk/src/main/res/drawable/bg_survey_edit_text.xml b/widgetssdk/src/main/res/drawable/bg_survey_edit_text.xml
index d4d02e265..e68286c1e 100644
--- a/widgetssdk/src/main/res/drawable/bg_survey_edit_text.xml
+++ b/widgetssdk/src/main/res/drawable/bg_survey_edit_text.xml
@@ -4,5 +4,5 @@
     <corners android:radius="4dp" />
     <stroke
         android:width="1dp"
-        android:color="@color/glia_base_shade_color" />
+        android:color="?attr/gliaBaseShadeColor" />
 </shape>
diff --git a/widgetssdk/src/main/res/drawable/bg_survey_radio_button.xml b/widgetssdk/src/main/res/drawable/bg_survey_radio_button.xml
index 1bfe49bff..03a72731f 100644
--- a/widgetssdk/src/main/res/drawable/bg_survey_radio_button.xml
+++ b/widgetssdk/src/main/res/drawable/bg_survey_radio_button.xml
@@ -5,7 +5,7 @@
         android:width="@dimen/glia_large_x_large"
         android:height="@dimen/glia_large_x_large">
         <shape android:shape="oval">
-            <solid android:color="@color/glia_base_light_color" />
+            <solid android:color="?attr/gliaBaseLightColor" />
         </shape>
     </item>
 
@@ -16,7 +16,7 @@
         <shape android:shape="oval">
             <stroke
                 android:width="@dimen/glia_px"
-                android:color="@color/glia_base_shade_color" />
+                android:color="?attr/gliaBaseShadeColor" />
         </shape>
     </item>
 
@@ -27,7 +27,7 @@
         android:end="5.25dp"
         android:bottom="5.25dp">
         <shape android:shape="oval">
-            <solid android:color="@color/glia_brand_primary_color" />
+            <solid android:color="?attr/gliaBrandPrimaryColor" />
         </shape>
     </item>
 </layer-list>
diff --git a/widgetssdk/src/main/res/drawable/ic_audio.xml b/widgetssdk/src/main/res/drawable/ic_audio.xml
new file mode 100644
index 000000000..55448bd63
--- /dev/null
+++ b/widgetssdk/src/main/res/drawable/ic_audio.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,14C13.66,14 14.99,12.66 14.99,11L15,5C15,3.34 13.66,2 12,2C10.34,2 9,3.34 9,5V11C9,12.66 10.34,14 12,14ZM17.3,11C17.3,14 14.76,16.1 12,16.1C9.24,16.1 6.7,14 6.7,11H5C5,14.42 7.72,17.23 11,17.72V20H9V22H15V20H13V17.72C16.28,17.24 19,14.42 19,11H17.3Z"
+      android:fillColor="#0F6BFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/widgetssdk/src/main/res/drawable/ic_chat.xml b/widgetssdk/src/main/res/drawable/ic_chat.xml
new file mode 100644
index 000000000..d5067d67f
--- /dev/null
+++ b/widgetssdk/src/main/res/drawable/ic_chat.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.826,3C6.377,3 3.467,5.559 3.055,8.954C2.814,10.936 3.374,12.851 4.632,14.348C5.874,15.827 7.659,16.676 9.524,16.676H11.609L11.786,16.842L16,21L15.963,16.489C19.186,15.693 21.331,12.494 20.958,9.049C20.59,5.657 17.619,3 14.192,3H9.826Z"
+      android:fillColor="#0F6BFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/widgetssdk/src/main/res/drawable/ic_drag_handle.xml b/widgetssdk/src/main/res/drawable/ic_drag_handle.xml
new file mode 100644
index 000000000..c0b572ec5
--- /dev/null
+++ b/widgetssdk/src/main/res/drawable/ic_drag_handle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="33dp"
+    android:height="4dp"
+    android:viewportWidth="33"
+    android:viewportHeight="4">
+  <path
+      android:pathData="M2.5,0L30.5,0A2,2 0,0 1,32.5 2L32.5,2A2,2 0,0 1,30.5 4L2.5,4A2,2 0,0 1,0.5 2L0.5,2A2,2 0,0 1,2.5 0z"
+      android:fillColor="?attr/gliaBaseShadeColor" />
+</vector>
diff --git a/widgetssdk/src/main/res/drawable/ic_video.xml b/widgetssdk/src/main/res/drawable/ic_video.xml
new file mode 100644
index 000000000..dabfc6b37
--- /dev/null
+++ b/widgetssdk/src/main/res/drawable/ic_video.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,5H6C3.791,5 2,6.791 2,9V15C2,17.209 3.791,19 6,19H13C15.209,19 17,17.209 17,15V13.417L22,18V7L17,11.583V9C17,6.791 15.209,5 13,5Z"
+      android:fillColor="#0F6BFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/widgetssdk/src/main/res/layout-land/call_view.xml b/widgetssdk/src/main/res/layout-land/call_view.xml
index 648b3d7ec..7f9e4dcec 100644
--- a/widgetssdk/src/main/res/layout-land/call_view.xml
+++ b/widgetssdk/src/main/res/layout-land/call_view.xml
@@ -37,7 +37,7 @@
         app:layout_constraintStart_toStartOf="@id/start_guideline"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.350"
-        app:rippleTint="@color/glia_base_light_color" />
+        app:rippleTint="?attr/gliaBaseLightColor" />
 
     <com.glia.widgets.call.ThemedStateText
         android:id="@+id/connecting_view"
@@ -48,7 +48,7 @@
         android:gravity="center"
         android:lineSpacingExtra="@dimen/glia_medium"
         android:textAppearance="?attr/textAppearanceHeadline2"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -61,7 +61,7 @@
         android:layout_marginTop="@dimen/glia_large"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceHeadline1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -76,7 +76,7 @@
         android:gravity="center"
         tools:text="@string/glia_call_on_hold"
         android:textAppearance="?attr/textAppearanceBody1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
         app:layout_constraintTop_toBottomOf="@id/operator_name_view" />
@@ -88,7 +88,7 @@
         android:layout_marginTop="@dimen/glia_large"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceHeadline1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -101,7 +101,7 @@
         android:layout_marginTop="@dimen/glia_medium"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceSubtitle1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -114,7 +114,7 @@
         android:layout_marginTop="@dimen/glia_medium"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceBody1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -138,8 +138,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:lightTint="@color/glia_base_light_color"
-        app:negativeTint="@color/glia_system_negative_color"
+        app:lightTint="?attr/gliaBaseLightColor"
+        app:negativeTint="?attr/gliaSystemNegativeColor"
         tools:titleText="@string/media_audio_name" />
 
     <TextView
@@ -148,7 +148,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceBody1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         app:layout_constraintBottom_toTopOf="@id/buttons_layout"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline" />
diff --git a/widgetssdk/src/main/res/layout/call_buttons_layout.xml b/widgetssdk/src/main/res/layout/call_buttons_layout.xml
index 81bebf963..97afc2596 100644
--- a/widgetssdk/src/main/res/layout/call_buttons_layout.xml
+++ b/widgetssdk/src/main/res/layout/call_buttons_layout.xml
@@ -12,7 +12,7 @@
         android:gravity="center"
         tools:text="@string/glia_call_chat_button_label"
         android:textAppearance="?attr/textAppearanceCaption"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/chat_button"
@@ -45,7 +45,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceCaption"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/video_button"
@@ -72,7 +72,7 @@
         android:gravity="center"
         tools:text="@string/glia_call_mute_button_mute"
         android:textAppearance="?attr/textAppearanceCaption"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/mute_button"
@@ -98,7 +98,7 @@
         android:gravity="center"
         tools:text="@string/glia_call_speaker_button_label"
         android:textAppearance="?attr/textAppearanceCaption"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/speaker_button"
@@ -123,7 +123,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceCaption"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/minimize_button"
diff --git a/widgetssdk/src/main/res/layout/call_view.xml b/widgetssdk/src/main/res/layout/call_view.xml
index 47a53308a..324f3eab8 100644
--- a/widgetssdk/src/main/res/layout/call_view.xml
+++ b/widgetssdk/src/main/res/layout/call_view.xml
@@ -13,8 +13,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:lightTint="@color/glia_base_light_color"
-        app:negativeTint="@color/glia_system_negative_color"
+        app:lightTint="?attr/gliaBaseLightColor"
+        app:negativeTint="?attr/gliaSystemNegativeColor"
         tools:titleText="@string/media_audio_name" />
 
     <androidx.constraintlayout.widget.Guideline
@@ -57,7 +57,7 @@
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
         app:layout_constraintTop_toBottomOf="@id/top_app_bar"
-        app:rippleTint="@color/glia_base_light_color" />
+        app:rippleTint="?attr/gliaBaseLightColor" />
 
     <com.glia.widgets.call.ThemedStateText
         android:id="@+id/connecting_view"
@@ -68,7 +68,7 @@
         android:gravity="center"
         android:lineSpacingExtra="@dimen/glia_medium"
         android:textAppearance="?attr/textAppearanceHeadline2"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -81,7 +81,7 @@
         android:layout_marginTop="@dimen/glia_large"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceHeadline1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -96,7 +96,7 @@
         android:gravity="center"
         tools:text="@string/call_on_hold_icon"
         android:textAppearance="?attr/textAppearanceBody1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
         app:layout_constraintTop_toBottomOf="@id/operator_name_view" />
@@ -108,7 +108,7 @@
         android:layout_marginTop="@dimen/glia_large"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceHeadline1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -121,7 +121,7 @@
         android:layout_marginTop="@dimen/glia_medium"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceSubtitle1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -134,7 +134,7 @@
         android:layout_marginTop="@dimen/glia_medium"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceBody1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
@@ -157,7 +157,7 @@
         android:layout_marginBottom="@dimen/glia_x_large"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceBody1"
-        android:textColor="@color/glia_base_light_color"
+        android:textColor="?attr/gliaBaseLightColor"
         app:layout_constraintBottom_toTopOf="@id/buttons_layout"
         app:layout_constraintEnd_toEndOf="@id/end_guideline"
         app:layout_constraintStart_toStartOf="@id/start_guideline"
diff --git a/widgetssdk/src/main/res/layout/chat_attachment_file_item.xml b/widgetssdk/src/main/res/layout/chat_attachment_file_item.xml
index c14a544cc..14da9fee6 100644
--- a/widgetssdk/src/main/res/layout/chat_attachment_file_item.xml
+++ b/widgetssdk/src/main/res/layout/chat_attachment_file_item.xml
@@ -21,7 +21,7 @@
             android:layout_marginStart="@dimen/glia_medium"
             android:layout_marginTop="@dimen/glia_medium"
             android:layout_marginBottom="@dimen/glia_large"
-            app:cardBackgroundColor="@color/glia_brand_primary_color"
+            app:cardBackgroundColor="?attr/gliaBrandPrimaryColor"
             app:cardCornerRadius="@dimen/glia_chat_attachment_corner_radius"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -32,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textColor="@color/glia_base_light_color"
+                android:textColor="?attr/gliaBaseLightColor"
                 android:textSize="14sp"
                 android:textStyle="bold"
                 tools:text="PDF" />
@@ -47,7 +47,7 @@
             android:layout_marginEnd="12dp"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="@color/glia_base_normal_color"
+            android:textColor="?attr/gliaBaseNormalColor"
             android:textAppearance="?attr/textAppearanceCaption"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
@@ -63,7 +63,7 @@
             android:layout_marginTop="4dp"
             android:layout_marginEnd="12dp"
             tools:text="@string/glia_chat_attachment_download_button_label"
-            android:textColor="@color/glia_base_dark_color"
+            android:textColor="?attr/gliaBaseDarkColor"
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
@@ -79,14 +79,14 @@
             android:indeterminate="true"
             android:max="100"
             android:visibility="gone"
-            app:indicatorColor="@color/glia_brand_primary_color"
+            app:indicatorColor="?attr/gliaBrandPrimaryColor"
             app:layout_constraintBottom_toBottomOf="@id/type_indicator_view"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toEndOf="@id/type_indicator_view"
             app:layout_constraintTop_toBottomOf="@id/status_indicator"
             app:layout_constraintWidth_percent="0.5"
-            app:trackColor="@color/glia_system_agent_bubble_color"
+            app:trackColor="?attr/gliaSystemAgentBubbleColor"
             app:trackCornerRadius="4dp" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/widgetssdk/src/main/res/layout/chat_attachment_uploaded_item.xml b/widgetssdk/src/main/res/layout/chat_attachment_uploaded_item.xml
index 0fbe02302..ec6ce3494 100644
--- a/widgetssdk/src/main/res/layout/chat_attachment_uploaded_item.xml
+++ b/widgetssdk/src/main/res/layout/chat_attachment_uploaded_item.xml
@@ -14,7 +14,7 @@
         android:layout_marginStart="@dimen/glia_medium"
         android:layout_marginTop="@dimen/glia_medium"
         android:layout_marginBottom="@dimen/glia_medium"
-        app:cardBackgroundColor="@color/glia_brand_primary_color"
+        app:cardBackgroundColor="?attr/gliaBrandPrimaryColor"
         app:cardCornerRadius="@dimen/glia_chat_attachment_corner_radius"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,7 +33,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/glia_base_light_color"
+            android:textColor="?attr/gliaBaseLightColor"
             android:textSize="14sp"
             android:textStyle="bold"
             tools:text="PDF" />
@@ -53,7 +53,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0"
-        app:tint="@color/glia_base_normal_color" />
+        app:tint="?attr/gliaBaseNormalColor" />
 
     <TextView
         android:id="@+id/item_title"
@@ -63,7 +63,7 @@
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:singleLine="true"
-        android:textColor="@color/glia_base_normal_color"
+        android:textColor="?attr/gliaBaseNormalColor"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@id/remove_item_button"
         app:layout_constraintHorizontal_bias="0"
@@ -77,7 +77,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginTop="4dp"
-        android:textColor="@color/glia_base_dark_color"
+        android:textColor="?attr/gliaBaseDarkColor"
         android:textSize="14sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@id/remove_item_button"
@@ -94,14 +94,14 @@
         android:indeterminate="true"
         android:max="100"
         app:trackThickness="@dimen/glia_chat_attachment_progressbar_height"
-        app:indicatorColor="@color/glia_brand_primary_color"
+        app:indicatorColor="?attr/gliaBrandPrimaryColor"
         app:layout_constraintBottom_toBottomOf="@id/type_indicator_view"
         app:layout_constraintEnd_toStartOf="@id/remove_item_button"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@id/type_indicator_view"
         app:layout_constraintTop_toBottomOf="@id/status_indicator"
         app:layout_constraintWidth_percent="0.5"
-        app:trackColor="@color/glia_system_agent_bubble_color"
+        app:trackColor="?attr/gliaSystemAgentBubbleColor"
         app:trackCornerRadius="4dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/widgetssdk/src/main/res/layout/chat_view.xml b/widgetssdk/src/main/res/layout/chat_view.xml
index 152011e95..19fbb4444 100644
--- a/widgetssdk/src/main/res/layout/chat_view.xml
+++ b/widgetssdk/src/main/res/layout/chat_view.xml
@@ -9,7 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/chat_recycler_view"
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
@@ -30,7 +29,8 @@
         android:paddingVertical="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/chat_recycler_view" />
+        app:layout_constraintTop_toBottomOf="@id/chat_recycler_view"
+        app:layout_constraintBottom_toTopOf="@+id/operator_typing_animation_view"/>
 
 
     <RelativeLayout
@@ -40,10 +40,10 @@
         android:clipChildren="false"
         android:clipToPadding="false"
         android:padding="@dimen/glia_large"
-        app:layout_constraintBottom_toTopOf="@id/divider_view"
+        app:layout_constraintBottom_toTopOf="@id/chat_bottom_divider_barrier"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="gone">
+        tools:visibility="visible">
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/new_messages_indicator_card"
@@ -81,22 +81,78 @@
         android:layout_height="36dp"
         android:layout_marginStart="@dimen/glia_medium"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/divider_view"
+        app:layout_constraintBottom_toTopOf="@+id/chat_bottom_divider_barrier"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/gva_quick_replies_layout"
         app:lottie_autoPlay="true"
         app:lottie_loop="true"
         app:lottie_rawRes="@raw/chat_typing_indicator"
         tools:visibility="visible" />
 
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/chat_bottom_divider_barrier"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:barrierDirection="top"
+        app:constraint_referenced_ids="sc_bottom_banner_divider, chat_divider"/>
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/secure_conversations_bottom_banner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="sc_bottom_banner_divider, sc_bottom_banner_label" />
+
+    <View
+        android:id="@+id/sc_bottom_banner_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/gliaBaseShadeColor"
+        app:layout_constraintBottom_toTopOf="@+id/sc_bottom_banner_label"/>
+
+    <TextView
+        android:id="@+id/sc_bottom_banner_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/chat_sc_error_barrier"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:background="?attr/gliaSystemAgentBubbleColor"
+        android:textAppearance="?attr/textAppearanceCaption"
+        tools:text="@string/secure_messaging_chat_banner_bottom" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/chat_sc_error_barrier"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:barrierDirection="top"
+        app:constraint_referenced_ids="sc_error_label, chat_divider"/>
+
+    <TextView
+        android:id="@+id/sc_error_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        app:layout_constraintBottom_toTopOf="@+id/chat_divider"
+        android:background="?attr/gliaSystemNegativeColor"
+        android:textColor="?attr/gliaBaseLightColor"
+        android:textAppearance="?attr/textAppearanceCaption"
+        app:drawableStartCompat="@drawable/ic_attention"
+        app:drawableTint="?attr/gliaBaseLightColor"
+        android:drawablePadding="8dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:text="@string/message_center_error_unavailable_message" />
+
     <View
-        android:id="@+id/divider_view"
+        android:id="@+id/chat_divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?attr/gliaBaseShadeColor"
-        app:layout_constraintBottom_toTopOf="@+id/add_attachment_queue"
-        app:layout_constraintTop_toBottomOf="@+id/operator_typing_animation_view"
-        tools:background="@android:color/holo_red_dark" />
+        app:layout_constraintBottom_toTopOf="@+id/add_attachment_queue" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/add_attachment_queue"
@@ -105,7 +161,6 @@
         android:scrollbars="vertical"
         app:layout_constraintBottom_toTopOf="@+id/chat_message_layout"
         app:layout_constraintHeight_max="216dp"
-        app:layout_constraintTop_toBottomOf="@+id/divider_view"
         tools:itemCount="6"
         tools:listitem="@layout/chat_attachment_uploaded_item" />
 
@@ -114,8 +169,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/add_attachment_queue">
+        app:layout_constraintBottom_toBottomOf="parent">
 
         <EditText
             android:id="@+id/chat_edit_text"
@@ -131,6 +185,7 @@
             android:textColor="?attr/gliaBaseDarkColor"
             android:textColorHint="?attr/gliaBaseNormalColor"
             android:textCursorDrawable="@null"
+            tools:text="@string/chat_input_placeholder"
             tools:ignore="RtlSymmetry"
             tools:textColor="@color/glia_black_color" />
 
@@ -153,7 +208,7 @@
             android:src="?attr/gliaIconSendMessage"
             app:tint="?attr/gliaBrandPrimaryColor"
             tools:src="@drawable/ic_baseline_send"
-            tools:tint="@color/glia_brand_primary_color" />
+            tools:tint="?attr/gliaBrandPrimaryColor" />
     </LinearLayout>
 
 </merge>
diff --git a/widgetssdk/src/main/res/layout/end_screen_sharing_view.xml b/widgetssdk/src/main/res/layout/end_screen_sharing_view.xml
index 0e87379d0..b0d2052b7 100644
--- a/widgetssdk/src/main/res/layout/end_screen_sharing_view.xml
+++ b/widgetssdk/src/main/res/layout/end_screen_sharing_view.xml
@@ -37,7 +37,7 @@
         android:layout_marginStart="@dimen/glia_pre_xx_large"
         android:layout_marginEnd="@dimen/glia_pre_xx_large"
         tools:text="@string/call_visualizer_button"
-        app:icon="@drawable/ic_screensharing_off"
+        app:icon="?attr/gliaIconEndScreenShare"
         app:iconTint="?attr/gliaBaseLightColor"
         app:iconGravity="textStart"
         app:cornerRadius="5dp"
diff --git a/widgetssdk/src/main/res/layout/entry_widget_error_item.xml b/widgetssdk/src/main/res/layout/entry_widget_error_item.xml
new file mode 100644
index 000000000..e3424a99d
--- /dev/null
+++ b/widgetssdk/src/main/res/layout/entry_widget_error_item.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingHorizontal="@dimen/glia_large"
+    android:paddingVertical="@dimen/entry_widget_error_item_default_padding">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:letterSpacing="0.01"
+        style="@style/Application.Glia.Header3"
+        android:textColor="?attr/gliaBaseDarkColor"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/description"/>
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/glia_large"
+        android:letterSpacing="-0.02"
+        style="@style/Application.Glia.Body"
+        android:textColor="?attr/gliaBaseNormalColor"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/button"/>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/glia_large"
+        android:textAllCaps="false"
+        android:textColor="?attr/gliaBrandPrimaryColor"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/description" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/widgetssdk/src/main/res/layout/entry_widget_fragment.xml b/widgetssdk/src/main/res/layout/entry_widget_fragment.xml
new file mode 100644
index 000000000..1d440e177
--- /dev/null
+++ b/widgetssdk/src/main/res/layout/entry_widget_fragment.xml
@@ -0,0 +1,34 @@
+<!-- res/layout/bottom_sheet_layout.xml -->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/bg_bottom_sheet"
+    android:backgroundTint="?attr/gliaBaseLightColor">
+
+    <ImageView
+        android:id="@+id/drag_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:src="@drawable/ic_drag_handle"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/container" />
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_marginBottom="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        app:layout_goneMarginBottom="16dp"
+        app:layout_constraintTop_toBottomOf="@id/drag_handle"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/widgetssdk/src/main/res/layout/entry_widget_media_type_item.xml b/widgetssdk/src/main/res/layout/entry_widget_media_type_item.xml
new file mode 100644
index 000000000..5861b52bf
--- /dev/null
+++ b/widgetssdk/src/main/res/layout/entry_widget_media_type_item.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="?attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/glia_large_x_large"
+        android:layout_height="@dimen/glia_large_x_large"
+        android:layout_marginStart="@dimen/glia_large"
+        android:layout_marginEnd="@dimen/glia_large"
+        app:tint="?attr/gliaBrandPrimaryColor"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/glia_large"
+        android:layout_marginEnd="@dimen/glia_x_large"
+        android:letterSpacing="-0.02"
+        android:textColor="?attr/gliaBaseDarkColor"
+        app:layout_constraintBottom_toTopOf="@id/description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/icon"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/glia_large"
+        android:layout_marginEnd="@dimen/glia_x_large"
+        android:letterSpacing="-0.01"
+        style="@style/Application.Glia.Subtitle2"
+        android:textColor="?attr/gliaBaseNormalColor"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/title" />
+
+    <View
+        android:id="@+id/icon_loading"
+        android:layout_width="@dimen/glia_large_x_large"
+        android:layout_height="@dimen/glia_large_x_large"
+        android:background="@drawable/bg_circle"
+        android:backgroundTint="?attr/gliaBaseShadeColor"
+        app:layout_constraintTop_toTopOf="@id/icon"
+        app:layout_constraintStart_toStartOf="@id/icon"
+        app:layout_constraintEnd_toEndOf="@id/icon"
+        app:layout_constraintBottom_toBottomOf="@id/icon"/>
+
+    <View
+        android:id="@+id/title_loading"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="@dimen/glia_medium"
+        android:background="@drawable/bg_entry_widget_loading"
+        android:backgroundTint="?attr/gliaBaseShadeColor"
+        app:layout_constraintVertical_weight="7"
+        app:layout_constraintTop_toTopOf="@+id/title"
+        app:layout_constraintStart_toStartOf="@+id/title"
+        app:layout_constraintEnd_toEndOf="@+id/title"
+        app:layout_constraintBottom_toTopOf="@id/description_loading"/>
+
+    <View
+        android:id="@+id/description_loading"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/bg_entry_widget_loading"
+        android:backgroundTint="?attr/gliaBaseShadeColor"
+        app:layout_constraintVertical_weight="6"
+        app:layout_constraintWidth_percent="0.43"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintTop_toBottomOf="@+id/title_loading"
+        app:layout_constraintStart_toStartOf="@+id/description"
+        app:layout_constraintEnd_toEndOf="@+id/description"
+        app:layout_constraintBottom_toBottomOf="@+id/description"/>
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/loading_group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="icon_loading, title_loading, description_loading"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/widgetssdk/src/main/res/layout/entry_widget_powered_by_item.xml b/widgetssdk/src/main/res/layout/entry_widget_powered_by_item.xml
new file mode 100644
index 000000000..58909f44f
--- /dev/null
+++ b/widgetssdk/src/main/res/layout/entry_widget_powered_by_item.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/glia_medium"
+        android:layout_marginEnd="@dimen/glia_small"
+        android:layout_marginBottom="@dimen/glia_medium"
+        style="@style/Application.Glia.Caption"
+        android:textColor="?attr/gliaBaseShadeColor"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/icon"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/glia_medium"
+        android:layout_marginBottom="@dimen/glia_medium"
+        android:src="@drawable/ic_glia_logo"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toEndOf="@id/title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/widgetssdk/src/main/res/layout/file_preview_activity.xml b/widgetssdk/src/main/res/layout/image_preview_activity.xml
similarity index 86%
rename from widgetssdk/src/main/res/layout/file_preview_activity.xml
rename to widgetssdk/src/main/res/layout/image_preview_activity.xml
index e47dfa84d..8d5bf543d 100644
--- a/widgetssdk/src/main/res/layout/file_preview_activity.xml
+++ b/widgetssdk/src/main/res/layout/image_preview_activity.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:gravity="center"
     android:orientation="vertical"
-    tools:context=".filepreview.ui.FilePreviewActivity">
+    tools:context=".filepreview.ui.ImagePreviewActivity">
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
@@ -18,8 +18,8 @@
         app:titleCentered="true"
         app:titleTextColor="@color/glia_white_color" />
 
-    <com.glia.widgets.filepreview.ui.FilePreviewView
-        android:id="@+id/file_preview_view"
+    <com.glia.widgets.filepreview.ui.ImagePreviewView
+        android:id="@+id/preview_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:srcCompat="@android:drawable/ic_btn_speak_now" />
diff --git a/widgetssdk/src/main/res/layout/message_center_message_view.xml b/widgetssdk/src/main/res/layout/message_center_message_view.xml
index 9d80c526e..8e7edef16 100644
--- a/widgetssdk/src/main/res/layout/message_center_message_view.xml
+++ b/widgetssdk/src/main/res/layout/message_center_message_view.xml
@@ -13,6 +13,20 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/leftGuideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_begin="16dp"/>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/rightGuideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_end="16dp"/>
+
         <Space
             android:id="@+id/top_space"
             android:layout_width="wrap_content"
@@ -22,13 +36,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintVertical_weight="1" />
+            app:layout_constraintVertical_weight="2" />
 
         <ImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginBottom="10dp"
             android:src="@drawable/ic_secure_message"
             app:tint="?attr/gliaBrandPrimaryColor"
@@ -36,54 +49,48 @@
             app:layout_constraintBottom_toTopOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@id/leftGuideline"
             app:layout_constraintTop_toBottomOf="@+id/top_space" />
 
         <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
             android:layout_marginBottom="16dp"
             tools:text="@string/message_center_title"
-            android:textColor="?attr/gliaBaseDarkColor"
-            android:textSize="20sp"
+            android:textAppearance="?attr/textAppearanceHeadline3"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@id/description"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/rightGuideline"
+            app:layout_constraintStart_toStartOf="@id/leftGuideline"
             app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/icon" />
 
         <TextView
             android:id="@+id/description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
-            android:layout_marginBottom="16dp"
             tools:text="@string/message_center_description"
             android:textColor="?attr/gliaBaseDarkColor"
-            android:textSize="14sp"
+            android:textSize="16sp"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@id/btn_check_messages"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/rightGuideline"
+            app:layout_constraintStart_toStartOf="@id/leftGuideline"
             app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/title" />
+            app:layout_constraintTop_toBottomOf="@+id/title"/>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_check_messages"
             style="?android:attr/borderlessButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="24dp"
-            android:paddingEnd="24dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
             tools:text="@string/message_center_check_messages_btn"
             android:textAllCaps="false"
             android:textColor="?attr/gliaBrandPrimaryColor"
-            android:textSize="24sp"
+            android:textSize="16sp"
             app:layout_constraintBottom_toTopOf="@id/message_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
@@ -95,47 +102,44 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="invisible"
+            tools:visibility="visible"
             app:constraint_referenced_ids="message_title, message_edit_text, attachments_recycler_view, btn_send_message" />
 
         <TextView
             android:id="@+id/message_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
             android:layout_marginTop="@dimen/glia_welcome_screen_input_title_margin"
-            android:layout_marginEnd="24dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            tools:text="@string/message_center_message_title"
-            android:textAppearance="?attr/textAppearanceBody1"
+            android:textAppearance="?attr/textAppearanceHeadline3"
+            android:textSize="14sp"
             app:layout_constraintBottom_toTopOf="@id/message_edit_text"
             app:layout_constraintEnd_toStartOf="@id/add_attachment_button"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_check_messages" />
+            app:layout_constraintStart_toStartOf="@id/leftGuideline"
+            app:layout_constraintTop_toBottomOf="@+id/btn_check_messages"
+            tools:text="@string/message_center_message_title" />
 
         <ImageButton
             android:id="@+id/add_attachment_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/glia_chat_add_attachment_description"
             android:paddingStart="16dp"
             android:paddingTop="22dp"
             android:paddingEnd="16dp"
-            android:paddingBottom="10dp"
+            android:paddingBottom="13dp"
             android:src="@drawable/ic_add_attachment"
             app:layout_constraintBottom_toTopOf="@id/message_edit_text"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/message_title" />
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <com.glia.widgets.messagecenter.StatefulEditText
             android:id="@+id/message_edit_text"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
             android:gravity="start"
             android:inputType="textCapSentences|textMultiLine"
             android:textColor="?attr/gliaBaseDarkColor"
@@ -144,9 +148,9 @@
             android:textColorHint="?attr/gliaBaseNormalColor"
             android:textCursorDrawable="@null"
             app:layout_constraintBottom_toTopOf="@id/error_text_view"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/leftGuideline"
+            app:layout_constraintEnd_toEndOf="@id/rightGuideline"
             app:layout_constraintHeight_min="@dimen/glia_welcome_screen_input_min_height"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/message_title"
             app:layout_constraintVertical_weight="7" />
 
@@ -154,8 +158,6 @@
             android:id="@+id/error_text_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
             android:layout_marginTop="4dp"
             tools:text="@string/message_center_message_limit_error_message"
             android:drawablePadding="@dimen/glia_small"
@@ -163,8 +165,8 @@
             app:drawableStartCompat="@drawable/ic_attention"
             android:textColor="?attr/gliaSystemNegativeColor"
             app:layout_constraintTop_toBottomOf="@id/message_edit_text"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/leftGuideline"
+            app:layout_constraintEnd_toEndOf="@id/rightGuideline"
             app:layout_constraintBottom_toTopOf="@id/attachments_recycler_view"
             app:layout_constraintHorizontal_bias="0.0"/>
 
@@ -173,12 +175,10 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
             android:overScrollMode="never"
             app:layout_constraintBottom_toTopOf="@id/btn_send_message"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@id/leftGuideline"
+            app:layout_constraintEnd_toEndOf="@id/rightGuideline"
             app:layout_constraintTop_toBottomOf="@id/error_text_view"
             tools:itemCount="1"
             tools:listitem="@layout/chat_attachment_uploaded_item" />
@@ -188,12 +188,10 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
             android:layout_marginBottom="16dp"
             app:layout_constraintBottom_toTopOf="@id/bottom_space"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@id/leftGuideline"
+            app:layout_constraintEnd_toEndOf="@id/rightGuideline"
             app:layout_constraintTop_toBottomOf="@+id/attachments_recycler_view" />
 
         <Space
diff --git a/widgetssdk/src/main/res/layout/survey_boolean_question_item.xml b/widgetssdk/src/main/res/layout/survey_boolean_question_item.xml
index 99358f03c..0e04deebc 100644
--- a/widgetssdk/src/main/res/layout/survey_boolean_question_item.xml
+++ b/widgetssdk/src/main/res/layout/survey_boolean_question_item.xml
@@ -46,7 +46,7 @@
         android:id="@+id/required_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/glia_system_negative_color"
+        android:textColor="?attr/gliaSystemNegativeColor"
         android:layout_marginStart="@dimen/glia_large_x_large"
         android:drawablePadding="@dimen/glia_small"
         app:drawableStartCompat="@drawable/ic_attention"
diff --git a/widgetssdk/src/main/res/layout/survey_input_question_item.xml b/widgetssdk/src/main/res/layout/survey_input_question_item.xml
index dbe0607ea..1852b5878 100644
--- a/widgetssdk/src/main/res/layout/survey_input_question_item.xml
+++ b/widgetssdk/src/main/res/layout/survey_input_question_item.xml
@@ -38,7 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/glia_medium"
-        android:textColor="@color/glia_system_negative_color"
+        android:textColor="?attr/gliaSystemNegativeColor"
         android:drawablePadding="@dimen/glia_small"
         app:drawableStartCompat="@drawable/ic_attention"
         tools:text="@string/survey_action_validation_error" />
diff --git a/widgetssdk/src/main/res/layout/survey_scale_question_item.xml b/widgetssdk/src/main/res/layout/survey_scale_question_item.xml
index 785df0edc..e1293df8c 100644
--- a/widgetssdk/src/main/res/layout/survey_scale_question_item.xml
+++ b/widgetssdk/src/main/res/layout/survey_scale_question_item.xml
@@ -82,7 +82,7 @@
         android:id="@+id/required_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/glia_system_negative_color"
+        android:textColor="?attr/gliaSystemNegativeColor"
         android:layout_marginStart="@dimen/glia_large_x_large"
         android:drawablePadding="@dimen/glia_small"
         app:drawableStartCompat="@drawable/ic_attention"
diff --git a/widgetssdk/src/main/res/layout/survey_single_question_item.xml b/widgetssdk/src/main/res/layout/survey_single_question_item.xml
index b4d4489b7..b15ba6822 100644
--- a/widgetssdk/src/main/res/layout/survey_single_question_item.xml
+++ b/widgetssdk/src/main/res/layout/survey_single_question_item.xml
@@ -31,7 +31,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/glia_small"
-        android:textColor="@color/glia_system_negative_color"
+        android:textColor="?attr/gliaSystemNegativeColor"
         android:drawablePadding="@dimen/glia_small"
         app:drawableStartCompat="@drawable/ic_attention"
         tools:text="@string/survey_action_validation_error" />
diff --git a/widgetssdk/src/main/res/layout/visitor_code_view.xml b/widgetssdk/src/main/res/layout/visitor_code_view.xml
index e7c884817..65ed8e872 100644
--- a/widgetssdk/src/main/res/layout/visitor_code_view.xml
+++ b/widgetssdk/src/main/res/layout/visitor_code_view.xml
@@ -154,7 +154,7 @@
         android:background="@null"
         android:visibility="gone"
         tools:visibility="visible"
-        tools:tint="@color/glia_base_normal_color"
+        tools:tint="?attr/gliaBaseNormalColor"
         app:layout_constraintTop_toBottomOf="@+id/body_container"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/widgetssdk/src/main/res/layout/visitor_video_floating_view.xml b/widgetssdk/src/main/res/layout/visitor_video_floating_view.xml
index 7f86995d6..6678f9d09 100644
--- a/widgetssdk/src/main/res/layout/visitor_video_floating_view.xml
+++ b/widgetssdk/src/main/res/layout/visitor_video_floating_view.xml
@@ -10,7 +10,7 @@
         android:background="@color/glia_black_color"
         android:gravity="center"
         android:text="@string/glia_call_visitor_video_on_hold_text"
-        android:textColor="@color/glia_base_light_color" />
+        android:textColor="?attr/gliaBaseLightColor" />
 
     <FrameLayout
         android:id="@+id/flip_camera_button"
diff --git a/widgetssdk/src/main/res/values/colors.xml b/widgetssdk/src/main/res/values/colors.xml
index 6b0dffe3b..7576931d0 100644
--- a/widgetssdk/src/main/res/values/colors.xml
+++ b/widgetssdk/src/main/res/values/colors.xml
@@ -27,7 +27,7 @@
     <color name="glia_chat_background_color">#FFFFFF</color>
     <color name="glia_dark_transparent_bg">#99000000</color>
 
-    <color name="glia_disable_button_bg">#F3F3F3</color>
-    <color name="glia_disable_button_border">#33616A75</color>
-    <color name="glia_disable_button_text">#80616A75</color>
+    <color name="glia_disable_button_bg">@color/glia_system_agent_bubble_color</color>
+    <color name="glia_disable_button_border">@color/glia_base_shade_color</color>
+    <color name="glia_disable_button_text">@color/glia_base_shade_color</color>
 </resources>
diff --git a/widgetssdk/src/main/res/values/dimens.xml b/widgetssdk/src/main/res/values/dimens.xml
index cf7ab4027..3ec5927b4 100644
--- a/widgetssdk/src/main/res/values/dimens.xml
+++ b/widgetssdk/src/main/res/values/dimens.xml
@@ -82,7 +82,7 @@
 
     <!-- Message Center Welcome Screen -->
     <dimen name="glia_welcome_screen_input_min_height">168dp</dimen>
-    <dimen name="glia_welcome_screen_input_title_margin">56dp</dimen>
+    <dimen name="glia_welcome_screen_input_title_margin">64dp</dimen>
 
     <!-- Message Center Confirmation Screen -->
     <dimen name="glia_confirmation_screen_confirmation_icon_size">144dp</dimen>
@@ -92,4 +92,8 @@
 
     <!-- Live Observation -->
     <dimen name="glia_snack_bar_bottom_margin">72dp</dimen>
+
+    <!-- Entry Widget -->
+    <dimen name="entry_widget_error_item_default_padding">40dp</dimen>
+    <dimen name="entry_widget_error_item_min_height">257dp</dimen>
 </resources>
diff --git a/widgetssdk/src/main/res/values/new_strings.xml b/widgetssdk/src/main/res/values/new_strings.xml
index 97b264063..130b7e794 100644
--- a/widgetssdk/src/main/res/values/new_strings.xml
+++ b/widgetssdk/src/main/res/values/new_strings.xml
@@ -65,7 +65,7 @@
 
     <!-- Chat -->
     <string name="engagement_chat_title">@string/glia_chat_title</string>
-    <string name="message_center_header">@string/glia_messaging_title</string>
+    <string name="message_center_header">@string/glia_message_center_title</string>
     <string name="chat_input_placeholder">@string/glia_chat_enter_message</string>
     <string name="chat_message_start_engagement_placeholder">@string/glia_chat_not_started_hint</string>
     <string name="android_file_not_ready_for_preview">@string/glia_view_file_not_ready_for_preview</string>
@@ -167,6 +167,8 @@
     <string name="general_sending">@string/message_center_progress_bar_content_description</string>
     <string name="general_send">@string/message_center_send_message_btn</string>
     <string name="message_center_welcome_file_picker_accessibility_label">File picker</string>
+    <string name="secure_messaging_chat_banner_bottom">@string/message_center_bottom_banner</string>
+    <string name="secure_messaging_chat_unavailable_message">@string/message_center_error_unavailable_message</string>
 
     <!-- General -->
     <string name="general_refresh">@string/glia_visitor_code_refresh_button</string>
@@ -214,4 +216,24 @@
     <string name="gva_unsupported_action_error">This action is not currently supported on mobile.</string>
     <string name="gva_gallery_card_message_accessibility">%1$s \n Card: %2$d of %3$d.</string><!--does not synchronized yet-->
 
+    <!--    Entry Widget -->
+    <string name="entry_widget_live_chat_button_label">Live Chat</string>
+    <string name="entry_widget_live_chat_button_description">For the texter in all of us</string>
+    <string name="entry_widget_live_chat_button_accessibility_hint">Starts a chat</string>
+    <string name="entry_widget_audio_button_label">Audio</string>
+    <string name="entry_widget_audio_button_description">Speak through your device</string>
+    <string name="entry_widget_audio_button_accessibility_hint">Starts a call</string>
+    <string name="entry_widget_video_button_label">Video</string>
+    <string name="entry_widget_video_button_description">Face-to-face, just like in person</string>
+    <string name="entry_widget_video_button_accessibility_hint">Starts a video call</string>
+    <string name="entry_widget_secure_messaging_button_label">Secure Messaging</string>
+    <string name="entry_widget_secure_messaging_button_description">Start a conversation, we’ll get back to you</string>
+    <string name="entry_widget_secure_messaging_button_accessibility_hint">Starts messaging with us</string>
+    <string name="entry_widget_empty_state_title">Support team is currently offline</string>
+    <string name="entry_widget_empty_state_description">We are here to assist you during our business hours.</string>
+    <string name="entry_widget_error_state_title">Oops! Contacts Couldn\'t Be Loaded</string>
+    <string name="entry_widget_error_state_description">We couldn\'t load the contacts at this time. This may be due to a temporary syncing issue or network problem.</string>
+    <string name="entry_widget_error_state_try_again_button_label">Try again</string>
+    <string name="entry_widget_loading_accessibility_label">Loading indicator. Waiting for available options.</string>
+
 </resources>
diff --git a/widgetssdk/src/main/res/values/strings.xml b/widgetssdk/src/main/res/values/strings.xml
index fb270232c..92c9a890b 100644
--- a/widgetssdk/src/main/res/values/strings.xml
+++ b/widgetssdk/src/main/res/values/strings.xml
@@ -30,7 +30,7 @@
     <string name="glia_chat_attachment_upload_ready_to_send">Ready to send</string>
     <string name="glia_chat_attachment_upload_error_file_size_over_limit">File size must be less than 25 MB.</string>
     <string name="glia_chat_attachment_upload_checking_file">Checking file security…</string>
-    <string name="message_center_description">Send a message and we\'ll get back to you \nwithin 48 hours</string>
+    <string name="message_center_description">Send a message and we will get back to you within 1 business day.</string>
     <string name="glia_chat_attachment_upload_uploading">Uploading file…</string>
     <string name="glia_dialog_leave_queue_title">Are you sure you want to leave?</string>
     <string name="glia_call_continue_browsing">You can continue browsing and we will connect you automatically.</string>
@@ -40,7 +40,7 @@
     <string name="glia_dialog_operators_unavailable_message">Operators are no longer available. Please try again later.</string>
     <string name="glia_call_minimize_button_label">Minimize</string>
     <string name="call_visualizer_button">End Screen Sharing</string>
-    <string name="message_center_screen_title">Messaging</string>
+    <string name="message_center_screen_title">Secure Messaging</string>
     <string name="glia_dialog_end_engagement_title">End Engagement?</string>
     <string name="glia_chat_visitor_status_transferring">Transferring</string>
     <string name="glia_dialog_screen_sharing_offer_title">Start Screen Sharing</string>
@@ -84,12 +84,14 @@
     <string name="glia_survey_required_error_message">Please provide an answer.</string>
     <string name="glia_survey_require_label_content_description">Required.</string>
     <string name="message_center_message_limit_error_message">The message cannot exceed 10,000 characters.</string>
-    <string name="message_center_title">Welcome to Message Center</string>
+    <string name="message_center_title">Welcome to Secure Messaging</string>
     <string name="message_center_check_messages_btn">Check messages</string>
     <string name="message_center_message_title">Your message</string>
-    <string name="message_center_message_edit_text_hint">Enter your message</string>
-    <string name="glia_messaging_title">Messaging</string>
-    <string name="message_center_confirmation_screen_message">Your message has been sent. We will get back to you within 48 hours.</string>
+    <string name="message_center_message_edit_text_hint">Enter message</string>
+    <string name="glia_message_center_title">Secure Messaging</string>
+    <string name="message_center_confirmation_screen_message">Your message has been sent. We will get back to you within 1 business day.</string>
+    <string name="message_center_bottom_banner">Secure messaging has an expected response time of 1 business day.</string>
+    <string name="message_center_error_unavailable_message">Sending messages is currently not available.</string>
     <string name="call_visualizer_screen_sharing_title">Screen Sharing</string>
     <string name="call_visualizer_label">Your Screen is Being Shared</string>
     <string name="glia_chat_file_download_success_message">The file has been downloaded.</string>
diff --git a/widgetssdk/src/main/res/values/styles.xml b/widgetssdk/src/main/res/values/styles.xml
index 2807579c1..759f9fd38 100644
--- a/widgetssdk/src/main/res/values/styles.xml
+++ b/widgetssdk/src/main/res/values/styles.xml
@@ -139,7 +139,11 @@
     <style name="Application.Glia.Header3" parent="TextAppearance.MaterialComponents.Headline3">
         <item name="android:textSize">18sp</item>
         <item name="android:textColor">?attr/gliaBaseDarkColor</item>
-        <!--        font weight available from api 28 :(-->
+
+        <!-- font weight available from api 28 :( -->
+        <!-- below is a workaround to make font look similar to android:textFontWeight=500 -->
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <!-- {@deprecated For internal use only} -->
diff --git a/widgetssdk/src/main/res/values/themes.xml b/widgetssdk/src/main/res/values/themes.xml
index 2fd1286fa..3c49bc919 100644
--- a/widgetssdk/src/main/res/values/themes.xml
+++ b/widgetssdk/src/main/res/values/themes.xml
@@ -76,7 +76,7 @@
 
     </style>
 
-    <style name="Application.Glia.FilePreview.Activity" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Application.Glia.ImagePreview.Activity" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="android:windowBackground">@color/glia_black_color</item>
         <item name="gliaIconAppBarBack">@drawable/ic_baseline_arrow_back</item>
         <item name="colorPrimary">@color/glia_black_color</item>
@@ -183,4 +183,13 @@
         <item name="android:backgroundTint">?attr/gliaBaseLightColor</item>
     </style>
 
+    <style name="ThemeOverlay.Glia.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/ThemeOverlay.Glia.BottomSheetModal</item>
+    </style>
+
+    <style name="ThemeOverlay.Glia.BottomSheetModal" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
+
 </resources>
diff --git a/widgetssdk/src/test/java/android/TestExtensions.kt b/widgetssdk/src/test/java/android/TestExtensions.kt
index 2daadd2df..2450f5994 100644
--- a/widgetssdk/src/test/java/android/TestExtensions.kt
+++ b/widgetssdk/src/test/java/android/TestExtensions.kt
@@ -1,10 +1,12 @@
 package android
 
 import android.content.Intent
+import io.reactivex.rxjava3.functions.Predicate
+import io.reactivex.rxjava3.subscribers.TestSubscriber
 import java.nio.charset.StandardCharsets
 
 internal const val COMMON_EXTENSIONS_CLASS_PATH = "com.glia.widgets.helper.CommonExtensionsKt"
-internal const val CONTEXT_EXTENSIONS_CLASS_PATH = "com.glia.widgets.helper.ContextExtensionsKt"
+internal const val CONTEXT_EXTENSIONS_CLASS_PATH = "com.glia.widgets.helper.ContextExtensions"
 internal const val LOGGER_PATH = "com.glia.widgets.helper.Logger"
 
 fun <T> Class<T>.readRawResource(resName: String): String = classLoader?.getResourceAsStream(resName)?.run {
@@ -12,3 +14,11 @@ fun <T> Class<T>.readRawResource(resName: String): String = classLoader?.getReso
 } ?: ""
 
 val Intent.targetActivityName: String? get() = component?.shortClassName
+
+fun <T : Any> TestSubscriber<T>.assertCurrentValue(expected: T): TestSubscriber<T> = run {
+    assertValueAt(values().lastIndex, expected)
+}
+
+fun <T : Any> TestSubscriber<T>.assertCurrentValue(predicate: Predicate<T>): TestSubscriber<T> = run {
+    assertValueAt(values().lastIndex, predicate)
+}
diff --git a/widgetssdk/src/test/java/com/glia/widgets/GliaWidgetsTest.kt b/widgetssdk/src/test/java/com/glia/widgets/GliaWidgetsTest.kt
index 5b3ad4cfd..7f168b005 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/GliaWidgetsTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/GliaWidgetsTest.kt
@@ -6,10 +6,12 @@ import com.glia.androidsdk.GliaConfig
 import com.glia.androidsdk.SiteApiKey
 import com.glia.androidsdk.omnibrowse.Omnibrowse
 import com.glia.widgets.callvisualizer.controller.CallVisualizerController
+import com.glia.widgets.core.queue.QueueRepository
 import com.glia.widgets.di.ControllerFactory
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.di.GliaCore
 import com.glia.widgets.di.RepositoryFactory
+import com.glia.widgets.engagement.EngagementRepository
 import org.junit.Assert
 import org.junit.Before
 import org.junit.ClassRule
@@ -69,10 +71,16 @@ class GliaWidgetsTest {
         whenever(gliaCore.callVisualizer).thenReturn(callVisualizer)
         val callVisualizerController = mock<CallVisualizerController>()
         whenever(controllerFactory.callVisualizerController).thenReturn(callVisualizerController)
-        whenever(repositoryFactory.engagementRepository) doReturn mock()
+        val engagementRepository = mock<EngagementRepository>()
+        whenever(repositoryFactory.engagementRepository) doReturn engagementRepository
+        whenever(repositoryFactory.engagementConfigRepository) doReturn mock()
+        val queueRepository = mock<QueueRepository>()
+        whenever(repositoryFactory.queueRepository) doReturn queueRepository
         GliaWidgets.init(widgetsConfig)
         val captor = argumentCaptor<GliaConfig>()
         verify(gliaCore).init(captor.capture())
+        verify(engagementRepository).initialize()
+        verify(queueRepository).initialize()
         val gliaConfig = captor.lastValue
         Assert.assertEquals(siteApiKey, gliaConfig.siteApiKey)
         Assert.assertEquals(siteId, gliaConfig.siteId)
diff --git a/widgetssdk/src/test/java/com/glia/widgets/callvisualizer/CallVisualizerActivityWatcherTest.kt b/widgetssdk/src/test/java/com/glia/widgets/callvisualizer/CallVisualizerActivityWatcherTest.kt
index 4a9c7b57e..5de2f06e7 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/callvisualizer/CallVisualizerActivityWatcherTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/callvisualizer/CallVisualizerActivityWatcherTest.kt
@@ -4,7 +4,6 @@ import android.CONTEXT_EXTENSIONS_CLASS_PATH
 import android.LOGGER_PATH
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.glia.widgets.UiTheme
@@ -17,6 +16,7 @@ import com.glia.widgets.helper.GliaActivityManager
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.OneTimeEvent
 import com.glia.widgets.helper.withRuntimeTheme
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.locale.LocaleProvider
 import com.glia.widgets.locale.LocaleString
 import com.glia.widgets.view.Dialogs
@@ -50,6 +50,7 @@ class CallVisualizerActivityWatcherTest {
 
     private lateinit var watcher: CallVisualizerActivityWatcher
     private lateinit var mockLocale: LocaleString
+    private lateinit var activityLauncher: ActivityLauncher
 
     @Before
     fun setUp() {
@@ -66,8 +67,9 @@ class CallVisualizerActivityWatcherTest {
         localeProvider = mockk(relaxed = true)
         themeManager = mockk(relaxed = true)
         mockLocale = mockk(relaxed = true)
+        activityLauncher = mockk(relaxed = true)
 
-        watcher = CallVisualizerActivityWatcher(controller, gliaActivityManager, localeProvider, themeManager)
+        watcher = CallVisualizerActivityWatcher(controller, gliaActivityManager, localeProvider, themeManager, activityLauncher)
         verify { controller.state }
     }
 
@@ -321,10 +323,6 @@ class CallVisualizerActivityWatcherTest {
     fun `WebBrowserActivity should be shown when current state is OpenWebBrowserScreen`() {
         val title = mockLocale
         val url = "url"
-        val intent: Intent = mockk(relaxed = true)
-        mockkObject(WebBrowserActivity)
-
-        every { WebBrowserActivity.intent(any(), any(), any()) } returns intent
 
         val activity = emitActivity<DialogHolderActivity>()
         val event = createMockEvent(CallVisualizerContract.State.OpenWebBrowserScreen(title, url))
@@ -335,10 +333,9 @@ class CallVisualizerActivityWatcherTest {
         verify { event.value }
         verify(exactly = 0) { event.consume(any()) }
         verify(exactly = 0) { event.markConsumed() }
-        verify { activity.startActivity(eq(intent)) }
+        verify { activityLauncher.launchWebBrowser(activity, title, url) }
 
         confirmVerified(activity, event)
-        unmockkObject(WebBrowserActivity)
     }
 
     private fun createMockEvent(state: CallVisualizerContract.State, isConsumed: Boolean = false): OneTimeEvent<CallVisualizerContract.State> {
diff --git a/widgetssdk/src/test/java/com/glia/widgets/chat/ChatManagerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/chat/ChatManagerTest.kt
index f7c501268..36ca8ad85 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/chat/ChatManagerTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/chat/ChatManagerTest.kt
@@ -153,17 +153,14 @@ class ChatManagerTest {
 
     @Test
     fun `mapInQueue adds OperatorStatusItem_InQueue to chatItems and updates operatorStatusItem`() {
-        val companyName = "company Name"
-        val newState = subjectUnderTest.mapInQueue(companyName, state)
+        val newState = subjectUnderTest.mapInQueue(state)
         val lastItem = newState.chatItems.last() as OperatorStatusItem.InQueue
-        assertEquals(companyName, lastItem.companyName)
-        assertEquals(companyName, newState.operatorStatusItem!!.companyName)
         assertEquals(lastItem, newState.operatorStatusItem)
     }
 
     @Test
     fun `mapTransferring removes old OperatorStatusItem when it exists and adds new one`() {
-        subjectUnderTest.mapTransferring(subjectUnderTest.mapInQueue("name", state)).apply {
+        subjectUnderTest.mapTransferring(subjectUnderTest.mapInQueue(state)).apply {
             assertTrue(chatItems.count() == 1)
             assertTrue(chatItems.contains(OperatorStatusItem.Transferring))
         }
@@ -171,7 +168,7 @@ class ChatManagerTest {
 
     @Test
     fun `mapOperatorConnected adds OperatorStatusItem_Connected when the old is null`() {
-        val action = ChatManager.Action.OperatorConnected("c_name", "o_name", "o_image")
+        val action = ChatManager.Action.OperatorConnected("o_name", "o_image")
         val stateSpy = spy(state)
         val subjectUnderTestSpy = spy(subjectUnderTest)
         subjectUnderTestSpy.mapOperatorConnected(action, stateSpy)
@@ -179,13 +176,12 @@ class ChatManagerTest {
         verify(stateSpy).resetOperator()
         val newItem = stateSpy.chatItems.last() as OperatorStatusItem.Connected
         assertEquals(newItem.operatorName, action.operatorFormattedName)
-        assertEquals(newItem.companyName, action.companyName)
         assertEquals(newItem.profileImgUrl, action.operatorImageUrl)
     }
 
     @Test
     fun `mapOperatorConnected replaces old OperatorStatusItem when the old is exists`() {
-        val action = ChatManager.Action.OperatorConnected("c_name", "o_name", "o_image")
+        val action = ChatManager.Action.OperatorConnected("o_name", "o_image")
         state.apply {
             operatorStatusItem = OperatorStatusItem.Transferring
             chatItems.add(mock())
@@ -197,7 +193,6 @@ class ChatManagerTest {
         verify(subjectUnderTestSpy).checkUnsentMessages(any())
         val newItem = newState.chatItems.last() as OperatorStatusItem.Connected
         assertEquals(newItem.operatorName, action.operatorFormattedName)
-        assertEquals(newItem.companyName, action.companyName)
         assertEquals(newItem.profileImgUrl, action.operatorImageUrl)
         assertFalse(newState.chatItems.contains(OperatorStatusItem.Transferring))
     }
@@ -222,7 +217,7 @@ class ChatManagerTest {
         val payload = SendMessagePayload(content = "content")
         val item = VisitorMessageItem(payload.content, payload.messageId)
 
-        val inQueue = OperatorStatusItem.InQueue("company_name")
+        val inQueue = OperatorStatusItem.InQueue
 
         assertTrue(state.messagePreviews.isEmpty())
         assertTrue(state.chatItems.isEmpty())
@@ -268,7 +263,7 @@ class ChatManagerTest {
 
     @Test
     fun `mapOperatorJoined adds OperatorStatusItem_Joined to chatItems when called`() {
-        val action: ChatManager.Action.OperatorJoined = ChatManager.Action.OperatorJoined("", "", "")
+        val action: ChatManager.Action.OperatorJoined = ChatManager.Action.OperatorJoined("", "")
         subjectUnderTest.mapTransferring(state).apply {
             assertTrue(chatItems.contains(OperatorStatusItem.Transferring))
         }
@@ -351,19 +346,14 @@ class ChatManagerTest {
 
     @Test
     fun `mapAction calls mapInQueue when Action_QueuingStarted passed`() {
-        val action: ChatManager.Action.QueuingStarted = mock {
-            on { companyName } doReturn ""
-        }
-
         val subjectUnderTestSpy = spy(subjectUnderTest)
-        subjectUnderTestSpy.mapAction(action, state)
-        verify(subjectUnderTestSpy).mapInQueue(any(), any())
+        subjectUnderTestSpy.mapAction(ChatManager.Action.QueuingStarted, state)
+        verify(subjectUnderTestSpy).mapInQueue(any())
     }
 
     @Test
     fun `mapAction calls mapOperatorConnected when Action_OperatorConnected passed`() {
         val action: ChatManager.Action.OperatorConnected = mock {
-            on { companyName } doReturn ""
             on { operatorFormattedName } doReturn ""
         }
 
@@ -384,7 +374,6 @@ class ChatManagerTest {
     @Test
     fun `mapAction calls mapOperatorJoined when Action_OperatorJoined passed`() {
         val action: ChatManager.Action.OperatorJoined = mock {
-            on { companyName } doReturn ""
             on { operatorFormattedName } doReturn ""
         }
 
diff --git a/widgetssdk/src/test/java/com/glia/widgets/chat/controller/ChatControllerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/chat/controller/ChatControllerTest.kt
index a04368db3..d1e1cd71a 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/chat/controller/ChatControllerTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/chat/controller/ChatControllerTest.kt
@@ -16,6 +16,7 @@ import com.glia.widgets.chat.domain.TakePictureUseCase
 import com.glia.widgets.chat.domain.UpdateFromCallScreenUseCase
 import com.glia.widgets.chat.domain.UriToFileAttachmentUseCase
 import com.glia.widgets.chat.domain.gva.DetermineGvaButtonTypeUseCase
+import com.glia.widgets.chat.model.ChatState
 import com.glia.widgets.chat.model.Gva
 import com.glia.widgets.chat.model.GvaButton
 import com.glia.widgets.core.dialog.DialogContract
@@ -34,8 +35,8 @@ import com.glia.widgets.core.notification.domain.CallNotificationUseCase
 import com.glia.widgets.core.permissions.domain.RequestNotificationPermissionIfPushNotificationsSetUpUseCase
 import com.glia.widgets.core.permissions.domain.WithCameraPermissionUseCase
 import com.glia.widgets.core.permissions.domain.WithReadWritePermissionsUseCase
+import com.glia.widgets.core.secureconversations.domain.IsMessagingAvailableUseCase
 import com.glia.widgets.core.secureconversations.domain.IsSecureEngagementUseCase
-import com.glia.widgets.core.secureconversations.domain.GetAvailableQueueIdsForSecureMessagingUseCase
 import com.glia.widgets.engagement.domain.AcceptMediaUpgradeOfferUseCase
 import com.glia.widgets.engagement.domain.DeclineMediaUpgradeOfferUseCase
 import com.glia.widgets.engagement.domain.EndEngagementUseCase
@@ -49,21 +50,24 @@ import com.glia.widgets.engagement.domain.ReleaseResourcesUseCase
 import com.glia.widgets.engagement.domain.ScreenSharingUseCase
 import com.glia.widgets.filepreview.domain.usecase.DownloadFileUseCase
 import com.glia.widgets.filepreview.domain.usecase.IsFileReadyForPreviewUseCase
-import com.glia.widgets.helper.Data
 import com.glia.widgets.helper.TimeCounter
 import com.glia.widgets.view.MessagesNotSeenHandler
 import com.glia.widgets.view.MinimizeHandler
 import com.glia.widgets.webbrowser.domain.GetUrlFromLinkUseCase
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Single
 import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.atLeastOnce
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import org.robolectric.RobolectricTestRunner
@@ -91,7 +95,6 @@ class ChatControllerTest {
     private lateinit var updateFromCallScreenUseCase: UpdateFromCallScreenUseCase
     private lateinit var isSecureEngagementUseCase: IsSecureEngagementUseCase
     private lateinit var engagementConfigUseCase: SetEngagementConfigUseCase
-    private lateinit var getAvailableQueueIdsForSecureMessagingUseCase: GetAvailableQueueIdsForSecureMessagingUseCase
     private lateinit var isFileReadyForPreviewUseCase: IsFileReadyForPreviewUseCase
     private lateinit var determineGvaButtonTypeUseCase: DetermineGvaButtonTypeUseCase
     private lateinit var updateOperatorDefaultImageUrlUseCase: UpdateOperatorDefaultImageUrlUseCase
@@ -121,6 +124,7 @@ class ChatControllerTest {
     private lateinit var chatManager: ChatManager
 
     private lateinit var chatView: ChatContract.View
+    private lateinit var isMessagingAvailableUseCase: IsMessagingAvailableUseCase
 
     @Before
     fun setUp() {
@@ -145,7 +149,6 @@ class ChatControllerTest {
         updateFromCallScreenUseCase = mock()
         isSecureEngagementUseCase = mock()
         engagementConfigUseCase = mock()
-        getAvailableQueueIdsForSecureMessagingUseCase = mock()
         isFileReadyForPreviewUseCase = mock()
         determineGvaButtonTypeUseCase = mock()
         isAuthenticatedUseCase = mock()
@@ -184,6 +187,7 @@ class ChatControllerTest {
         requestNotificationPermissionIfPushNotificationsSetUpUseCase = mock()
         releaseResourcesUseCase = mock()
         getUrlFromLinkUseCase = mock()
+        isMessagingAvailableUseCase = mock()
 
         chatController = ChatController(
             callTimer = callTimer,
@@ -207,7 +211,6 @@ class ChatControllerTest {
             updateFromCallScreenUseCase = updateFromCallScreenUseCase,
             isSecureEngagementUseCase = isSecureEngagementUseCase,
             engagementConfigUseCase = engagementConfigUseCase,
-            getAvailableQueueIdsForSecureMessagingUseCase = getAvailableQueueIdsForSecureMessagingUseCase,
             isFileReadyForPreviewUseCase = isFileReadyForPreviewUseCase,
             determineGvaButtonTypeUseCase = determineGvaButtonTypeUseCase,
             isAuthenticatedUseCase = isAuthenticatedUseCase,
@@ -231,73 +234,60 @@ class ChatControllerTest {
             withReadWritePermissionsUseCase = withReadWritePermissionsUseCase,
             requestNotificationPermissionIfPushNotificationsSetUpUseCase = requestNotificationPermissionIfPushNotificationsSetUpUseCase,
             releaseResourcesUseCase = releaseResourcesUseCase,
-            getUrlFromLinkUseCase = getUrlFromLinkUseCase
+            getUrlFromLinkUseCase = getUrlFromLinkUseCase,
+            isMessagingAvailableUseCase = isMessagingAvailableUseCase
         )
         chatController.setView(chatView)
     }
 
     @Test
     fun initChat_setsConfiguration_withInitialParams() {
-        val queueIds = listOf("QueueId1", "QueueId2")
         whenever(chatManager.initialize(any(), any(), any())) doReturn Flowable.never()
+        whenever(isMessagingAvailableUseCase()) doReturn Flowable.never()
 
-        chatController.initChat(
-            "CompanyName",
-            queueIds,
-            "VisitorId",
-            ChatType.SECURE_MESSAGING
-        )
+        chatController.initChat(ChatType.SECURE_MESSAGING)
 
-        verify(engagementConfigUseCase).invoke(ChatType.SECURE_MESSAGING, queueIds)
+        verify(engagementConfigUseCase).invoke(ChatType.SECURE_MESSAGING)
     }
 
     @Test
     fun initChat_setsConfiguration_withAvailableQueues() {
-        val queueIds = listOf("QueueId1", "QueueId2")
-        whenever(isSecureEngagementUseCase.invoke()) doReturn true
-        whenever(getAvailableQueueIdsForSecureMessagingUseCase.invoke()) doReturn Single.just(Data.Value(queueIds))
+        val stateCaptor = argumentCaptor<ChatState>()
+        whenever(isSecureEngagementUseCase()) doReturn true
         whenever(chatManager.initialize(any(), any(), any())) doReturn Flowable.never()
+        whenever(isMessagingAvailableUseCase()) doReturn Flowable.just(Result.success(true))
 
-        chatController.initChat(
-            "CompanyName",
-            emptyList(),
-            "VisitorId",
-            ChatType.SECURE_MESSAGING
-        )
+        chatController.initChat(ChatType.SECURE_MESSAGING)
 
-        verify(engagementConfigUseCase).invoke(ChatType.SECURE_MESSAGING, emptyList())
-        verify(engagementConfigUseCase).invoke(ChatType.SECURE_MESSAGING, queueIds)
+        verify(chatView, atLeastOnce()).emitState(stateCaptor.capture())
+        assertFalse(stateCaptor.lastValue.isSecureMessagingUnavailableLabelVisible)
+        verify(dialogController, never()).showUnexpectedErrorDialog()
+        verify(engagementConfigUseCase).invoke(ChatType.SECURE_MESSAGING)
     }
 
     @Test
-    fun initChat_showsMessageCenterUnavailableDialog_whenNoAvailableQueues() {
-        whenever(isSecureEngagementUseCase.invoke()) doReturn true
-        whenever(getAvailableQueueIdsForSecureMessagingUseCase.invoke()) doReturn Single.just(Data.Value(null))
+    fun initChat_showsMessageCenterUnavailableLabel_whenNoAvailableQueues() {
+        val stateCaptor = argumentCaptor<ChatState>()
+        whenever(isSecureEngagementUseCase()) doReturn true
         whenever(chatManager.initialize(any(), any(), any())) doReturn Flowable.never()
+        whenever(isMessagingAvailableUseCase()) doReturn Flowable.just(Result.success(false))
 
-        chatController.initChat(
-            "CompanyName",
-            emptyList(),
-            "VisitorId",
-            ChatType.SECURE_MESSAGING
-        )
+        chatController.initChat(ChatType.SECURE_MESSAGING)
 
-        verify(dialogController).showMessageCenterUnavailableDialog()
+        verify(chatView, atLeastOnce()).emitState(stateCaptor.capture())
+        assertTrue(stateCaptor.lastValue.isSecureMessagingUnavailableLabelVisible)
+        verify(dialogController, never()).showUnexpectedErrorDialog()
     }
 
     @Test
     fun initChat_showsUnexpectedErrorDialog_onException() {
-        whenever(isSecureEngagementUseCase.invoke()) doReturn true
-        whenever(getAvailableQueueIdsForSecureMessagingUseCase.invoke()) doReturn Single.error(Exception())
+        whenever(isSecureEngagementUseCase()) doReturn true
         whenever(chatManager.initialize(any(), any(), any())) doReturn Flowable.never()
+        whenever(isMessagingAvailableUseCase()) doReturn Flowable.just(Result.failure(RuntimeException()))
 
-        chatController.initChat(
-            "CompanyName",
-            emptyList(),
-            "VisitorId",
-            ChatType.SECURE_MESSAGING
-        )
+        chatController.initChat(ChatType.SECURE_MESSAGING)
 
+        verify(dialogController, never()).showMessageCenterUnavailableDialog()
         verify(dialogController).showUnexpectedErrorDialog()
     }
 
diff --git a/widgetssdk/src/test/java/com/glia/widgets/core/configuration/EngagementCallConfigurationManagerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/core/configuration/EngagementCallConfigurationManagerTest.kt
deleted file mode 100644
index 45cf455c0..000000000
--- a/widgetssdk/src/test/java/com/glia/widgets/core/configuration/EngagementCallConfigurationManagerTest.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.glia.widgets.core.configuration
-
-import com.glia.androidsdk.Glia
-import com.glia.widgets.R
-import com.glia.widgets.di.Dependencies
-import com.glia.widgets.helper.ResourceProvider
-import com.glia.widgets.locale.LocaleProvider
-import io.mockk.every
-import io.mockk.justRun
-import io.mockk.mockk
-import io.mockk.mockkStatic
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-
-private const val DEFAULT_LOCAL_COMPANY_NAME = "Local Company Name"
-
-class EngagementCallConfigurationManagerTest {
-
-    private val configurationManager: GliaSdkConfigurationManager = GliaSdkConfigurationManager()
-    private val resourceProvider: ResourceProvider = mockk()
-    private val localeProvider: LocaleProvider = mockk()
-
-    @Before
-    fun setup() {
-        mockkStatic(Glia::class)
-        Dependencies.resourceProvider = resourceProvider
-        Dependencies.localeProvider = localeProvider
-        every { resourceProvider.getResourceKey(R.string.general_company_name)} returns "key"
-        every { resourceProvider.getString(any()) } returns DEFAULT_LOCAL_COMPANY_NAME
-        justRun { localeProvider.reportImproperInitialisation(any())}
-    }
-
-    @Test
-    fun `getCompanyName returns legacy value when non-legacy is null`() {
-        configurationManager.setLegacyCompanyName("Legacy name")
-        configurationManager.companyName = null
-        assertEquals("Legacy name", configurationManager.companyName)
-    }
-
-    @Test
-    fun `getCompanyName should not be replaced when remote value is empty but local custom value is set using GliaWidgetsConfig setCompanyName`() {
-        configurationManager.setLegacyCompanyName("Legacy name")
-        configurationManager.companyName = "Init company name"
-        every { Glia.getRemoteString(any()) } returns ""
-        every { resourceProvider.getString(R.string.general_company_name) } returns DEFAULT_LOCAL_COMPANY_NAME
-        assertEquals("Init company name", configurationManager.companyName)
-    }
-}
diff --git a/widgetssdk/src/test/java/com/glia/widgets/core/queue/QueueRepositoryTest.kt b/widgetssdk/src/test/java/com/glia/widgets/core/queue/QueueRepositoryTest.kt
new file mode 100644
index 000000000..201818163
--- /dev/null
+++ b/widgetssdk/src/test/java/com/glia/widgets/core/queue/QueueRepositoryTest.kt
@@ -0,0 +1,294 @@
+package com.glia.widgets.core.queue
+
+import android.assertCurrentValue
+import com.glia.androidsdk.GliaException
+import com.glia.androidsdk.RequestCallback
+import com.glia.androidsdk.queuing.Queue
+import com.glia.widgets.di.GliaCore
+import com.glia.widgets.helper.Logger
+import com.glia.widgets.launcher.ConfigurationManager
+import io.mockk.CapturingSlot
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import io.reactivex.rxjava3.functions.Predicate
+import io.reactivex.rxjava3.processors.PublishProcessor
+import org.junit.Before
+import org.junit.Test
+import java.util.function.Consumer
+
+class QueueRepositoryTest {
+
+    private lateinit var gliaCore: GliaCore
+    private lateinit var configurationManager: ConfigurationManager
+    private lateinit var queueRepository: QueueRepository
+
+    private lateinit var getQueuesCallbackSlot: MutableList<RequestCallback<List<Queue>?>>
+    private lateinit var subscribeToQueueUpdatesCallbackSlot: CapturingSlot<Consumer<Queue>>
+
+    private val configurationQueuesProcessor: PublishProcessor<List<String>> =
+        PublishProcessor.create()
+
+    @Before
+    fun setUp() {
+        Logger.setIsDebug(false)
+        gliaCore = mockk(relaxUnitFun = true)
+        configurationManager = mockk {
+            every { queueIdsObservable } returns configurationQueuesProcessor.hide()
+        }
+        getQueuesCallbackSlot = mutableListOf()
+        subscribeToQueueUpdatesCallbackSlot = slot()
+
+        queueRepository = QueueRepositoryImpl(gliaCore, configurationManager)
+
+        verify(exactly = 0) { configurationManager.queueIdsObservable }
+        verify(exactly = 0) { gliaCore.getQueues(any()) }
+        verify(exactly = 0) { gliaCore.isInitialized }
+    }
+
+    private fun pushCustomQueues(queues: List<String> = emptyList()) {
+        configurationQueuesProcessor.onNext(queues)
+    }
+
+    private fun createQueue(id: String, isDefault: Boolean, name: String = "defaultName"): Queue {
+        val queue = mockk<Queue>()
+        every { queue.id } returns id
+        every { queue.isDefault } returns isDefault
+        every { queue.name } returns name
+        return queue
+    }
+
+    private fun initialize() {
+        every { gliaCore.isInitialized } returns true
+
+        queueRepository.initialize()
+
+        verify { gliaCore.isInitialized }
+        verify { gliaCore.getQueues(capture(getQueuesCallbackSlot)) }
+
+        verify(exactly = 0) { configurationManager.queueIdsObservable }
+    }
+
+    private fun pushSiteQueues(vararg queues: Queue) {
+        getQueuesCallbackSlot.last().onResult(listOf(*queues), null)
+    }
+
+    @Test
+    fun `getQueues is not called when core not initialized`() {
+        every { gliaCore.isInitialized } returns false
+
+        queueRepository.initialize()
+
+        verify(exactly = 0) { configurationManager.queueIdsObservable }
+        verify(exactly = 0) { gliaCore.getQueues(any()) }
+        verify { gliaCore.isInitialized }
+    }
+
+    @Test
+    fun `getQueues will be called on subscription when core initialized`() {
+        every { gliaCore.isInitialized } returns true
+
+        queueRepository.relevantQueueIds.test().assertNotComplete()
+        verify { gliaCore.isInitialized }
+        verify { gliaCore.getQueues(any()) }
+
+        verify(exactly = 0) { configurationManager.queueIdsObservable }
+    }
+
+    @Test
+    fun `getQueues will be called on initialization when core initialized`() {
+        initialize()
+    }
+
+    @Test
+    fun `fetchQueues will set Error state when fetching failed`() {
+        initialize()
+
+        val exception = GliaException("Fetching queues failed", GliaException.Cause.NETWORK_TIMEOUT)
+
+        val subscriber = queueRepository.queuesState.test()
+
+        verify { gliaCore.getQueues(capture(getQueuesCallbackSlot)) }
+        verify(exactly = 0) { configurationManager.queueIdsObservable }
+        subscriber.assertCurrentValue(QueuesState.Loading)
+
+        getQueuesCallbackSlot.last().onResult(null, exception)
+        subscriber.assertCurrentValue(QueuesState.Error(exception))
+    }
+
+    @Test
+    fun `fetchQueues will set Error state when queues are null`() {
+        initialize()
+
+        val subscriber = queueRepository.queuesState.test()
+
+        verify { gliaCore.getQueues(capture(getQueuesCallbackSlot)) }
+        verify(exactly = 0) { configurationManager.queueIdsObservable }
+        subscriber.assertCurrentValue(QueuesState.Loading)
+
+        getQueuesCallbackSlot.last().onResult(null, null)
+        subscriber.assertCurrentValue(Predicate { it is QueuesState.Error })
+    }
+
+    @Test
+    fun `fetchQueues will subscribe to queues when response is not error`() {
+        initialize()
+
+        pushSiteQueues(createQueue("1", false))
+        verify { configurationManager.queueIdsObservable }
+    }
+
+    @Test
+    fun `onQueuesReceived will emit Empty state when site has no Queues`() {
+        initialize()
+
+        pushSiteQueues()
+        pushCustomQueues(listOf("1", "2"))
+        verify { configurationManager.queueIdsObservable }
+        verify(exactly = 0) { gliaCore.subscribeToQueueStateUpdates(any(), any(), any()) }
+        queueRepository.queuesState.test().assertCurrentValue(Predicate { it is QueuesState.Empty })
+        queueRepository.relevantQueueIds.test().assertValue { it.isEmpty() }
+    }
+
+    @Test
+    fun `onQueuesReceived will fall back to Default Queues when integrator queues are empty`() {
+        val defaultQueueId = "defaultQueue"
+        val defaultQueue = createQueue(defaultQueueId, true)
+        val nonDefaultQueue = createQueue("nonDefaultQueue", false)
+        initialize()
+
+        pushSiteQueues(defaultQueue, nonDefaultQueue)
+        pushCustomQueues()
+
+        verify { configurationManager.queueIdsObservable }
+
+        queueRepository.queuesState.test()
+            .assertCurrentValue(QueuesState.Queues(listOf(defaultQueue)))
+
+        queueRepository.relevantQueueIds.test().assertValue(listOf(defaultQueue.id))
+        verify { gliaCore.subscribeToQueueStateUpdates(eq(listOf(defaultQueueId)), any(), any()) }
+    }
+
+    @Test
+    fun `onQueuesReceived will emit Empty state when integrator queues are empty and no default queues`() {
+        val nonDefaultQueue = createQueue("nonDefaultQueue", false)
+        initialize()
+
+        pushSiteQueues(nonDefaultQueue)
+        pushCustomQueues()
+
+        verify { configurationManager.queueIdsObservable }
+
+        queueRepository.queuesState.test().assertCurrentValue(QueuesState.Empty)
+        queueRepository.relevantQueueIds.test().assertValue { it.isEmpty() }
+        verify(exactly = 0) { gliaCore.subscribeToQueueStateUpdates(any(), any(), any()) }
+    }
+
+    @Test
+    fun `onQueuesReceived will fall back to Default Queues when no matched queues`() {
+        val defaultQueueId = "defaultQueue"
+        val defaultQueue = createQueue(defaultQueueId, true)
+        val nonDefaultQueue = createQueue("nonDefaultQueue", false)
+        initialize()
+
+        pushSiteQueues(defaultQueue, nonDefaultQueue)
+        pushCustomQueues(listOf("1"))
+
+        verify { configurationManager.queueIdsObservable }
+
+        queueRepository.queuesState.test()
+            .assertCurrentValue(QueuesState.Queues(listOf(defaultQueue)))
+        queueRepository.relevantQueueIds.test().assertValue(listOf(defaultQueue.id))
+        verify { gliaCore.subscribeToQueueStateUpdates(eq(listOf(defaultQueueId)), any(), any()) }
+    }
+
+    @Test
+    fun `onQueuesReceived will emit Empty state when no matched and default queues`() {
+        val nonDefaultQueue = createQueue("nonDefaultQueue", false)
+        initialize()
+
+        pushSiteQueues(nonDefaultQueue)
+        pushCustomQueues(listOf("1"))
+
+        verify { configurationManager.queueIdsObservable }
+
+        queueRepository.queuesState.test().assertCurrentValue(QueuesState.Empty)
+        queueRepository.relevantQueueIds.test().assertValue { it.isEmpty() }
+        verify(exactly = 0) { gliaCore.subscribeToQueueStateUpdates(any(), any(), any()) }
+    }
+
+    @Test
+    fun `onQueuesReceived will emit matched Queues`() {
+        val defaultQueueId = "defaultQueue"
+        val defaultQueue = createQueue(defaultQueueId, true)
+        val nonDefaultQueueId = "nonDefaultQueue"
+        val nonDefaultQueue = createQueue(nonDefaultQueueId, false)
+        initialize()
+
+        pushSiteQueues(defaultQueue, nonDefaultQueue)
+        pushCustomQueues(listOf(defaultQueue.id, nonDefaultQueue.id))
+
+        verify { configurationManager.queueIdsObservable }
+
+        queueRepository.queuesState.test()
+            .assertCurrentValue(QueuesState.Queues(listOf(defaultQueue, nonDefaultQueue)))
+        queueRepository.relevantQueueIds.test()
+            .assertValue(listOf(defaultQueue.id, nonDefaultQueue.id))
+        verify {
+            gliaCore.subscribeToQueueStateUpdates(
+                eq(
+                    listOf(
+                        defaultQueueId,
+                        nonDefaultQueueId
+                    )
+                ), any(), any()
+            )
+        }
+    }
+
+    @Test
+    fun `updateQueues updates proper queue when it receives`() {
+        val defaultQueueId = "defaultQueue"
+        val defaultQueue = createQueue(defaultQueueId, true)
+        val nonDefaultQueueId = "nonDefaultQueue"
+        val nonDefaultQueue = createQueue(nonDefaultQueueId, false)
+        initialize()
+
+        pushSiteQueues(defaultQueue, nonDefaultQueue)
+        pushCustomQueues(listOf(defaultQueue.id, nonDefaultQueue.id))
+
+        verify { configurationManager.queueIdsObservable }
+
+        queueRepository.queuesState.test()
+            .assertCurrentValue(QueuesState.Queues(listOf(defaultQueue, nonDefaultQueue)))
+        queueRepository.relevantQueueIds.test()
+            .assertValue(listOf(defaultQueue.id, nonDefaultQueue.id))
+
+        verify {
+            gliaCore.subscribeToQueueStateUpdates(
+                eq(listOf(defaultQueueId, nonDefaultQueueId)),
+                any(),
+                capture(subscribeToQueueUpdatesCallbackSlot)
+            )
+        }
+
+        val updatedQueueName = "updatedDefaultQueueName"
+        val updatedDefaultQueue = createQueue(defaultQueue.id, true, updatedQueueName)
+
+        subscribeToQueueUpdatesCallbackSlot.captured.accept(updatedDefaultQueue)
+
+        verify(atMost = 1) {
+            gliaCore.subscribeToQueueStateUpdates(
+                eq(listOf(defaultQueueId, nonDefaultQueueId)), any(), any()
+            )
+        }
+
+        queueRepository.queuesState.test()
+            .assertCurrentValue(QueuesState.Queues(listOf(updatedDefaultQueue, nonDefaultQueue)))
+        queueRepository.relevantQueueIds.test()
+            .assertValue(listOf(defaultQueue.id, nonDefaultQueue.id))
+    }
+
+
+}
diff --git a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/GetAvailableQueueIdsForSecureMessagingUseCaseTest.kt b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/GetAvailableQueueIdsForSecureMessagingUseCaseTest.kt
deleted file mode 100644
index 6a00142af..000000000
--- a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/GetAvailableQueueIdsForSecureMessagingUseCaseTest.kt
+++ /dev/null
@@ -1,272 +0,0 @@
-package com.glia.widgets.core.secureconversations.domain
-
-import android.annotation.SuppressLint
-import com.glia.androidsdk.Engagement
-import com.glia.androidsdk.LogLevel
-import com.glia.androidsdk.LoggingAdapter
-import com.glia.androidsdk.queuing.Queue
-import com.glia.androidsdk.queuing.QueueState
-import com.glia.widgets.core.engagement.GliaEngagementConfigRepository
-import com.glia.widgets.core.queue.GliaQueueRepository
-import com.glia.widgets.helper.Logger
-import com.glia.widgets.helper.rx.Schedulers
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.mockito.kotlin.any
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.never
-import org.mockito.kotlin.verify
-import org.mockito.kotlin.whenever
-
-class GetAvailableQueueIdsForSecureMessagingUseCaseTest {
-    private lateinit var engagementConfigRepository: GliaEngagementConfigRepository
-    private lateinit var queueRepository: GliaQueueRepository
-    private lateinit var isMessagingAvailableUseCase: IsMessagingAvailableUseCase
-    private lateinit var testScheduler: TestScheduler
-    private lateinit var loggingAdapter: LoggingAdapter
-
-    private lateinit var useCase: GetAvailableQueueIdsForSecureMessagingUseCase
-
-    // Queues
-    private val queue1 = Queue(
-        "1068c08b-4155-4ee6-93d2-5baebee72ca6",
-        "Queue1",
-        QueueState.Status.OPEN,
-        arrayOf(Engagement.MediaType.TEXT, Engagement.MediaType.MESSAGING),
-        false
-    )
-    private val queue2 = Queue(
-        "60b040be-03dd-4c78-a0e2-834e8b8903dc",
-        "Queue2",
-        QueueState.Status.OPEN,
-        arrayOf(Engagement.MediaType.TEXT, Engagement.MediaType.MESSAGING),
-        true
-    )
-    private val queue3 = Queue(
-        "f8dcaccb-1874-4c1c-ba26-79eee699578c",
-        "Queue3",
-        QueueState.Status.OPEN,
-        arrayOf(Engagement.MediaType.TEXT, Engagement.MediaType.MESSAGING),
-        true
-    )
-    private val queues = listOf(queue1, queue2, queue3)
-    private val queueIds = queues.map { it.id }
-
-    private val defaultQueues = listOf(queue2, queue3)
-    private val defaultQueuesIds = defaultQueues.map { it.id }
-
-    @Before
-    fun setUp() {
-        loggingAdapter = mock()
-        Logger.addAdapter(loggingAdapter)
-        Logger.setIsDebug(false)
-
-        engagementConfigRepository = mock()
-        queueRepository = mock()
-        isMessagingAvailableUseCase = mock()
-
-        testScheduler = TestScheduler()
-        val schedulers = mock<Schedulers>()
-        whenever(schedulers.mainScheduler) doReturn testScheduler
-        whenever(schedulers.computationScheduler) doReturn testScheduler
-
-        useCase = GetAvailableQueueIdsForSecureMessagingUseCase(
-            engagementConfigRepository,
-            queueRepository,
-            isMessagingAvailableUseCase,
-            schedulers
-        )
-    }
-
-    @Test
-    fun `invoke() returns queue IDs when isMessagingAvailableUseCase returns true`() {
-        whenever(engagementConfigRepository.queueIds) doReturn queueIds
-        whenever(queueRepository.queues) doReturn Single.just(queues.toTypedArray())
-        whenever(isMessagingAvailableUseCase(queues.toList())) doReturn true
-
-        var isCallbackInvoked = false
-        useCase { result, error ->
-            assertEquals(queueIds, result)
-            assertNull(error)
-
-            isCallbackInvoked = true
-        }
-
-        testScheduler.triggerActions()
-
-        assertTrue(isCallbackInvoked)
-
-        verify(loggingAdapter).log(
-            LogLevel.INFO,
-            "Glia Widgets: GetAvailableQueueIdsForSecureMessagingUseCase",
-            "Secure Messaging is available in queues with IDs: $queueIds.",
-            emptyMap()
-        )
-    }
-
-    @Test
-    fun `invoke() returns null when isMessagingAvailableUseCase returns false`() {
-        val queueIds = listOf(queue1.id, "d9470299-030d-45d2-b21c-bcf6ad8e4415")
-        whenever(engagementConfigRepository.queueIds) doReturn queueIds
-        whenever(queueRepository.queues) doReturn Single.just(queues.toTypedArray())
-        whenever(isMessagingAvailableUseCase(listOf(queue1))) doReturn false
-
-        var isCallbackInvoked = false
-        useCase { result, error ->
-            assertNull(result)
-            assertNull(error)
-
-            isCallbackInvoked = true
-        }
-
-        testScheduler.triggerActions()
-
-        assertTrue(isCallbackInvoked)
-
-        verify(loggingAdapter).log(
-            LogLevel.WARN,
-            "Glia Widgets: GetAvailableQueueIdsForSecureMessagingUseCase",
-            "Provided queue IDs do not match with queues that have status other than closed and support messaging.",
-            emptyMap()
-        )
-    }
-
-    @Test
-    fun `invoke() returns default queue IDs when configured queues list is empty`() {
-        whenever(engagementConfigRepository.queueIds) doReturn emptyList()
-        whenever(queueRepository.queues) doReturn Single.just(queues.toTypedArray())
-        whenever(isMessagingAvailableUseCase(defaultQueues)) doReturn true
-
-        var isCallbackInvoked = false
-        useCase { result, error ->
-            assertEquals(defaultQueuesIds, result)
-            assertNull(error)
-
-            isCallbackInvoked = true
-        }
-
-        testScheduler.triggerActions()
-
-        assertTrue(isCallbackInvoked)
-
-        verify(loggingAdapter, never()).log(
-            LogLevel.WARN,
-            "Glia Widgets: GetAvailableQueueIdsForSecureMessagingUseCase",
-            "Provided queue IDs do not match with any queue.",
-            emptyMap()
-        )
-
-        verify(loggingAdapter).log(
-            LogLevel.INFO,
-            "Glia Widgets: GetAvailableQueueIdsForSecureMessagingUseCase",
-            "Secure Messaging is available using queues that are set as **Default**.",
-            emptyMap()
-        )
-    }
-
-    @Test
-    fun `invoke() returns default queue IDs when configured queues list not match with site queues`() {
-        whenever(engagementConfigRepository.queueIds) doReturn listOf("6d0d7251-1ef5-4741-88cf-c1dec9563197", "57256db7-1abf-412d-9d84-b0afd47e15b1")
-        whenever(queueRepository.queues) doReturn Single.just(queues.toTypedArray())
-        whenever(isMessagingAvailableUseCase(defaultQueues)) doReturn true
-
-        var isCallbackInvoked = false
-        useCase { result, error ->
-            assertEquals(defaultQueuesIds, result)
-            assertNull(error)
-
-            isCallbackInvoked = true
-        }
-
-        testScheduler.triggerActions()
-
-        assertTrue(isCallbackInvoked)
-
-        verify(loggingAdapter).log(
-            LogLevel.WARN,
-            "Glia Widgets: GetAvailableQueueIdsForSecureMessagingUseCase",
-            "Provided queue IDs do not match with any queue.",
-            emptyMap()
-        )
-
-        verify(loggingAdapter).log(
-            LogLevel.INFO,
-            "Glia Widgets: GetAvailableQueueIdsForSecureMessagingUseCase",
-            "Secure Messaging is available using queues that are set as **Default**.",
-            emptyMap()
-        )
-    }
-
-    @Test
-    fun `invoke() returns null when default queue IDs not available for messaging`() {
-        whenever(engagementConfigRepository.queueIds) doReturn emptyList()
-        whenever(queueRepository.queues) doReturn Single.just(queues.toTypedArray())
-        whenever(isMessagingAvailableUseCase(defaultQueues)) doReturn false
-
-        var isCallbackInvoked = false
-        useCase { result, error ->
-            assertNull(result)
-            assertNull(error)
-
-            isCallbackInvoked = true
-        }
-
-        testScheduler.triggerActions()
-
-        assertTrue(isCallbackInvoked)
-
-        verify(loggingAdapter).log(
-            LogLevel.WARN,
-            "Glia Widgets: GetAvailableQueueIdsForSecureMessagingUseCase",
-            "No default queues that have status other than closed and support messaging were found.",
-            emptyMap()
-        )
-    }
-
-    @Test
-    fun `invoke() returns error when get queues returns error`() {
-        val exception = Exception("Error")
-        whenever(queueRepository.queues) doReturn Single.error(exception)
-
-        var isCallbackInvoked = false
-        useCase { result, error ->
-            assertNull(result)
-            assertNotNull(error)
-
-            isCallbackInvoked = true
-        }
-
-        testScheduler.triggerActions()
-
-        assertTrue(isCallbackInvoked)
-
-        verify(loggingAdapter, never()).log(any(), any(), any(), any())
-    }
-
-    @SuppressLint("CheckResult")
-    @Test
-    fun `invoke() logs invalid IDs when some queue IDs are invalid`() {
-        val queuesIds = listOf("invalidId1", "f8dcaccb-1874-4c1c-ba26-79eee699578c", "invalidId2")
-        whenever(engagementConfigRepository.queueIds) doReturn queuesIds
-        whenever(queueRepository.queues) doReturn Single.just(queues.toTypedArray())
-        whenever(isMessagingAvailableUseCase(any())) doReturn false
-
-        useCase().test()
-
-        testScheduler.triggerActions()
-
-        verify(loggingAdapter).log(
-            LogLevel.WARN,
-            "Glia Widgets: GetAvailableQueueIdsForSecureMessagingUseCase",
-            "Queue ID array for Secure Messaging contains invalid queue IDs: [invalidId1, invalidId2].",
-            emptyMap()
-        )
-    }
-}
diff --git a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/GetUnreadMessagesCountWithTimeoutUseCaseTest.kt b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/GetUnreadMessagesCountWithTimeoutUseCaseTest.kt
index 1f60a0ec2..1c5ae055d 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/GetUnreadMessagesCountWithTimeoutUseCaseTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/GetUnreadMessagesCountWithTimeoutUseCaseTest.kt
@@ -2,7 +2,9 @@ package com.glia.widgets.core.secureconversations.domain
 
 import com.glia.androidsdk.GliaException
 import com.glia.androidsdk.RequestCallback
+import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
 import com.glia.widgets.core.secureconversations.SecureConversationsRepository
+import com.glia.widgets.di.GliaCore
 import io.reactivex.rxjava3.plugins.RxJavaPlugins
 import org.junit.Before
 import org.junit.Test
@@ -20,16 +22,37 @@ import kotlin.properties.Delegates
 class GetUnreadMessagesCountWithTimeoutUseCaseTest {
     private var repository: SecureConversationsRepository by Delegates.notNull()
     private var useCase: GetUnreadMessagesCountWithTimeoutUseCase by Delegates.notNull()
+    private var isAuthenticatedUseCase: IsAuthenticatedUseCase by Delegates.notNull()
+    private var core: GliaCore by Delegates.notNull()
 
     @Before
     fun setUp() {
         RxJavaPlugins.reset()
         repository = mock()
-        useCase = GetUnreadMessagesCountWithTimeoutUseCase(repository)
+        isAuthenticatedUseCase = mock()
+        core = mock()
+        useCase = GetUnreadMessagesCountWithTimeoutUseCase(repository, isAuthenticatedUseCase, core)
+    }
+
+    @Test
+    fun `invoke returns NO_UNREAD_MESSAGES when GliaCore is not initialized`() {
+        whenever(core.isInitialized).thenReturn(false)
+
+        useCase().test().assertComplete().assertValue(NO_UNREAD_MESSAGES)
+    }
+
+    @Test
+    fun `invoke returns NO_UNREAD_MESSAGES when user is not authenticated`() {
+        whenever(core.isInitialized).thenReturn(true)
+        whenever(isAuthenticatedUseCase()).thenReturn(false)
+
+        useCase().test().assertComplete().assertValue(NO_UNREAD_MESSAGES)
     }
 
     @Test
     fun `invoke returns NO_UNREAD_MESSAGES when there is no answer during timeout`() {
+        mockInitializedAndAuthenticated()
+
         val answer: Answer<*> = AnswersWithDelay(
             TIMEOUT_SEC * 2_000L
         ) {
@@ -43,6 +66,8 @@ class GetUnreadMessagesCountWithTimeoutUseCaseTest {
 
     @Test
     fun `invoke completes with NO_UNREAD_MESSAGES when error is returned`() {
+        mockInitializedAndAuthenticated()
+
         doAnswer {
             val callback: RequestCallback<Int?> = it.getArgument(0)
             callback.onResult(null, GliaException("", GliaException.Cause.INTERNAL_ERROR))
@@ -53,6 +78,8 @@ class GetUnreadMessagesCountWithTimeoutUseCaseTest {
 
     @Test
     fun `invoke completes with NO_UNREAD_MESSAGES when count is null`() {
+        mockInitializedAndAuthenticated()
+
         doAnswer {
             val callback: RequestCallback<Int?> = it.getArgument(0)
             callback.onResult(null, null)
@@ -63,6 +90,8 @@ class GetUnreadMessagesCountWithTimeoutUseCaseTest {
 
     @Test
     fun `invoke completes with NO_UNREAD_MESSAGES when count is 0`() {
+        mockInitializedAndAuthenticated()
+
         doAnswer {
             val callback: RequestCallback<Int?> = it.getArgument(0)
             callback.onResult(0, null)
@@ -73,6 +102,8 @@ class GetUnreadMessagesCountWithTimeoutUseCaseTest {
 
     @Test
     fun `invoke completes with correct messages count when success is called`() {
+        mockInitializedAndAuthenticated()
+
         doAnswer {
             val callback: RequestCallback<Int?> = it.getArgument(0)
             callback.onResult(10, null)
@@ -80,4 +111,9 @@ class GetUnreadMessagesCountWithTimeoutUseCaseTest {
 
         useCase().test().assertComplete().assertValue(10)
     }
+
+    private fun mockInitializedAndAuthenticated() {
+        whenever(core.isInitialized).thenReturn(true)
+        whenever(isAuthenticatedUseCase()).thenReturn(true)
+    }
 }
diff --git a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/HasPendingSecureConversationsWithTimeoutUseCaseTest.kt b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/HasPendingSecureConversationsWithTimeoutUseCaseTest.kt
new file mode 100644
index 000000000..880c30809
--- /dev/null
+++ b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/HasPendingSecureConversationsWithTimeoutUseCaseTest.kt
@@ -0,0 +1,91 @@
+package com.glia.widgets.core.secureconversations.domain
+
+import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
+import com.glia.widgets.core.secureconversations.SecureConversationsRepository
+import com.glia.widgets.di.GliaCore
+import io.mockk.every
+import io.mockk.mockk
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.plugins.RxJavaPlugins
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class HasPendingSecureConversationsWithTimeoutUseCaseTest {
+    private lateinit var repository: SecureConversationsRepository
+    private lateinit var useCase: HasPendingSecureConversationsWithTimeoutUseCase
+    private lateinit var isAuthenticatedUseCase: IsAuthenticatedUseCase
+    private lateinit var core: GliaCore
+
+    @Before
+    fun setUp() {
+        RxJavaPlugins.setIoSchedulerHandler { Schedulers.trampoline() }
+        repository = mockk()
+        isAuthenticatedUseCase = mockk()
+        core = mockk()
+        useCase = HasPendingSecureConversationsWithTimeoutUseCase(repository, isAuthenticatedUseCase, core)
+    }
+
+    @Test
+    fun `invoke returns false when GliaCore is not initialized`() {
+        every { core.isInitialized } returns false
+
+        val result = useCase().blockingGet()
+        assertEquals(false, result)
+    }
+
+    @Test
+    fun `invoke returns false when user is not authenticated`() {
+        every { core.isInitialized } returns true
+        every { isAuthenticatedUseCase() } returns false
+
+        val result = useCase().blockingGet()
+        assertEquals(false, result)
+    }
+
+    @Test
+    fun `invoke returns false when there is no answer during timeout`() {
+        mockInitializedAndAuthenticated()
+
+        every { repository.getHasPendingSecureConversations() } returns Single.never()
+
+        val result = useCase().blockingGet()
+        assertEquals(false, result)
+    }
+
+    @Test
+    fun `invoke returns false when error is returned`() {
+        mockInitializedAndAuthenticated()
+
+        every { repository.getHasPendingSecureConversations() } returns Single.error(Exception("Error"))
+
+        val result = useCase().blockingGet()
+        assertEquals(false, result)
+    }
+
+    @Test
+    fun `invoke returns true when there are pending secure conversations`() {
+        mockInitializedAndAuthenticated()
+
+        every { repository.getHasPendingSecureConversations() } returns Single.just(true)
+
+        val result = useCase().blockingGet()
+        assertEquals(true, result)
+    }
+
+    @Test
+    fun `invoke returns false when there are no pending secure conversations`() {
+        mockInitializedAndAuthenticated()
+
+        every { repository.getHasPendingSecureConversations() } returns Single.just(false)
+
+        val result = useCase().blockingGet()
+        assertEquals(false, result)
+    }
+
+    private fun mockInitializedAndAuthenticated() {
+        every { core.isInitialized } returns true
+        every { isAuthenticatedUseCase() } returns true
+    }
+}
diff --git a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/IsMessagingAvailableUseCaseTest.kt b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/IsMessagingAvailableUseCaseTest.kt
index cdad8de69..e1de6170d 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/IsMessagingAvailableUseCaseTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/IsMessagingAvailableUseCaseTest.kt
@@ -1,108 +1,101 @@
 package com.glia.widgets.core.secureconversations.domain
 
-import com.glia.androidsdk.Engagement
+import android.COMMON_EXTENSIONS_CLASS_PATH
 import com.glia.androidsdk.queuing.Queue
 import com.glia.androidsdk.queuing.QueueState
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
+import com.glia.widgets.core.queue.QueueRepository
+import com.glia.widgets.core.queue.QueuesState
+import com.glia.widgets.helper.supportMessaging
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.subscribers.TestSubscriber
+import org.junit.After
 import org.junit.Before
 import org.junit.Test
-import kotlin.properties.Delegates
 
 class IsMessagingAvailableUseCaseTest {
-    private val messagingQueueId = "messagingQueueId"
-    private val mediaTypesWithMessaging =
-        arrayOf(Engagement.MediaType.TEXT, Engagement.MediaType.MESSAGING)
-    private val mediaTypesWithoutMessaging =
-        arrayOf(Engagement.MediaType.TEXT, Engagement.MediaType.AUDIO)
-
-    // Queues
-    private val audioQueue = Queue(
-        "audioQueueId",
-        "Audio Queue",
-        QueueState.Status.OPEN,
-        mediaTypesWithoutMessaging,
-        false
-    )
-    private val videoQueue = Queue(
-        "videoQueueId",
-        "Video Queue",
-        QueueState.Status.OPEN,
-        mediaTypesWithoutMessaging,
-        false
-    )
-
-    private var isMessagingAvailableUseCase: IsMessagingAvailableUseCase by Delegates.notNull()
+
+    private lateinit var queueRepository: QueueRepository
+    private lateinit var isMessagingAvailableUseCase: IsMessagingAvailableUseCase
 
     @Before
     fun setUp() {
-        isMessagingAvailableUseCase = IsMessagingAvailableUseCase()
+        queueRepository = mockk()
+        isMessagingAvailableUseCase = IsMessagingAvailableUseCase(queueRepository)
+        mockkStatic(COMMON_EXTENSIONS_CLASS_PATH)
     }
 
-    @Test
-    fun containsMessagingQueue_ReturnsTrue_WhenQueueWithMediaTypeMessagingExists() {
-        val messagingQueue = createMessagingQueueWithStatus()
-        val queues = listOf(audioQueue, messagingQueue, videoQueue)
-        val isMessageCenterAvailable: Boolean = isMessagingAvailableUseCase(queues)
-        assertTrue(isMessageCenterAvailable)
+    @After
+    fun tearDown() {
+        unmockkStatic(COMMON_EXTENSIONS_CLASS_PATH)
     }
 
     @Test
-    fun containsMessagingQueue_ReturnsFalse_WhenQueueWithMediaTypeMessagingDoesNotExist() {
-        val queues = listOf(audioQueue, videoQueue)
-        val isMessageCenterAvailable: Boolean = isMessagingAvailableUseCase(queues)
-        assertFalse(isMessageCenterAvailable)
-    }
+    fun `invoke returns true when queue with messaging exists`() {
+        val messagingQueue = createQueueWithStatus(QueueState.Status.OPEN, true)
+        val queuesState = QueuesState.Queues(listOf(messagingQueue))
+        every { queueRepository.queuesState } returns Flowable.just(queuesState)
 
-    @Test
-    fun containsMessagingQueue_ReturnsTrue_WhenExistingQueueUnStaffed() {
-        val queueWithMessagingIdFromUseCaseUnstaffed =
-            createMessagingQueueWithStatus(QueueState.Status.UNSTAFFED)
-        val queues = listOf(audioQueue, queueWithMessagingIdFromUseCaseUnstaffed, videoQueue)
-        val isMessageCenterAvailable: Boolean = isMessagingAvailableUseCase(queues)
-        assertTrue(isMessageCenterAvailable)
+        val testSubscriber = TestSubscriber<Result<Boolean>>()
+        isMessagingAvailableUseCase().subscribe(testSubscriber)
+
+        testSubscriber.assertValue(Result.success(true))
     }
 
     @Test
-    fun containsMessagingQueue_ReturnsTrue_WhenExistingQueueFull() {
-        val queueWithMessagingIdFromUseCaseFull =
-            createMessagingQueueWithStatus(QueueState.Status.FULL)
-        val queues = listOf(audioQueue, queueWithMessagingIdFromUseCaseFull, videoQueue)
-        val isMessageCenterAvailable: Boolean = isMessagingAvailableUseCase(queues)
-        assertTrue(isMessageCenterAvailable)
+    fun `invoke returns false when no queue with messaging exists`() {
+        val nonMessagingQueue = createQueueWithStatus(QueueState.Status.OPEN, false)
+        val queuesState = QueuesState.Queues(listOf(nonMessagingQueue))
+        every { queueRepository.queuesState } returns Flowable.just(queuesState)
+
+        val testSubscriber = TestSubscriber<Result<Boolean>>()
+        isMessagingAvailableUseCase().subscribe(testSubscriber)
+
+        testSubscriber.assertValue(Result.success(false))
     }
 
     @Test
-    fun containsMessagingQueue_ReturnsFalse_WhenExistingQueueClosed() {
-        val queueWithMessagingIdFromUseCaseClosed =
-            createMessagingQueueWithStatus(QueueState.Status.CLOSED)
-        val queues = listOf(audioQueue, queueWithMessagingIdFromUseCaseClosed, videoQueue)
-        val isMessageCenterAvailable: Boolean = isMessagingAvailableUseCase(queues)
-        assertFalse(isMessageCenterAvailable)
+    fun `invoke returns false when queue state is closed`() {
+        val closedQueue = createQueueWithStatus(QueueState.Status.CLOSED, true)
+        val queuesState = QueuesState.Queues(listOf(closedQueue))
+        every { queueRepository.queuesState } returns Flowable.just(queuesState)
+
+        val testSubscriber = TestSubscriber<Result<Boolean>>()
+        isMessagingAvailableUseCase().subscribe(testSubscriber)
+
+        testSubscriber.assertValue(Result.success(false))
     }
 
     @Test
-    fun containsMessagingQueue_ReturnsFalse_WhenExistingQueueStateUnknown() {
-        val queueWithMessagingIdFromUseCaseUnknown =
-            createMessagingQueueWithStatus(QueueState.Status.UNKNOWN)
-        val queues = listOf(audioQueue, queueWithMessagingIdFromUseCaseUnknown, videoQueue)
-        val isMessageCenterAvailable: Boolean = isMessagingAvailableUseCase(queues)
-        assertFalse(isMessageCenterAvailable)
+    fun `invoke returns false when queue state is unknown`() {
+        val unknownQueue = createQueueWithStatus(QueueState.Status.UNKNOWN, true)
+        val queuesState = QueuesState.Queues(listOf(unknownQueue))
+        every { queueRepository.queuesState } returns Flowable.just(queuesState)
+
+        val testSubscriber = TestSubscriber<Result<Boolean>>()
+        isMessagingAvailableUseCase().subscribe(testSubscriber)
+
+        testSubscriber.assertValue(Result.success(false))
     }
 
     @Test
-    fun containsMessagingQueue_ReturnsFalse_WhenQueuesEmpty() {
-        val queues = listOf<Queue>()
-        val isMessageCenterAvailable: Boolean = isMessagingAvailableUseCase(queues)
-        assertFalse(isMessageCenterAvailable)
+    fun `invoke returns error when queue state is error`() {
+        val errorState = QueuesState.Error(Throwable("Error"))
+        every { queueRepository.queuesState } returns Flowable.just(errorState)
+
+        val testSubscriber = TestSubscriber<Result<Boolean>>()
+        isMessagingAvailableUseCase().subscribe(testSubscriber)
+
+        testSubscriber.assertValue { it.isFailure }
     }
 
-    private fun createMessagingQueueWithStatus(status: QueueState.Status = QueueState.Status.OPEN) =
-        Queue(
-            messagingQueueId,
-            "Messaging Queue",
-            status,
-            mediaTypesWithMessaging,
-            false
-        )
+    private fun createQueueWithStatus(status: QueueState.Status, supportsMessaging: Boolean): Queue {
+        val queue = mockk<Queue>()
+        every { queue.state.status } returns status
+        every { any<Queue>().supportMessaging() } returns supportsMessaging
+        return queue
+    }
 }
diff --git a/widgetssdk/src/test/java/com/glia/widgets/engagement/EngagementRepositoryTest.kt b/widgetssdk/src/test/java/com/glia/widgets/engagement/EngagementRepositoryTest.kt
index 6fc06bf3a..1b2302c86 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/engagement/EngagementRepositoryTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/engagement/EngagementRepositoryTest.kt
@@ -30,10 +30,12 @@ import com.glia.androidsdk.screensharing.ScreenSharing
 import com.glia.androidsdk.screensharing.ScreenSharingRequest
 import com.glia.androidsdk.screensharing.VisitorScreenSharingState
 import com.glia.widgets.core.engagement.GliaOperatorRepository
+import com.glia.widgets.core.queue.QueueRepository
 import com.glia.widgets.di.GliaCore
 import com.glia.widgets.helper.Data
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.formattedName
+import com.glia.widgets.launcher.ConfigurationManager
 import io.mockk.CapturingSlot
 import io.mockk.MockKAnnotations
 import io.mockk.Runs
@@ -48,6 +50,7 @@ import io.mockk.slot
 import io.mockk.spyk
 import io.mockk.unmockkStatic
 import io.mockk.verify
+import io.reactivex.rxjava3.core.Single
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertNull
@@ -90,13 +93,18 @@ class EngagementRepositoryTest {
     private lateinit var engagementState: EngagementState
     private lateinit var cameraDevice: CameraDevice
 
+    private lateinit var queueRepository: QueueRepository
+
     private lateinit var repository: EngagementRepository
+    private lateinit var configurationManager: ConfigurationManager
 
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
         mockLogger()
 
+        queueRepository = mockk(relaxUnitFun = true)
+
         engagementRequestCallbackSlot = slot()
         omniCoreEngagementCallbackSlot = slot()
         callVisualizerEngagementCallbackSlot = slot()
@@ -112,8 +120,11 @@ class EngagementRepositoryTest {
         screenSharingStateCallbackSlot = slot()
 
         every { core.callVisualizer } returns callVisualizer
+        configurationManager = mockk<ConfigurationManager> {
+            every { visitorContextAssetId } returns null
+        }
 
-        repository = EngagementRepositoryImpl(core, operatorRepository)
+        repository = EngagementRepositoryImpl(core, operatorRepository, queueRepository, configurationManager)
         initializeAndVerify()
     }
 
@@ -401,7 +412,7 @@ class EngagementRepositoryTest {
 
     @After
     fun tearDown() {
-        confirmVerified(core, operatorRepository, callVisualizer)
+        confirmVerified(core, operatorRepository, callVisualizer, queueRepository)
         unmockkStatic(LOGGER_PATH)
     }
 
@@ -786,70 +797,87 @@ class EngagementRepositoryTest {
     }
 
     @Test
-    fun `queueForEngagement with TEXT type produces PreQueueing when queueing success`() {
+    fun `queueForEngagement produces PreQueueing`() {
         val queueId = "queue_id"
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
         val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
-        repository.queueForEngagement(listOf(queueId), MediaType.TEXT,null)
 
-        verify(exactly = 1) { core.queueForEngagement(arrayOf(queueId), MediaType.TEXT, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        repository.queueForEngagement(MediaType.TEXT)
+
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), MediaType.TEXT, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
         queueForEngagementCallbackSlot.captured.accept(null)
 
         assertTrue(repository.isQueueing)
         assertFalse(repository.isQueueingForMedia)
 
-        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(listOf(queueId), MediaType.TEXT))
+        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(MediaType.TEXT))
 
-        repository.queueForEngagement(listOf(queueId), MediaType.TEXT, "url")
+        repository.queueForEngagement(MediaType.TEXT)
 
-        verify(exactly = 0) { core.queueForEngagement(arrayOf(queueId), MediaType.TEXT, "url", any(), any(), capture(queueForEngagementCallbackSlot)) }
+        verify { queueRepository.relevantQueueIds }
+        verify(exactly = 0) { core.queueForEngagement(listOf(queueId), MediaType.TEXT, "url", any(), any(), capture(queueForEngagementCallbackSlot)) }
     }
 
     @Test
-    fun `queueForEngagement with AUDIO type produces PreQueueing when queueing success`() {
-        val queueId = "queue_id"
-        val mediaType = MediaType.AUDIO
-        val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
-        repository.queueForEngagement(listOf(queueId), mediaType, null)
+    fun `queueForEngagement produces Error when relevant queues are empty`() {
+        every { queueRepository.relevantQueueIds } returns Single.just(emptyList())
+        val testSubscriber = repository.engagementState.test()
 
-        verify { core.queueForEngagement(arrayOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
-        queueForEngagementCallbackSlot.captured.accept(null)
+        repository.queueForEngagement(MediaType.TEXT)
 
-        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(listOf(queueId), mediaType))
+        verify { queueRepository.relevantQueueIds }
+        verify(exactly = 0) { core.queueForEngagement(any(), MediaType.TEXT, null, any(), any(), any()) }
+
+        assertFalse(repository.isQueueing)
+        assertFalse(repository.isQueueingForMedia)
+
+        testSubscriber.assertNotComplete().assertValuesOnly(
+            State.NoEngagement,
+            State.PreQueuing(MediaType.TEXT),
+            State.UnexpectedErrorHappened,
+            State.NoEngagement
+        )
     }
 
     @Test
-    fun `queueForEngagement produces PreQueueing when already queued`() {
+    fun `queueForEngagement will do nothing when already queued`() {
         val queueId = "queue_id"
         val mediaType = MediaType.AUDIO
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
         val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
-        repository.queueForEngagement(listOf(queueId), mediaType, null)
+        repository.queueForEngagement(mediaType)
 
-        verify(exactly = 1) { core.queueForEngagement(arrayOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(mediaType))
+        verify { queueRepository.relevantQueueIds }
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
         queueForEngagementCallbackSlot.captured.accept(GliaException("message", GliaException.Cause.ALREADY_QUEUED))
 
         assertTrue(repository.isQueueing)
         assertTrue(repository.isQueueingForMedia)
 
-        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(listOf(queueId), mediaType))
+        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(mediaType))
 
-        repository.queueForEngagement(listOf(queueId), MediaType.VIDEO, null)
+        repository.queueForEngagement(MediaType.VIDEO)
 
-        verify(exactly = 0) { core.queueForEngagement(arrayOf(queueId), MediaType.VIDEO, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        verify(exactly = 0) { core.queueForEngagement(listOf(queueId), MediaType.VIDEO, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
     }
 
     @Test
     fun `queueForEngagement produces QueueUnstaffed when queue is unavailable`() {
         val queueId = "queue_id"
         val mediaType = MediaType.AUDIO
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
         val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
         val testSubscriber = repository.engagementState.test()
-        repository.queueForEngagement(listOf(queueId), mediaType, null)
+        repository.queueForEngagement(mediaType)
 
-        verify { core.queueForEngagement(arrayOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        verify { queueRepository.relevantQueueIds }
+        verify { core.queueForEngagement(listOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
         queueForEngagementCallbackSlot.captured.accept(GliaException("message", GliaException.Cause.QUEUE_CLOSED))
 
         testSubscriber.assertNotComplete().assertValuesOnly(
             State.NoEngagement,
+            State.PreQueuing(mediaType = mediaType),
             State.QueueUnstaffed,
             State.NoEngagement
         )
@@ -859,15 +887,18 @@ class EngagementRepositoryTest {
     fun `queueForEngagement produces UnexpectedError when queueing failed`() {
         val queueId = "queue_id"
         val mediaType = MediaType.AUDIO
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
         val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
         val testSubscriber = repository.engagementState.test()
-        repository.queueForEngagement(listOf(queueId), mediaType, null)
+        repository.queueForEngagement(mediaType)
 
-        verify { core.queueForEngagement(arrayOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        verify { queueRepository.relevantQueueIds }
+        verify { core.queueForEngagement(listOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
         queueForEngagementCallbackSlot.captured.accept(GliaException("message", GliaException.Cause.NETWORK_TIMEOUT))
 
         testSubscriber.assertNotComplete().assertValuesOnly(
             State.NoEngagement,
+            State.PreQueuing(mediaType = mediaType),
             State.UnexpectedErrorHappened,
             State.NoEngagement
         )
@@ -877,21 +908,23 @@ class EngagementRepositoryTest {
     fun `enqueuing is canceling when unstaffed queue ticked is received`() {
         val queueId = "queue_id"
         val mediaType = MediaType.TEXT
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
         val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
         val subscribeQueueTicketCallbackSlot = slot<RequestCallback<QueueTicket?>>()
         val ticketId = "ticket_id"
         val queueTicket: QueueTicket = mockk(relaxed = true) {
             every { id } returns ticketId
         }
-        repository.queueForEngagement(listOf(queueId), mediaType, null)
+        repository.queueForEngagement(mediaType)
 
-        verify(exactly = 1) { core.queueForEngagement(arrayOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        verify { queueRepository.relevantQueueIds }
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
         queueForEngagementCallbackSlot.captured.accept(null)
 
         assertTrue(repository.isQueueing)
         assertFalse(repository.isQueueingForMedia)
 
-        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(listOf(queueId), mediaType))
+        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(mediaType))
 
         queueTicketCallbackSlot.captured.accept(queueTicket)
 
@@ -904,7 +937,7 @@ class EngagementRepositoryTest {
             subscribeQueueTicketCallbackSlot.captured.onResult(unstaffedTicket, null)
 
             assertNotComplete().assertValuesOnly(
-                State.Queuing(listOf(queueId), ticketId, mediaType),
+                State.Queuing(ticketId, mediaType),
                 State.QueueUnstaffed,
                 State.NoEngagement
             )
@@ -915,6 +948,7 @@ class EngagementRepositoryTest {
     fun `cancelQueuing sends cancel queue request immediately when current state is Queueing`() {
         val queueId = "queue_id"
         val mediaType = MediaType.TEXT
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
         val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
         val subscribeQueueTicketCallbackSlot = slot<RequestCallback<QueueTicket?>>()
         val cancelQueueTicketCallbackSlot = slot<Consumer<GliaException?>>()
@@ -922,15 +956,16 @@ class EngagementRepositoryTest {
         val queueTicket: QueueTicket = mockk(relaxed = true) {
             every { id } returns ticketId
         }
-        repository.queueForEngagement(listOf(queueId), mediaType, null)
+        repository.queueForEngagement(mediaType)
 
-        verify(exactly = 1) { core.queueForEngagement(arrayOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        verify { queueRepository.relevantQueueIds }
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
         queueForEngagementCallbackSlot.captured.accept(null)
 
         assertTrue(repository.isQueueing)
         assertFalse(repository.isQueueingForMedia)
 
-        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(listOf(queueId), mediaType))
+        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(mediaType))
 
         queueTicketCallbackSlot.captured.accept(queueTicket)
 
@@ -942,7 +977,7 @@ class EngagementRepositoryTest {
             cancelQueueTicketCallbackSlot.captured.accept(null)
             assertNotComplete()
                 .assertValuesOnly(
-                    State.Queuing(listOf(queueId), ticketId, mediaType),
+                    State.Queuing(ticketId, mediaType),
                     State.QueueingCanceled,
                     State.NoEngagement
                 )
@@ -953,6 +988,7 @@ class EngagementRepositoryTest {
     fun `cancelQueuing sends cancel queue request after queue ticket update when current state is PreQueueing`() {
         val queueId = "queue_id"
         val mediaType = MediaType.TEXT
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
         val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
         val subscribeQueueTicketCallbackSlot = slot<RequestCallback<QueueTicket?>>()
         val cancelQueueTicketCallbackSlot = slot<Consumer<GliaException?>>()
@@ -960,15 +996,16 @@ class EngagementRepositoryTest {
         val queueTicket: QueueTicket = mockk(relaxed = true) {
             every { id } returns ticketId
         }
-        repository.queueForEngagement(listOf(queueId), mediaType, null)
+        repository.queueForEngagement(mediaType)
 
-        verify(exactly = 1) { core.queueForEngagement(arrayOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        verify { queueRepository.relevantQueueIds }
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), mediaType, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
         queueForEngagementCallbackSlot.captured.accept(null)
 
         assertTrue(repository.isQueueing)
         assertFalse(repository.isQueueingForMedia)
 
-        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(listOf(queueId), mediaType))
+        repository.engagementState.test().assertNotComplete().assertValue(State.PreQueuing(mediaType))
         repository.cancelQueuing()
 
         queueTicketCallbackSlot.captured.accept(queueTicket)
@@ -1309,4 +1346,45 @@ class EngagementRepositoryTest {
         assertEquals(VisitorCamera.Switching, repository.currentVisitorCamera)
     }
 
+    @Test
+    fun `queueForEngagement uses visitorContextAssetId from configurationManager`() {
+        val queueId = "queue_id"
+        val visitorContextAssetId = "visitor_context_asset_id"
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
+        every { configurationManager.visitorContextAssetId } returns visitorContextAssetId
+        val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
+
+        repository.queueForEngagement(MediaType.TEXT)
+
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), MediaType.TEXT, visitorContextAssetId, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        queueForEngagementCallbackSlot.captured.accept(null)
+
+        assertTrue(repository.isQueueing)
+        assertFalse(repository.isQueueingForMedia)
+
+        repository.queueForEngagement(MediaType.TEXT)
+
+        verify { queueRepository.relevantQueueIds }
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), MediaType.TEXT, visitorContextAssetId, any(), any(), capture(queueForEngagementCallbackSlot)) }
+    }
+
+    @Test
+    fun `queueForEngagement uses null visitorContextAssetId when configurationManager returns null`() {
+        val queueId = "queue_id"
+        every { queueRepository.relevantQueueIds } returns Single.just(listOf(queueId))
+        every { configurationManager.visitorContextAssetId } returns null
+        val queueForEngagementCallbackSlot = slot<Consumer<GliaException?>>()
+
+        repository.queueForEngagement(MediaType.TEXT)
+
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), MediaType.TEXT, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+        queueForEngagementCallbackSlot.captured.accept(null)
+
+        assertTrue(repository.isQueueing)
+        assertFalse(repository.isQueueingForMedia)
+        repository.queueForEngagement(MediaType.TEXT)
+
+        verify { queueRepository.relevantQueueIds }
+        verify(exactly = 1) { core.queueForEngagement(listOf(queueId), MediaType.TEXT, null, any(), any(), capture(queueForEngagementCallbackSlot)) }
+    }
 }
diff --git a/widgetssdk/src/test/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcherTest.kt b/widgetssdk/src/test/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcherTest.kt
index 648c96723..a804b5ffa 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcherTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcherTest.kt
@@ -7,12 +7,14 @@ import android.content.Context
 import android.os.Parcelable
 import android.view.View
 import androidx.appcompat.app.AlertDialog
+import com.glia.androidsdk.engagement.Survey
 import com.glia.widgets.UiTheme
 import com.glia.widgets.chat.ChatActivity
 import com.glia.widgets.helper.GliaActivityManager
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.OneTimeEvent
 import com.glia.widgets.helper.withRuntimeTheme
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.view.Dialogs
 import io.mockk.Runs
 import io.mockk.confirmVerified
@@ -40,6 +42,7 @@ class EngagementCompletionActivityWatcherTest {
     private lateinit var controller: EngagementCompletionContract.Controller
 
     private lateinit var watcher: EngagementCompletionActivityWatcher
+    private lateinit var activityLauncher: ActivityLauncher
 
     @Before
     fun setUp() {
@@ -59,7 +62,9 @@ class EngagementCompletionActivityWatcherTest {
             every { state } returns stateProcessor
         }
 
-        watcher = EngagementCompletionActivityWatcher(controller, gliaActivityManager)
+        activityLauncher = mockk(relaxUnitFun = true)
+
+        watcher = EngagementCompletionActivityWatcher(controller, gliaActivityManager, activityLauncher)
 
         verify { controller.state }
     }
@@ -275,7 +280,8 @@ class EngagementCompletionActivityWatcherTest {
 
     @Test
     fun `handleState will start Survey when event is SurveyLoaded`() {
-        val event = createMockEvent(EngagementCompletionState.SurveyLoaded(mockk(moreInterfaces = arrayOf(Parcelable::class))))
+        val survey = mockk<Survey>(moreInterfaces = arrayOf(Parcelable::class))
+        val event = createMockEvent(EngagementCompletionState.SurveyLoaded(survey))
 
         val activity = mockkActivity<ChatActivity>()
 
@@ -292,9 +298,7 @@ class EngagementCompletionActivityWatcherTest {
 
         verify { event.consume(any()) }
 
-        verify { activity.overridePendingTransition(any(), any()) }
-        verify { activity.startActivity(any()) }
-        verify { activity.packageName }
+        verify { activityLauncher.launchSurvey(eq(activity), eq(survey)) }
 
         verify(exactly = 0) { dialog.dismiss() }
         verify(exactly = 0) { gliaActivityManager.finishActivities() }
diff --git a/widgetssdk/src/test/java/com/glia/widgets/engagement/completion/EngagementCompletionControllerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/engagement/completion/EngagementCompletionControllerTest.kt
index 4173eb027..b08a51c68 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/engagement/completion/EngagementCompletionControllerTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/engagement/completion/EngagementCompletionControllerTest.kt
@@ -103,8 +103,8 @@ class EngagementCompletionControllerTest {
         val testState = controller.state.test()
 
         engagementStateProcessor.onNext(State.NoEngagement)
-        engagementStateProcessor.onNext(State.PreQueuing(listOf("queueId"), Engagement.MediaType.TEXT))
-        engagementStateProcessor.onNext(State.Queuing(listOf("queueId"), "queueTicketId", Engagement.MediaType.TEXT))
+        engagementStateProcessor.onNext(State.PreQueuing(Engagement.MediaType.TEXT))
+        engagementStateProcessor.onNext(State.Queuing("queueTicketId", Engagement.MediaType.TEXT))
         engagementStateProcessor.onNext(State.QueueingCanceled)
         engagementStateProcessor.onNext(State.StartedOmniCore)
         engagementStateProcessor.onNext(State.StartedCallVisualizer)
diff --git a/widgetssdk/src/test/java/com/glia/widgets/engagement/domain/EngagementDomainTest.kt b/widgetssdk/src/test/java/com/glia/widgets/engagement/domain/EngagementDomainTest.kt
index e75729c03..61000dd80 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/engagement/domain/EngagementDomainTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/engagement/domain/EngagementDomainTest.kt
@@ -24,6 +24,7 @@ import com.glia.widgets.engagement.EngagementRepository
 import com.glia.widgets.engagement.ScreenSharingState
 import com.glia.widgets.helper.Data
 import com.glia.widgets.helper.formattedName
+import com.glia.widgets.launcher.ConfigurationManager
 import com.glia.widgets.permissions.Permissions
 import com.glia.widgets.permissions.PermissionsGrantedCallback
 import io.mockk.Runs
@@ -308,30 +309,16 @@ class EngagementDomainTest {
         assertTrue(useCase.isMediaEngagement)
     }
 
-    @Test
-    fun `EnqueueForEngagementUseCase invoke enqueues for chat engagement when media type is absent`() {
-        val repository: EngagementRepository = mockk(relaxUnitFun = true)
-        val queueIds = listOf("queueId1", "queueId2")
-        val mediaType: Engagement.MediaType? = null
-        val visitorContextAssetId = null
-
-        val useCase: EnqueueForEngagementUseCase = EnqueueForEngagementUseCaseImpl(engagementRepository = repository)
-        useCase(queueIds, mediaType, visitorContextAssetId)
-
-        verify { repository.queueForEngagement(queueIds, Engagement.MediaType.TEXT, visitorContextAssetId) }
-    }
-
     @Test
     fun `EnqueueForEngagementUseCase invoke enqueues with selected type engagement when media type is present`() {
         val repository: EngagementRepository = mockk(relaxUnitFun = true)
         val queueIds = listOf("queueId1", "queueId2")
         val mediaType: Engagement.MediaType = mockk(relaxUnitFun = true)
-        val visitorContextAssetId = null
 
         val useCase: EnqueueForEngagementUseCase = EnqueueForEngagementUseCaseImpl(engagementRepository = repository)
-        useCase(queueIds, mediaType, visitorContextAssetId)
+        useCase(mediaType)
 
-        verify { repository.queueForEngagement(queueIds, mediaType, visitorContextAssetId) }
+        verify { repository.queueForEngagement(mediaType) }
     }
 
     @Test
@@ -523,12 +510,17 @@ class EngagementDomainTest {
 
     @Test
     fun `ScreenSharingUseCase test`() {
+        val mode = ScreenSharing.Mode.UNBOUNDED
         val engagementRepository: EngagementRepository = mockk(relaxUnitFun = true)
         val releaseScreenSharingResourcesUseCase: ReleaseScreenSharingResourcesUseCase = mockk(relaxUnitFun = true)
 
+        val configurationManager = mockk<ConfigurationManager> {
+            every { screenSharingMode } returns mode
+        }
         val useCase: ScreenSharingUseCase = ScreenSharingUseCaseImpl(
             engagementRepository = engagementRepository,
-            releaseScreenSharingResourcesUseCase = releaseScreenSharingResourcesUseCase
+            releaseScreenSharingResourcesUseCase = releaseScreenSharingResourcesUseCase,
+            configurationManager
         )
 
         every { engagementRepository.isSharingScreen } returns true
@@ -548,8 +540,7 @@ class EngagementDomainTest {
         verify { engagementRepository.declineScreenSharingRequest() }
 
         val activity: Activity = mockk(relaxUnitFun = true)
-        val mode: ScreenSharing.Mode = mockk(relaxUnitFun = true)
-        useCase.acceptRequestWithAskedPermission(activity, mode)
+        useCase.acceptRequestWithAskedPermission(activity)
         verify { engagementRepository.acceptScreenSharingWithAskedPermission(activity, mode) }
 
         val resultCode = 1
diff --git a/widgetssdk/src/test/java/com/glia/widgets/entrywidget/EntryWidgetControllerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/entrywidget/EntryWidgetControllerTest.kt
new file mode 100644
index 000000000..9d14543b7
--- /dev/null
+++ b/widgetssdk/src/test/java/com/glia/widgets/entrywidget/EntryWidgetControllerTest.kt
@@ -0,0 +1,172 @@
+package com.glia.widgets.entrywidget
+
+import android.app.Activity
+import com.glia.androidsdk.Engagement
+import com.glia.androidsdk.queuing.Queue
+import com.glia.androidsdk.queuing.QueueState
+import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
+import com.glia.widgets.core.queue.QueueRepository
+import com.glia.widgets.core.queue.QueuesState
+import com.glia.widgets.di.GliaCore
+import com.glia.widgets.helper.Logger
+import io.reactivex.rxjava3.core.Flowable
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyList
+import org.mockito.Mockito.atLeast
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
+import org.mockito.kotlin.never
+
+class EntryWidgetControllerTest {
+
+    private lateinit var queueRepository: QueueRepository
+    private lateinit var isAuthenticatedUseCase: IsAuthenticatedUseCase
+    private lateinit var core: GliaCore
+    private lateinit var controller: EntryWidgetController
+    private lateinit var view: EntryWidgetContract.View
+    private lateinit var activity: Activity
+
+    @Before
+    fun setUp() {
+        Logger.setIsDebug(false)
+        queueRepository = mock(QueueRepository::class.java)
+        isAuthenticatedUseCase = mock(IsAuthenticatedUseCase::class.java)
+        core = mock(GliaCore::class.java)
+        activity = mock(Activity::class.java)
+        view = mock(EntryWidgetContract.View::class.java)
+
+        controller = EntryWidgetController(queueRepository, isAuthenticatedUseCase, core)
+        controller.setView(view)
+    }
+
+    @Test
+    fun `showItems is called if sdk is initialized`() {
+        `when`(core.isInitialized).thenReturn(true)
+        `when`(queueRepository.queuesState).thenReturn(Flowable.just(QueuesState.Loading))
+
+        controller.setView(view)
+
+        verify(view, atLeast(1)).showItems(anyList())
+    }
+
+    @Test
+    fun `showItems is called with ERROR_STATE if SDK is not initialized`() {
+        `when`(core.isInitialized).thenReturn(false)
+
+        controller.setView(view)
+
+        verify(view, atLeast(1)).showItems(listOf(EntryWidgetContract.ItemType.SDK_NOT_INITIALIZED_STATE))
+    }
+
+    @Test
+    fun `mapState returns CHAT and PROVIDED_BY if TEXT media type is available`() {
+        val queue = mock(Queue::class.java)
+        val queueState = mock(QueueState::class.java)
+        `when`(queue.state).thenReturn(queueState)
+        `when`(queueState.status).thenReturn(QueueState.Status.OPEN)
+        `when`(queueState.medias).thenReturn(arrayOf(Engagement.MediaType.TEXT))
+
+        val result = controller.mapState(QueuesState.Queues(listOf(queue)))
+        assert(
+            result == listOf(
+                EntryWidgetContract.ItemType.CHAT,
+                EntryWidgetContract.ItemType.PROVIDED_BY
+            )
+        )
+    }
+
+    @Test
+    fun `mapState returns SECURE_MESSAGE and PROVIDED_BY if SECURE_MESSAGE media type is available and visitor is authenticates`() {
+        val queue = mock(Queue::class.java)
+        val queueState = mock(QueueState::class.java)
+        `when`(queue.state).thenReturn(queueState)
+        `when`(queueState.status).thenReturn(QueueState.Status.OPEN)
+        `when`(isAuthenticatedUseCase.invoke()).thenReturn(true)
+        `when`(queueState.medias).thenReturn(arrayOf(Engagement.MediaType.MESSAGING))
+
+        val result = controller.mapState(QueuesState.Queues(listOf(queue)))
+        assert(
+            result == listOf(
+                EntryWidgetContract.ItemType.SECURE_MESSAGE,
+                EntryWidgetContract.ItemType.PROVIDED_BY
+            )
+        )
+    }
+
+    @Test
+    fun `mapState returns EMPTY_STATE if SECURE_MESSAGE media type is available but visitor is not authenticates`() {
+        val queue = mock(Queue::class.java)
+        val queueState = mock(QueueState::class.java)
+        `when`(queue.state).thenReturn(queueState)
+        `when`(queueState.status).thenReturn(QueueState.Status.OPEN)
+        `when`(isAuthenticatedUseCase.invoke()).thenReturn(false)
+        `when`(queueState.medias).thenReturn(arrayOf(Engagement.MediaType.MESSAGING))
+
+        val result = controller.mapState(QueuesState.Queues(listOf(queue)))
+        assert(
+            result == listOf(
+                EntryWidgetContract.ItemType.EMPTY_STATE
+            )
+        )
+    }
+
+    @Test
+    fun `mapState returns a list of LOADING_STATE if called with a Loading state`() {
+        val result = controller.mapState(QueuesState.Loading)
+        assert(
+            result == listOf(
+                EntryWidgetContract.ItemType.LOADING_STATE,
+                EntryWidgetContract.ItemType.LOADING_STATE,
+                EntryWidgetContract.ItemType.LOADING_STATE,
+                EntryWidgetContract.ItemType.LOADING_STATE,
+                EntryWidgetContract.ItemType.PROVIDED_BY
+            )
+        )
+    }
+
+    @Test
+    fun `mapState returns EMPTY_STATE if called with Empty state`() {
+        val result = controller.mapState(QueuesState.Empty)
+        assert(result == listOf(EntryWidgetContract.ItemType.EMPTY_STATE))
+    }
+
+    @Test
+    fun `mapState returns ERROR_STATE if called with Error state`() {
+        val result = controller.mapState(QueuesState.Error(Exception("Error")))
+        assert(result == listOf(EntryWidgetContract.ItemType.ERROR_STATE))
+    }
+
+    @Test
+    fun `onItemClicked calls dismiss when CHAT item clicked`() {
+        controller.onItemClicked(EntryWidgetContract.ItemType.CHAT, activity)
+        verify(view).dismiss()
+    }
+
+    @Test
+    fun `onItemClicked calls dismiss when AUDIO_CALL item clicked`() {
+        controller.onItemClicked(EntryWidgetContract.ItemType.AUDIO_CALL, activity)
+        verify(view).dismiss()
+    }
+
+    @Test
+    fun `onItemClicked calls dismiss when VIDEO_CALL item clicked`() {
+        controller.onItemClicked(EntryWidgetContract.ItemType.VIDEO_CALL, activity)
+        verify(view).dismiss()
+    }
+
+    @Test
+    fun `onItemClicked calls dismiss when SECURE_MESSAGE item clicked`() {
+        controller.onItemClicked(EntryWidgetContract.ItemType.SECURE_MESSAGE, activity)
+        verify(view).dismiss()
+    }
+
+    @Test
+    fun `onItemClicked does not call dismiss when ERROR_STATE item clicked`() {
+        val mockQueuesState : Flowable<QueuesState> = Flowable.just(QueuesState.Loading)
+        `when`(queueRepository.queuesState).thenReturn(mockQueuesState)
+        controller.onItemClicked(EntryWidgetContract.ItemType.ERROR_STATE, activity)
+        verify(view, never()).dismiss()
+    }
+}
diff --git a/widgetssdk/src/test/java/com/glia/widgets/filepreview/ui/FilePreviewControllerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/filepreview/ui/ImagePreviewControllerTest.kt
similarity index 88%
rename from widgetssdk/src/test/java/com/glia/widgets/filepreview/ui/FilePreviewControllerTest.kt
rename to widgetssdk/src/test/java/com/glia/widgets/filepreview/ui/ImagePreviewControllerTest.kt
index 57ea50c20..94dd1cf26 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/filepreview/ui/FilePreviewControllerTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/filepreview/ui/ImagePreviewControllerTest.kt
@@ -24,12 +24,12 @@ import org.mockito.kotlin.whenever
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
-class FilePreviewControllerTest {
-    private lateinit var view: FilePreviewContract.View
+class ImagePreviewControllerTest {
+    private lateinit var view: ImagePreviewContract.View
     private lateinit var getImageFileFromDownloadsUseCase: GetImageFileFromDownloadsUseCase
     private lateinit var getImageFileFromCacheUseCase: GetImageFileFromCacheUseCase
     private lateinit var putImageFileToDownloadsUseCase: PutImageFileToDownloadsUseCase
-    private lateinit var filePreviewController: FilePreviewController
+    private lateinit var imagePreviewController: ImagePreviewController
 
     @Before
     fun setUp() {
@@ -37,19 +37,19 @@ class FilePreviewControllerTest {
         getImageFileFromDownloadsUseCase = mock()
         getImageFileFromCacheUseCase = mock()
         putImageFileToDownloadsUseCase = mock()
-        filePreviewController = FilePreviewController(
+        imagePreviewController = ImagePreviewController(
             getImageFileFromDownloadsUseCase,
             getImageFileFromCacheUseCase,
             putImageFileToDownloadsUseCase,
             mock()
         )
-        filePreviewController.setView(view)
+        imagePreviewController.setView(view)
     }
 
     @Test
     fun onImageDataReceived_updatesState_whenNonNullArguments() {
         val argument = argumentCaptor<State>()
-        filePreviewController.onImageDataReceived(BITMAP_ID, BITMAP_NAME)
+        imagePreviewController.onImageDataReceived(BITMAP_ID, BITMAP_NAME)
         verify(view).onStateUpdated(argument.capture())
         assertEquals(BITMAP_ID, argument.lastValue.imageName)
         assertEquals(BITMAP_NAME, argument.lastValue.imageId)
@@ -59,7 +59,7 @@ class FilePreviewControllerTest {
     fun onImageRequested_updatesState_whenLoadingFromDownloadsSuccess() {
         whenever(getImageFileFromDownloadsUseCase(any())) doReturn Maybe.just(BITMAP)
         val argument = argumentCaptor<State>()
-        filePreviewController.onImageRequested()
+        imagePreviewController.onImageRequested()
         verify(view, times(2)).onStateUpdated(argument.capture())
         val (imageLoadingState, isShowShareButton, isShowDownloadButton) = argument.allValues[0]
         assertEquals(State.ImageLoadingState.LOADING_FROM_DOWNLOADS, imageLoadingState)
@@ -78,7 +78,7 @@ class FilePreviewControllerTest {
         whenever(getImageFileFromDownloadsUseCase(any())) doReturn Maybe.error(EXCEPTION)
         whenever(getImageFileFromCacheUseCase(any())) doReturn Maybe.just(BITMAP)
 
-        filePreviewController.onImageRequested()
+        imagePreviewController.onImageRequested()
         verify(view, Mockito.times(3)).onStateUpdated(argument.capture())
         val (imageLoadingState, isShowShareButton, isShowDownloadButton) = argument.allValues[0]
         assertEquals(State.ImageLoadingState.LOADING_FROM_DOWNLOADS, imageLoadingState)
@@ -101,7 +101,7 @@ class FilePreviewControllerTest {
 
         whenever(getImageFileFromDownloadsUseCase(any())) doReturn Maybe.error(EXCEPTION)
         whenever(getImageFileFromCacheUseCase(any())) doReturn Maybe.error(EXCEPTION)
-        filePreviewController.onImageRequested()
+        imagePreviewController.onImageRequested()
         verify(view, times(3)).onStateUpdated(argument.capture())
         verify(view).showOnImageLoadingFailed()
         val (imageLoadingState, isShowShareButton, isShowDownloadButton) = argument.allValues[0]
@@ -118,20 +118,20 @@ class FilePreviewControllerTest {
 
     @Test
     fun onSharePressed_callsShareImageFile_whenValidArguments() {
-        filePreviewController.onImageDataReceived(BITMAP_ID, BITMAP_NAME)
-        filePreviewController.onSharePressed()
+        imagePreviewController.onImageDataReceived(BITMAP_ID, BITMAP_NAME)
+        imagePreviewController.onSharePressed()
         verify(view).shareImageFile(BITMAP_ID)
     }
 
     @Test
     fun onDownloadPressed_updatesState_whenDownloadSuccessful() {
         whenever(getImageFileFromDownloadsUseCase(any())) doReturn Maybe.just(BITMAP)
-        filePreviewController.onImageRequested()
+        imagePreviewController.onImageRequested()
         val argument = argumentCaptor<State>()
 
         whenever(putImageFileToDownloadsUseCase(any(), any())) doReturn Completable.complete()
 
-        filePreviewController.onDownloadPressed()
+        imagePreviewController.onDownloadPressed()
         verify(view).showOnImageSaveSuccess()
         verify(view, times(3)).onStateUpdated(argument.capture())
         val (imageLoadingState, isShowShareButton, isShowDownloadButton) = argument.lastValue
@@ -143,9 +143,9 @@ class FilePreviewControllerTest {
     @Test
     fun onDownloadPressed_callsShowOnImageSaveFailed_whenDownloadFails() {
         whenever(getImageFileFromDownloadsUseCase(any())) doReturn Maybe.just(BITMAP)
-        filePreviewController.onImageRequested()
+        imagePreviewController.onImageRequested()
         whenever(putImageFileToDownloadsUseCase(any(), any())) doReturn Completable.error(EXCEPTION)
-        filePreviewController.onDownloadPressed()
+        imagePreviewController.onDownloadPressed()
         verify(view).showOnImageSaveFailed()
     }
 
diff --git a/widgetssdk/src/test/java/com/glia/widgets/helper/GliaActivityManagerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/helper/GliaActivityManagerTest.kt
index 1485a354d..8dc1fef8b 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/helper/GliaActivityManagerTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/helper/GliaActivityManagerTest.kt
@@ -3,7 +3,7 @@ package com.glia.widgets.helper
 import android.app.Activity
 import com.glia.widgets.call.CallActivity
 import com.glia.widgets.chat.ChatActivity
-import com.glia.widgets.filepreview.ui.FilePreviewActivity
+import com.glia.widgets.filepreview.ui.ImagePreviewActivity
 import io.mockk.MockKAnnotations
 import io.mockk.confirmVerified
 import io.mockk.impl.annotations.MockK
@@ -20,7 +20,7 @@ class GliaActivityManagerTest {
     private lateinit var callActivity: CallActivity
 
     @MockK(relaxUnitFun = true)
-    private lateinit var filePreviewActivity: FilePreviewActivity
+    private lateinit var imagePreviewActivity: ImagePreviewActivity
 
     @MockK(relaxUnitFun = true)
     private lateinit var anotherActivity: Activity
@@ -59,34 +59,34 @@ class GliaActivityManagerTest {
     fun `onActivityDestroyed() removes activity from the list`() {
         managerTest.onActivityCreated(chatActivity)
         managerTest.onActivityCreated(callActivity)
-        managerTest.onActivityCreated(filePreviewActivity)
+        managerTest.onActivityCreated(imagePreviewActivity)
 
-        managerTest.onActivityDestroyed(filePreviewActivity)
+        managerTest.onActivityDestroyed(imagePreviewActivity)
 
         managerTest.finishActivities()
 
         verify { chatActivity.finish() }
         verify { callActivity.finish() }
-        verify(exactly = 0) { filePreviewActivity.finish() }
+        verify(exactly = 0) { imagePreviewActivity.finish() }
 
-        confirmVerified(chatActivity, callActivity, filePreviewActivity)
+        confirmVerified(chatActivity, callActivity, imagePreviewActivity)
     }
 
     @Test
     fun `finishActivity finishes activity when it is present in list`() {
         managerTest.onActivityCreated(chatActivity)
         managerTest.onActivityCreated(callActivity)
-        managerTest.onActivityCreated(filePreviewActivity)
+        managerTest.onActivityCreated(imagePreviewActivity)
         managerTest.onActivityCreated(anotherActivity)
 
-        managerTest.finishActivity(FilePreviewActivity::class)
+        managerTest.finishActivity(ImagePreviewActivity::class)
 
         verify(exactly = 0) { chatActivity.finish() }
         verify(exactly = 0) { callActivity.finish() }
         verify(exactly = 0) { anotherActivity.finish() }
-        verify { filePreviewActivity.finish() }
+        verify { imagePreviewActivity.finish() }
 
-        confirmVerified(chatActivity, callActivity, filePreviewActivity, anotherActivity)
+        confirmVerified(chatActivity, callActivity, imagePreviewActivity, anotherActivity)
     }
 
 }
diff --git a/widgetssdk/src/test/java/com/glia/widgets/launcher/EngagementLauncherTest.kt b/widgetssdk/src/test/java/com/glia/widgets/launcher/EngagementLauncherTest.kt
new file mode 100644
index 000000000..8a0fef35f
--- /dev/null
+++ b/widgetssdk/src/test/java/com/glia/widgets/launcher/EngagementLauncherTest.kt
@@ -0,0 +1,98 @@
+package com.glia.widgets.launcher
+
+import android.app.Activity
+import io.mockk.*
+import org.junit.Before
+import org.junit.Test
+
+class EngagementLauncherTest {
+
+    private lateinit var activity: Activity
+    private lateinit var activityLauncher: ActivityLauncher
+    private lateinit var engagementLauncher: EngagementLauncher
+    private lateinit var configurationManager: ConfigurationManager
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+        activity = mockk(relaxed = true)
+        activityLauncher = mockk<ActivityLauncher> {
+            every { launchChat(any()) } returns  Unit
+            every { launchCall(any(), any(), any()) } returns  Unit
+            every { launchSecureMessagingWelcomeScreen(any()) } returns  Unit
+        }
+        configurationManager = mockk<ConfigurationManager> {
+            every { setVisitorContextAssetId(any()) } just Runs
+        }
+        engagementLauncher = EngagementLauncherImpl(activityLauncher, configurationManager)
+    }
+
+    @Test
+    fun `startChat with visitorContextAssetId calls setVisitorContextAssetId`() {
+        val visitorContextAssetId = "visitor_context"
+        engagementLauncher.startChat(activity, visitorContextAssetId)
+
+        verify { configurationManager.setVisitorContextAssetId(visitorContextAssetId) }
+    }
+
+    @Test
+    fun `startChat without visitorContextAssetId does not call setVisitorContextAssetId`() {
+        engagementLauncher.startChat(activity)
+
+        verify(exactly = 0) { configurationManager.setVisitorContextAssetId(any()) }
+    }
+
+    @Test
+    fun `startChat with visitorContextAssetId null does not call setVisitorContextAssetId`() {
+        val visitorContextAssetId = null
+        engagementLauncher.startChat(activity, visitorContextAssetId)
+
+        verify(exactly = 0) { configurationManager.setVisitorContextAssetId(any()) }
+    }
+
+    @Test
+    fun `startAudioCall with visitorContextAssetId calls setVisitorContextAssetId`() {
+        val visitorContextAssetId = "visitor_context"
+        engagementLauncher.startAudioCall(activity, visitorContextAssetId)
+
+        verify { configurationManager.setVisitorContextAssetId(visitorContextAssetId) }
+    }
+
+    @Test
+    fun `startAudioCall without visitorContextAssetId does not call setVisitorContextAssetId`() {
+        engagementLauncher.startAudioCall(activity)
+
+        verify(exactly = 0) { configurationManager.setVisitorContextAssetId(any()) }
+    }
+
+    @Test
+    fun `startAudioCall with visitorContextAssetId null does not call setVisitorContextAssetId`() {
+        val visitorContextAssetId = null
+        engagementLauncher.startAudioCall(activity, visitorContextAssetId)
+
+        verify(exactly = 0) { configurationManager.setVisitorContextAssetId(any()) }
+    }
+
+    @Test
+    fun `startSecureMessaging with visitorContextAssetId calls setVisitorContextAssetId`() {
+        val visitorContextAssetId = "visitor_context"
+        engagementLauncher.startSecureMessaging(activity, visitorContextAssetId)
+
+        verify { configurationManager.setVisitorContextAssetId(visitorContextAssetId) }
+    }
+
+    @Test
+    fun `startSecureMessaging without visitorContextAssetId does not call setVisitorContextAssetId`() {
+        engagementLauncher.startSecureMessaging(activity)
+
+        verify(exactly = 0) { configurationManager.setVisitorContextAssetId(any()) }
+    }
+
+    @Test
+    fun `startSecureMessaging with visitorContextAssetId null does not call setVisitorContextAssetId`() {
+        val visitorContextAssetId = null
+        engagementLauncher.startSecureMessaging(activity, visitorContextAssetId)
+
+        verify(exactly = 0) { configurationManager.setVisitorContextAssetId(any()) }
+    }
+}
diff --git a/widgetssdk/src/test/java/com/glia/widgets/messagecenter/MessageCenterControllerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/messagecenter/MessageCenterControllerTest.kt
index c2be27d9a..eb9c9c2d1 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/messagecenter/MessageCenterControllerTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/messagecenter/MessageCenterControllerTest.kt
@@ -1,29 +1,25 @@
 package com.glia.widgets.messagecenter
 
 import com.glia.androidsdk.GliaException
-import com.glia.androidsdk.RequestCallback
-import com.glia.widgets.UiTheme
-import com.glia.widgets.chat.ChatType
 import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
 import com.glia.widgets.chat.domain.SiteInfoUseCase
 import com.glia.widgets.chat.domain.TakePictureUseCase
 import com.glia.widgets.chat.domain.UriToFileAttachmentUseCase
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.engagement.domain.SetEngagementConfigUseCase
 import com.glia.widgets.core.fileupload.model.LocalAttachment
 import com.glia.widgets.core.permissions.domain.RequestNotificationPermissionIfPushNotificationsSetUpUseCase
 import com.glia.widgets.core.secureconversations.domain.AddSecureFileAttachmentsObserverUseCase
 import com.glia.widgets.core.secureconversations.domain.AddSecureFileToAttachmentAndUploadUseCase
-import com.glia.widgets.core.secureconversations.domain.GetAvailableQueueIdsForSecureMessagingUseCase
 import com.glia.widgets.core.secureconversations.domain.GetSecureFileAttachmentsUseCase
+import com.glia.widgets.core.secureconversations.domain.IsMessagingAvailableUseCase
 import com.glia.widgets.core.secureconversations.domain.OnNextMessageUseCase
 import com.glia.widgets.core.secureconversations.domain.RemoveSecureFileAttachmentUseCase
 import com.glia.widgets.core.secureconversations.domain.ResetMessageCenterUseCase
 import com.glia.widgets.core.secureconversations.domain.SendMessageButtonStateUseCase
 import com.glia.widgets.core.secureconversations.domain.SendSecureMessageUseCase
 import com.glia.widgets.core.secureconversations.domain.ShowMessageLimitErrorUseCase
-import com.glia.widgets.view.head.controller.ServiceChatHeadController
+import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Observable
 import org.junit.Before
 import org.junit.Test
@@ -34,14 +30,13 @@ import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
 import org.mockito.kotlin.whenever
 
 internal class MessageCenterControllerTest {
-    private lateinit var serviceChatHeadController: ServiceChatHeadController
     private lateinit var messageCenterController: MessageCenterController
     private lateinit var engagementConfigUseCase: SetEngagementConfigUseCase
     private lateinit var sendSecureMessageUseCase: SendSecureMessageUseCase
-    private lateinit var getAvailableQueueIdsForSecureMessagingUseCase: GetAvailableQueueIdsForSecureMessagingUseCase
     private lateinit var addFileAttachmentsObserverUseCase: AddSecureFileAttachmentsObserverUseCase
     private lateinit var addFileToAttachmentAndUploadUseCase: AddSecureFileToAttachmentAndUploadUseCase
     private lateinit var getFileAttachmentsUseCase: GetSecureFileAttachmentsUseCase
@@ -57,13 +52,12 @@ internal class MessageCenterControllerTest {
     private lateinit var takePictureUseCase: TakePictureUseCase
     private lateinit var uriToFileAttachmentUseCase: UriToFileAttachmentUseCase
     private lateinit var requestNotificationPermissionIfPushNotificationsSetUpUseCase: RequestNotificationPermissionIfPushNotificationsSetUpUseCase
+    private lateinit var isMessagingAvailableUseCase: IsMessagingAvailableUseCase
 
     @Before
     fun setUp() {
-        serviceChatHeadController = mock()
         engagementConfigUseCase = mock()
         sendSecureMessageUseCase = mock()
-        getAvailableQueueIdsForSecureMessagingUseCase = mock()
         addFileAttachmentsObserverUseCase = mock()
         addFileToAttachmentAndUploadUseCase = mock()
         getFileAttachmentsUseCase = mock()
@@ -79,11 +73,10 @@ internal class MessageCenterControllerTest {
         takePictureUseCase = mock()
         uriToFileAttachmentUseCase = mock()
         requestNotificationPermissionIfPushNotificationsSetUpUseCase = mock()
+        isMessagingAvailableUseCase = mock()
         messageCenterController = MessageCenterController(
-            serviceChatHeadController = serviceChatHeadController,
             engagementConfigUseCase = engagementConfigUseCase,
             sendSecureMessageUseCase = sendSecureMessageUseCase,
-            getAvailableQueueIdsForSecureMessagingUseCase = getAvailableQueueIdsForSecureMessagingUseCase,
             addFileAttachmentsObserverUseCase = addFileAttachmentsObserverUseCase,
             addFileToAttachmentAndUploadUseCase = addFileToAttachmentAndUploadUseCase,
             getFileAttachmentsUseCase = getFileAttachmentsUseCase,
@@ -97,26 +90,11 @@ internal class MessageCenterControllerTest {
             dialogController = dialogController,
             takePictureUseCase = takePictureUseCase,
             uriToFileAttachmentUseCase = uriToFileAttachmentUseCase,
-            requestNotificationPermissionIfPushNotificationsSetUpUseCase = requestNotificationPermissionIfPushNotificationsSetUpUseCase
+            requestNotificationPermissionIfPushNotificationsSetUpUseCase = requestNotificationPermissionIfPushNotificationsSetUpUseCase,
+            isMessagingAvailableUseCase = isMessagingAvailableUseCase
         )
     }
 
-    @Test
-    fun setConfiguration_setBuildTimeTheme_onTrigger() {
-        val uiTheme = mock<UiTheme>()
-        messageCenterController.setConfiguration(uiTheme, mock())
-
-        verify(serviceChatHeadController, times(1)).setBuildTimeTheme(uiTheme)
-    }
-
-    @Test
-    fun setConfiguration_setEngagementConfiguration_onTrigger() {
-        val configuration = mock<EngagementConfiguration>()
-        messageCenterController.setConfiguration(mock(), configuration)
-
-        verify(serviceChatHeadController, times(1)).setEngagementConfiguration(configuration)
-    }
-
     @Test
     fun initialize_ExecutesAddSecureFileAttachmentsObserverUseCase_onTrigger() {
         whenever(isAuthenticatedUseCase()) doReturn true
@@ -258,58 +236,53 @@ internal class MessageCenterControllerTest {
         verify(resetMessageCenterUseCase, times(1)).invoke()
     }
 
-    @Test
-    fun onDestroy_ExecutesIsMessageCenterAvailableUseCase_onTrigger() {
-        messageCenterController.onDestroy()
-
-        verify(getAvailableQueueIdsForSecureMessagingUseCase, times(1)).dispose()
-    }
-
-    @Test
-    fun ensureMessageCenterAvailability_setsAvailableQueueIds_onTrigger() {
-        val availableQueueIds = listOf("id1", "id2")
-
-        messageCenterController.ensureMessageCenterAvailability()
-        val argumentCaptor = argumentCaptor<RequestCallback<List<String>>>()
-        verify(getAvailableQueueIdsForSecureMessagingUseCase, times(1)).invoke(argumentCaptor.capture())
-
-        argumentCaptor.firstValue.onResult(availableQueueIds, null)
-
-        verify(engagementConfigUseCase, times(1)).invoke(ChatType.SECURE_MESSAGING, availableQueueIds)
-    }
-
     @Test
     fun ensureMessageCenterAvailability_showsUnexpectedErrorDialog_onException() {
+        messageCenterController.setView(viewContract)
+        whenever(isMessagingAvailableUseCase.invoke()) doReturn Flowable.just(
+            Result.failure(
+                GliaException(
+                    "Error",
+                    GliaException.Cause.INTERNAL_ERROR
+                )
+            )
+        )
         messageCenterController.ensureMessageCenterAvailability()
-        val argumentCaptor = argumentCaptor<RequestCallback<List<String>>>()
-        verify(getAvailableQueueIdsForSecureMessagingUseCase, times(1)).invoke(argumentCaptor.capture())
 
-        argumentCaptor.firstValue.onResult(null, GliaException("Error", GliaException.Cause.INTERNAL_ERROR))
+        val messageCenterStateArgumentCaptor = argumentCaptor<MessageCenterState>()
+        verify(viewContract, times(1)).onStateUpdated(messageCenterStateArgumentCaptor.capture())
+
+        messageCenterStateArgumentCaptor.firstValue.apply {
+            assert(!showSendMessageGroup)
+        }
 
+        verify(dialogController, never()).showMessageCenterUnavailableDialog()
         verify(dialogController, times(1)).showUnexpectedErrorDialog()
     }
 
     @Test
-    fun ensureMessageCenterAvailability_showsMessageCenterUnavailableDialog_whenNoAvailableQueues() {
+    fun ensureMessageCenterAvailability_showsMessageCenterUnavailableDialog_whenMessagingIsUnavailable() {
+        messageCenterController.setView(viewContract)
+        whenever(isMessagingAvailableUseCase.invoke()) doReturn Flowable.just(Result.success(false))
         messageCenterController.ensureMessageCenterAvailability()
-        val argumentCaptor = argumentCaptor<RequestCallback<List<String>>>()
-        verify(getAvailableQueueIdsForSecureMessagingUseCase, times(1)).invoke(argumentCaptor.capture())
 
-        argumentCaptor.firstValue.onResult(null, null)
+        val messageCenterStateArgumentCaptor = argumentCaptor<MessageCenterState>()
+        verify(viewContract, times(1)).onStateUpdated(messageCenterStateArgumentCaptor.capture())
+
+        messageCenterStateArgumentCaptor.firstValue.apply {
+            assert(!showSendMessageGroup)
+        }
 
         verify(dialogController, times(1)).showMessageCenterUnavailableDialog()
+        verify(dialogController, never()).showUnexpectedErrorDialog()
     }
 
     @Test
-    fun ensureMessageCenterAvailability_showSendMessageGroup_whenQueuesAvailable() {
+    fun ensureMessageCenterAvailability_showSendMessageGroup_whenMessageCenterAvailable() {
         messageCenterController.setView(viewContract)
-        val availableQueueIds = listOf("id1", "id2")
+        whenever(isMessagingAvailableUseCase.invoke()) doReturn Flowable.just(Result.success(true))
 
         messageCenterController.ensureMessageCenterAvailability()
-        val requestCallbackArgumentCaptor = argumentCaptor<RequestCallback<List<String>>>()
-        verify(getAvailableQueueIdsForSecureMessagingUseCase, times(1)).invoke(requestCallbackArgumentCaptor.capture())
-
-        requestCallbackArgumentCaptor.firstValue.onResult(availableQueueIds, null)
 
         val messageCenterStateArgumentCaptor = argumentCaptor<MessageCenterState>()
         verify(viewContract, times(1)).onStateUpdated(messageCenterStateArgumentCaptor.capture())
@@ -317,5 +290,8 @@ internal class MessageCenterControllerTest {
         messageCenterStateArgumentCaptor.firstValue.apply {
             assert(showSendMessageGroup)
         }
+
+        verify(dialogController, never()).showMessageCenterUnavailableDialog()
+        verify(dialogController, never()).showUnexpectedErrorDialog()
     }
 }
diff --git a/widgetssdk/src/test/java/com/glia/widgets/operator/OperatorRequestActivityWatcherTest.kt b/widgetssdk/src/test/java/com/glia/widgets/operator/OperatorRequestActivityWatcherTest.kt
index 8b319963c..dacb425a6 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/operator/OperatorRequestActivityWatcherTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/operator/OperatorRequestActivityWatcherTest.kt
@@ -4,7 +4,6 @@ import android.COMMON_EXTENSIONS_CLASS_PATH
 import android.CONTEXT_EXTENSIONS_CLASS_PATH
 import android.LOGGER_PATH
 import android.app.Activity
-import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.targetActivityName
@@ -14,7 +13,7 @@ import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
-import com.glia.androidsdk.Engagement
+import com.glia.androidsdk.Engagement.MediaType
 import com.glia.androidsdk.comms.MediaUpgradeOffer
 import com.glia.widgets.UiTheme
 import com.glia.widgets.call.CallActivity
@@ -22,15 +21,16 @@ import com.glia.widgets.chat.ChatActivity
 import com.glia.widgets.engagement.domain.MediaUpgradeOfferData
 import com.glia.widgets.helper.DialogHolderActivity
 import com.glia.widgets.helper.GliaActivityManager
-import com.glia.widgets.helper.IntentConfigurationHelper
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.OneTimeEvent
 import com.glia.widgets.helper.showToast
 import com.glia.widgets.helper.withRuntimeTheme
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.view.Dialogs
 import io.mockk.Runs
 import io.mockk.confirmVerified
 import io.mockk.every
+import io.mockk.invoke
 import io.mockk.just
 import io.mockk.mockk
 import io.mockk.mockkObject
@@ -51,7 +51,7 @@ class OperatorRequestActivityWatcherTest {
     private val controllerState: PublishProcessor<OneTimeEvent<OperatorRequestContract.State>> = PublishProcessor.create()
     private lateinit var controller: OperatorRequestContract.Controller
     private lateinit var gliaActivityManager: GliaActivityManager
-    private lateinit var intentConfigurationHelper: IntentConfigurationHelper
+    private lateinit var activityLauncher: ActivityLauncher
 
     private lateinit var watcher: OperatorRequestActivityWatcher
 
@@ -65,9 +65,9 @@ class OperatorRequestActivityWatcherTest {
         controller = mockk(relaxUnitFun = true)
         every { controller.state } returns controllerState
         gliaActivityManager = mockk(relaxUnitFun = true)
-        intentConfigurationHelper = mockk(relaxUnitFun = true)
+        activityLauncher = mockk(relaxed = true)
 
-        watcher = OperatorRequestActivityWatcher(controller, intentConfigurationHelper, gliaActivityManager)
+        watcher = OperatorRequestActivityWatcher(controller, activityLauncher, gliaActivityManager)
 
         verify { controller.state }
     }
@@ -76,7 +76,7 @@ class OperatorRequestActivityWatcherTest {
     fun tearDown() {
         RxAndroidPlugins.reset()
 
-        confirmVerified(controller, intentConfigurationHelper)
+        confirmVerified(controller, activityLauncher)
         unmockkStatic(LOGGER_PATH, CONTEXT_EXTENSIONS_CLASS_PATH)
     }
 
@@ -86,7 +86,7 @@ class OperatorRequestActivityWatcherTest {
         val activityFinishing: Activity = mockk(relaxed = true)
         every { activityFinishing.isFinishing } returns true
 
-        val state: OperatorRequestContract.State = OperatorRequestContract.State.OpenCallActivity(Engagement.MediaType.VIDEO)
+        val state: OperatorRequestContract.State = OperatorRequestContract.State.OpenCallActivity(MediaType.VIDEO)
 
         val event: OneTimeEvent<OperatorRequestContract.State> = mockk()
         every { event.value } returns state
@@ -126,52 +126,42 @@ class OperatorRequestActivityWatcherTest {
 
     @Test
     fun `openCallActivity will start CallActivity when current activity is not a CallActivity`() {
-        val intent: Intent = mockk(relaxed = true)
-        every { intentConfigurationHelper.createForCall(any(), any(), any()) } returns intent
-
         fireState<ChatActivity>(
-            controllerState, watcher, OperatorRequestContract.State.OpenCallActivity(Engagement.MediaType.VIDEO)
+            controllerState,
+            watcher,
+            OperatorRequestContract.State.OpenCallActivity(MediaType.VIDEO)
         ) { event, activity ->
             verify { event.consume(any()) }
             verify { gliaActivityManager.finishActivities() }
-            verify { intentConfigurationHelper.createForCall(any(), any(), any()) }
-            verify { activity.startActivity(intent) }
+            verify { activityLauncher.launchCall(any(), any<MediaType>(), eq(true)) }
 
-            confirmVerified(intent, activity, event)
+            confirmVerified(activity, event)
         }
     }
 
     @Test
     fun `openCallActivity will start CallActivity when current activity is not a GliaActivity`() {
-        val intent: Intent = mockk(relaxed = true)
-        every { intentConfigurationHelper.createForCall(any(), any(), any()) } returns intent
-
         fireState<Activity>(
-            controllerState, watcher, OperatorRequestContract.State.OpenCallActivity(Engagement.MediaType.VIDEO)
+            controllerState, watcher, OperatorRequestContract.State.OpenCallActivity(MediaType.VIDEO)
         ) { event, activity ->
             verify { event.consume(any()) }
             verify(exactly = 0) { gliaActivityManager.finishActivities() }
-            verify { intentConfigurationHelper.createForCall(any(), any(), any()) }
-            verify { activity.startActivity(intent) }
+            verify { activityLauncher.launchCall(any(), any<MediaType>(), eq(true)) }
 
-            confirmVerified(intent, activity, event)
+            confirmVerified(activity, event)
         }
     }
 
     @Test
     fun `openCallActivity will do nothing when current activity is Call Activity`() {
-        val intent: Intent = mockk(relaxed = true)
-        every { intentConfigurationHelper.createForCall(any(), any(), any()) } returns intent
-
         fireState<CallActivity>(
-            controllerState, watcher, OperatorRequestContract.State.OpenCallActivity(Engagement.MediaType.VIDEO)
+            controllerState, watcher, OperatorRequestContract.State.OpenCallActivity(MediaType.VIDEO)
         ) { event, activity ->
             verify { event.consume(any()) }
             verify(exactly = 0) { gliaActivityManager.finishActivities() }
-            verify(exactly = 0) { intentConfigurationHelper.createForCall(any(), any(), any()) }
-            verify(exactly = 0) { activity.startActivity(intent) }
+            verify(exactly = 0) { activityLauncher.launchCall(any(), any<MediaType>(), eq(true)) }
 
-            confirmVerified(intent, activity, event)
+            confirmVerified(activity, event)
         }
     }
 
@@ -359,41 +349,31 @@ class OperatorRequestActivityWatcherTest {
 
     @Test
     fun `state OpenOverlayPermissionScreen will open overlay permissions screen when system can handle that intent`() {
-        val componentName: ComponentName = mockk()
-
-        val overlayIntent: Intent = mockk {
-            every { resolveActivity(any()) } returns componentName
-        }
-        every { intentConfigurationHelper.createForOverlayPermissionScreen(any()) } returns overlayIntent
+        val onSuccessSlot = slot<() -> Unit>()
         fireState<ChatActivity>(
             controllerState,
             watcher,
             OperatorRequestContract.State.OpenOverlayPermissionScreen
         ) { _, activity ->
-            verify { intentConfigurationHelper.createForOverlayPermissionScreen(eq(activity)) }
-            verify { overlayIntent.resolveActivity(any()) }
-            verify { activity.startActivity(eq(overlayIntent)) }
+            verify { activityLauncher.launchOverlayPermission(activity, capture(onSuccessSlot), any()) }
+            onSuccessSlot.invoke()
             verify { controller.overlayPermissionScreenOpened() }
-            confirmVerified(overlayIntent, componentName, intentConfigurationHelper)
+            confirmVerified(activityLauncher)
         }
     }
 
     @Test
     fun `state OpenOverlayPermissionScreen will do nothing when system can't handle that intent`() {
-        val overlayIntent: Intent = mockk {
-            every { resolveActivity(any()) } returns null
-        }
-        every { intentConfigurationHelper.createForOverlayPermissionScreen(any()) } returns overlayIntent
-
+        val onFailureSlot = slot<() -> Unit>()
         fireState<ChatActivity>(
             controllerState,
             watcher,
             OperatorRequestContract.State.OpenOverlayPermissionScreen
         ) { _, activity ->
-            verify { intentConfigurationHelper.createForOverlayPermissionScreen(eq(activity)) }
-            verify { overlayIntent.resolveActivity(any()) }
+            verify { activityLauncher.launchOverlayPermission(activity, any(), capture(onFailureSlot)) }
+            onFailureSlot.invoke()
             verify { controller.failedToOpenOverlayPermissionScreen() }
-            confirmVerified(overlayIntent, intentConfigurationHelper)
+            confirmVerified(activityLauncher)
         }
     }
 
diff --git a/widgetssdk/src/test/java/com/glia/widgets/operator/OperatorRequestControllerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/operator/OperatorRequestControllerTest.kt
index a57f039c4..2d5047904 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/operator/OperatorRequestControllerTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/operator/OperatorRequestControllerTest.kt
@@ -8,7 +8,6 @@ import androidx.activity.result.ActivityResult
 import com.glia.androidsdk.Engagement
 import com.glia.androidsdk.comms.MediaUpgradeOffer
 import com.glia.widgets.chat.ChatActivity
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.core.dialog.DialogContract
 import com.glia.widgets.core.dialog.domain.IsShowOverlayPermissionRequestDialogUseCase
 import com.glia.widgets.core.dialog.domain.SetOverlayPermissionRequestDialogShownUseCase
@@ -62,7 +61,6 @@ class OperatorRequestControllerTest {
     private lateinit var setOverlayPermissionRequestDialogShownUseCase: SetOverlayPermissionRequestDialogShownUseCase
     private lateinit var dialogController: DialogContract.Controller
     private lateinit var dialogCallbackSlot: CapturingSlot<DialogContract.Controller.Callback>
-    private lateinit var gliaSdkConfigurationManager: GliaSdkConfigurationManager
     private lateinit var withNotificationPermissionUseCase: WithNotificationPermissionUseCase
     private lateinit var prepareToScreenSharingUseCase: PrepareToScreenSharingUseCase
     private lateinit var releaseScreenSharingResourcesUseCase: ReleaseScreenSharingResourcesUseCase
@@ -93,8 +91,6 @@ class OperatorRequestControllerTest {
 
         dialogCallbackSlot = slot()
 
-        gliaSdkConfigurationManager = mockk(relaxed = true)
-
         controller = OperatorRequestController(
             operatorMediaUpgradeOfferUseCase,
             acceptMediaUpgradeOfferUseCase,
@@ -106,7 +102,6 @@ class OperatorRequestControllerTest {
             isCurrentEngagementCallVisualizerUseCase,
             setOverlayPermissionRequestDialogShownUseCase,
             dialogController,
-            gliaSdkConfigurationManager,
             withNotificationPermissionUseCase,
             prepareToScreenSharingUseCase,
             releaseScreenSharingResourcesUseCase
@@ -308,20 +303,17 @@ class OperatorRequestControllerTest {
 
         verify { withNotificationPermissionUseCase(capture(callbackSlot)) }
 
-        verify(exactly = 0) { gliaSdkConfigurationManager.screenSharingMode }
-        verify(exactly = 0) { screenSharingUseCase.acceptRequestWithAskedPermission(eq(activity), any()) }
+        verify(exactly = 0) { screenSharingUseCase.acceptRequestWithAskedPermission(eq(activity)) }
         state.assertNotComplete().assertNoValues()
 
         callbackSlot.captured.invoke()
 
-        verify { gliaSdkConfigurationManager.screenSharingMode }
-        verify { screenSharingUseCase.acceptRequestWithAskedPermission(eq(activity), any()) }
+        verify { screenSharingUseCase.acceptRequestWithAskedPermission(eq(activity)) }
         state.assertNotComplete().assertValue { it.value == OperatorRequestContract.State.AcquireMediaProjectionToken }
         confirmVerified(
             releaseScreenSharingResourcesUseCase,
             prepareToScreenSharingUseCase,
             screenSharingUseCase,
-            gliaSdkConfigurationManager,
             withNotificationPermissionUseCase
         )
     }
diff --git a/widgetssdk/src/test/java/com/glia/widgets/view/head/ActivityWatcherForChatHeadTest.kt b/widgetssdk/src/test/java/com/glia/widgets/view/head/ActivityWatcherForChatHeadTest.kt
index 8238c924b..215bf13f8 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/view/head/ActivityWatcherForChatHeadTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/view/head/ActivityWatcherForChatHeadTest.kt
@@ -142,7 +142,7 @@ internal class ActivityWatcherForChatHeadTest {
     fun `bubble will be updated when PreQueuing`() {
         mockShouldShowChatHead()
 
-        engagementStateFlowable.onNext(State.PreQueuing(listOf(""), Engagement.MediaType.TEXT))
+        engagementStateFlowable.onNext(State.PreQueuing(Engagement.MediaType.TEXT))
         verifyBubbleIsShowed(times = 2)
     }
 
@@ -150,7 +150,7 @@ internal class ActivityWatcherForChatHeadTest {
     fun `bubble will be updated when Queueing is started`() {
         mockShouldShowChatHead()
 
-        engagementStateFlowable.onNext(State.Queuing(listOf(""), "", Engagement.MediaType.TEXT))
+        engagementStateFlowable.onNext(State.Queuing("", Engagement.MediaType.TEXT))
         verifyBubbleIsShowed(times = 2)
     }
 
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_audioCallStartedWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_audioCallStartedWithUiTheme.png
deleted file mode 100644
index 358c1ce62..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_audioCallStartedWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9803908d7d29e14ff3bec5bff21a67fc2aef39495599b980752fde617b7461f
-size 39539
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_initCallWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_initCallWithUiTheme.png
deleted file mode 100644
index 031f5db69..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_initCallWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:232909d8b8e83028e49ac3a574f3c756544dd7cb8a50339cfbdb27746b28f71f
-size 38580
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_onHoldWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_onHoldWithUiTheme.png
deleted file mode 100644
index 82bbd7f6d..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_onHoldWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42bd852bb38a9935c3b2fc9e550f32a6ae981333bdf6cd16c1ccf8481dc94105
-size 41898
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_operatorConnectedWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_operatorConnectedWithUiTheme.png
deleted file mode 100644
index 4da048b82..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewAudioSnapshotTest_operatorConnectedWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:629bc5af926e19b1c24e2f6aeec24a02a7f930831f6be5fdd56bb8f5663e8feb
-size 33197
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_initCallWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_initCallWithUiTheme.png
deleted file mode 100644
index cfae834f2..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_initCallWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8d424f6c567ef6dec31a5a4904a6a423148bab76cf7f22a0ce3b2b13380c861
-size 38628
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_onHoldWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_onHoldWithUiTheme.png
deleted file mode 100644
index a8867124d..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_onHoldWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31bd5e9a9cad9e773c0eaca2371d43b6036f4daf1439232b3c2dd68f526cf7ac
-size 45824
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_operatorConnectedWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_operatorConnectedWithUiTheme.png
deleted file mode 100644
index d2d15937f..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_operatorConnectedWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2dc6d0875118676874e5f747c77505c703bfa25ae517442c57a5be11c4f9ba0
-size 35558
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video1WayCallStartedWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video1WayCallStartedWithUiTheme.png
deleted file mode 100644
index b003d3a07..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video1WayCallStartedWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f4d131dd57b02c1ee25a1b3972cf6ca7796c4226c837c56e861bef959bcd0ee
-size 35782
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video2WayCallStartedWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video2WayCallStartedWithUiTheme.png
deleted file mode 100644
index 566b33da1..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video2WayCallStartedWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:389039bd0f2d8c79f98d432c88a1f8c2473b7162b79dcb5c958bdb854a08eb9b
-size 39906
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video2WayWithFlipButtonWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video2WayWithFlipButtonWithUiTheme.png
deleted file mode 100644
index 61b1026fd..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.call_CallViewVideoSnapshotTest_video2WayWithFlipButtonWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c15226796cf79d73b50364d946cc0e736858539d0283576b3041c828fcf6e33e
-size 42095
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_allViewsWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_allViewsWithUiTheme.png
deleted file mode 100644
index f54cb7fe7..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_allViewsWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48e87eda10f94d38fcbc511ef03a0e0e52150ca0c71f246691fe7c8318c9d144
-size 72643
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longButtonsTitleWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longButtonsTitleWithUiTheme.png
deleted file mode 100644
index e77477e68..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longButtonsTitleWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7a6fbf82cccf164cc95d510e8fface386e19479018d1d7a4bc056d0dcd75b8f
-size 55587
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longSubtitleWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longSubtitleWithUiTheme.png
deleted file mode 100644
index df3fd2f26..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longSubtitleWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ac642e1f91cef9e01da2f54b9f63837e6926b57bbd374dd0ce842b5a90889af
-size 47534
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longTitleWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longTitleWithUiTheme.png
deleted file mode 100644
index 0425ded8b..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_longTitleWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a190d4b7cf2657995c4d7ab5768173533d9dc309da3d98387b800823967bcbd4
-size 39441
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_onlyMandatoryWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_onlyMandatoryWithUiTheme.png
deleted file mode 100644
index 0806594cd..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryItemViewHolderSnapshotTest_onlyMandatoryWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe3c716ea7b97e92bddf58b2c1d7cac00dd028380f74a3b6b5193d8fb3836666
-size 3947
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryViewHolderSnapshotTest_itemsWithChatHeadWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryViewHolderSnapshotTest_itemsWithChatHeadWithUiTheme.png
deleted file mode 100644
index 44e727cb9..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryViewHolderSnapshotTest_itemsWithChatHeadWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5fab45aac3e81f350e7f4eeeceb1eb55c1b4a8e6df8a5b01e50afc61aef5c2b0
-size 69240
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryViewHolderSnapshotTest_itemsWithoutChatHeadWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryViewHolderSnapshotTest_itemsWithoutChatHeadWithUiTheme.png
deleted file mode 100644
index 23f022739..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaGalleryViewHolderSnapshotTest_itemsWithoutChatHeadWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df478c2f7d0e318b93ca17d6e15d6e13fc4f0c5eb6bb040c61cd1cb511b5278f
-size 67096
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaPersistentButtonsViewHolderSnapshotTest_withChatHeadWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaPersistentButtonsViewHolderSnapshotTest_withChatHeadWithUiTheme.png
deleted file mode 100644
index 3d1e200ea..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaPersistentButtonsViewHolderSnapshotTest_withChatHeadWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8dbb8fbd96d69558cd2d98eaebd49eddc50b224de9ae40f7088a5338c548ebbd
-size 89459
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaPersistentButtonsViewHolderSnapshotTest_withoutChatHeadWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaPersistentButtonsViewHolderSnapshotTest_withoutChatHeadWithUiTheme.png
deleted file mode 100644
index c4f47760f..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaPersistentButtonsViewHolderSnapshotTest_withoutChatHeadWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e867b12a20b15e0dcbdca9053ae197dbd21960054db95f393a50dd6f92ee286
-size 86873
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaResponseTextViewHolderSnapshotTest_withChatHeadWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaResponseTextViewHolderSnapshotTest_withChatHeadWithUiTheme.png
deleted file mode 100644
index 4f44faaae..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaResponseTextViewHolderSnapshotTest_withChatHeadWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f86f5c029ef83a78abaa1c627e19c5a5f776d94186d92153e1ee377100d2ddb4
-size 76469
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaResponseTextViewHolderSnapshotTest_withoutChatHeadWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaResponseTextViewHolderSnapshotTest_withoutChatHeadWithUiTheme.png
deleted file mode 100644
index 34719b748..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_GvaResponseTextViewHolderSnapshotTest_withoutChatHeadWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e93886ce10219b0cd0632179a10d6bae270ec114235a4919c280a42444d2f4f4
-size 72094
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_MediaUpgradeStartedViewHolderSnapshotTest_audioUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_MediaUpgradeStartedViewHolderSnapshotTest_audioUiTheme.png
deleted file mode 100644
index f655b7202..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_MediaUpgradeStartedViewHolderSnapshotTest_audioUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5fdbeba30fa66131f7294fba0386ec6f69149a0b541739e7f8bc523df696d76
-size 27441
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_MediaUpgradeStartedViewHolderSnapshotTest_videoUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_MediaUpgradeStartedViewHolderSnapshotTest_videoUiTheme.png
deleted file mode 100644
index 7cf00410a..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_MediaUpgradeStartedViewHolderSnapshotTest_videoUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d786632e6874aa34b46cbc5a5288af002e8bb60cdef06237f478b88436f4541
-size 26595
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_NewMessagesDividerViewHolderSnapshotTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_NewMessagesDividerViewHolderSnapshotTest_withUiTheme.png
deleted file mode 100644
index 77b0aabb2..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_NewMessagesDividerViewHolderSnapshotTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d1ab2d49652052bdf23049eba01c3327fedc0db0bdeaa7f79c71310540ece37
-size 11174
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorFileAttachmentViewHolderSnapshotTest_withHeaderWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorFileAttachmentViewHolderSnapshotTest_withHeaderWithUiTheme.png
deleted file mode 100644
index 95d7c094b..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorFileAttachmentViewHolderSnapshotTest_withHeaderWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:980559e2cd8d2e89f913ce4119cbe559c70a25f81b46626c84b3a17cd0e7d190
-size 28065
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorImageAttachmentViewHolderSnapshotTest_withHeaderWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorImageAttachmentViewHolderSnapshotTest_withHeaderWithUiTheme.png
deleted file mode 100644
index 7ae930503..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorImageAttachmentViewHolderSnapshotTest_withHeaderWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb3281e06fb6fe782f52476e6c148ad3196e99c41c6b2c3bfd9d341788012d74
-size 83023
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_plainTextWithHeaderWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_plainTextWithHeaderWithUiTheme.png
deleted file mode 100644
index 21368152f..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_plainTextWithHeaderWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9fa354411a34ff700d6e809a82b8a15ec229d7fcb882a708faa24f1fd7fc681d
-size 22127
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_plainTextWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_plainTextWithUiTheme.png
deleted file mode 100644
index 70e58a7d6..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_plainTextWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d37bc27f23f53d1471e5a4f8e274070460de069c884312dfcee0b38b296f7eec
-size 16999
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_responseCardWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_responseCardWithUiTheme.png
deleted file mode 100644
index 1564ad855..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorMessageViewHolderSnapshotTest_responseCardWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eaea0e3c9f96cdc28e3c486a36bcc6b72b09115cf12c033de51af4ef345a3348
-size 78153
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_connectedWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_connectedWithUiTheme.png
deleted file mode 100644
index 6a0a12102..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_connectedWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:52f9f62610c53746d78795ce122383cfaf246f7d1b4762c65037584b111d6c95
-size 39599
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_inQueueWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_inQueueWithUiTheme.png
deleted file mode 100644
index 7ee07c90c..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_inQueueWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a14b6d4d06b0a111b7791393a7ee36f8c217b674fe26b5bd98304fdac703f9e
-size 47997
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_joinedWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_joinedWithUiTheme.png
deleted file mode 100644
index e35ea1508..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_joinedWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c834d187d73fd2449391bd53c9053c5b23da30a4c84e52e803da6935b09a69b4
-size 34685
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_transferringWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_transferringWithUiTheme.png
deleted file mode 100644
index 6f386c82d..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_OperatorStatusViewHolderSnapshotTest_transferringWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfead9f65b04e749808494185e7b257c45ae8b89accd172e26cd26cfc5756bcf
-size 53541
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_SystemMessageViewHolderSnapshotTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_SystemMessageViewHolderSnapshotTest_withUiTheme.png
deleted file mode 100644
index 3ddb23575..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_SystemMessageViewHolderSnapshotTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76f504347a14807ba98744fe5e6db5518527683a073f6d59f666068e8303b149
-size 55426
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_deliveredLabelWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_deliveredLabelWithUiTheme.png
deleted file mode 100644
index e866350d0..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_deliveredLabelWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1185eb6c1bc24b3407401529cc63aa369c6ae3d05a4da0d38a8707eb861544d0
-size 84255
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_errorLabelWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_errorLabelWithUiTheme.png
deleted file mode 100644
index 2ee2889f7..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_errorLabelWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b16488c4702acf599b656ebbc9e90d1afe1af084fedeb99c90b94ce420fb66b6
-size 85734
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_withoutLabelsWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_withoutLabelsWithUiTheme.png
deleted file mode 100644
index 1c4383fcd..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorImageAttachmentViewHolderSnapshotTest_withoutLabelsWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c671a9ed7ed8ae82439bb4bf93910e2ea1f0baf008d4a336297fab48b3a9fffc
-size 80246
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_deliveredLabelWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_deliveredLabelWithUiTheme.png
deleted file mode 100644
index 043320f66..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_deliveredLabelWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:796b2965b50b931835eb256bf15edfcb79502a1e06c18c6e43d0612534565e65
-size 11732
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_errorLabelWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_errorLabelWithUiTheme.png
deleted file mode 100644
index a2c0daf4f..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_errorLabelWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43e24a08447c631cb63deda4ba6ca6c99bab9950d8eba9e7a8ed8ce2b6cfc047
-size 13155
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_withoutLabelsWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_withoutLabelsWithUiTheme.png
deleted file mode 100644
index 6413893dc..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat.adapter.holder_VisitorMessageViewHolderSnapshotTest_withoutLabelsWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ab5060a309e31202d7937267076418256dddf93c79effafeedf846af1044eec
-size 7957
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_AttachmentPopupSnapshotTest_secureConversationsWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_AttachmentPopupSnapshotTest_secureMessagingWithUnifiedTheme.png
similarity index 100%
rename from widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_AttachmentPopupSnapshotTest_secureConversationsWithUnifiedTheme.png
rename to widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_AttachmentPopupSnapshotTest_secureMessagingWithUnifiedTheme.png
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewQuickReplySnapshotTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewQuickReplySnapshotTest_withUiTheme.png
deleted file mode 100644
index 38e0f35af..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewQuickReplySnapshotTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61a85f34ccf8e73b8026df0e6c38495f4aaac944dc4c5570eee50e8ed5e7c783
-size 33129
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_attachmentListWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_attachmentListWithUiTheme.png
deleted file mode 100644
index 3c59f9d41..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_attachmentListWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bfa062e59ed0929aada3dde0d608be48ed62e93d289922ff26f266756821229
-size 46286
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_failedAttachmentListWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_failedAttachmentListWithUiTheme.png
deleted file mode 100644
index 47603815d..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_failedAttachmentListWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c34e37429b9046b6ee4e80e79d0e9c2eb35b0e5843b269b286a51b7ae1b329b9
-size 30373
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessaging.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessaging.png
index fd5b7cd04..caa5817d4 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessaging.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessaging.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c828774f8f6c1bd1624b2e9b63537c9fa71fd624d0116cfb87025f8dc664ae3
-size 14393
+oid sha256:85f0f896e4d07499a812dd98d7188b455e81ee01265fc1d14f8875c0e17fcb10
+size 18449
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailable.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailable.png
new file mode 100644
index 000000000..d785b292c
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailable.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23f53f60273320595171ad452a0ad8090fc2cc81a879b10d14ebb4cae4654000
+size 24801
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailableWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailableWithGlobalColors.png
new file mode 100644
index 000000000..56f9c3314
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailableWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9efbb7f5073ca18cf52ec3c7121cbf1a90c44e442b47ba149efe9f28a854d517
+size 23897
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailableWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailableWithUnifiedTheme.png
new file mode 100644
index 000000000..44e1451b1
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingUnavailableWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:556bdc1cb01f13676f674962bcf64c6d143044d5a6fdb86db884b469125d4a9d
+size 37673
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithGlobalColors.png
index 3d668eadd..353c961ba 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:351c993f8e08af7808568e08f24f0d934020d6c43937ae26453a43ccddba550d
-size 14205
+oid sha256:114aa1445cfc36b5b932aee940fd0a467d954611490de1a3d46ad90f440ae986
+size 18247
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUiTheme.png
deleted file mode 100644
index 156a008ce..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2adb4fe7bc3822f5be2d0982fa025f9d2437e58b30aa8f09e64cd6e98dee0f43
-size 13860
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUnifiedTheme.png
index 2f1fae4b2..e2726b88d 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb026458867d18c65ccef485d4977edd3da89966aa7f1562707475d6c4eaa9db
-size 21589
+oid sha256:f65d37ff9375539fbc5a733057466ffb7a1cb8c175e99ad884022e9eaf8a81c9
+size 30501
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUnifiedThemeWithoutChat.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUnifiedThemeWithoutChat.png
index fd5b7cd04..caa5817d4 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUnifiedThemeWithoutChat.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_secureMessagingWithUnifiedThemeWithoutChat.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c828774f8f6c1bd1624b2e9b63537c9fa71fd624d0116cfb87025f8dc664ae3
-size 14393
+oid sha256:85f0f896e4d07499a812dd98d7188b455e81ee01265fc1d14f8875c0e17fcb10
+size 18449
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_transferringWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_transferringWithUiTheme.png
deleted file mode 100644
index a76634fb1..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewSnapshotTest_transferringWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e12fb22079f28246f3dd06648c8cb49d19afb5d79e10ad776138e2175175ed8
-size 29560
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_deliveredLabelWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_deliveredLabelWithUiTheme.png
deleted file mode 100644
index c5cac2210..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_deliveredLabelWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d2b62bcc09bf4362bb021b8a172ccf348687c30adf0401aa8f25e3dcda2b1cfe
-size 26738
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_errorLabelWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_errorLabelWithUiTheme.png
deleted file mode 100644
index 9ae71537a..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_errorLabelWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f2f632231014075a3991ae099af1bcfa704e610f3bf9dccb96b9266b025a574
-size 27767
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_withoutLabelsWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_withoutLabelsWithUiTheme.png
deleted file mode 100644
index 8f6e8316b..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_VisitorFileAttachmentChatItemsSnapshotTest_withoutLabelsWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1339cf90ee4b908241191470588cf09b5e092d55e019c524f68b777cde10bcc
-size 24399
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withGlobalColors.png
index e18b3bbde..3001053fc 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e248f825939453e3ba8020520d41311b13df8e5f865c01b6d71406c6828aed97
-size 10315
+oid sha256:bccf0f6a341ab8c501d006610fbedb1929023309829dec4b9695873045a960fa
+size 9781
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withGlobalColorsAndButton.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withGlobalColorsAndButton.png
index 0eb046192..e95e879f0 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withGlobalColorsAndButton.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withGlobalColorsAndButton.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cdef80953825de901c664eac8bd9df70bd8f946f44b32a5a26df5427ccae986
-size 10862
+oid sha256:ddeb3dd60a6b4508ee7bc17e26aaec0cde00b8a2f13b63980b477a2046565960
+size 10529
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUiTheme.png
deleted file mode 100644
index 9dac5bb09..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5fbe8a5b5e720e585664e028611457e1b6acb19fe0e597c88f07a4822c3111d2
-size 10322
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUiThemeAndButton.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUiThemeAndButton.png
deleted file mode 100644
index 45ac038a1..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUiThemeAndButton.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46281ac15dda70d22fded65f0a4e30529a0f2af7e8caa8ea030b2b27a5682e7e
-size 10870
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUnifiedTheme.png
index 11495b9e1..9d7d5d2a8 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7bd6df0b39e42fdc3daa73e3116ec7bac717f530f3aadd5d264c976ae9cd81f
-size 10121
+oid sha256:fb8b9ddc75a6e090abff405fcf4180f9b2627e71a7c7646299e4f7f87dad84a4
+size 9552
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUnifiedThemeAndButton.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUnifiedThemeAndButton.png
index dbdbb4531..640ca898d 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUnifiedThemeAndButton.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_AlertDialogTest_withUnifiedThemeAndButton.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4cfa390f3a09f65ef3ce0ace71e098750216124e0874f3aec97ba6bbc1c756e
-size 10658
+oid sha256:bd32f8d5bbfbc6b1f652779d4093fe50692d2ea0b47d12de72efd58b849282e7
+size 10280
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withGlobalColors.png
index 7026e64b0..9b9597d4c 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f61b85cdf01001f4872f99acab7649e17f613cc205245d8b071ddbb7c4ccede
-size 52914
+oid sha256:2e1c35a87fe7d7f79616c910d532ff68a654ce1c8c99e6ee1be1c3b0ec78b8c5
+size 54871
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withLink1WithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withLink1WithGlobalColors.png
index 3fbdf1984..f537861c4 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withLink1WithGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withLink1WithGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:107311f52e1da99daf0c9969732a14746a60e92fd022a08a732785cc7385c6d3
-size 57639
+oid sha256:224a62fd56d10ad652ed2464c2166f178259edefcc8de6601300be7a899b308c
+size 46608
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withLink2WithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withLink2WithGlobalColors.png
index 861ebcc1b..519c3f207 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withLink2WithGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withLink2WithGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cb43aa48900a0f8124cd4c944becad7faa3aa3f751e155a4d3c19bf551e24cc
-size 58109
+oid sha256:420fa1aa33f254747cbe3191b26e17e0ab199a58b3a1087677a05c4bfb2c48e2
+size 47011
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUiTheme.png
deleted file mode 100644
index 30c5c4f3f..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4fb8437514b01ecc99fa74639fe1194b05d4e72b9a2e236d1193916670477e0
-size 53125
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUnifiedTheme.png
index e402aacbd..b85224eca 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e6c5231bd7d9a93955650f5c40a73992acc4902eefc50c3426ae70fd823635d
-size 103610
+oid sha256:088acfc032a304e247507e18053b179a07593b2117d19c5538bc545507fe2546
+size 95167
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUnifiedThemeWithoutDialogLinkButton.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUnifiedThemeWithoutDialogLinkButton.png
index 40c10219f..2de11b434 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUnifiedThemeWithoutDialogLinkButton.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withUnifiedThemeWithoutDialogLinkButton.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15e3b4cc35f89d4f2ddd027e6201a8c28f4899f425f7f2b5250feecb3d8ade00
-size 68069
+oid sha256:9aeec66b899db0bb8e4b370be93693cc83c9827461d4f3d3828651218b6e3fcc
+size 59206
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withoutLinksWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withoutLinksWithGlobalColors.png
index 250b95140..e62d13921 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withoutLinksWithGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ConfirmationDialogTest_withoutLinksWithGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1136baea2a4380b6e0f4cb18d1e737c6104accb8067ad9c7171f9f1132a8bb36
-size 49554
+oid sha256:e07c4ceaf5d6dc6522904dedfddaf8f40bff10e641de9efc133dc0a6189ce9a4
+size 38707
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withGlobalColors.png
index 3f01757d3..fe74f2c67 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c2620af6daf304a1cf381e69a46a36727f502baf0596fcb28ee8fbf7417d643
-size 21367
+oid sha256:f07bb1417b43f33444767fd84abe8d6649e5c6ba9467d7af3e1024df45772cbb
+size 20689
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withUiTheme.png
deleted file mode 100644
index 72538847f..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65cbd5707c774258ad77dcde0104f6d28e93e503046f64f145ec2573fd73f26a
-size 21174
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withUnifiedTheme.png
index 4648e3171..415d49446 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OperatorEndedEngagementTest_withUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f5ed4491776251afee1992eb544ac79ccab165c91033c20e14390fb3cbc339a
-size 19476
+oid sha256:bccf9804233f590fc7ec0e4253453576933771e774fceda2597ffac24146a408
+size 18453
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withGlobalColors.png
index bf2d50427..e62d13921 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fdce36c560f781bf0ba486fe416bb215283e6380cb9ec0a697daa2c1e2eaddb
-size 37711
+oid sha256:e07c4ceaf5d6dc6522904dedfddaf8f40bff10e641de9efc133dc0a6189ce9a4
+size 38707
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withUiTheme.png
deleted file mode 100644
index 0d3f3d163..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3094c48b5761f728cfd6e032f57efcaf4a9122da7568e487d6617d3e6530985
-size 38484
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withUnifiedTheme.png
index fafc7810b..be4be34d6 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_OptionDialogTest_withUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76c4c3ef3adc79930d0e0be0e759ab11c2635bf968796c9cae06f27ca6c71dec
-size 50990
+oid sha256:d002add70049f2408b85d31f9dd84956dd29dcc8b3118ccae2c4c32c1bda2cfc
+size 41742
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withGlobalColors.png
index 0e0f5c636..90513a974 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f037f67a21493555297fb9b177b2b1401e44b683a0d228bdbf0faad5660281b9
-size 37452
+oid sha256:8a0f39466d314097db29c679a62b5177b77312ef5c7906619f3b421af0354943
+size 38584
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withUiTheme.png
deleted file mode 100644
index 37a65c0db..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac8b3fc2ffacc2d4a4c9f71cd6d7334dfb71e0a7a92b48cd805b29e87113678f
-size 38501
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withUnifiedTheme.png
index 30f2b1ad6..83b17587d 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ReversedOptionDialogTest_withUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82d2fb0cf06ba66ad27dbbbe2564785fe10055529f9a90e350670f5afb46dc0d
-size 51050
+oid sha256:db0c660444ec9c08d6e35c1801033b75a65612612800de8b4ad49534efc1f8d1
+size 41760
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withGlobalColors.png
index 9f939d194..054d233d0 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b57323a80a5c0cf02c2470483b3d1149cfd9bd591c146a65f2875da5f47891e
-size 38328
+oid sha256:e5b3ac8cfeb33d35facecd2f5afd7252eafce63c5cbccafe2060911015191e2e
+size 40585
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withUiTheme.png
deleted file mode 100644
index 7dae54e81..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:426125a839660d7ec8e1b930f78c647e0cba9dfc7b978157e4624afae75475e9
-size 39324
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withUnifiedTheme.png
index 623252ea6..dcef7bcf5 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_ScreenSharingDialogTest_withUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5af15a3d953b9156692d6be79f219f481aaf6c4d3097cadf0f8bbb461d0e3943
-size 53188
+oid sha256:5ebdd57e21941dffd3638108b7b20ae12cab35f7220e1dce71003d146493a55e
+size 43197
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withGlobalColors.png
index eba575523..898eb2cdc 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6af867a53d1fc7bc8f06d3464daa7ad418e2810b4fe1c16f4f8e046f77a1055c
-size 32035
+oid sha256:6cd218119fecb6c31ecdd96a364fc4e2c7d4c636feab9d999707092820f8d7f6
+size 33260
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withUiTheme.png
deleted file mode 100644
index dffd91495..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:724177605f6adb585f6c5460306ba838ff6f493c007c4c95487ad533ca4e5b59
-size 32511
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withUnifiedTheme.png
index 74dc4a78d..574de7b16 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_UpgradeDialogTest_withUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:056191e4b8c020e0d594f72a8e4acd1249fbe9bd04ef9425e82e38e9e978bbbf
-size 47937
+oid sha256:e82072a6ca000ffe02be94b587fe709f28ca79718453bc669e753f92eeb6c60b
+size 37626
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_errorWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_errorWithUiTheme.png
deleted file mode 100644
index 5f5a5c796..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_errorWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:357b93eda4862a7e0b9d77b176962cab9d2a1a7d33b6b4289e58542ea667c7e3
-size 19891
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_loadingWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_loadingWithUiTheme.png
deleted file mode 100644
index 95f2a7993..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_loadingWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f3680265072851add682e325518cb9bf6c161cdd8e7b6c622dbebabe88447e2
-size 20871
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_visitorCodeWithUiTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_visitorCodeWithUiTheme.png
deleted file mode 100644
index a6233adb9..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.dialog_VisitorCodeDialogTest_visitorCodeWithUiTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e8d2e9e5e5a87f765ef2cf07ed8f022770931bcf1881cb0953230de730ac9c0
-size 30038
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsDefaultTheme.png
new file mode 100644
index 000000000..cd8746db7
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:131c12c79023f740e187f4ff8c30dce9105faa67f47faab9f95de12f8c717e3e
+size 130969
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedTheme.png
new file mode 100644
index 000000000..0f27237b3
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11cde158a869f5b8b0f80b06f3fd024314cf0041bae4e0ca9875383ddc28cb30
+size 161847
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..133923abc
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4aeda81eb5fd357d68095cfbf538ed276379c18313b9eccecda1e30f5441253
+size 130569
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..cd8746db7
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_contactsWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:131c12c79023f740e187f4ff8c30dce9105faa67f47faab9f95de12f8c717e3e
+size 130969
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyDefaultTheme.png
new file mode 100644
index 000000000..51b8f06bb
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06161f46ba357a490eaea0510115da5b14e372b5a8ee65243aff0b4a0bb57a7c
+size 44820
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedTheme.png
new file mode 100644
index 000000000..9e9f0aa64
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a7e80837490680da1848dd0d2df38b0a7bad0891a2532e84cd5f6ca610a68e5
+size 56121
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..a285c6809
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69f08a86e3ec50173f29fd6e7f2cac6515f9a2d6e8b31e8b5b5fb91568748640
+size 45439
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..51b8f06bb
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_emptyWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06161f46ba357a490eaea0510115da5b14e372b5a8ee65243aff0b4a0bb57a7c
+size 44820
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorDefaultTheme.png
new file mode 100644
index 000000000..7b6edddb8
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:faf4e48a0001101de92b3cdb3b9042a3dc7cbf182023c5ae26243624c21cdd53
+size 59825
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorDefaultThemeGliaNotInitialized.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorDefaultThemeGliaNotInitialized.png
new file mode 100644
index 000000000..a739070a5
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorDefaultThemeGliaNotInitialized.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3695bf4ecbf7fb56dd493a2fb85c1823df855f35556b2bff4d9929dd2cfc8d8
+size 43104
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedTheme.png
new file mode 100644
index 000000000..fd19a059b
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b1b3bda5c5a0a223cc7f992d9cf991f3538b76cd68b4ca9d996c99da896222b
+size 68776
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..8682eee93
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82c6315cc188d4251849da2303940236d685bf1538bae93b87c49e7cdac90def
+size 61605
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..7b6edddb8
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_errorWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:faf4e48a0001101de92b3cdb3b9042a3dc7cbf182023c5ae26243624c21cdd53
+size 59825
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingDefaultTheme.png
new file mode 100644
index 000000000..562977e47
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd82ad40d8cf79704b067ede6efcaf6fcce0f6521777d0a2ce7bec5129a7854b
+size 26728
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedTheme.png
new file mode 100644
index 000000000..044263ff5
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23c989e05b4c10fe9048d32c3d97c98034e1b2b59de3e47b2cc63ad5b270673c
+size 53539
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..7dcf0cc3a
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f30a8215115951f86fc0e0b9dbaf33462d5d1c5d13567c1c1c7153cdb46b9c58
+size 30231
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..562977e47
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_loadingWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd82ad40d8cf79704b067ede6efcaf6fcce0f6521777d0a2ce7bec5129a7854b
+size 26728
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsDefaultTheme.png
new file mode 100644
index 000000000..d37b66567
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46d25db9ff51ae1556d1616986fb7398afb8d79fca1282923da67d98435a20cb
+size 43111
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedTheme.png
new file mode 100644
index 000000000..f13b6d75f
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8b84202c3027d1abead2862861151b90f8be256958d6c8cef20e3908567dbc8
+size 54954
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..d0df31857
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:930f07f406d55c4698fe546bf30d1f87977c9fdd43485a382ee04d93af9bb092
+size 43942
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..d37b66567
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetBottomSheetTest_sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46d25db9ff51ae1556d1616986fb7398afb8d79fca1282923da67d98435a20cb
+size 43111
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsDefaultTheme.png
new file mode 100644
index 000000000..71ee96541
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c42d0c6ea2d2c0487dfe501355882a6224ff2cd4b8d6d486305cd62d4d9cbe31
+size 127759
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedTheme.png
new file mode 100644
index 000000000..c7e070163
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b97555c784d320f81c4d23e28d8e847f9ae5ac904e1e7891b461780d700140b
+size 188403
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..c158ea810
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ffb22e420e2334897b2d6f04e0e8c6fc034167527fb4a23a2d5398cf1bcdc48
+size 125404
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..71ee96541
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_contactsWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c42d0c6ea2d2c0487dfe501355882a6224ff2cd4b8d6d486305cd62d4d9cbe31
+size 127759
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyDefaultTheme.png
new file mode 100644
index 000000000..97177a520
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1997f8e73aa26259d7e6f1080e25ef1a0d182f87bc5045f2d1fa4bcb20d19310
+size 40908
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedTheme.png
new file mode 100644
index 000000000..fcf554948
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a111f62fc4399bd1d5695f18b1e36babc846bc2be958f1a4848c8db4b2391cd9
+size 52494
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..8b5625346
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bdcda47e0261b849cf1837fc4612feff94dfb81f49182b632ab24269b0c78be3
+size 39486
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..97177a520
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_emptyWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1997f8e73aa26259d7e6f1080e25ef1a0d182f87bc5045f2d1fa4bcb20d19310
+size 40908
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorDefaultTheme.png
new file mode 100644
index 000000000..3edad7179
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bc7477831028d1592d33756bf82c924c261d5735ff9d74dfe2db811e6d7d77b
+size 58084
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorDefaultThemeGliaNotInitialized.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorDefaultThemeGliaNotInitialized.png
new file mode 100644
index 000000000..db6f84d68
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorDefaultThemeGliaNotInitialized.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b4f84f08d413c5aa4a499e0a8065d046d53936e64703337885dfcb0178904fd
+size 39332
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedTheme.png
new file mode 100644
index 000000000..cbe4ee3a0
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:403286b0a20452b8d01177dbaaa72cdeaaa6c74d383a91181ddaeb5483db2895
+size 66733
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..c9ea5cd05
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:276e108e67ecabbbca77e6ecd6945fef9a3b5ac64600e8013c563ac4a0c5b491
+size 58123
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..3edad7179
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_errorWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bc7477831028d1592d33756bf82c924c261d5735ff9d74dfe2db811e6d7d77b
+size 58084
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingDefaultTheme.png
new file mode 100644
index 000000000..14255b5fe
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f802b154b769afcc9a18476ba84ad2382050f406ac092caf3e7eeb283af7ca2
+size 25685
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedTheme.png
new file mode 100644
index 000000000..2c4881ff2
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93708070b0ce3dc80a50c5f7e3e05368b08a1ab0f9213b91c5c523b2670dfa09
+size 54844
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..8ae3291d0
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a031f9091783a3b8293238af089f7719534cf1ef081e227b7facdfdc1a5921e
+size 27076
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..14255b5fe
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_loadingWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f802b154b769afcc9a18476ba84ad2382050f406ac092caf3e7eeb283af7ca2
+size 25685
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsDefaultTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsDefaultTheme.png
new file mode 100644
index 000000000..db6f84d68
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsDefaultTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b4f84f08d413c5aa4a499e0a8065d046d53936e64703337885dfcb0178904fd
+size 39332
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedTheme.png
new file mode 100644
index 000000000..3833af4bb
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f76dfae0fc23a81e56e20f4d0f5b1afabb68a02c7b288d96e01348a041d1b1a
+size 51104
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors.png
new file mode 100644
index 000000000..d734178db
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b347afbc1cafe41139f5b959079ccc5171011623a8d214c7adf992d9d4178819
+size 37878
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget.png
new file mode 100644
index 000000000..db6f84d68
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.entrywidget_EntryWidgetEmbeddedViewTest_sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b4f84f08d413c5aa4a499e0a8065d046d53936e64703337885dfcb0178904fd
+size 39332
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.filepreview_FilePreviewTest_defaultView.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.filepreview_ImagePreviewTest_defaultView.png
similarity index 100%
rename from widgetssdk/src/test/snapshots/images/com.glia.widgets.filepreview_FilePreviewTest_defaultView.png
rename to widgetssdk/src/test/snapshots/images/com.glia.widgets.filepreview_ImagePreviewTest_defaultView.png
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_available.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_available.png
deleted file mode 100644
index 8e9355e96..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_available.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23e10677b09e429715766f0f91a5da21fc9865d4878eeee6f72357d965fc9578
-size 80114
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithGlobalColors.png
deleted file mode 100644
index 14e474368..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithGlobalColors.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a173ba86aa198574d8ac828e32df1d7eddb8ae31b0156b314619689fcb75bdd1
-size 81320
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithUnifiedTheme.png
deleted file mode 100644
index 7f408da61..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithUnifiedTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1844176721a3d656ff6f5cd05a94400a380ed49a1e6c79a2d0e4bd243a2c9214
-size 111562
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithUnifiedThemeWithoutWelcomeScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithUnifiedThemeWithoutWelcomeScreen.png
deleted file mode 100644
index 8e9355e96..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_availableWithUnifiedThemeWithoutWelcomeScreen.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23e10677b09e429715766f0f91a5da21fc9865d4878eeee6f72357d965fc9578
-size 80114
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitError.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitError.png
deleted file mode 100644
index 39ccc19c7..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitError.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06da023ff9b2adb70625ad31e2295ade62eb690401943739500dcbceb1e95d4c
-size 86700
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithGlobalColors.png
deleted file mode 100644
index faaf2c910..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithGlobalColors.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36364b314c8cacd4e12fb216c71226d0394328854239c611080d22bafc7d584b
-size 84715
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithUnifiedTheme.png
deleted file mode 100644
index 49fbedd7e..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithUnifiedTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0960bd73e124da0af7056c89b72bfa3734c34ba26801c89197a856b4cc733ed
-size 120832
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithUnifiedThemeWithoutWelcomeScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithUnifiedThemeWithoutWelcomeScreen.png
deleted file mode 100644
index 39ccc19c7..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_limitErrorWithUnifiedThemeWithoutWelcomeScreen.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06da023ff9b2adb70625ad31e2295ade62eb690401943739500dcbceb1e95d4c
-size 86700
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailable.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailable.png
deleted file mode 100644
index 60e10eafd..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailable.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3bb81c3a77790e356fff5a4365e9d1e88665e0b7231fc4192c1ed2a5821b764
-size 31605
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithGlobalColors.png
deleted file mode 100644
index b1780be56..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithGlobalColors.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7af15e201fdacc82864f30d857f9031155975134f7839dd39bf243a623dd879
-size 31916
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithUnifiedTheme.png
deleted file mode 100644
index 582f0b08a..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithUnifiedTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:226ca9d32363458d3e7d1124aaa9869733a216e7dfd117e2226553886d9c403b
-size 35800
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithUnifiedThemeWithoutWelcomeScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithUnifiedThemeWithoutWelcomeScreen.png
deleted file mode 100644
index 60e10eafd..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_notAvailableWithUnifiedThemeWithoutWelcomeScreen.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3bb81c3a77790e356fff5a4365e9d1e88665e0b7231fc4192c1ed2a5821b764
-size 31605
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sending.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sending.png
deleted file mode 100644
index 7dc910317..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sending.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d4b856634d138d6d783d58fbdc380387dcade31c5603f2c7437c8f0f8b1d504
-size 46719
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithGlobalColors.png
deleted file mode 100644
index 6ffe63930..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithGlobalColors.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5aa6cf1b65977580f507100b73864a171e39f7aeadee4ea10fab76534e703d3f
-size 46130
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithUnifiedTheme.png
deleted file mode 100644
index 739c3b7b2..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithUnifiedTheme.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c34a5152128c6785b5fb1d06508be792c9d3439f91622d7ee8afde3c905e8963
-size 59092
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithUnifiedThemeWithoutWelcomeScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithUnifiedThemeWithoutWelcomeScreen.png
deleted file mode 100644
index 7dc910317..000000000
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsWelcomeScreenTest_sendingWithUnifiedThemeWithoutWelcomeScreen.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d4b856634d138d6d783d58fbdc380387dcade31c5603f2c7437c8f0f8b1d504
-size 46719
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsConfirmationScreenTest_confirmation.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingConfirmationScreenTest_confirmation.png
similarity index 100%
rename from widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsConfirmationScreenTest_confirmation.png
rename to widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingConfirmationScreenTest_confirmation.png
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsConfirmationScreenTest_confirmationWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingConfirmationScreenTest_confirmationWithGlobalColors.png
similarity index 100%
rename from widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsConfirmationScreenTest_confirmationWithGlobalColors.png
rename to widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingConfirmationScreenTest_confirmationWithGlobalColors.png
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsConfirmationScreenTest_confirmationWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingConfirmationScreenTest_confirmationWithUnifiedTheme.png
similarity index 100%
rename from widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsConfirmationScreenTest_confirmationWithUnifiedTheme.png
rename to widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingConfirmationScreenTest_confirmationWithUnifiedTheme.png
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsConfirmationScreenTest_confirmationWithUnifiedThemeWithoutConfirmationScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingConfirmationScreenTest_confirmationWithUnifiedThemeWithoutConfirmationScreen.png
similarity index 100%
rename from widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureConversationsConfirmationScreenTest_confirmationWithUnifiedThemeWithoutConfirmationScreen.png
rename to widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingConfirmationScreenTest_confirmationWithUnifiedThemeWithoutConfirmationScreen.png
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_available.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_available.png
new file mode 100644
index 000000000..6bdb56b2b
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_available.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ed37b01c67527d6721098d719277c22fc664c58cc97bf42848cd7946649e9d4
+size 76925
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithGlobalColors.png
new file mode 100644
index 000000000..bffbb7c06
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a3ae82e37cf03f93918aa86548f1cda552d921ceecb8dc1e30b2307e1818430
+size 77546
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithUnifiedTheme.png
new file mode 100644
index 000000000..814178480
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d70db992c82774709670bb4d3bc73f5fd027a74a80b006eaedc5c7cedabbaa94
+size 112242
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithUnifiedThemeWithoutWelcomeScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithUnifiedThemeWithoutWelcomeScreen.png
new file mode 100644
index 000000000..6bdb56b2b
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_availableWithUnifiedThemeWithoutWelcomeScreen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ed37b01c67527d6721098d719277c22fc664c58cc97bf42848cd7946649e9d4
+size 76925
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitError.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitError.png
new file mode 100644
index 000000000..8a9a262c0
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitError.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:820a3a361f633dca45e3c3692f9992e09c2dde39c1baaee4a451c7d070e3111c
+size 82657
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithGlobalColors.png
new file mode 100644
index 000000000..0a93e61fb
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48e6dcb6ea389aedf14ba599fa227482c8666b88df01746983c8eff65018d941
+size 80367
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithUnifiedTheme.png
new file mode 100644
index 000000000..6032491c3
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c94930a783c50de278651a0aabb87d624e90e9411390784af56ad511f097c41
+size 121276
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithUnifiedThemeWithoutWelcomeScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithUnifiedThemeWithoutWelcomeScreen.png
new file mode 100644
index 000000000..8a9a262c0
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_limitErrorWithUnifiedThemeWithoutWelcomeScreen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:820a3a361f633dca45e3c3692f9992e09c2dde39c1baaee4a451c7d070e3111c
+size 82657
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailable.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailable.png
new file mode 100644
index 000000000..7e46b17a3
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailable.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f40e1b7206da54f9ef81bdafecf7625d6d8b96b4a4febefbd5cc3841dc647228
+size 28240
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithGlobalColors.png
new file mode 100644
index 000000000..2dd25a513
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb41a91210ebc0d9023765d9268b35eb1657d884c9030a5ca3d3d8e4e0a3c830
+size 28744
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithUnifiedTheme.png
new file mode 100644
index 000000000..eeee4905a
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea1922a47de695193b6dda242385d78011759db2215481462893ccd9e9427966
+size 36551
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithUnifiedThemeWithoutWelcomeScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithUnifiedThemeWithoutWelcomeScreen.png
new file mode 100644
index 000000000..7e46b17a3
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_notAvailableWithUnifiedThemeWithoutWelcomeScreen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f40e1b7206da54f9ef81bdafecf7625d6d8b96b4a4febefbd5cc3841dc647228
+size 28240
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sending.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sending.png
new file mode 100644
index 000000000..61eebae32
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sending.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0eaccaa2f0b0ca22af83f64e9139be75f1e41f4fea9ec81f8c20c1cb8bf9e1de
+size 42886
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithGlobalColors.png
new file mode 100644
index 000000000..2c062a83a
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithGlobalColors.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bdcc92f7cd19235909175cce3e52d223caa32154e7a8ac624fb4408871a9522
+size 42187
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithUnifiedTheme.png
new file mode 100644
index 000000000..88e7e547c
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithUnifiedTheme.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:844ca2fbf31e3fb6977eee4b1b62d84a19daeb8ee73c80a85c9494b2cb411b11
+size 59981
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithUnifiedThemeWithoutWelcomeScreen.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithUnifiedThemeWithoutWelcomeScreen.png
new file mode 100644
index 000000000..61eebae32
--- /dev/null
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.messagecenter_SecureMessagingWelcomeScreenTest_sendingWithUnifiedThemeWithoutWelcomeScreen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0eaccaa2f0b0ca22af83f64e9139be75f1e41f4fea9ec81f8c20c1cb8bf9e1de
+size 42886
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_defaultState.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_defaultState.png
index af998a258..438b45207 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_defaultState.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_defaultState.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0aa841dcf7b28f5b7cdedc7ff36a3596ad5c275fc666316c88912add4d0d590
-size 6794
+oid sha256:ff820d028f9e1a8000e5f222755b51d0ea68e6219b3e725d5e24b8bfb9802351
+size 6766
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_hideOnHold.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_hideOnHold.png
index 141224651..793178e61 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_hideOnHold.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_hideOnHold.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f1fd23c84c2c8a65e9d08fe4fac9e43580843f46464243f9253487b7bf81033
-size 10935
+oid sha256:ebefcd183376ef7f884233755e526c0aa42e86f3166f3a941906f6fd48d1800d
+size 10909
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_hideOnHoldWithUnifiedThemeWithoutChat.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_hideOnHoldWithUnifiedThemeWithoutChat.png
index 141224651..793178e61 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_hideOnHoldWithUnifiedThemeWithoutChat.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_hideOnHoldWithUnifiedThemeWithoutChat.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f1fd23c84c2c8a65e9d08fe4fac9e43580843f46464243f9253487b7bf81033
-size 10935
+oid sha256:ebefcd183376ef7f884233755e526c0aa42e86f3166f3a941906f6fd48d1800d
+size 10909
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOnHold.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOnHold.png
index 27adb02e2..891693320 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOnHold.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOnHold.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7f36a1909fe07ce5d5b243b72703ee9822b3fa3ab190932551a9247714000da
+oid sha256:40eca4d4026dee1255d1c8b86ad874def759281fd0a0998b550a9dab4704464a
 size 12018
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOnHoldWithUnifiedThemeWithoutChat.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOnHoldWithUnifiedThemeWithoutChat.png
index 27adb02e2..891693320 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOnHoldWithUnifiedThemeWithoutChat.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOnHoldWithUnifiedThemeWithoutChat.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7f36a1909fe07ce5d5b243b72703ee9822b3fa3ab190932551a9247714000da
+oid sha256:40eca4d4026dee1255d1c8b86ad874def759281fd0a0998b550a9dab4704464a
 size 12018
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOperatorImage.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOperatorImage.png
index 141224651..793178e61 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOperatorImage.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOperatorImage.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f1fd23c84c2c8a65e9d08fe4fac9e43580843f46464243f9253487b7bf81033
-size 10935
+oid sha256:ebefcd183376ef7f884233755e526c0aa42e86f3166f3a941906f6fd48d1800d
+size 10909
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOperatorImageWithUnifiedThemeWithoutChat.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOperatorImageWithUnifiedThemeWithoutChat.png
index 141224651..793178e61 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOperatorImageWithUnifiedThemeWithoutChat.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showOperatorImageWithUnifiedThemeWithoutChat.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f1fd23c84c2c8a65e9d08fe4fac9e43580843f46464243f9253487b7bf81033
-size 10935
+oid sha256:ebefcd183376ef7f884233755e526c0aa42e86f3166f3a941906f6fd48d1800d
+size 10909
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholder.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholder.png
index 6500a5568..d758d7847 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholder.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b72d27ab8eefaea9b48312de7488da6cb91840eeb6efe093dddd12c47fd4b0ab
-size 8475
+oid sha256:c48f8e912f0dd8b017fb818fc6893823eb44970fe1a1eb1f01cda96149c06d2f
+size 8267
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithGlobalColors.png
index 49eefb063..adc939fed 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:700f63aab93dc9445ad4fd73a75807057213ed731f5585de89556606d3862788
-size 8367
+oid sha256:ce3b0add3580121535cbd241cb41ba0780d831c154ee1d64a80ec8082db76c1e
+size 8596
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithUnifiedTheme.png
index 063d6f4c7..1617e3161 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cb13a6152f258ce5200703a62eba479d5e05499caf4ebe9394c90e4b52b3d83
-size 8418
+oid sha256:96c2347934208b903cddb115dec74a0613b039b4b836d4e44c8a6d4d18f802d2
+size 8580
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithUnifiedThemeWithoutChat.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithUnifiedThemeWithoutChat.png
index 6500a5568..d758d7847 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithUnifiedThemeWithoutChat.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showPlaceholderWithUnifiedThemeWithoutChat.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b72d27ab8eefaea9b48312de7488da6cb91840eeb6efe093dddd12c47fd4b0ab
-size 8475
+oid sha256:c48f8e912f0dd8b017fb818fc6893823eb44970fe1a1eb1f01cda96149c06d2f
+size 8267
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueing.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueing.png
index 6500a5568..d758d7847 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueing.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b72d27ab8eefaea9b48312de7488da6cb91840eeb6efe093dddd12c47fd4b0ab
-size 8475
+oid sha256:c48f8e912f0dd8b017fb818fc6893823eb44970fe1a1eb1f01cda96149c06d2f
+size 8267
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithGlobalColors.png
index 49eefb063..adc939fed 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:700f63aab93dc9445ad4fd73a75807057213ed731f5585de89556606d3862788
-size 8367
+oid sha256:ce3b0add3580121535cbd241cb41ba0780d831c154ee1d64a80ec8082db76c1e
+size 8596
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithUnifiedTheme.png
index 063d6f4c7..1617e3161 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cb13a6152f258ce5200703a62eba479d5e05499caf4ebe9394c90e4b52b3d83
-size 8418
+oid sha256:96c2347934208b903cddb115dec74a0613b039b4b836d4e44c8a6d4d18f802d2
+size 8580
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithUnifiedThemeWithoutChat.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithUnifiedThemeWithoutChat.png
index 6500a5568..d758d7847 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithUnifiedThemeWithoutChat.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showQueueingWithUnifiedThemeWithoutChat.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b72d27ab8eefaea9b48312de7488da6cb91840eeb6efe093dddd12c47fd4b0ab
-size 8475
+oid sha256:c48f8e912f0dd8b017fb818fc6893823eb44970fe1a1eb1f01cda96149c06d2f
+size 8267
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharing.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharing.png
index 7bc964967..c0b7312d3 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharing.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:371e91d997a0bea8f697400c71bd47570b657b2c6afda2fd224301e89b84f5ef
-size 8378
+oid sha256:997552ddc97882b9f7ce786a3000eecd38870d587ebfb53972375413193a11e9
+size 8158
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithGlobalColors.png
index 1b6553c31..9d1d25a87 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5688fd3c37a754a57555858302f25bdf390c85c55dab13b4223d473b5e698853
-size 8270
+oid sha256:1d509ff5afed76e71c3f840fe43ace975bf796dfc9fc63c0e6270efc43ea36de
+size 8511
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithUnifiedTheme.png
index b1212ae60..39331a6f3 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:537db3c17da88930c2e53b1b17e4bd17fcaeba4ab402749ec46cb195fd69c085
-size 8319
+oid sha256:28e8b37368cec01e7bba4e2914fc9ca6d785e7d7ab04821598d996f7a41d7bee
+size 8493
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithUnifiedThemeWithoutChat.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithUnifiedThemeWithoutChat.png
index 7bc964967..c0b7312d3 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithUnifiedThemeWithoutChat.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showScreenSharingWithUnifiedThemeWithoutChat.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:371e91d997a0bea8f697400c71bd47570b657b2c6afda2fd224301e89b84f5ef
-size 8378
+oid sha256:997552ddc97882b9f7ce786a3000eecd38870d587ebfb53972375413193a11e9
+size 8158
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCount.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCount.png
index 4a0f77434..3038ca366 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCount.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCount.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2909c60846a92416d5c99b8350c91bafe70f01c6b90bec75a0cc8ca04a9803ef
-size 12736
+oid sha256:81db27ea49c1ff293268dda787832c619eb36c135aca36663c12820e9b928e69
+size 11087
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithGlobalColors.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithGlobalColors.png
index a16cd5222..d7535fee5 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithGlobalColors.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithGlobalColors.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d59d9d3bedd0261e9de8e9a35d519419d5bd755d1ebe45bcda9a6b7587320d4b
-size 11211
+oid sha256:9c14558fa5d3433a388aa811335af921f35a05c710435099241020527cd74110
+size 11406
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithUnifiedTheme.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithUnifiedTheme.png
index 41625dea8..25f8ab175 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithUnifiedTheme.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithUnifiedTheme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de6a2fc700fa24381705beb5f1d8706d6afaa5013fb636747eba24ae9439b5de
-size 12017
+oid sha256:d126befe3b71088b490942c979baee6bf7b0913eb8b3e58f46b9e381bb737709
+size 12170
diff --git a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithUnifiedThemeWithoutChat.png b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithUnifiedThemeWithoutChat.png
index 4a0f77434..3038ca366 100644
--- a/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithUnifiedThemeWithoutChat.png
+++ b/widgetssdk/src/test/snapshots/images/com.glia.widgets.view.head_ChatHeadViewSnapshotTest_showUnreadMessageCountWithUnifiedThemeWithoutChat.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2909c60846a92416d5c99b8350c91bafe70f01c6b90bec75a0cc8ca04a9803ef
-size 12736
+oid sha256:81db27ea49c1ff293268dda787832c619eb36c135aca36663c12820e9b928e69
+size 11087
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/SnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/SnapshotTest.kt
index a1bb30e6e..b3a3d3de5 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/SnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/SnapshotTest.kt
@@ -13,8 +13,8 @@ import com.glia.widgets.snapshotutils.OnTestEnded
 import com.glia.widgets.snapshotutils.SnapshotContent
 import com.glia.widgets.snapshotutils.SnapshotProviders
 import com.glia.widgets.snapshotutils.SnapshotStrings
-import com.glia.widgets.snapshotutils.SnapshotTheme
 import com.glia.widgets.snapshotutils.SnapshotTestLifecycle
+import com.glia.widgets.snapshotutils.SnapshotTheme
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/CallViewAudioSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/CallViewAudioSnapshotTest.kt
index 54d74e754..b4afb0465 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/CallViewAudioSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/CallViewAudioSnapshotTest.kt
@@ -21,16 +21,6 @@ internal class CallViewAudioSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun initCallWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = initCallState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun initCallWithGlobalColors() {
         snapshot(
@@ -76,16 +66,6 @@ internal class CallViewAudioSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun operatorConnectedWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = operatorConnectedState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun operatorConnectedWithGlobalColors() {
         snapshot(
@@ -134,16 +114,6 @@ internal class CallViewAudioSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun audioCallStartedWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = audioCallStartedState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun audioCallStartedWithGlobalColors() {
         snapshot(
@@ -188,16 +158,6 @@ internal class CallViewAudioSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun onHoldWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = onHoldState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun onHoldWithGlobalColors() {
         snapshot(
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/CallViewVideoSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/CallViewVideoSnapshotTest.kt
index b8ccd0a55..08f1d3c77 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/CallViewVideoSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/CallViewVideoSnapshotTest.kt
@@ -12,8 +12,7 @@ internal class CallViewVideoSnapshotTest : SnapshotTest(
 
     // MARK: Init call
 
-    private fun initCallState() = callState()
-        .initCall(requestedMediaType = Engagement.MediaType.VIDEO)
+    private fun initCallState() = callState().initCall(requestedMediaType = Engagement.MediaType.VIDEO)
 
     @Test
     fun initCall() {
@@ -24,16 +23,6 @@ internal class CallViewVideoSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun initCallWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = initCallState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun initCallWithGlobalColors() {
         snapshot(
@@ -78,16 +67,6 @@ internal class CallViewVideoSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun operatorConnectedWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = operatorConnectedState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun operatorConnectedWithGlobalColors() {
         snapshot(
@@ -136,16 +115,6 @@ internal class CallViewVideoSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun video1WayCallStartedWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = video1WayCallStartedState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun video1WayCallStartedWithGlobalColors() {
         snapshot(
@@ -194,16 +163,6 @@ internal class CallViewVideoSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun video2WayCallStartedWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = video2WayCallStartedState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun video2WayCallStartedWithGlobalColors() {
         snapshot(
@@ -254,16 +213,6 @@ internal class CallViewVideoSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun video2WayWithFlipButtonWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = video2WayWithFlipButtonState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun video2WayWithFlipButtonWithGlobalColors() {
         snapshot(
@@ -308,16 +257,6 @@ internal class CallViewVideoSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun onHoldWithUiTheme() {
-        snapshot(
-            setupView(
-                callState = onHoldState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun onHoldWithGlobalColors() {
         snapshot(
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/SnapshotCallView.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/SnapshotCallView.kt
index 6ba95af98..913a0d3f4 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/SnapshotCallView.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/call/SnapshotCallView.kt
@@ -12,7 +12,6 @@ import com.glia.androidsdk.comms.Video
 import com.glia.androidsdk.comms.VideoView
 import com.glia.androidsdk.comms.VisitorMediaState
 import com.glia.widgets.R
-import com.glia.widgets.UiTheme
 import com.glia.widgets.databinding.CallActivityBinding
 import com.glia.widgets.di.ControllerFactory
 import com.glia.widgets.di.Dependencies
@@ -22,6 +21,7 @@ import com.glia.widgets.snapshotutils.SnapshotLottie
 import com.glia.widgets.snapshotutils.SnapshotProviders
 import com.glia.widgets.snapshotutils.SnapshotSchedulers
 import com.glia.widgets.snapshotutils.SnapshotTheme
+import com.glia.widgets.snapshotutils.SnapshotThemeConfiguration
 import com.glia.widgets.view.floatingvisitorvideoview.FloatingVisitorVideoContract.FlipButtonState
 import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
 import com.google.gson.JsonObject
@@ -36,7 +36,7 @@ import java.util.concurrent.Executor
 // TODO: move to com.glia.widgets.snapshotutils after CallState refactored
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 internal interface SnapshotCallView : SnapshotContent, SnapshotTheme, SnapshotActivityWindow,
-    SnapshotProviders, SnapshotSchedulers, SnapshotLottie {
+    SnapshotProviders, SnapshotSchedulers, SnapshotLottie, SnapshotThemeConfiguration {
 
     data class Mock(
         val activityMock: SnapshotActivityWindow.Mock,
@@ -58,10 +58,6 @@ internal interface SnapshotCallView : SnapshotContent, SnapshotTheme, SnapshotAc
         whenever(controllerFactoryMock.callController).thenReturn(callControllerMock)
         Dependencies.controllerFactory = controllerFactoryMock
 
-//        setOnEndListener {
-//            Dependencies.controllerFactory = null
-//        }
-
         return Mock(activityMock, schedulersMock, controllerFactoryMock, callControllerMock)
     }
 
@@ -73,17 +69,13 @@ internal interface SnapshotCallView : SnapshotContent, SnapshotTheme, SnapshotAc
 
     fun setupView(
         callState: CallState? = null,
-        companyName: String? = "SnapshotCall Tests",
         executor: Executor? = Executor(Runnable::run),
         unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme? = null,
         callViewCallback: ((CallContract.View, callState: CallState?) -> Unit)? = null
     ): ViewData {
+        setUnifiedTheme(unifiedTheme)
         val mock = callViewMock()
 
-        unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
-        Dependencies.sdkConfigurationManager.companyName = companyName
-
         val callViewCaptor: KArgumentCaptor<CallContract.View> = argumentCaptor()
 
         val callActivityBinding = CallActivityBinding.inflate(layoutInflater)
@@ -91,19 +83,11 @@ internal interface SnapshotCallView : SnapshotContent, SnapshotTheme, SnapshotAc
         val callView = callActivityBinding.callView
         verify(mock.callControllerMock).setView(callViewCaptor.capture())
 
-        callView.setUiTheme(uiTheme)
-
         callView.executor = executor
 
         val callViewContract = callViewCaptor.lastValue
         callState?.let { callViewContract.emitState(it) }
         callViewCallback?.invoke(callViewContract, callState)
-
-        setOnEndListener {
-            Dependencies.gliaThemeManager.theme = null
-            Dependencies.sdkConfigurationManager.companyName = null
-        }
-
         return ViewData(root, callView, mock)
     }
 
@@ -160,6 +144,7 @@ internal interface SnapshotCallView : SnapshotContent, SnapshotTheme, SnapshotAc
     ) = mock<Audio>().also {
         whenever(it.status).thenReturn(status)
     }
+
     fun video(
         status: Media.Status = Media.Status.PLAYING,
         title: String,
@@ -175,7 +160,7 @@ internal interface SnapshotCallView : SnapshotContent, SnapshotTheme, SnapshotAc
         title: String,
         backgroundColor: Int = Color.BLACK,
         textColor: Int = Color.WHITE
-    ) = object:VideoView(context) {
+    ) = object : VideoView(context) {
         init {
             addView(
                 TextView(context).apply {
@@ -203,14 +188,12 @@ internal interface SnapshotCallView : SnapshotContent, SnapshotTheme, SnapshotAc
 
     fun CallState.initCall(
         companyName: String = "Snapshot tests",
-        queueIds: List<String> = listOf("queueId"),
-        visitorContextAssetId: String = "visitorContextAssetId",
         requestedMediaType: Engagement.MediaType = Engagement.MediaType.AUDIO,
         visitorMediaState: VisitorMediaState? = null,
         showFlipVisitorCameraButton: Boolean = false,
         isOnHold: Boolean = false
     ): CallState = this
-        .initCall(companyName, queueIds, visitorContextAssetId, requestedMediaType)
+        .initCall(requestedMediaType)
         .visitorMediaStateChanged(visitorMediaState)
         .setOnHold(isOnHold)
         .landscapeControlsVisibleChanged(false)
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/AttachmentPopupSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/AttachmentPopupSnapshotTest.kt
index 3c6be35e2..efc52e703 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/AttachmentPopupSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/AttachmentPopupSnapshotTest.kt
@@ -39,9 +39,9 @@ class AttachmentPopupSnapshotTest : SnapshotTest(), SnapshotTheme, SnapshotProvi
     }
 
     @Test
-    fun secureConversationsWithUnifiedTheme() {
+    fun secureMessagingWithUnifiedTheme() {
         setupView(
-            unifiedTheme().secureConversationsWelcomeScreenTheme?.pickMediaTheme
+            unifiedTheme().secureMessagingWelcomeScreenTheme?.pickMediaTheme
         ) {
             snapshot(it)
         }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/ChatViewQuickReplySnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/ChatViewQuickReplySnapshotTest.kt
index bf591c0eb..fed19b320 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/ChatViewQuickReplySnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/ChatViewQuickReplySnapshotTest.kt
@@ -24,16 +24,6 @@ internal class ChatViewQuickReplySnapshotTest : SnapshotTest(), SnapshotChatView
         )
     }
 
-    @Test
-    fun withUiTheme() {
-        snapshot(
-            setupView(
-                chatState = chatState(),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun withGlobalColors() {
         snapshot(
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/ChatViewSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/ChatViewSnapshotTest.kt
index 5fa7eb7df..6f5a800ef 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/ChatViewSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/ChatViewSnapshotTest.kt
@@ -2,7 +2,6 @@ package com.glia.widgets.chat
 
 import com.glia.widgets.R
 import com.glia.widgets.SnapshotTest
-import com.glia.widgets.UiTheme
 import com.glia.widgets.chat.model.ChatState
 import com.glia.widgets.chat.model.OperatorStatusItem
 import com.glia.widgets.core.fileupload.model.LocalAttachment
@@ -25,10 +24,7 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
 
     // MARK: Attachment list
 
-    private fun attachmentListView(
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme? = null
-    ) = setupView(
+    private fun attachmentListView(unifiedTheme: UnifiedTheme? = null) = setupView(
         chatState = ChatState()
             .changeVisibility(true)
             .engagementStarted()
@@ -60,8 +56,7 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
             R.drawable.test_launcher
         ),
         message = mediumLengthTexts()[0],
-        unifiedTheme = unifiedTheme,
-        uiTheme = uiTheme
+        unifiedTheme = unifiedTheme
     )
 
     @Test
@@ -71,15 +66,6 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
         )
     }
 
-    @Test
-    fun attachmentListWithUiTheme() {
-        snapshot(
-            attachmentListView(
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun attachmentListWithGlobalColors() {
         snapshot(
@@ -109,10 +95,7 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
 
     // MARK: Failed attachment list
 
-    private fun failedAttachmentListView(
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme? = null
-    ) = setupView(
+    private fun failedAttachmentListView(unifiedTheme: UnifiedTheme? = null) = setupView(
         chatState = ChatState()
             .changeVisibility(true)
             .engagementStarted()
@@ -135,8 +118,7 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
             R.drawable.test_launcher
         ),
         message = mediumLengthTexts()[1],
-        unifiedTheme = unifiedTheme,
-        uiTheme = uiTheme
+        unifiedTheme = unifiedTheme
     )
 
     @Test
@@ -146,15 +128,6 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
         )
     }
 
-    @Test
-    fun failedAttachmentListWithUiTheme() {
-        snapshot(
-            failedAttachmentListView(
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun failedAttachmentListWithGlobalColors() {
         snapshot(
@@ -184,16 +157,13 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
 
     // MARK: Secure messaging
 
-    private fun secureMessagingView(
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme? = null
-    ) = setupView(
+    private fun secureMessagingView(unifiedTheme: UnifiedTheme? = null, isUnavailable: Boolean = false) = setupView(
         chatState = ChatState()
-            .changeVisibility(true)
-            .setSecureMessagingState(),
+            .initChat()
+            .setSecureMessagingState()
+            .let { if (isUnavailable) it.setSecureMessagingUnavailable() else it },
         message = mediumLengthTexts()[2],
-        unifiedTheme = unifiedTheme,
-        uiTheme = uiTheme
+        unifiedTheme = unifiedTheme
     )
 
     @Test
@@ -204,53 +174,67 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
     }
 
     @Test
-    fun secureMessagingWithUiTheme() {
+    fun secureMessagingWithGlobalColors() {
         snapshot(
             secureMessagingView(
-                uiTheme = uiTheme()
+                unifiedTheme = unifiedThemeWithGlobalColors()
             ).root
         )
     }
 
     @Test
-    fun secureMessagingWithGlobalColors() {
+    fun secureMessagingWithUnifiedTheme() {
         snapshot(
             secureMessagingView(
-                unifiedTheme = unifiedThemeWithGlobalColors()
+                unifiedTheme = unifiedTheme()
             ).root
         )
     }
 
     @Test
-    fun secureMessagingWithUnifiedTheme() {
+    fun secureMessagingWithUnifiedThemeWithoutChat() {
         snapshot(
             secureMessagingView(
-                unifiedTheme = unifiedTheme()
+                unifiedTheme = unifiedThemeWithoutChat()
             ).root
         )
     }
 
     @Test
-    fun secureMessagingWithUnifiedThemeWithoutChat() {
+    fun secureMessagingUnavailable() {
+        snapshot(
+            secureMessagingView(isUnavailable = true).root
+        )
+    }
+
+    @Test
+    fun secureMessagingUnavailableWithGlobalColors() {
         snapshot(
             secureMessagingView(
-                unifiedTheme = unifiedThemeWithoutChat()
+                unifiedTheme = unifiedThemeWithGlobalColors(),
+                isUnavailable = true
+            ).root
+        )
+    }
+
+    @Test
+    fun secureMessagingUnavailableWithUnifiedTheme() {
+        snapshot(
+            secureMessagingView(
+                unifiedTheme = unifiedTheme(),
+                isUnavailable = true
             ).root
         )
     }
 
     // MARK: Transferring
 
-    private fun transferringView(
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme? = null
-    ) = setupView(
+    private fun transferringView(unifiedTheme: UnifiedTheme? = null) = setupView(
         chatState = ChatState()
             .changeVisibility(true)
             .transferring(),
         chatItems = listOf(OperatorStatusItem.Transferring),
-        unifiedTheme = unifiedTheme,
-        uiTheme = uiTheme
+        unifiedTheme = unifiedTheme
     )
 
     @Test
@@ -260,15 +244,6 @@ internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView, Snapshot
         )
     }
 
-    @Test
-    fun transferringWithUiTheme() {
-        snapshot(
-            transferringView(
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun transferringWithGlobalColors() {
         snapshot(
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/VisitorFileAttachmentChatItemsSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/VisitorFileAttachmentChatItemsSnapshotTest.kt
index 75412c993..3415fb7e7 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/VisitorFileAttachmentChatItemsSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/VisitorFileAttachmentChatItemsSnapshotTest.kt
@@ -24,17 +24,6 @@ internal class VisitorFileAttachmentChatItemsSnapshotTest : SnapshotTest(), Snap
         )
     }
 
-    @Test
-    fun withoutLabelsWithUiTheme() {
-        snapshot(
-            setupView(
-                chatState = chatState(),
-                chatItems = listOf(visitorAttachmentItemFile()),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun withoutLabelsWithGlobalColors() {
         snapshot(
@@ -80,17 +69,6 @@ internal class VisitorFileAttachmentChatItemsSnapshotTest : SnapshotTest(), Snap
         )
     }
 
-    @Test
-    fun deliveredLabelWithUiTheme() {
-        snapshot(
-            setupView(
-                chatState = chatState(),
-                chatItems = listOf(visitorAttachmentItemFile(showDelivered = true)),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun deliveredLabelWithGlobalColors() {
         snapshot(
@@ -136,17 +114,6 @@ internal class VisitorFileAttachmentChatItemsSnapshotTest : SnapshotTest(), Snap
         )
     }
 
-    @Test
-    fun errorLabelWithUiTheme() {
-        snapshot(
-            setupView(
-                chatState = chatState(),
-                chatItems = listOf(visitorAttachmentItemFile(showError = true)),
-                uiTheme = uiTheme()
-            ).root
-        )
-    }
-
     @Test
     fun errorLabelWithGlobalColors() {
         snapshot(
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaGalleryItemViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaGalleryItemViewHolderSnapshotTest.kt
index 323fdbfe4..d69901b6a 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaGalleryItemViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaGalleryItemViewHolderSnapshotTest.kt
@@ -37,16 +37,6 @@ class GvaGalleryItemViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snapsh
         )
     }
 
-    @Test
-    fun allViewsWithUiTheme() {
-        snapshot(
-            setupView(
-                allViewsCard(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun allViewsWithGlobalColors() {
         snapshot(
@@ -92,16 +82,6 @@ class GvaGalleryItemViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snapsh
         )
     }
 
-    @Test
-    fun onlyMandatoryWithUiTheme() {
-        snapshot(
-            setupView(
-                onlyMandatoryCard(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun onlyMandatoryWithGlobalColors() {
         snapshot(
@@ -147,16 +127,6 @@ class GvaGalleryItemViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snapsh
         )
     }
 
-    @Test
-    fun longTitleWithUiTheme() {
-        snapshot(
-            setupView(
-                longTitleCard(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun longTitleWithGlobalColors() {
         snapshot(
@@ -204,17 +174,6 @@ class GvaGalleryItemViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snapsh
         )
     }
 
-    @Test
-    fun longSubtitleWithUiTheme() {
-        snapshot(
-            setupView(
-                longSubtitleCard(),
-                uiTheme = uiTheme(),
-                height = 740
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun longSubtitleWithGlobalColors() {
         snapshot(
@@ -265,18 +224,6 @@ class GvaGalleryItemViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snapsh
         snapshot(itemView)
     }
 
-    @Test
-    fun longButtonsTitleWithUiTheme() {
-        val itemView = setupView(
-            longButtonsTitleCard(),
-            uiTheme = uiTheme()
-
-        ).viewHolder.itemView
-        measureHeight(itemView)
-
-        snapshot(itemView)
-    }
-
     @Test
     fun longButtonsTitleWithGlobalColors() {
         val itemView = setupView(
@@ -321,13 +268,12 @@ class GvaGalleryItemViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snapsh
         card: GvaGalleryCard,
         @DrawableRes imageRes: Int = R.drawable.test_banner,
         unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme(),
         height: Int? = null
     ): ViewData {
         picassoMock(imageResources = listOf(imageRes))
 
         val binding = ChatGvaGalleryItemBinding.inflate(layoutInflater)
-        val viewHolder = GvaGalleryItemViewHolder(binding, {}, uiTheme, unifiedTheme)
+        val viewHolder = GvaGalleryItemViewHolder(binding, {}, UiTheme(), unifiedTheme)
 
         viewHolder.bind(card, 1, 4)
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaGalleryViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaGalleryViewHolderSnapshotTest.kt
index a1e52b50b..28c708238 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaGalleryViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaGalleryViewHolderSnapshotTest.kt
@@ -42,18 +42,6 @@ class GvaGalleryViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, SnapshotPr
         )
     }
 
-    @Test
-    fun itemsWithoutChatHeadWithUiTheme() {
-        snapshot(
-            setupView(
-                GvaGalleryCards(
-                    galleryCards = galleryCardList()
-                ),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun itemsWithoutChatHeadWithGlobalColors() {
         snapshot(
@@ -104,19 +92,6 @@ class GvaGalleryViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, SnapshotPr
         )
     }
 
-    @Test
-    fun itemsWithChatHeadWithUiTheme() {
-        snapshot(
-            setupView(
-                GvaGalleryCards(
-                    galleryCards = galleryCardList(),
-                    showChatHead = true
-                ),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun itemsWithChatHeadWithGlobalColors() {
         snapshot(
@@ -160,18 +135,14 @@ class GvaGalleryViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, SnapshotPr
 
     private data class ViewData(val binding: ChatGvaGalleryLayoutBinding, val viewHolder: GvaGalleryViewHolder)
 
-    private fun setupView(
-        galleryCards: GvaGalleryCards,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
-    ): ViewData {
+    private fun setupView(galleryCards: GvaGalleryCards, unifiedTheme: UnifiedTheme? = null): ViewData {
         localeProviderMock()
 
-        val heightManager = ChatItemHeightManager(uiTheme, layoutInflater, resources, unifiedTheme)
+        val heightManager = ChatItemHeightManager(UiTheme(), layoutInflater, resources, unifiedTheme)
         heightManager.measureHeight(listOf(galleryCards))
 
         val binding = ChatGvaGalleryLayoutBinding.inflate(layoutInflater)
-        val viewHolder = GvaGalleryViewHolder(binding, {}, uiTheme, unifiedTheme)
+        val viewHolder = GvaGalleryViewHolder(binding, {}, UiTheme(), unifiedTheme)
 
         viewHolder.bind(galleryCards, heightManager.getMeasuredHeight(galleryCards))
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaPersistentButtonsViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaPersistentButtonsViewHolderSnapshotTest.kt
index 740a32863..fc77be206 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaPersistentButtonsViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaPersistentButtonsViewHolderSnapshotTest.kt
@@ -30,16 +30,6 @@ class GvaPersistentButtonsViewHolderSnapshotTest : SnapshotTest(), SnapshotGva,
         )
     }
 
-    @Test
-    fun withoutChatHeadWithUiTheme() {
-        snapshot(
-            setupView(
-                gvaPersistentButtons(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun withoutChatHeadWithGlobalColors() {
         snapshot(
@@ -83,18 +73,6 @@ class GvaPersistentButtonsViewHolderSnapshotTest : SnapshotTest(), SnapshotGva,
         )
     }
 
-    @Test
-    fun withChatHeadWithUiTheme() {
-        snapshot(
-            setupView(
-                gvaPersistentButtons(
-                    showChatHead = true
-                ),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun withChatHeadWithGlobalColors() {
         snapshot(
@@ -141,8 +119,7 @@ class GvaPersistentButtonsViewHolderSnapshotTest : SnapshotTest(), SnapshotGva,
 
     private fun setupView(
         card: GvaPersistentButtons,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
+        unifiedTheme: UnifiedTheme? = null
     ): ViewData {
         localeProviderMock()
 
@@ -156,7 +133,7 @@ class GvaPersistentButtonsViewHolderSnapshotTest : SnapshotTest(), SnapshotGva,
             chatOperatorMessageLayoutBinding,
             gvaPersistentButtonsContentBinding,
             {},
-            uiTheme,
+            UiTheme(),
             unifiedTheme
         )
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaResponseTextViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaResponseTextViewHolderSnapshotTest.kt
index c52eb0c90..873d79e73 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaResponseTextViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/GvaResponseTextViewHolderSnapshotTest.kt
@@ -28,16 +28,6 @@ class GvaResponseTextViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snaps
         )
     }
 
-    @Test
-    fun withoutChatHeadWithUiTheme() {
-        snapshot(
-            setupView(
-                gvaResponseText(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun withoutChatHeadWithGlobalColors() {
         snapshot(
@@ -71,18 +61,6 @@ class GvaResponseTextViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snaps
         )
     }
 
-    @Test
-    fun withChatHeadWithUiTheme() {
-        snapshot(
-            setupView(
-                gvaResponseText(
-                    showChatHead = true
-                ),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun withChatHeadWithGlobalColors() {
         snapshot(
@@ -115,11 +93,7 @@ class GvaResponseTextViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snaps
         val viewHolder: GvaResponseTextViewHolder
     )
 
-    private fun setupView(
-        card: GvaResponseText,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
-    ): ViewData {
+    private fun setupView(card: GvaResponseText, unifiedTheme: UnifiedTheme? = null): ViewData {
         localeProviderMock()
 
         val chatOperatorMessageLayoutBinding = ChatOperatorMessageLayoutBinding.inflate(layoutInflater)
@@ -131,7 +105,7 @@ class GvaResponseTextViewHolderSnapshotTest : SnapshotTest(), SnapshotGva, Snaps
         val viewHolder = GvaResponseTextViewHolder(
             chatOperatorMessageLayoutBinding,
             gvaPersistentButtonsContentBinding,
-            uiTheme,
+            UiTheme(),
             unifiedTheme
         )
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/MediaUpgradeStartedViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/MediaUpgradeStartedViewHolderSnapshotTest.kt
index 5f49891e4..e33ef8b4c 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/MediaUpgradeStartedViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/MediaUpgradeStartedViewHolderSnapshotTest.kt
@@ -23,16 +23,6 @@ class MediaUpgradeStartedViewHolderSnapshotTest : SnapshotTest(), SnapshotChatSc
         )
     }
 
-    @Test
-    fun audioUiTheme() {
-        snapshot(
-            setupView(
-                MediaUpgradeStartedTimerItem.Audio(),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun audioWithGlobalColors() {
         snapshot(
@@ -72,16 +62,6 @@ class MediaUpgradeStartedViewHolderSnapshotTest : SnapshotTest(), SnapshotChatSc
         )
     }
 
-    @Test
-    fun videoUiTheme() {
-        snapshot(
-            setupView(
-                MediaUpgradeStartedTimerItem.Video(),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun videoWithGlobalColors() {
         snapshot(
@@ -114,11 +94,7 @@ class MediaUpgradeStartedViewHolderSnapshotTest : SnapshotTest(), SnapshotChatSc
 
     // MARK: utils for tests
 
-    private fun setupView(
-        item: MediaUpgradeStartedTimerItem,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme(iconChatVideoUpgrade = R.drawable.ic_baseline_videocam)
-    ): MediaUpgradeStartedViewHolder {
+    private fun setupView(item: MediaUpgradeStartedTimerItem, unifiedTheme: UnifiedTheme? = null): MediaUpgradeStartedViewHolder {
         localeProviderMock()
         unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
 
@@ -128,7 +104,7 @@ class MediaUpgradeStartedViewHolderSnapshotTest : SnapshotTest(), SnapshotChatSc
 
         return MediaUpgradeStartedViewHolder(
             ChatMediaUpgradeLayoutBinding.inflate(layoutInflater),
-            uiTheme
+            UiTheme(iconChatVideoUpgrade = R.drawable.ic_baseline_videocam)
         ).also { viewHolder ->
             viewHolder.bind(item)
         }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/NewMessagesDividerViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/NewMessagesDividerViewHolderSnapshotTest.kt
index 3eb0098b9..ba4292f6d 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/NewMessagesDividerViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/NewMessagesDividerViewHolderSnapshotTest.kt
@@ -23,15 +23,6 @@ class NewMessagesDividerViewHolderSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun withUiTheme() {
-        snapshot(
-            setupView(
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun withGlobalColors() {
         snapshot(
@@ -61,10 +52,7 @@ class NewMessagesDividerViewHolderSnapshotTest : SnapshotTest(
 
     // MARK: utils for tests
 
-    private fun setupView(
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
-    ): NewMessagesDividerViewHolder {
+    private fun setupView(unifiedTheme: UnifiedTheme? = null): NewMessagesDividerViewHolder {
         localeProviderMock()
         unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
 
@@ -74,7 +62,7 @@ class NewMessagesDividerViewHolderSnapshotTest : SnapshotTest(
 
         return NewMessagesDividerViewHolder(
             ChatNewMessagesDividerLayoutBinding.inflate(layoutInflater),
-            uiTheme
+            UiTheme()
         )
     }
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorFileAttachmentViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorFileAttachmentViewHolderSnapshotTest.kt
index 96a847378..8c0d9a709 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorFileAttachmentViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorFileAttachmentViewHolderSnapshotTest.kt
@@ -32,16 +32,6 @@ class OperatorFileAttachmentViewHolderSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun withoutHeaderWithUiTheme() {
-        snapshot(
-            setupView(
-                operatorAttachmentItemFile(),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun withoutHeaderWithGlobalColors() {
         snapshot(
@@ -83,16 +73,6 @@ class OperatorFileAttachmentViewHolderSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun withHeaderWithUiTheme() {
-        snapshot(
-            setupView(
-                operatorAttachmentItemFile(showChatHead = true),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun withHeaderWithGlobalColors() {
         snapshot(
@@ -139,16 +119,6 @@ class OperatorFileAttachmentViewHolderSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun operatorImageHeaderWithUiTheme() {
-        snapshot(
-            setupView(
-                operatorImageHeaderItem(),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun operatorImageHeaderWithGlobalColors() {
         snapshot(
@@ -181,11 +151,7 @@ class OperatorFileAttachmentViewHolderSnapshotTest : SnapshotTest(
 
     // MARK: utils for tests
 
-    private fun setupView(
-        item: OperatorAttachmentItem.File,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
-    ): OperatorFileAttachmentViewHolder {
+    private fun setupView(item: OperatorAttachmentItem.File, unifiedTheme: UnifiedTheme? = null): OperatorFileAttachmentViewHolder {
         localeProviderMock()
         picassoMock(listOf(R.drawable.test_launcher2))
         unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
@@ -196,7 +162,7 @@ class OperatorFileAttachmentViewHolderSnapshotTest : SnapshotTest(
 
         return OperatorFileAttachmentViewHolder(
             ChatAttachmentOperatorFileLayoutBinding.inflate(layoutInflater),
-            uiTheme,
+            UiTheme(),
             object : ChatAdapter.OnFileItemClickListener {
                 override fun onFileOpenClick(file: AttachmentFile) {}
                 override fun onFileDownloadClick(file: AttachmentFile) {}
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorImageAttachmentViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorImageAttachmentViewHolderSnapshotTest.kt
index 434acf977..ec3f8e4fe 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorImageAttachmentViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorImageAttachmentViewHolderSnapshotTest.kt
@@ -34,16 +34,6 @@ class OperatorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCh
         )
     }
 
-    @Test
-    fun withoutHeaderWithUiTheme() {
-        snapshot(
-            setupView(
-                operatorAttachmentItemImage(),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun withoutHeaderWithGlobalColors() {
         snapshot(
@@ -85,16 +75,6 @@ class OperatorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCh
         )
     }
 
-    @Test
-    fun withHeaderWithUiTheme() {
-        snapshot(
-            setupView(
-                operatorAttachmentItemImage(showChatHead = true),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun withHeaderWithGlobalColors() {
         snapshot(
@@ -141,16 +121,6 @@ class OperatorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCh
         )
     }
 
-    @Test
-    fun operatorImageHeaderWithUiTheme() {
-        snapshot(
-            setupView(
-                operatorImageHeaderItem(),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun operatorImageHeaderWithGlobalColors() {
         snapshot(
@@ -183,11 +153,7 @@ class OperatorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCh
 
     // MARK: utils for tests
 
-    private fun setupView(
-        item: OperatorAttachmentItem.Image,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
-    ): OperatorImageAttachmentViewHolder {
+    private fun setupView(item: OperatorAttachmentItem.Image, unifiedTheme: UnifiedTheme? = null): OperatorImageAttachmentViewHolder {
         unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
 
         picassoMock(listOf(R.drawable.test_launcher2))
@@ -199,7 +165,7 @@ class OperatorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCh
 
         val viewHolder = OperatorImageAttachmentViewHolder(
             binding, imageFileMock.getImageFileFromCacheUseCaseMock, imageFileMock.getImageFileFromDownloadsUseCaseMock,
-            imageFileMock.getImageFileFromNetworkUseCaseMock, schedulersMock.schedulers, uiTheme, object : ChatAdapter.OnImageItemClickListener {
+            imageFileMock.getImageFileFromNetworkUseCaseMock, schedulersMock.schedulers, UiTheme(), object : ChatAdapter.OnImageItemClickListener {
                 override fun onImageItemClick(item: AttachmentFile, view: View) {}
                 override fun onLocalImageItemClick(attachment: LocalAttachment, view: View) {}
             }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorMessageViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorMessageViewHolderSnapshotTest.kt
index c8a71a6cc..9b8fc82fe 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorMessageViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorMessageViewHolderSnapshotTest.kt
@@ -28,16 +28,6 @@ class OperatorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen
         )
     }
 
-    @Test
-    fun plainTextWithUiTheme() {
-        snapshot(
-            setupView(
-                operatorMessagePlainText(content = mediumLengthTexts()[0]),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun plainTextWithGlobalColors() {
         snapshot(
@@ -82,16 +72,6 @@ class OperatorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen
         )
     }
 
-    @Test
-    fun plainTextWithHeaderWithUiTheme() {
-        snapshot(
-            setupView(
-                plainTextWithHeaderItem(),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun plainTextWithHeaderWithGlobalColors() {
         snapshot(
@@ -138,16 +118,6 @@ class OperatorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen
         )
     }
 
-    @Test
-    fun responseCardWithUiTheme() {
-        snapshot(
-            setupView(
-                responseCardItem(),
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun responseCardWithGlobalColors() {
         snapshot(
@@ -180,11 +150,7 @@ class OperatorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen
 
     // MARK: utils for tests
 
-    private fun setupView(
-        item: OperatorMessageItem,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
-    ): OperatorMessageViewHolder {
+    private fun setupView(item: OperatorMessageItem, unifiedTheme: UnifiedTheme? = null): OperatorMessageViewHolder {
         localeProviderMock()
         picassoMock(listOf(R.drawable.test_banner, R.drawable.test_launcher2))
         unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
@@ -195,7 +161,7 @@ class OperatorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen
 
         return OperatorMessageViewHolder(
             ChatOperatorMessageLayoutBinding.inflate(layoutInflater),
-            uiTheme
+            UiTheme()
         ).also { viewHolder ->
             viewHolder.bind(item) { _, _ -> }
         }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolderSnapshotTest.kt
index 5088cd390..9d69d3942 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/OperatorStatusViewHolderSnapshotTest.kt
@@ -20,7 +20,6 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
     // MARK: Connected
 
     private fun connectedItem() = OperatorStatusItem.Connected(
-        "Snapshot Company",
         "Screen Shot",
         "https://test.url"
     )
@@ -34,16 +33,6 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun connectedWithUiTheme() {
-        snapshot(
-            setupView(
-                connectedItem(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun connectedWithGlobalColors() {
         snapshot(
@@ -88,9 +77,7 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
 
     // MARK: In Queue
 
-    private fun inQueueItem() = OperatorStatusItem.InQueue(
-        "Snapshot Company"
-    )
+    private fun inQueueItem() = OperatorStatusItem.InQueue
 
     @Test
     fun inQueue() {
@@ -101,16 +88,6 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun inQueueWithUiTheme() {
-        snapshot(
-            setupView(
-                inQueueItem(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun inQueueWithGlobalColors() {
         snapshot(
@@ -144,7 +121,6 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
     // MARK: In Queue
 
     private fun joinedItem() = OperatorStatusItem.Joined(
-        "Snapshot Company",
         "Screen Shot",
         null
     )
@@ -158,16 +134,6 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun joinedWithUiTheme() {
-        snapshot(
-            setupView(
-                joinedItem(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun joinedWithGlobalColors() {
         snapshot(
@@ -209,16 +175,6 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun transferringWithUiTheme() {
-        snapshot(
-            setupView(
-                OperatorStatusItem.Transferring,
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun transferringWithGlobalColors() {
         snapshot(
@@ -256,8 +212,7 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
     private fun setupView(
         item: OperatorStatusItem,
         imageLoadError: Boolean = false,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
+        unifiedTheme: UnifiedTheme? = null
     ): ViewData {
         lottieMock()
         localeProviderMock()
@@ -266,7 +221,7 @@ class OperatorStatusViewHolderSnapshotTest : SnapshotTest(
         unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
 
         val binding = ChatOperatorStatusLayoutBinding.inflate(layoutInflater)
-        val viewHolder = OperatorStatusViewHolder(binding, uiTheme)
+        val viewHolder = OperatorStatusViewHolder(binding, UiTheme())
 
         viewHolder.bind(item)
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/SystemMessageViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/SystemMessageViewHolderSnapshotTest.kt
index fae2d881e..0ec4eb6ee 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/SystemMessageViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/SystemMessageViewHolderSnapshotTest.kt
@@ -21,15 +21,6 @@ class SystemMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen,
         )
     }
 
-    @Test
-    fun withUiTheme() {
-        snapshot(
-            setupView(
-                uiTheme = uiTheme()
-            ).itemView
-        )
-    }
-
     @Test
     fun withGlobalColors() {
         snapshot(
@@ -61,8 +52,7 @@ class SystemMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen,
 
     private fun setupView(
         message: String = mediumLengthTexts().joinToString(separator = " "),
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
+        unifiedTheme: UnifiedTheme? = null
     ): SystemMessageViewHolder {
         localeProviderMock()
         unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
@@ -73,7 +63,7 @@ class SystemMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen,
 
         return SystemMessageViewHolder(
             ChatReceiveMessageContentBinding.inflate(layoutInflater),
-            uiTheme
+            UiTheme()
         ).also { viewHolder ->
             viewHolder.bind(message)
         }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/VisitorImageAttachmentViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/VisitorImageAttachmentViewHolderSnapshotTest.kt
index 540375d0e..e9ae9d194 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/VisitorImageAttachmentViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/VisitorImageAttachmentViewHolderSnapshotTest.kt
@@ -32,16 +32,6 @@ class VisitorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCha
         )
     }
 
-    @Test
-    fun withoutLabelsWithUiTheme() {
-        snapshot(
-            setupView(
-                visitorAttachmentItemImage(),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun withoutLabelsWithGlobalColors() {
         snapshot(
@@ -83,16 +73,6 @@ class VisitorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCha
         )
     }
 
-    @Test
-    fun deliveredLabelWithUiTheme() {
-        snapshot(
-            setupView(
-                visitorAttachmentItemImage(showDelivered = true),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun deliveredLabelWithGlobalColors() {
         snapshot(
@@ -134,16 +114,6 @@ class VisitorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCha
         )
     }
 
-    @Test
-    fun errorLabelWithUiTheme() {
-        snapshot(
-            setupView(
-                visitorAttachmentItemImage(showError = true),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun errorLabelWithGlobalColors() {
         snapshot(
@@ -180,8 +150,7 @@ class VisitorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCha
 
     private fun setupView(
         item: VisitorAttachmentItem.RemoteImage,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
+        unifiedTheme: UnifiedTheme? = null
     ): ViewData {
         val imageFileMock = getImageFileMock(R.drawable.test_banner)
         val schedulersMock = schedulersMock()
@@ -194,7 +163,7 @@ class VisitorImageAttachmentViewHolderSnapshotTest : SnapshotTest(), SnapshotCha
             imageFileMock.getImageFileFromDownloadsUseCaseMock,
             imageFileMock.getImageFileFromNetworkUseCaseMock,
             schedulersMock.schedulers,
-            uiTheme,
+            UiTheme(),
             { },
             object : ChatAdapter.OnImageItemClickListener {
                 override fun onImageItemClick(item: AttachmentFile, view: View) {}
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/VisitorMessageViewHolderSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/VisitorMessageViewHolderSnapshotTest.kt
index 6580346d0..5648bcc9e 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/VisitorMessageViewHolderSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/chat/adapter/holder/VisitorMessageViewHolderSnapshotTest.kt
@@ -23,16 +23,6 @@ class VisitorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen,
         )
     }
 
-    @Test
-    fun withoutLabelsWithUiTheme() {
-        snapshot(
-            setupView(
-                VisitorMessageItem("Visitor message text", "ID"),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun withoutLabelsWithGlobalColors() {
         snapshot(
@@ -74,16 +64,6 @@ class VisitorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen,
         )
     }
 
-    @Test
-    fun deliveredLabelWithUiTheme() {
-        snapshot(
-            setupView(
-                VisitorMessageItem("Visitor message text", "ID", status = VisitorItemStatus.DELIVERED),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun deliveredLabelWithGlobalColors() {
         snapshot(
@@ -125,16 +105,6 @@ class VisitorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen,
         )
     }
 
-    @Test
-    fun errorLabelWithUiTheme() {
-        snapshot(
-            setupView(
-                VisitorMessageItem("Visitor message text", "ID", status = VisitorItemStatus.ERROR_INDICATOR),
-                uiTheme = uiTheme()
-            ).viewHolder.itemView
-        )
-    }
-
     @Test
     fun errorLabelWithGlobalColors() {
         snapshot(
@@ -169,13 +139,9 @@ class VisitorMessageViewHolderSnapshotTest : SnapshotTest(), SnapshotChatScreen,
 
     private data class ViewData(val binding: ChatVisitorMessageLayoutBinding, val viewHolder: VisitorMessageViewHolder)
 
-    private fun setupView(
-        item: VisitorMessageItem,
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme()
-    ): ViewData {
+    private fun setupView(item: VisitorMessageItem, unifiedTheme: UnifiedTheme? = null): ViewData {
         val binding = ChatVisitorMessageLayoutBinding.inflate(layoutInflater)
-        val viewHolder = VisitorMessageViewHolder(binding, {}, uiTheme, unifiedTheme, localeProviderMock())
+        val viewHolder = VisitorMessageViewHolder(binding, {}, UiTheme(), unifiedTheme, localeProviderMock())
 
         viewHolder.bind(item)
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/AlertDialogTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/AlertDialogTest.kt
index e460fabbe..fd7a62776 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/AlertDialogTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/AlertDialogTest.kt
@@ -25,15 +25,9 @@ internal class AlertDialogTest : SnapshotTest(), SnapshotDialog {
         snapshot(view)
     }
 
-    @Test
-    fun withUiTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), dialogType = DialogType.AlertDialog(payloadWithoutButton))
-        snapshot(view)
-    }
-
     @Test
     fun withUnifiedTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), unifiedTheme(), dialogType = DialogType.AlertDialog(payloadWithoutButton))
+        val view = inflateView(context = context, unifiedTheme(), dialogType = DialogType.AlertDialog(payloadWithoutButton))
         snapshot(view)
     }
 
@@ -41,7 +35,6 @@ internal class AlertDialogTest : SnapshotTest(), SnapshotDialog {
     fun withGlobalColors() {
         val view = inflateView(
             context = context,
-            uiTheme = uiTheme(),
             unifiedThemeWithGlobalColors(),
             dialogType = DialogType.AlertDialog(payloadWithoutButton)
         )
@@ -54,16 +47,10 @@ internal class AlertDialogTest : SnapshotTest(), SnapshotDialog {
         snapshot(view)
     }
 
-    @Test
-    fun withUiThemeAndButton() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), dialogType = DialogType.AlertDialog(payloadWithButton))
-        snapshot(view)
-    }
-
     @Test
     fun withUnifiedThemeAndButton() {
         val view =
-            inflateView(context = context, uiTheme = uiTheme(), unifiedTheme = unifiedTheme(), dialogType = DialogType.AlertDialog(payloadWithButton))
+            inflateView(context = context, unifiedTheme = unifiedTheme(), dialogType = DialogType.AlertDialog(payloadWithButton))
         snapshot(view)
     }
 
@@ -71,7 +58,6 @@ internal class AlertDialogTest : SnapshotTest(), SnapshotDialog {
     fun withGlobalColorsAndButton() {
         val view = inflateView(
             context = context,
-            uiTheme = uiTheme(),
             unifiedTheme = unifiedThemeWithGlobalColors(),
             dialogType = DialogType.AlertDialog(payloadWithButton)
         )
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ConfirmationDialogTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ConfirmationDialogTest.kt
index 251a4b735..fb990b350 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ConfirmationDialogTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ConfirmationDialogTest.kt
@@ -44,20 +44,10 @@ class ConfirmationDialogTest : SnapshotTest(
         snapshot(view)
     }
 
-    @Test
-    fun withUiTheme() {
-        val view = inflateView(context = context,
-            uiTheme = uiTheme(),
-            dialogType = dialogType()
-        )
-        snapshot(view)
-    }
-
     @Test
     fun withUnifiedTheme() {
         val view = inflateView(
             context = context,
-            uiTheme = uiTheme(whiteLabel = false),
             unifiedTheme = unifiedTheme(),
             dialogType = dialogType()
         )
@@ -68,7 +58,6 @@ class ConfirmationDialogTest : SnapshotTest(
     fun withUnifiedThemeWithoutDialogLinkButton() {
         val view = inflateView(
             context = context,
-            uiTheme = uiTheme(whiteLabel = false),
             unifiedTheme = unifiedThemeWithoutDialogLinkButton(),
             dialogType = dialogType()
         )
@@ -79,7 +68,6 @@ class ConfirmationDialogTest : SnapshotTest(
     fun withGlobalColors() {
         val view = inflateView(
             context = context,
-            uiTheme = uiTheme(),
             unifiedTheme = unifiedThemeWithGlobalColors(),
             dialogType = dialogType()
         )
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/OperatorEndedEngagementTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/OperatorEndedEngagementTest.kt
index a4c5c42fc..1a2bde138 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/OperatorEndedEngagementTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/OperatorEndedEngagementTest.kt
@@ -23,21 +23,15 @@ internal class OperatorEndedEngagementTest : SnapshotTest(), SnapshotDialog {
         snapshot(view)
     }
 
-    @Test
-    fun withUiTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), dialogType = dialogType)
-        snapshot(view)
-    }
-
     @Test
     fun withUnifiedTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), unifiedTheme(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedTheme(), dialogType = dialogType)
         snapshot(view)
     }
 
     @Test
     fun withGlobalColors() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), unifiedThemeWithGlobalColors(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedThemeWithGlobalColors(), dialogType = dialogType)
         snapshot(view)
     }
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/OptionDialogTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/OptionDialogTest.kt
index 96078cd93..8bb2c8fb4 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/OptionDialogTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/OptionDialogTest.kt
@@ -29,21 +29,15 @@ class OptionDialogTest : SnapshotTest(
         snapshot(view)
     }
 
-    @Test
-    fun withUiTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), dialogType = dialogType)
-        snapshot(view)
-    }
-
     @Test
     fun withUnifiedTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(whiteLabel = false), unifiedTheme(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedTheme(), dialogType = dialogType)
         snapshot(view)
     }
 
     @Test
     fun withGlobalColors() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), unifiedThemeWithGlobalColors(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedThemeWithGlobalColors(), dialogType = dialogType)
         snapshot(view)
     }
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ReversedOptionDialogTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ReversedOptionDialogTest.kt
index d777441a7..ce90a4fc1 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ReversedOptionDialogTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ReversedOptionDialogTest.kt
@@ -29,21 +29,15 @@ class ReversedOptionDialogTest : SnapshotTest(
         snapshot(view)
     }
 
-    @Test
-    fun withUiTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), dialogType = dialogType)
-        snapshot(view)
-    }
-
     @Test
     fun withUnifiedTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(whiteLabel = false), unifiedTheme(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedTheme(), dialogType = dialogType)
         snapshot(view)
     }
 
     @Test
     fun withGlobalColors() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), unifiedThemeWithGlobalColors(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedThemeWithGlobalColors(), dialogType = dialogType)
         snapshot(view)
     }
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ScreenSharingDialogTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ScreenSharingDialogTest.kt
index 563e0638d..8dfc37e8b 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ScreenSharingDialogTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/ScreenSharingDialogTest.kt
@@ -29,21 +29,15 @@ class ScreenSharingDialogTest : SnapshotTest(
         snapshot(view)
     }
 
-    @Test
-    fun withUiTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), dialogType = dialogType)
-        snapshot(view)
-    }
-
     @Test
     fun withUnifiedTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(whiteLabel = false), unifiedTheme(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedTheme(), dialogType = dialogType)
         snapshot(view)
     }
 
     @Test
     fun withGlobalColors() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), unifiedThemeWithGlobalColors(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedThemeWithGlobalColors(), dialogType = dialogType)
         snapshot(view)
     }
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/UpgradeDialogTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/UpgradeDialogTest.kt
index 871516aca..7b7b276df 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/UpgradeDialogTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/UpgradeDialogTest.kt
@@ -29,21 +29,15 @@ class UpgradeDialogTest : SnapshotTest(
         snapshot(view)
     }
 
-    @Test
-    fun withUiTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), dialogType = dialogType)
-        snapshot(view)
-    }
-
     @Test
     fun withUnifiedTheme() {
-        val view = inflateView(context = context, uiTheme = uiTheme(whiteLabel = false), unifiedTheme(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedTheme(), dialogType = dialogType)
         snapshot(view)
     }
 
     @Test
     fun withGlobalColors() {
-        val view = inflateView(context = context, uiTheme = uiTheme(), unifiedThemeWithGlobalColors(), dialogType = dialogType)
+        val view = inflateView(context = context, unifiedThemeWithGlobalColors(), dialogType = dialogType)
         snapshot(view)
     }
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/VisitorCodeDialogTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/VisitorCodeDialogTest.kt
index 79c9041e8..a1e90ee56 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/VisitorCodeDialogTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/dialog/VisitorCodeDialogTest.kt
@@ -3,11 +3,10 @@ package com.glia.widgets.dialog
 import com.glia.androidsdk.omnibrowse.VisitorCode
 import com.glia.widgets.R
 import com.glia.widgets.SnapshotTest
-import com.glia.widgets.UiTheme
-import com.glia.widgets.core.configuration.GliaSdkConfigurationManager
 import com.glia.widgets.di.ControllerFactory
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.snapshotutils.SnapshotProviders
+import com.glia.widgets.snapshotutils.SnapshotThemeConfiguration
 import com.glia.widgets.view.VisitorCodeView
 import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
 import com.google.gson.JsonObject
@@ -18,7 +17,7 @@ import java.util.concurrent.Executor
 
 class VisitorCodeDialogTest : SnapshotTest(
     renderingMode = fullWidthRenderMode
-), SnapshotProviders {
+), SnapshotProviders, SnapshotThemeConfiguration {
 
     // MARK: Show visitor code
 
@@ -33,19 +32,6 @@ class VisitorCodeDialogTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun visitorCodeWithUiTheme() {
-        snapshot(
-            setupView(
-                uiTheme = uiTheme()
-            ).apply {
-                startLoading()
-                showVisitorCode(code())
-            },
-            offsetMillis = 200
-        )
-    }
-
     @Test
     fun visitorCodeWithGlobalColors() {
         snapshot(
@@ -99,20 +85,6 @@ class VisitorCodeDialogTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun errorWithUiTheme() {
-        snapshot(
-            setupView(
-                uiTheme = uiTheme()
-            ).apply {
-                setClosable(true)
-                startLoading()
-                showError(Throwable())
-            },
-            offsetMillis = 200
-        )
-    }
-
     @Test
     fun errorWithGlobalColors() {
         snapshot(
@@ -167,18 +139,6 @@ class VisitorCodeDialogTest : SnapshotTest(
         )
     }
 
-    @Test
-    fun loadingWithUiTheme() {
-        snapshot(
-            setupView(
-                uiTheme = uiTheme()
-            ).apply {
-                setClosable(true)
-                startLoading()
-            }
-        )
-    }
-
     @Test
     fun loadingWithGlobalColors() {
         snapshot(
@@ -216,29 +176,18 @@ class VisitorCodeDialogTest : SnapshotTest(
     }
 
     private fun setupView(
-        uiTheme: UiTheme = UiTheme(),
         unifiedTheme: UnifiedTheme? = null,
         executor: Executor? = Executor(Runnable::run)
     ): VisitorCodeView {
+        setUnifiedTheme(unifiedTheme)
         localeProviderMock()
         resourceProviderMock()
 
-        unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
-        val configurationManager = GliaSdkConfigurationManager().also {
-            it.uiTheme = uiTheme
-        }
         val controllerFactoryMock: ControllerFactory = mock<ControllerFactory>().also {
             whenever(it.visitorCodeController).thenReturn(mock())
         }
-        Dependencies.sdkConfigurationManager = configurationManager
         Dependencies.controllerFactory = controllerFactoryMock
 
-        setOnEndListener {
-            Dependencies.gliaThemeManager.theme = null
-            Dependencies.sdkConfigurationManager = GliaSdkConfigurationManager()
-//            Dependencies.controllerFactory = null
-        }
-
         return VisitorCodeView(context, executor).apply {
             notifySetupComplete()
         }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/entrywidget/EntryWidgetBottomSheetTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/entrywidget/EntryWidgetBottomSheetTest.kt
new file mode 100644
index 000000000..57c2269f2
--- /dev/null
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/entrywidget/EntryWidgetBottomSheetTest.kt
@@ -0,0 +1,28 @@
+package com.glia.widgets.entrywidget
+
+import android.view.View
+import androidx.core.view.allViews
+import com.glia.widgets.databinding.EntryWidgetFragmentBinding
+import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
+
+internal class EntryWidgetBottomSheetTest : EntryWidgetEmbeddedViewTest() {
+    override fun setupView(
+        items: List<EntryWidgetContract.ItemType>,
+        viewType: EntryWidgetContract.ViewType,
+        unifiedTheme: UnifiedTheme?
+    ): View {
+        localeProviderMock()
+
+        val entryWidgetFragment = EntryWidgetFragment()
+        val binding = EntryWidgetFragmentBinding.inflate(layoutInflater)
+
+        entryWidgetFragment.setupView(context, binding, unifiedTheme?.entryWidgetTheme)
+
+        binding.container.allViews.forEach {
+            val entryWidgetView = it as? EntryWidgetView
+            entryWidgetView?.showItems(items)
+        }
+
+        return binding.root
+    }
+}
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/entrywidget/EntryWidgetEmbeddedViewTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/entrywidget/EntryWidgetEmbeddedViewTest.kt
new file mode 100644
index 000000000..b7802ae28
--- /dev/null
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/entrywidget/EntryWidgetEmbeddedViewTest.kt
@@ -0,0 +1,278 @@
+package com.glia.widgets.entrywidget
+
+import android.view.View
+import com.glia.widgets.R
+import com.glia.widgets.SnapshotTest
+import com.glia.widgets.di.ControllerFactory
+import com.glia.widgets.di.Dependencies
+import com.glia.widgets.entrywidget.adapter.EntryWidgetAdapter
+import com.glia.widgets.snapshotutils.SnapshotProviders
+import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+
+internal open class EntryWidgetEmbeddedViewTest : SnapshotTest(
+    renderingMode = fullWidthRenderMode
+), SnapshotProviders {
+
+    override fun setUp() {
+        super.setUp()
+
+        val controllerFactoryMock = mock<ControllerFactory>()
+        val entryWidgetControllerMock = mock<EntryWidgetContract.Controller>()
+        whenever(controllerFactoryMock.entryWidgetController).thenReturn(entryWidgetControllerMock)
+        Dependencies.controllerFactory = controllerFactoryMock
+    }
+
+    // MARK: Contacts Tests
+
+    private val contactsItems = listOf(
+        EntryWidgetContract.ItemType.VIDEO_CALL,
+        EntryWidgetContract.ItemType.AUDIO_CALL,
+        EntryWidgetContract.ItemType.CHAT,
+        EntryWidgetContract.ItemType.SECURE_MESSAGE,
+        EntryWidgetContract.ItemType.PROVIDED_BY
+    )
+
+    @Test
+    fun contactsDefaultTheme() {
+        snapshot(
+            setupView(items = contactsItems)
+        )
+    }
+
+    @Test
+    fun contactsWithUnifiedTheme() {
+        snapshot(
+            setupView(
+                items = contactsItems,
+                unifiedTheme = unifiedTheme()
+            )
+        )
+    }
+
+    @Test
+    fun contactsWithUnifiedThemeWithGlobalColors() {
+        snapshot(
+            setupView(
+                items = contactsItems,
+                unifiedTheme = unifiedThemeWithGlobalColors()
+            )
+        )
+    }
+
+    @Test
+    fun contactsWithUnifiedThemeWithoutEntryWidget() {
+        snapshot(
+            setupView(
+                items = contactsItems,
+                unifiedTheme = unifiedThemeWithoutEntryWidget()
+            )
+        )
+    }
+
+    // MARK: Loading state tests
+
+    private val loadingItems = listOf(
+        EntryWidgetContract.ItemType.LOADING_STATE,
+        EntryWidgetContract.ItemType.LOADING_STATE,
+        EntryWidgetContract.ItemType.LOADING_STATE,
+        EntryWidgetContract.ItemType.LOADING_STATE,
+        EntryWidgetContract.ItemType.PROVIDED_BY
+    )
+
+    @Test
+    fun loadingDefaultTheme() {
+        snapshot(
+            setupView(items = loadingItems)
+        )
+    }
+
+    @Test
+    fun loadingWithUnifiedTheme() {
+        snapshot(
+            setupView(
+                items = loadingItems,
+                unifiedTheme = unifiedTheme()
+            )
+        )
+    }
+
+    @Test
+    fun loadingWithUnifiedThemeWithGlobalColors() {
+        snapshot(
+            setupView(
+                items = loadingItems,
+                unifiedTheme = unifiedThemeWithGlobalColors()
+            )
+        )
+    }
+
+    @Test
+    fun loadingWithUnifiedThemeWithoutEntryWidget() {
+        snapshot(
+            setupView(
+                items = loadingItems,
+                unifiedTheme = unifiedThemeWithoutEntryWidget()
+            )
+        )
+    }
+
+    // MARK: Empty state tests
+
+    private val emptyItems = listOf(
+        EntryWidgetContract.ItemType.EMPTY_STATE,
+        EntryWidgetContract.ItemType.PROVIDED_BY
+    )
+
+    @Test
+    fun emptyDefaultTheme() {
+        snapshot(
+            setupView(items = emptyItems)
+        )
+    }
+
+    @Test
+    fun emptyWithUnifiedTheme() {
+        snapshot(
+            setupView(
+                items = emptyItems,
+                unifiedTheme = unifiedTheme()
+            )
+        )
+    }
+
+    @Test
+    fun emptyWithUnifiedThemeWithGlobalColors() {
+        snapshot(
+            setupView(
+                items = emptyItems,
+                unifiedTheme = unifiedThemeWithGlobalColors()
+            )
+        )
+    }
+
+    @Test
+    fun emptyWithUnifiedThemeWithoutEntryWidget() {
+        snapshot(
+            setupView(
+                items = emptyItems,
+                unifiedTheme = unifiedThemeWithoutEntryWidget()
+            )
+        )
+    }
+
+
+    // MARK: SDK not initialized state tests
+
+    private val sdkNotInitializedItems = listOf(
+        EntryWidgetContract.ItemType.SDK_NOT_INITIALIZED_STATE,
+        EntryWidgetContract.ItemType.PROVIDED_BY
+    )
+
+    @Test
+    fun sdkNotInitializedItemsDefaultTheme() {
+        snapshot(
+            setupView(items = sdkNotInitializedItems)
+        )
+    }
+
+    @Test
+    fun sdkNotInitializedItemsWithUnifiedTheme() {
+        snapshot(
+            setupView(
+                items = sdkNotInitializedItems,
+                unifiedTheme = unifiedTheme()
+            )
+        )
+    }
+
+    @Test
+    fun sdkNotInitializedItemsWithUnifiedThemeWithGlobalColors() {
+        snapshot(
+            setupView(
+                items = sdkNotInitializedItems,
+                unifiedTheme = unifiedThemeWithGlobalColors()
+            )
+        )
+    }
+
+    @Test
+    fun sdkNotInitializedItemsWithUnifiedThemeWithoutEntryWidget() {
+        snapshot(
+            setupView(
+                items = sdkNotInitializedItems,
+                unifiedTheme = unifiedThemeWithoutEntryWidget()
+            )
+        )
+    }
+
+    // MARK: Error state tests
+
+    private val errorItems = listOf(
+        EntryWidgetContract.ItemType.ERROR_STATE,
+        EntryWidgetContract.ItemType.PROVIDED_BY
+    )
+
+    @Test
+    fun errorDefaultTheme() {
+        snapshot(
+            setupView(items = errorItems)
+        )
+    }
+
+    @Test
+    fun errorWithUnifiedTheme() {
+        snapshot(
+            setupView(
+                items = errorItems,
+                unifiedTheme = unifiedTheme()
+            )
+        )
+    }
+
+    @Test
+    fun errorWithUnifiedThemeWithGlobalColors() {
+        snapshot(
+            setupView(
+                items = errorItems,
+                unifiedTheme = unifiedThemeWithGlobalColors()
+            )
+        )
+    }
+
+    @Test
+    fun errorWithUnifiedThemeWithoutEntryWidget() {
+        snapshot(
+            setupView(
+                items = errorItems,
+                unifiedTheme = unifiedThemeWithoutEntryWidget()
+            )
+        )
+    }
+
+    // MARK: utils for tests
+
+    open fun setupView(
+        items: List<EntryWidgetContract.ItemType> = listOf(EntryWidgetContract.ItemType.PROVIDED_BY),
+        viewType: EntryWidgetContract.ViewType = EntryWidgetContract.ViewType.EMBEDDED_VIEW,
+        unifiedTheme: UnifiedTheme? = null
+    ) : View {
+        localeProviderMock()
+
+        val entryWidgetTheme = unifiedTheme?.entryWidgetTheme
+
+        return EntryWidgetView(
+            context,
+            viewAdapter = EntryWidgetAdapter(viewType, entryWidgetTheme),
+            entryWidgetTheme = entryWidgetTheme
+        ).apply {
+            showItems(items)
+        }
+    }
+
+    private fun unifiedThemeWithoutEntryWidget(): UnifiedTheme = unifiedTheme(R.raw.test_unified_config) { unifiedTheme ->
+        unifiedTheme.remove("entryWidget")
+    }
+}
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/filepreview/FilePreviewTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/filepreview/ImagePreviewTest.kt
similarity index 64%
rename from widgetssdk/src/testSnapshot/java/com/glia/widgets/filepreview/FilePreviewTest.kt
rename to widgetssdk/src/testSnapshot/java/com/glia/widgets/filepreview/ImagePreviewTest.kt
index 7bb4681fc..87f4c3894 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/filepreview/FilePreviewTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/filepreview/ImagePreviewTest.kt
@@ -5,13 +5,13 @@ import androidx.annotation.DrawableRes
 import com.android.ide.common.rendering.api.SessionParams
 import com.glia.widgets.R
 import com.glia.widgets.SnapshotTest
-import com.glia.widgets.databinding.FilePreviewActivityBinding
+import com.glia.widgets.databinding.ImagePreviewActivityBinding
 import com.glia.widgets.snapshotutils.SnapshotProviders
 import org.junit.Test
 
-internal class FilePreviewTest : SnapshotTest(
+internal class ImagePreviewTest : SnapshotTest(
     renderingMode = SessionParams.RenderingMode.NORMAL,
-    theme = "Application_Glia_FilePreview_Activity"
+    theme = "Application_Glia_ImagePreview_Activity"
 ), SnapshotProviders {
 
     @Test
@@ -26,14 +26,14 @@ internal class FilePreviewTest : SnapshotTest(
         showDownloadIcon: Boolean = true,
         showShareIcon: Boolean = false,
         @DrawableRes imageRes: Int? = R.drawable.test_banner
-    ): FilePreviewActivityBinding {
+    ): ImagePreviewActivityBinding {
         localeProviderMock()
 
-        val filePreviewActivityBinding = FilePreviewActivityBinding.inflate(layoutInflater)
+        val imagePreviewActivityBinding = ImagePreviewActivityBinding.inflate(layoutInflater)
 
-        filePreviewActivityBinding.toolbar.title = title
+        imagePreviewActivityBinding.toolbar.title = title
 
-        val menu = filePreviewActivityBinding.toolbar.menu
+        val menu = imagePreviewActivityBinding.toolbar.menu
         MenuInflater(context).inflate(R.menu.menu_file_preview, menu)
         menu.findItem(R.id.save_item).also {
             it.isVisible = showDownloadIcon
@@ -42,9 +42,9 @@ internal class FilePreviewTest : SnapshotTest(
             it.isVisible = showShareIcon
         }
 
-        imageRes?.also { filePreviewActivityBinding.filePreviewView.setImageResource(it) }
+        imageRes?.also { imagePreviewActivityBinding.previewView.setImageResource(it) }
 
-        return filePreviewActivityBinding
+        return imagePreviewActivityBinding
     }
 
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureConversationsConfirmationScreenTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureMessagingConfirmationScreenTest.kt
similarity index 94%
rename from widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureConversationsConfirmationScreenTest.kt
rename to widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureMessagingConfirmationScreenTest.kt
index aaaba9af7..7decd04c3 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureConversationsConfirmationScreenTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureMessagingConfirmationScreenTest.kt
@@ -7,7 +7,7 @@ import com.glia.widgets.snapshotutils.SnapshotStrings
 import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
 import org.junit.Test
 
-internal class SecureConversationsConfirmationScreenTest : SnapshotTest(
+internal class SecureMessagingConfirmationScreenTest : SnapshotTest(
     renderingMode = SessionParams.RenderingMode.NORMAL
 ), SnapshotMessageCenterView, SnapshotStrings {
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureConversationsWelcomeScreenTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureMessagingWelcomeScreenTest.kt
similarity index 98%
rename from widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureConversationsWelcomeScreenTest.kt
rename to widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureMessagingWelcomeScreenTest.kt
index 99f98b8d7..af9bd07fb 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureConversationsWelcomeScreenTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/messagecenter/SecureMessagingWelcomeScreenTest.kt
@@ -9,7 +9,7 @@ import com.glia.widgets.snapshotutils.SnapshotStrings
 import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
 import org.junit.Test
 
-internal class SecureConversationsWelcomeScreenTest : SnapshotTest(
+internal class SecureMessagingWelcomeScreenTest : SnapshotTest(
     renderingMode = SessionParams.RenderingMode.NORMAL
 ), SnapshotMessageCenterView, SnapshotStrings {
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotActivityWindow.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotActivityWindow.kt
index d7db3eb02..24dc164fb 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotActivityWindow.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotActivityWindow.kt
@@ -26,14 +26,14 @@ interface SnapshotActivityWindow: SnapshotTestLifecycle {
         val windowMock = mock<Window>()
         whenever(activityMock.window).thenReturn(windowMock)
         whenever(windowMock.statusBarColor).thenReturn(statusBarColor)
-        mockkStatic("com.glia.widgets.helper.ContextExtensionsKt")
+        mockkStatic("com.glia.widgets.helper.ContextExtensions")
         every { any<Context>().requireActivity() } returns activityMock
         every { any<Context>().asActivity() } returns activityMock
         mockkStatic("com.glia.widgets.helper.Insets")
         every { any<WindowInsetsControllerCompat>().hideKeyboard() } returns Unit
 
         setOnEndListener {
-            unmockkStatic("com.glia.widgets.helper.ContextExtensionsKt")
+            unmockkStatic("com.glia.widgets.helper.ContextExtensions")
             unmockkStatic("com.glia.widgets.helper.Insets")
         }
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotChatView.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotChatView.kt
index f6bee2d80..e448b75f9 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotChatView.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotChatView.kt
@@ -4,7 +4,6 @@ import android.view.View
 import android.widget.EditText
 import androidx.annotation.DrawableRes
 import com.glia.widgets.R
-import com.glia.widgets.UiTheme
 import com.glia.widgets.chat.ChatContract
 import com.glia.widgets.chat.ChatView
 import com.glia.widgets.chat.controller.ChatController
@@ -23,7 +22,7 @@ import org.mockito.kotlin.whenever
 import java.util.concurrent.Executor
 
 internal interface SnapshotChatView : SnapshotContent, SnapshotTheme, SnapshotActivityWindow, SnapshotProviders,
-    SnapshotGetImageFile, SnapshotSchedulers, SnapshotAttachment, SnapshotPicasso, SnapshotLottie {
+    SnapshotGetImageFile, SnapshotSchedulers, SnapshotAttachment, SnapshotPicasso, SnapshotLottie, SnapshotThemeConfiguration {
 
     data class Mock(
         val activityMock: SnapshotActivityWindow.Mock,
@@ -63,13 +62,13 @@ internal interface SnapshotChatView : SnapshotContent, SnapshotTheme, SnapshotAc
         @DrawableRes imageResources: List<Int>? = null,
         message: String? = null,
         executor: Executor? = Executor(Runnable::run),
-        unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme? = null
+        unifiedTheme: UnifiedTheme? = null
     ): ViewData {
+        setUnifiedTheme(unifiedTheme)
+
         val mock = chatViewMock()
 
         imageResources?.let { picassoMock(imageResources) }
-        unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
 
         val chatViewCaptor: KArgumentCaptor<ChatContract.View> = argumentCaptor()
         val chatActivityBinding = ChatActivityBinding.inflate(layoutInflater)
@@ -77,8 +76,6 @@ internal interface SnapshotChatView : SnapshotContent, SnapshotTheme, SnapshotAc
         val chatView = chatActivityBinding.chatView
         verify(mock.chatControllerMock).setView(chatViewCaptor.capture())
 
-        chatView.setUiTheme(uiTheme)
-
         chatView.executor = executor
 
         val chatViewCallback = chatViewCaptor.lastValue
@@ -87,10 +84,6 @@ internal interface SnapshotChatView : SnapshotContent, SnapshotTheme, SnapshotAc
         fileAttachments?.let { chatViewCallback.emitUploadAttachments(it) }
         message?.let { chatView.findViewById<EditText>(R.id.chat_edit_text).setText(it) }
 
-        setOnEndListener {
-            Dependencies.gliaThemeManager.theme = null
-        }
-
         return ViewData(root, chatView, mock)
     }
 
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotDialog.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotDialog.kt
index 08c34afa3..95e0359a9 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotDialog.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotDialog.kt
@@ -53,9 +53,9 @@ internal interface SnapshotDialog: SnapshotTheme, SnapshotProviders {
     val buttonDescription: LocaleString
         get() = LocaleString(R.string.dialog_button_description)
 
-    fun inflateView(context: Context, uiTheme: UiTheme = UiTheme(), unifiedTheme: UnifiedTheme? = null, dialogType: DialogType): View {
+    fun inflateView(context: Context, unifiedTheme: UnifiedTheme? = null, dialogType: DialogType): View {
         localeProviderMock()
-        return DialogViewFactory(context, uiTheme, unifiedTheme).createView(dialogType)
+        return DialogViewFactory(context, UiTheme(whiteLabel = unifiedTheme != null), unifiedTheme).createView(dialogType)
     }
 
     fun unifiedThemeWithoutDialog(): UnifiedTheme = unifiedTheme(R.raw.test_unified_config) { unifiedTheme ->
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotMessageCenterView.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotMessageCenterView.kt
index 6899a388c..f4d44a40c 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotMessageCenterView.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotMessageCenterView.kt
@@ -83,10 +83,10 @@ internal interface SnapshotMessageCenterView : SnapshotTestLifecycle, SnapshotCo
     }
 
     fun unifiedThemeWithoutWelcomeScreen(): UnifiedTheme = unifiedTheme(R.raw.test_unified_config) { unifiedTheme ->
-        unifiedTheme.remove("secureConversationsWelcomeScreen")
+        unifiedTheme.remove("secureMessagingWelcomeScreen")
     }
 
     fun unifiedThemeWithoutConfirmationScreen(): UnifiedTheme = unifiedTheme(R.raw.test_unified_config) { unifiedTheme ->
-        unifiedTheme.remove("secureConversationsConfirmationScreen")
+        unifiedTheme.remove("secureMessagingConfirmationScreen")
     }
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotTheme.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotTheme.kt
index c8cdafba5..a723cd8d0 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotTheme.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotTheme.kt
@@ -1,15 +1,12 @@
 package com.glia.widgets.snapshotutils
 
-import androidx.annotation.ColorRes
-import androidx.annotation.DrawableRes
-import androidx.annotation.FontRes
 import androidx.annotation.RawRes
 import com.glia.widgets.R
-import com.glia.widgets.UiTheme
 import com.glia.widgets.helper.ResourceProvider
 import com.glia.widgets.view.unifiedui.config.RemoteConfiguration
 import com.glia.widgets.view.unifiedui.parse.RemoteConfigurationParser
 import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
+import com.glia.widgets.view.unifiedui.theme.alert.AlertTheme
 import com.google.gson.Gson
 import com.google.gson.JsonObject
 
@@ -31,117 +28,9 @@ internal interface SnapshotTheme : SnapshotContent {
         return unifiedTheme(jsonRaw)
     }
 
-    fun unifiedThemeWithGlobalColors(): UnifiedTheme = unifiedTheme(R.raw.global_colors_unified_config)
+    fun unifiedThemeWithGlobalColors(): UnifiedTheme = unifiedTheme(R.raw.global_colors_unified_config).run {
+        copy(alertTheme = alertTheme?.copy(isVerticalAxis = true) ?: AlertTheme(isVerticalAxis = true))
+    }
 
     fun unifiedTheme(): UnifiedTheme = unifiedTheme(R.raw.test_unified_config)
-
-    fun uiTheme(
-        appBarTitle: String? = "Snapshot Test",
-        @ColorRes brandPrimaryColor: Int? = R.color.brandPrimaryColor,
-        @ColorRes baseLightColor: Int? = R.color.baseLightColor,
-        @ColorRes baseDarkColor: Int? = R.color.baseDarkColor,
-        @ColorRes baseNormalColor: Int? = R.color.baseNormalColor,
-        @ColorRes baseShadeColor: Int? = R.color.baseShadeColor,
-        @ColorRes systemAgentBubbleColor: Int? = R.color.systemAgentBubbleColor,
-        @ColorRes systemNegativeColor: Int? = R.color.systemNegativeColor,
-        @ColorRes visitorMessageBackgroundColor: Int? = R.color.visitorMessageBackgroundColor,
-        @ColorRes visitorMessageTextColor: Int? = R.color.visitorMessageTextColor,
-        @ColorRes operatorMessageBackgroundColor: Int? = R.color.operatorMessageBackgroundColor,
-        @ColorRes operatorMessageTextColor: Int? = R.color.operatorMessageTextColor,
-        @ColorRes newMessageDividerColor: Int? = R.color.newMessageDividerColor,
-        @ColorRes newMessageDividerTextColor: Int? = R.color.newMessageDividerTextColor,
-        @ColorRes botActionButtonBackgroundColor: Int? = R.color.botActionButtonBackgroundColor,
-        @ColorRes botActionButtonTextColor: Int? = R.color.botActionButtonTextColor,
-        @ColorRes botActionButtonSelectedBackgroundColor: Int? = R.color.botActionButtonSelectedBackgroundColor,
-        @ColorRes botActionButtonSelectedTextColor: Int? = R.color.botActionButtonSelectedTextColor,
-        @ColorRes sendMessageButtonTintColor: Int? = R.color.sendMessageButtonTintColor,
-        @ColorRes gliaChatBackgroundColor: Int? = R.color.gliaChatBackgroundColor,
-        @ColorRes gliaChatHeaderTitleTintColor: Int? = R.color.gliaChatHeaderTitleTintColor,
-        @ColorRes gliaChatHeaderHomeButtonTintColor: Int? = R.color.gliaChatHeaderHomeButtonTintColor,
-        @ColorRes gliaChatHeaderExitQueueButtonTintColor: Int? = R.color.gliaChatHeaderExitQueueButtonTintColor,
-        @ColorRes visitorCodeTextColor: Int? = R.color.visitorCodeTextColor,
-        @ColorRes visitorCodeBackgroundColor: Int? = R.color.visitorCodeBackgroundColor,
-        @ColorRes visitorCodeBorderColor: Int? = R.color.visitorCodeBorderColor,
-        @ColorRes gvaQuickReplyBackgroundColor: Int? = R.color.gvaQuickReplyBackgroundColor,
-        @ColorRes gvaQuickReplyStrokeColor: Int? = R.color.gvaQuickReplyStrokeColor,
-        @ColorRes gvaQuickReplyTextColor: Int? = R.color.gvaQuickReplyTextColor,
-        @ColorRes endScreenShareTintColor: Int? = R.color.endScreenShareTintColor,
-        @FontRes fontRes: Int? = R.font.expletus,
-        @DrawableRes iconAppBarBack: Int? = R.drawable.test_ic_app_bar_back,
-        @DrawableRes iconLeaveQueue: Int? = R.drawable.test_ic_leave_queue,
-        @DrawableRes iconSendMessage: Int? = R.drawable.test_ic_send_message,
-        @DrawableRes iconChatAudioUpgrade: Int? = R.drawable.test_ic_chat_audio_upgrade,
-        @DrawableRes iconUpgradeAudioDialog: Int? = R.drawable.test_ic_upgrade_audio_dialog,
-        @DrawableRes iconCallAudioOn: Int? = R.drawable.test_ic_call_audio_on,
-        @DrawableRes iconChatVideoUpgrade: Int? = R.drawable.test_ic_chat_video_upgrade,
-        @DrawableRes iconUpgradeVideoDialog: Int? = R.drawable.test_ic_upgrade_video_dialog,
-        @DrawableRes iconScreenSharingDialog: Int? = R.drawable.test_ic_screen_sharing_dialog,
-        @DrawableRes iconCallVideoOn: Int? = R.drawable.test_ic_call_video_on,
-        @DrawableRes iconCallAudioOff: Int? = R.drawable.test_ic_call_audio_off,
-        @DrawableRes iconCallVideoOff: Int? = R.drawable.test_ic_call_video_off,
-        @DrawableRes iconCallChat: Int? = R.drawable.test_ic_call_chat,
-        @DrawableRes iconCallSpeakerOn: Int? = R.drawable.test_ic_call_speaker_on,
-        @DrawableRes iconCallSpeakerOff: Int? = R.drawable.test_ic_call_speaker_off,
-        @DrawableRes iconCallMinimize: Int? = R.drawable.test_ic_call_minimize,
-        @DrawableRes iconPlaceholder: Int? = R.drawable.test_ic_placeholder,
-        @DrawableRes iconOnHold: Int? = R.drawable.test_ic_on_hold,
-        @DrawableRes iconEndScreenShare: Int? = R.drawable.test_ic_end_screen_share,
-        whiteLabel: Boolean? = true,
-        gliaAlertDialogButtonUseVerticalAlignment: Boolean? = true
-    ): UiTheme {
-        return UiTheme(
-            appBarTitle = "Snapshot Test",
-            brandPrimaryColor = brandPrimaryColor,
-            baseLightColor = baseLightColor,
-            baseDarkColor = baseDarkColor,
-            baseNormalColor = baseNormalColor,
-            baseShadeColor = baseShadeColor,
-            systemAgentBubbleColor = systemAgentBubbleColor,
-            systemNegativeColor = systemNegativeColor,
-            visitorMessageBackgroundColor = visitorMessageBackgroundColor,
-            visitorMessageTextColor = visitorMessageTextColor,
-            operatorMessageBackgroundColor = operatorMessageBackgroundColor,
-            operatorMessageTextColor = operatorMessageTextColor,
-            newMessageDividerColor = newMessageDividerColor,
-            newMessageDividerTextColor = newMessageDividerTextColor,
-            botActionButtonBackgroundColor = botActionButtonBackgroundColor,
-            botActionButtonTextColor = botActionButtonTextColor,
-            botActionButtonSelectedBackgroundColor = botActionButtonSelectedBackgroundColor,
-            botActionButtonSelectedTextColor = botActionButtonSelectedTextColor,
-            sendMessageButtonTintColor = sendMessageButtonTintColor,
-            gliaChatBackgroundColor = gliaChatBackgroundColor,
-            gliaChatHeaderTitleTintColor = gliaChatHeaderTitleTintColor,
-            gliaChatHeaderHomeButtonTintColor = gliaChatHeaderHomeButtonTintColor,
-            gliaChatHeaderExitQueueButtonTintColor = gliaChatHeaderExitQueueButtonTintColor,
-            visitorCodeTextColor = visitorCodeTextColor,
-            visitorCodeBackgroundColor = visitorCodeBackgroundColor,
-            visitorCodeBorderColor = visitorCodeBorderColor,
-            gvaQuickReplyBackgroundColor = gvaQuickReplyBackgroundColor,
-            gvaQuickReplyStrokeColor = gvaQuickReplyStrokeColor,
-            gvaQuickReplyTextColor = gvaQuickReplyTextColor,
-            endScreenShareTintColor = endScreenShareTintColor,
-            fontRes = fontRes,
-            iconAppBarBack = iconAppBarBack,
-            iconLeaveQueue = iconLeaveQueue,
-            iconSendMessage = iconSendMessage,
-            iconChatAudioUpgrade = iconChatAudioUpgrade,
-            iconUpgradeAudioDialog = iconUpgradeAudioDialog,
-            iconCallAudioOn = iconCallAudioOn,
-            iconChatVideoUpgrade = iconChatVideoUpgrade,
-            iconUpgradeVideoDialog = iconUpgradeVideoDialog,
-            iconScreenSharingDialog = iconScreenSharingDialog,
-            iconCallVideoOn = iconCallVideoOn,
-            iconCallAudioOff = iconCallAudioOff,
-            iconCallVideoOff = iconCallVideoOff,
-            iconCallChat = iconCallChat,
-            iconCallSpeakerOn = iconCallSpeakerOn,
-            iconCallSpeakerOff = iconCallSpeakerOff,
-            iconCallMinimize = iconCallMinimize,
-            iconPlaceholder = iconPlaceholder,
-            iconOnHold = iconOnHold,
-            iconEndScreenShare = iconEndScreenShare,
-            whiteLabel = whiteLabel,
-            gliaAlertDialogButtonUseVerticalAlignment = gliaAlertDialogButtonUseVerticalAlignment
-        )
-    }
 }
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotThemeConfiguration.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotThemeConfiguration.kt
new file mode 100644
index 000000000..de250b0ec
--- /dev/null
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/snapshotutils/SnapshotThemeConfiguration.kt
@@ -0,0 +1,19 @@
+package com.glia.widgets.snapshotutils
+
+import com.glia.widgets.di.Dependencies
+import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
+import io.mockk.mockk
+
+internal interface SnapshotThemeConfiguration : SnapshotTestLifecycle {
+
+    fun setUnifiedTheme(unifiedTheme: UnifiedTheme?) {
+        Dependencies.repositoryFactory = mockk(relaxed = true)
+
+        Dependencies.gliaThemeManager.theme = unifiedTheme
+
+        setOnEndListener {
+            Dependencies.gliaThemeManager.theme = null
+        }
+    }
+
+}
diff --git a/widgetssdk/src/testSnapshot/java/com/glia/widgets/view/head/ChatHeadViewSnapshotTest.kt b/widgetssdk/src/testSnapshot/java/com/glia/widgets/view/head/ChatHeadViewSnapshotTest.kt
index 5fc30c4bc..cb8a75f68 100644
--- a/widgetssdk/src/testSnapshot/java/com/glia/widgets/view/head/ChatHeadViewSnapshotTest.kt
+++ b/widgetssdk/src/testSnapshot/java/com/glia/widgets/view/head/ChatHeadViewSnapshotTest.kt
@@ -2,9 +2,7 @@ package com.glia.widgets.view.head
 
 import com.glia.widgets.R
 import com.glia.widgets.SnapshotTest
-import com.glia.widgets.UiTheme
 import com.glia.widgets.core.callvisualizer.domain.IsCallVisualizerScreenSharingUseCase
-import com.glia.widgets.core.configuration.EngagementConfiguration
 import com.glia.widgets.di.ControllerFactory
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.di.UseCaseFactory
@@ -13,7 +11,7 @@ import com.glia.widgets.snapshotutils.SnapshotChatView
 import com.glia.widgets.snapshotutils.SnapshotLottie
 import com.glia.widgets.snapshotutils.SnapshotPicasso
 import com.glia.widgets.snapshotutils.SnapshotProviders
-import com.glia.widgets.view.configuration.ChatHeadConfiguration
+import com.glia.widgets.snapshotutils.SnapshotThemeConfiguration
 import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
 import org.junit.Test
 import org.mockito.kotlin.mock
@@ -22,15 +20,13 @@ import java.util.concurrent.Executor
 
 class ChatHeadViewSnapshotTest : SnapshotTest(
     maxPercentDifference = 0.01
-), SnapshotChatView, SnapshotProviders, SnapshotLottie, SnapshotPicasso {
+), SnapshotChatView, SnapshotProviders, SnapshotLottie, SnapshotPicasso, SnapshotThemeConfiguration {
 
     // MARK: Default state
 
     @Test
     fun defaultState() {
-        snapshot(
-            setupView()
-        )
+        snapshot(setupView())
     }
 
     // MARK: Operator Image
@@ -303,9 +299,7 @@ class ChatHeadViewSnapshotTest : SnapshotTest(
 
     private fun setupView(
         unifiedTheme: UnifiedTheme? = null,
-        uiTheme: UiTheme = UiTheme(),
         executor: Executor? = Executor(Runnable::run),
-        sdkConfiguration: EngagementConfiguration? = sdkConfiguration(uiTheme),
         isCallVisualizerScreenSharingUseCase: Boolean = false
     ): ChatHeadView {
         lottieMock()
@@ -326,34 +320,11 @@ class ChatHeadViewSnapshotTest : SnapshotTest(
         whenever(useCaseFactoryMock.isCurrentEngagementCallVisualizer).thenReturn(isCurrentEngagementCallVisualizerUseCaseMock)
         Dependencies.useCaseFactory = useCaseFactoryMock
 
-        unifiedTheme?.let { Dependencies.gliaThemeManager.theme = it }
-
-        setOnEndListener {
-            Dependencies.gliaThemeManager.theme = null
-        }
+        setUnifiedTheme(unifiedTheme)
 
         return ChatHeadView(context).also {
             it.executor = executor
-            it.updateConfiguration(uiTheme, sdkConfiguration)
         }
     }
 
-    private fun sdkConfiguration(
-        uiTheme: UiTheme = UiTheme(),
-        chatHeadConfiguration: ChatHeadConfiguration = chatHeadConfiguration()
-    ) = mock<EngagementConfiguration>().also {
-        whenever(it.runTimeTheme).thenReturn(uiTheme.copy(chatHeadConfiguration = chatHeadConfiguration))
-    }
-    private fun chatHeadConfiguration() = ChatHeadConfiguration.Builder()
-        .operatorPlaceholderBackgroundColor(R.color.glia_brand_primary_color)
-        .operatorPlaceholderIcon(R.drawable.ic_person)
-        .operatorPlaceholderIconTintList(R.color.call_fab_icon_color_states)
-        .badgeBackgroundTintList(R.color.call_fab_bg_color_states)
-        .badgeTextColor(R.color.glia_base_light_color)
-        .backgroundColorRes(R.color.glia_system_negative_color)
-        .iconOnHold(R.drawable.ic_pause_circle)
-        .iconOnHoldTintList(R.color.call_fab_icon_color_states)
-        .iconScreenSharingDialog(R.drawable.ic_screensharing)
-        .build()
-
 }
diff --git a/widgetssdk/src/testSnapshot/res/raw/test_unified_config.json b/widgetssdk/src/testSnapshot/res/raw/test_unified_config.json
index f08ee9767..4af7e23b7 100644
--- a/widgetssdk/src/testSnapshot/res/raw/test_unified_config.json
+++ b/widgetssdk/src/testSnapshot/res/raw/test_unified_config.json
@@ -1435,6 +1435,58 @@
           "value": ["84d9f7", "#4a6bac"]
         }
       }
+    },
+    "secureMessaging": {
+      "bottomBannerBackground": {
+        "color": {
+          "type": "gradient",
+          "value": ["#ff55e0", "#e7a518"]
+        },
+        "border": {
+          "type": "fill",
+          "value": ["#a2522f"]
+        },
+        "borderWidth": 4,
+        "cornerRadius": 30
+      },
+      "bottomBannerText": {
+        "alignment": "center",
+        "font": {
+          "size": 16,
+          "style": "italic"
+        },
+        "foreground": {
+          "type": "fill",
+          "value": ["#288726"]
+        }
+      },
+      "bottomBannerDividerColor": {
+        "type": "fill",
+        "value": ["b9000d"]
+      },
+      "unavailableStatusBackground": {
+        "color": {
+          "type": "gradient",
+          "value": ["#70faff", "#db71e7"]
+        },
+        "border": {
+          "type": "fill",
+          "value": ["#3b36a2"]
+        },
+        "borderWidth": 4,
+        "cornerRadius": 30
+      },
+      "unavailableStatusText": {
+        "alignment": "center",
+        "font": {
+          "size": 10,
+          "style": "bold"
+        },
+        "foreground": {
+          "type": "fill",
+          "value": ["#b9000d"]
+        }
+      }
     }
   },
   "snackBar": {
@@ -2689,7 +2741,7 @@
       }
     }
   },
-  "secureConversationsWelcomeScreen": {
+  "secureMessagingWelcomeScreen": {
     "header": {
       "backButton": {
         "background": {
@@ -3481,7 +3533,7 @@
       "value": ["#8717db", "#091394"]
     }
   },
-  "secureConversationsConfirmationScreen": {
+  "secureMessagingConfirmationScreen": {
     "header": {
       "backButton": {
         "background": {
@@ -3958,5 +4010,132 @@
         }
       }
     }
+  },
+  "entryWidget": {
+    "background": {
+      "color": {
+        "type": "fill",
+        "value": ["#7de9ff"]
+      },
+      "border": {
+        "type": "fill",
+        "value": ["#6657ff"]
+      },
+      "borderWidth": 6,
+      "cornerRadius": 9
+    },
+    "mediaTypeItems": {
+      "mediaTypeItem": {
+        "background": {
+          "color": {
+            "type": "gradient",
+            "value": ["#71ffdb", "#99ff41"]
+          },
+          "border": {
+            "type": "fill",
+            "value": ["#00a325"]
+          },
+          "borderWidth": 3,
+          "cornerRadius": 18
+        },
+        "iconColor": {
+          "type": "fill",
+          "value": ["#ff3200"]
+        },
+        "title": {
+          "alignment": "center",
+          "background": {
+            "type": "fill",
+            "value": ["#ffcc00"]
+          },
+          "font": {
+            "size": 21,
+            "style": "bold"
+          },
+          "foreground": {
+            "type": "fill",
+            "value": ["#e4a3ff"]
+          }
+        },
+        "message": {
+          "alignment": "left",
+          "background": {
+            "type": "fill",
+            "value": ["#ff687c"]
+          },
+          "font": {
+            "size": 14,
+            "style": "italic"
+          },
+          "foreground": {
+            "type": "fill",
+            "value": ["#687022"]
+          }
+        },
+        "loadingTintColor": {
+          "type": "gradient",
+          "value": ["#FF8E45", "#FF7CB9"]
+        }
+      },
+      "dividerColor": {
+        "type": "gradient",
+        "value": ["#0738ff", "#ff00ef"]
+      }
+    },
+    "errorTitle": {
+      "alignment": "center",
+      "background": {
+        "type": "fill",
+        "value": ["#abcdef"]
+      },
+      "font": {
+        "size": 12,
+        "style": "bold"
+      },
+      "foreground": {
+        "type": "fill",
+        "value": ["#877563"]
+      }
+    },
+    "errorMessage": {
+      "alignment": "left",
+      "background": {
+        "type": "gradient",
+        "value": ["#007686", "#1e6941"]
+      },
+      "font": {
+        "size": 24,
+        "style": "italic"
+      },
+      "foreground": {
+        "type": "fill",
+        "value": ["#ff1028"]
+      }
+    },
+    "errorButton": {
+      "background": {
+        "type": "fill",
+        "value": ["#778899"]
+      },
+      "text": {
+        "alignment": "center",
+        "background": {
+          "type": "fill",
+          "value": ["#6f67de"]
+        },
+        "font": {
+          "size": 16,
+          "style": "regular"
+        },
+        "foreground": {
+          "type": "fill",
+          "value": ["#ddeeff"]
+        }
+      },
+      "tintColor": {
+        "type": "fill",
+        "value": ["#ff9f2c"]
+      }
+    }
   }
 }