diff --git a/app/assets/javascripts/clusters_list/components/agent_empty_state.vue b/app/assets/javascripts/clusters_list/components/agent_empty_state.vue
index 4a20f9ec10d75122c261567c0fa84e1301945e8b..dbe7c4efdcee77b663cfca2e28d6cff86723bfd8 100644
--- a/app/assets/javascripts/clusters_list/components/agent_empty_state.vue
+++ b/app/assets/javascripts/clusters_list/components/agent_empty_state.vue
@@ -17,11 +17,11 @@ export default {
 
 <template>
   <gl-empty-state
+    :title="$options.i18n.title"
     :svg-path="emptyStateImage"
-    :svg-height="100"
     data-testid="cluster-agent-empty-state"
   >
-    <template #title>
+    <template #description>
       <gl-sprintf :message="$options.i18n.introText">
         <template #link="{ content }">
           <gl-link :href="$options.agentDocsUrl">
diff --git a/app/assets/javascripts/clusters_list/components/install_agent_modal.vue b/app/assets/javascripts/clusters_list/components/install_agent_modal.vue
index e98e2b373624b9865347187294088436b6f2a6a1..bcc3d49cd983d0274699414e178fedded66a1b73 100644
--- a/app/assets/javascripts/clusters_list/components/install_agent_modal.vue
+++ b/app/assets/javascripts/clusters_list/components/install_agent_modal.vue
@@ -295,19 +295,13 @@ export default {
       />
     </template>
 
-    <template v-else>
-      <div class="gl-text-center gl-mb-5">
-        <img :alt="$options.i18n.altText" :src="emptyStateImage" height="100" />
-      </div>
-
-      <p v-if="kasDisabled">
-        <gl-sprintf :message="$options.i18n.enableKasText">
-          <template #link="{ content }">
-            <gl-link :href="$options.enableKasPath">{{ content }}</gl-link>
-          </template>
-        </gl-sprintf>
-      </p>
-    </template>
+    <gl-alert v-else :dismissible="false" variant="warning">
+      <gl-sprintf :message="$options.i18n.enableKasText">
+        <template #link="{ content }">
+          <gl-link :href="$options.enableKasPath">{{ content }}</gl-link>
+        </template>
+      </gl-sprintf>
+    </gl-alert>
 
     <template #modal-footer>
       <gl-button
diff --git a/app/assets/javascripts/clusters_list/constants.js b/app/assets/javascripts/clusters_list/constants.js
index fcf317f10cdbae8041726bf3ef156a67fb3f1bcc..29c661955f67d78809a9bc59dbcfbea2a08f4803 100644
--- a/app/assets/javascripts/clusters_list/constants.js
+++ b/app/assets/javascripts/clusters_list/constants.js
@@ -180,6 +180,7 @@ export const AGENT_STATUSES = {
 };
 
 export const I18N_AGENTS_EMPTY_STATE = {
+  title: s__("ClusterIntegration|Your project doesn't have any GitLab agents"),
   introText: s__(
     'ClusterIntegration|Use the %{linkStart}GitLab agent%{linkEnd} to safely connect your Kubernetes clusters to GitLab. You can deploy your applications, run your pipelines, use Review Apps, and much more.',
   ),
diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb
index 8a0086f880b7aa5f68e3ced3ffbf2d57c39915dc..d58b8da25ea8ef81c7ca696076fa14d94136f42b 100644
--- a/app/helpers/clusters_helper.rb
+++ b/app/helpers/clusters_helper.rb
@@ -15,7 +15,7 @@ def js_clusters_list_data(clusterable)
         gcp: { path: image_path('illustrations/logos/google_gke.svg'), text: s_('ClusterIntegration|Google GKE') }
       },
       clusters_empty_state_image: image_path('illustrations/empty-state/empty-state-clusters.svg'),
-      empty_state_image: image_path('illustrations/empty-state/empty-state-agents.svg'),
+      empty_state_image: image_path('illustrations/empty-state/empty-environment-md.svg'),
       empty_state_help_text: clusterable.empty_state_help_text,
       add_cluster_path: clusterable.connect_path,
       new_cluster_docs_path: clusterable.new_cluster_docs_path,
diff --git a/app/helpers/projects/cluster_agents_helper.rb b/app/helpers/projects/cluster_agents_helper.rb
index d285cfa03c2bc8b645be3735fedc1c63ce10416f..7eaf3d4bbd0f29784e2120d0f10a6f8101d12141 100644
--- a/app/helpers/projects/cluster_agents_helper.rb
+++ b/app/helpers/projects/cluster_agents_helper.rb
@@ -3,7 +3,7 @@
 module Projects::ClusterAgentsHelper
   def js_cluster_agent_details_data(agent_name, project)
     {
-      activity_empty_state_image: image_path('illustrations/empty-state/empty-state-agents.svg'),
+      activity_empty_state_image: image_path('illustrations/empty-state/empty-environment-md.svg'),
       agent_name: agent_name,
       can_admin_vulnerability: can?(current_user, :admin_vulnerability, project).to_s,
       empty_state_svg_path: image_path('illustrations/empty-state/empty-radar-md.svg'),
diff --git a/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml b/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml
index 972468e536fc2ec5af86b6a9484687f7f49ff0a7..affa49f69dac44a119b80117b0f685834484f213 100644
--- a/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml
+++ b/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml
@@ -1,7 +1,7 @@
 - link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer')
 
 = render Pajamas::AlertComponent.new(title: s_('ClusterIntegration|Did you know?'),
-  alert_options: { class: 'gcp-signup-offer',
+  alert_options: { class: 'gl-mb-6 gcp-signup-offer',
                    data: { feature_id: Users::CalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: callouts_path }},
                    close_button_options: { data: { track_action: 'click_dismiss', track_label: 'gcp_signup_offer_banner' }}) do |c|
   - c.with_body do
diff --git a/app/views/clusters/clusters/index.html.haml b/app/views/clusters/clusters/index.html.haml
index 7bc782df119d25d7f3e2e24987ad3ee08cb2ffe1..f713e6f03a2115d119ef4693a55e76e084ce2fd8 100644
--- a/app/views/clusters/clusters/index.html.haml
+++ b/app/views/clusters/clusters/index.html.haml
@@ -5,5 +5,4 @@
 = render_gcp_signup_offer
 
 .clusters-container
-  .gl-my-6
-    .js-clusters-main-view{ data: js_clusters_list_data(clusterable) }
+  .js-clusters-main-view{ data: js_clusters_list_data(clusterable) }
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 3465a4507ce2e626efd81f254ac6d1294497461b..566e3597d535a778e60849a0a71902384c0c3db2 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -12075,6 +12075,9 @@ msgstr ""
 msgid "ClusterIntegration|Your cluster API is unreachable. Please ensure your API URL is correct."
 msgstr ""
 
+msgid "ClusterIntegration|Your project doesn't have any GitLab agents"
+msgstr ""
+
 msgid "ClusterIntegration|sign up"
 msgstr ""
 
diff --git a/spec/frontend/clusters_list/components/install_agent_modal_spec.js b/spec/frontend/clusters_list/components/install_agent_modal_spec.js
index 0cf6b8fbff9ae4ed6da5686a233c9329d8b844a0..686104df89fcf11072e285715b9dc2b8405812c5 100644
--- a/spec/frontend/clusters_list/components/install_agent_modal_spec.js
+++ b/spec/frontend/clusters_list/components/install_agent_modal_spec.js
@@ -81,7 +81,6 @@ describe('InstallAgentModal', () => {
   const findActionButton = () => findButtonByVariant('confirm');
   const findCancelButton = () => findButtonByVariant('default');
   const findPrimaryButton = () => wrapper.findByTestId('agent-primary-button');
-  const findImage = () => wrapper.findByRole('img', { alt: i18n.altText });
 
   const expectDisabledAttribute = (element, disabled) => {
     if (disabled) {
@@ -313,10 +312,6 @@ describe('InstallAgentModal', () => {
       await waitForPromises();
     });
 
-    it('renders empty state image', () => {
-      expect(findImage().attributes('src')).toBe(emptyStateImage);
-    });
-
     it('renders an instruction to enable the KAS', () => {
       expect(findModal().text()).toContain(
         sprintf(i18n.enableKasText, { linkStart: '', linkEnd: '' }),
diff --git a/spec/helpers/clusters_helper_spec.rb b/spec/helpers/clusters_helper_spec.rb
index 2f53ff63998c4ee410e970200d2790fe42481953..5b5b3a31fd726cdd2710ecb68aa0286bd0370ba7 100644
--- a/spec/helpers/clusters_helper_spec.rb
+++ b/spec/helpers/clusters_helper_spec.rb
@@ -63,7 +63,7 @@
 
     it 'displays empty image path' do
       expect(subject[:clusters_empty_state_image]).to match(%r{/illustrations/empty-state/empty-state-clusters|svg})
-      expect(subject[:empty_state_image]).to match(%r{/illustrations/empty-state/empty-state-agents|svg})
+      expect(subject[:empty_state_image]).to match(%r{/illustrations/empty-state/empty-environment-md|svg})
     end
 
     it 'displays add cluster using certificate path' do