diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
index aa4dd2e20..ef7c54df0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
@@ -5,7 +5,7 @@
       <thead>
         <tr>
           <td>
-            <div class="checkbox-wrap">
+            <div class="flex items-center">
               <input
                 name="select-all-agents"
                 type="checkbox"
@@ -15,8 +15,12 @@
               />
             </div>
           </td>
-          <td>{{ $t('TEAMS_SETTINGS.AGENTS.AGENT') }}</td>
-          <td>{{ $t('TEAMS_SETTINGS.AGENTS.EMAIL') }}</td>
+          <td class=" text-slate-800 dark:text-slate-100">
+            {{ $t('TEAMS_SETTINGS.AGENTS.AGENT') }}
+          </td>
+          <td class=" text-slate-800 dark:text-slate-100">
+            {{ $t('TEAMS_SETTINGS.AGENTS.EMAIL') }}
+          </td>
         </tr>
       </thead>
       <tbody>
@@ -25,8 +29,8 @@
           :key="agent.id"
           :class="agentRowClass(agent.id)"
         >
-          <td class="checkbox-cell">
-            <div class="checkbox-wrap">
+          <td class="w-12">
+            <div class="flex items-center">
               <input
                 type="checkbox"
                 :checked="isAgentSelected(agent.id)"
@@ -35,14 +39,14 @@
             </div>
           </td>
           <td>
-            <div class="user-info-wrap">
+            <div class="flex items-center gap-2">
               <thumbnail
                 :src="agent.thumbnail"
                 size="24px"
                 :username="agent.name"
                 :status="agent.availability_status"
               />
-              <h4 class="sub-block-title user-name">
+              <h4 class="text-base mb-0 text-slate-800 dark:text-slate-100">
                 {{ agent.name }}
               </h4>
             </div>
@@ -53,7 +57,7 @@
         </tr>
       </tbody>
     </table>
-    <div class="add-agents__footer">
+    <div class="flex items-center justify-between">
       <p>
         {{
           $t('TEAMS_SETTINGS.AGENTS.SELECTED_COUNT', {
@@ -141,39 +145,8 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
-.table__meta {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: var(--space-small);
-}
-
-.user-info-wrap {
-  display: flex;
-  align-items: center;
-}
-
-.user-name {
-  margin-bottom: 0;
-  margin-left: var(--space-small);
-}
-
-.add-agents__footer {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.checkbox-wrap {
-  display: flex;
-  align-items: center;
-
-  input {
-    margin: 0;
-  }
-}
-.checkbox-cell {
-  width: var(--space-larger);
+<style scoped>
+input {
+  @apply mb-0;
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
index dc702b6a6..27517b5c6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%] overflow-y-auto"
+  >
     <form class="mx-0 flex flex-wrap" @submit.prevent="addAgents">
       <div class="w-full">
         <page-header