diff --git a/src/locales/de-DE/messages.po b/src/locales/de-DE/messages.po
index f7f05544..5dc7589b 100644
--- a/src/locales/de-DE/messages.po
+++ b/src/locales/de-DE/messages.po
@@ -21,10 +21,6 @@ msgstr "({0} max)"
 msgid "(${0} / month per additional account)"
 msgstr "(${0} / Monat pro zusätzlichem Konto)"
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:48
-msgid "{0, plural, one {# cloud account} other {# cloud accounts}}"
-msgstr ""
-
 #: src/shared/utils/parseDuration.ts:171
 msgid "{0, plural, one {# Day} other {# Days}}"
 msgstr "{0, plural, one {# Tag} other {# Tage}}"
@@ -126,10 +122,6 @@ msgstr "{0}-monatige Historie"
 msgid "{0}: We've identified {1} non-compliant resources out of {2}."
 msgstr "{0}: Wir haben {1} nicht konforme Ressourcen von insgesamt {2}."
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:43
-msgid "{accountLength, plural, one {# enabled cloud account} other {# enabled cloud accounts}}"
-msgstr ""
-
 #: src/pages/panel/resource-detail/utils/nodeChange.tsx:140
 msgid "{added} configuration lines added and {removed} lines deleted."
 msgstr "{added} Konfigurationszeilen hinzugefügt und {removed} Zeilen gelöscht."
@@ -264,7 +256,7 @@ msgstr "Der Zugriff auf Ihr Konto ist unterbrochen"
 
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:195
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormAccount.tsx:65
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:240
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:241
 msgid "Account"
 msgstr "Konto"
 
@@ -312,6 +304,7 @@ msgid "Add a New Credit or Debit Card"
 msgstr ""
 
 #: src/shared/add-account-button/AddAccountButton.tsx:16
+#: src/shared/add-account-button/AddAccountButtonDisabled.tsx:8
 msgid "Add an account"
 msgstr "Füge ein Konto hinzu"
 
@@ -343,7 +336,7 @@ msgstr ""
 msgid "Add Role Assignment"
 msgstr ""
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:77
+#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:67
 msgid "Added accounts"
 msgstr "Konten hinzugefügt"
 
@@ -365,7 +358,7 @@ msgstr "Erweiterte Suchabfrage"
 msgid "Affected resources"
 msgstr ""
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:249
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:250
 #: src/shared/charts/NetworkDiagram.tsx:378
 msgid "Age"
 msgstr "Alter"
@@ -517,7 +510,7 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:225
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:226
 msgid "Basic Information"
 msgstr "Grundinformation"
 
@@ -724,7 +717,7 @@ msgstr "Schließen"
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:165
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormCloudValues.tsx:62
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormMore.tsx:96
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:236
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:237
 #: src/pages/panel/security/AccountCard.tsx:37
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountRow.tsx:493
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx:59
@@ -900,7 +893,7 @@ msgstr ""
 msgid "Created in the last 7 days"
 msgstr ""
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:243
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:244
 msgid "Created Time"
 msgstr "Erstellte Zeit"
 
@@ -1034,7 +1027,7 @@ msgstr "Für die Organisation bereitstellen"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:321
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:322
 msgid "Details"
 msgstr "Einzelheiten"
 
@@ -1052,7 +1045,7 @@ msgstr "Trennen"
 msgid "Disconnect Service"
 msgstr "Dienst trennen"
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:87
+#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:77
 msgid "Discovered but unconfigured accounts"
 msgstr "Erkannte, aber nicht konfigurierte Konten"
 
@@ -1371,7 +1364,7 @@ msgstr ""
 msgid "Id"
 msgstr ""
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:233
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:234
 #: src/pages/panel/security/AccountCard.tsx:34
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountRow.tsx:490
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx:62
@@ -1520,7 +1513,7 @@ msgid "kind"
 msgstr ""
 
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:189
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:232
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:233
 #: src/shared/charts/NetworkDiagram.tsx:375
 msgid "Kind"
 msgstr "Art"
@@ -1643,7 +1636,7 @@ msgid "Most Non-Compliant Accounts"
 msgstr "Die meisten nicht konformen Konten"
 
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:177
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:234
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:235
 #: src/pages/panel/user-settings/UserSettingsApiTokensRow.tsx:92
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountRow.tsx:496
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx:65
@@ -1666,7 +1659,7 @@ msgstr "Name"
 msgid "Neighborhood view"
 msgstr "Nachbarschaftsansicht"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:213
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:214
 msgid "Neighborhood View"
 msgstr "Nachbarschaftsansicht"
 
@@ -1837,7 +1830,7 @@ msgstr "Öffnen Sie den Datenbankzugriff"
 msgid "Open drawer"
 msgstr "Öffene die Schublade"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:258
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:259
 msgid "Open resource {name} in AWS Console"
 msgstr "Öffnen Sie die Ressource {name} in der AWS-Konsole"
 
@@ -2050,7 +2043,7 @@ msgstr "Erneut authentifizieren"
 msgid "Receipts"
 msgstr "Quittungen"
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:67
+#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:57
 msgid "Recently added accounts"
 msgstr "Kürzlich hinzugefügte Konten"
 
@@ -2070,7 +2063,7 @@ msgstr "Regenerieren"
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:183
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormMore.tsx:97
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormRegionValues.tsx:60
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:241
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:242
 msgid "Region"
 msgstr "Region"
 
@@ -2269,8 +2262,8 @@ msgstr "Sicherheitsbewertung"
 msgid "Security Score over all {accountCounts} cloud accounts"
 msgstr ""
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:269
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:280
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:270
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:281
 msgid "See this Resource in AWS Console"
 msgstr "Sehen Sie sich diese Ressource in der AWS-Konsole an"
 
@@ -2390,7 +2383,7 @@ msgstr "Snowflake-Datenexport (bald verfügbar!)"
 msgid "Some checks have been disabled for this resource"
 msgstr "Einige Prüfungen wurden für diese Ressource deaktiviert"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:296
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:297
 #: src/pages/panel/user-settings/UserSettingsFormEmail.tsx:33
 #: src/pages/panel/user-settings/UserSettingsFormPassword.tsx:23
 #: src/pages/panel/user-settings/UserSettingsTotpActivationModal.tsx:107
@@ -2430,7 +2423,7 @@ msgid "Successfully invited {email}"
 msgstr "{email} erfolgreich eingeladen"
 
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormMore.tsx:98
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:306
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:307
 msgid "Tags"
 msgstr "Stichworte"
 
@@ -2471,7 +2464,7 @@ msgstr ""
 msgid "The OTP or recovery code you entered is incorrect or the OTP has expired. Please try entering it again."
 msgstr "Das von Ihnen eingegebene OTP oder Wiederherstellungscode ist falsch oder das OTP ist abgelaufen. Bitte versuchen Sie es erneut einzugeben."
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:294
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:295
 msgid "The selected resource does not exist anymore."
 msgstr "Die ausgewählte Ressource existiert nicht mehr."
 
@@ -2531,7 +2524,7 @@ msgstr "Drei"
 msgid "Tier"
 msgstr "Stufe"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:275
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:276
 msgid "To access this resource, please ensure that you are logged into the AWS account: {account}"
 msgstr "Um auf diese Ressource zuzugreifen, stellen Sie bitte sicher, dass Sie beim AWS-Konto angemeldet sind: {account}"
 
@@ -2831,10 +2824,6 @@ msgstr "Sie können TOTP über den Wiederherstellungscode deaktivieren"
 msgid "You currently have {0} attached to this workspace. There must only be {1} in order to downgrade to the free tier."
 msgstr ""
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:41
-msgid "You currently have {0}. There must only be {1} enabled in {2} tier. To increase your cloud account limit, you can upgrade your product tier <0>here</0>."
-msgstr ""
-
 #: src/pages/panel/workspace-settings-billing/ChangeProductTierModal.tsx:235
 #: src/pages/panel/workspace-settings-billing/ChangeProductTierToFreeModal.tsx:146
 msgid "You currently have {0}. There must only be {1} in order to downgrade to the free tier."
@@ -2860,6 +2849,10 @@ msgstr ""
 msgid "You don't have the permission to view this workspace, contact the workspace owner for more information."
 msgstr ""
 
+#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:41
+msgid "You have reached the maximum number of cloud accounts allowed for the {0} tier. To add more accounts, please <0>Upgrade Your Subscription</0>."
+msgstr ""
+
 #: src/pages/auth/login/LoginPage.tsx:204
 msgid "You have successfully reset your password."
 msgstr "Sie haben Ihr Passwort erfolgreich zurückgesetzt."
diff --git a/src/locales/en-US/messages.po b/src/locales/en-US/messages.po
index 8f291e32..0e50fbd8 100644
--- a/src/locales/en-US/messages.po
+++ b/src/locales/en-US/messages.po
@@ -21,10 +21,6 @@ msgstr "({0} max)"
 msgid "(${0} / month per additional account)"
 msgstr "(${0} / month per additional account)"
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:48
-msgid "{0, plural, one {# cloud account} other {# cloud accounts}}"
-msgstr "{0, plural, one {# cloud account} other {# cloud accounts}}"
-
 #: src/shared/utils/parseDuration.ts:171
 msgid "{0, plural, one {# Day} other {# Days}}"
 msgstr "{0, plural, one {# Day} other {# Days}}"
@@ -126,10 +122,6 @@ msgstr "{0}-month history"
 msgid "{0}: We've identified {1} non-compliant resources out of {2}."
 msgstr "{0}: We've identified {1} non-compliant resources out of {2}."
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:43
-msgid "{accountLength, plural, one {# enabled cloud account} other {# enabled cloud accounts}}"
-msgstr "{accountLength, plural, one {# enabled cloud account} other {# enabled cloud accounts}}"
-
 #: src/pages/panel/resource-detail/utils/nodeChange.tsx:140
 msgid "{added} configuration lines added and {removed} lines deleted."
 msgstr "{added} configuration lines added and {removed} lines deleted."
@@ -264,7 +256,7 @@ msgstr "Access to your account is broken"
 
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:195
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormAccount.tsx:65
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:240
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:241
 msgid "Account"
 msgstr "Account"
 
@@ -312,6 +304,7 @@ msgid "Add a New Credit or Debit Card"
 msgstr "Add a New Credit or Debit Card"
 
 #: src/shared/add-account-button/AddAccountButton.tsx:16
+#: src/shared/add-account-button/AddAccountButtonDisabled.tsx:8
 msgid "Add an account"
 msgstr "Add an account"
 
@@ -343,7 +336,7 @@ msgstr "Add Permission"
 msgid "Add Role Assignment"
 msgstr "Add Role Assignment"
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:77
+#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:67
 msgid "Added accounts"
 msgstr "Added accounts"
 
@@ -365,7 +358,7 @@ msgstr "Advanced search query"
 msgid "Affected resources"
 msgstr "Affected resources"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:249
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:250
 #: src/shared/charts/NetworkDiagram.tsx:378
 msgid "Age"
 msgstr "Age"
@@ -517,7 +510,7 @@ msgstr "Azure Service Management"
 msgid "Back"
 msgstr "Back"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:225
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:226
 msgid "Basic Information"
 msgstr "Basic Information"
 
@@ -724,7 +717,7 @@ msgstr "Close"
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:165
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormCloudValues.tsx:62
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormMore.tsx:96
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:236
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:237
 #: src/pages/panel/security/AccountCard.tsx:37
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountRow.tsx:493
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx:59
@@ -900,7 +893,7 @@ msgstr "Created At"
 msgid "Created in the last 7 days"
 msgstr "Created in the last 7 days"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:243
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:244
 msgid "Created Time"
 msgstr "Created Time"
 
@@ -1034,7 +1027,7 @@ msgstr "Deploy to organization"
 msgid "Description"
 msgstr "Description"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:321
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:322
 msgid "Details"
 msgstr "Details"
 
@@ -1052,7 +1045,7 @@ msgstr "Disconnect"
 msgid "Disconnect Service"
 msgstr "Disconnect Service"
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:87
+#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:77
 msgid "Discovered but unconfigured accounts"
 msgstr "Discovered but unconfigured accounts"
 
@@ -1371,7 +1364,7 @@ msgstr "IAM Role changes in the last 30 days."
 msgid "Id"
 msgstr "Id"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:233
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:234
 #: src/pages/panel/security/AccountCard.tsx:34
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountRow.tsx:490
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx:62
@@ -1520,7 +1513,7 @@ msgid "kind"
 msgstr "kind"
 
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:189
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:232
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:233
 #: src/shared/charts/NetworkDiagram.tsx:375
 msgid "Kind"
 msgstr "Kind"
@@ -1643,7 +1636,7 @@ msgid "Most Non-Compliant Accounts"
 msgstr "Most Non-Compliant Accounts"
 
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:177
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:234
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:235
 #: src/pages/panel/user-settings/UserSettingsApiTokensRow.tsx:92
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountRow.tsx:496
 #: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx:65
@@ -1666,7 +1659,7 @@ msgstr "Name"
 msgid "Neighborhood view"
 msgstr "Neighborhood view"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:213
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:214
 msgid "Neighborhood View"
 msgstr "Neighborhood View"
 
@@ -1837,7 +1830,7 @@ msgstr "Open Database Access"
 msgid "Open drawer"
 msgstr "Open drawer"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:258
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:259
 msgid "Open resource {name} in AWS Console"
 msgstr "Open resource {name} in AWS Console"
 
@@ -2050,7 +2043,7 @@ msgstr "Re-Authenticate"
 msgid "Receipts"
 msgstr "Receipts"
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:67
+#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:57
 msgid "Recently added accounts"
 msgstr "Recently added accounts"
 
@@ -2070,7 +2063,7 @@ msgstr "Regenerate"
 #: src/pages/panel/benchmark-detail/BenchmarkDetailCheckDetail.tsx:183
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormMore.tsx:97
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormRegionValues.tsx:60
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:241
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:242
 msgid "Region"
 msgstr "Region"
 
@@ -2269,8 +2262,8 @@ msgstr "Security Score"
 msgid "Security Score over all {accountCounts} cloud accounts"
 msgstr "Security Score over all {accountCounts} cloud accounts"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:269
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:280
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:270
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:281
 msgid "See this Resource in AWS Console"
 msgstr "See this Resource in AWS Console"
 
@@ -2390,7 +2383,7 @@ msgstr "Snowflake data export (coming soon!)"
 msgid "Some checks have been disabled for this resource"
 msgstr "Some checks have been disabled for this resource"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:296
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:297
 #: src/pages/panel/user-settings/UserSettingsFormEmail.tsx:33
 #: src/pages/panel/user-settings/UserSettingsFormPassword.tsx:23
 #: src/pages/panel/user-settings/UserSettingsTotpActivationModal.tsx:107
@@ -2430,7 +2423,7 @@ msgid "Successfully invited {email}"
 msgstr "Successfully invited {email}"
 
 #: src/pages/panel/inventory-search/inventory-form/InventoryFormMore.tsx:98
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:306
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:307
 msgid "Tags"
 msgstr "Tags"
 
@@ -2471,7 +2464,7 @@ msgstr "The Google Cloud Service Account key file is valid but did not allow us
 msgid "The OTP or recovery code you entered is incorrect or the OTP has expired. Please try entering it again."
 msgstr "The OTP or recovery code you entered is incorrect or the OTP has expired. Please try entering it again."
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:294
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:295
 msgid "The selected resource does not exist anymore."
 msgstr "The selected resource does not exist anymore."
 
@@ -2531,7 +2524,7 @@ msgstr "Three"
 msgid "Tier"
 msgstr "Tier"
 
-#: src/pages/panel/resource-detail/ResourceDetailView.tsx:275
+#: src/pages/panel/resource-detail/ResourceDetailView.tsx:276
 msgid "To access this resource, please ensure that you are logged into the AWS account: {account}"
 msgstr "To access this resource, please ensure that you are logged into the AWS account: {account}"
 
@@ -2831,10 +2824,6 @@ msgstr "You can deactivate TOTP via recovery code"
 msgid "You currently have {0} attached to this workspace. There must only be {1} in order to downgrade to the free tier."
 msgstr "You currently have {0} attached to this workspace. There must only be {1} in order to downgrade to the free tier."
 
-#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:41
-msgid "You currently have {0}. There must only be {1} enabled in {2} tier. To increase your cloud account limit, you can upgrade your product tier <0>here</0>."
-msgstr "You currently have {0}. There must only be {1} enabled in {2} tier. To increase your cloud account limit, you can upgrade your product tier <0>here</0>."
-
 #: src/pages/panel/workspace-settings-billing/ChangeProductTierModal.tsx:235
 #: src/pages/panel/workspace-settings-billing/ChangeProductTierToFreeModal.tsx:146
 msgid "You currently have {0}. There must only be {1} in order to downgrade to the free tier."
@@ -2860,6 +2849,10 @@ msgstr "You don't have the permission to change this, contact the workspace owne
 msgid "You don't have the permission to view this workspace, contact the workspace owner for more information."
 msgstr "You don't have the permission to view this workspace, contact the workspace owner for more information."
 
+#: src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx:41
+msgid "You have reached the maximum number of cloud accounts allowed for the {0} tier. To add more accounts, please <0>Upgrade Your Subscription</0>."
+msgstr "You have reached the maximum number of cloud accounts allowed for the {0} tier. To add more accounts, please <0>Upgrade Your Subscription</0>."
+
 #: src/pages/auth/login/LoginPage.tsx:204
 msgid "You have successfully reset your password."
 msgstr "You have successfully reset your password."
diff --git a/src/pages/panel/inventory-search/utils/inventoryRenderNodeChangeCell.tsx b/src/pages/panel/inventory-search/utils/inventoryRenderNodeChangeCell.tsx
index a4bda5f6..c2df6e03 100644
--- a/src/pages/panel/inventory-search/utils/inventoryRenderNodeChangeCell.tsx
+++ b/src/pages/panel/inventory-search/utils/inventoryRenderNodeChangeCell.tsx
@@ -15,7 +15,7 @@ export const inventoryRenderNodeChangeCell = (params: GridRenderCellParams<Works
     case 'node_created':
       return (
         <Stack direction="row" spacing={1} alignItems="center">
-          <Tooltip title={<Trans>Resource created</Trans>}>
+          <Tooltip title={<Trans>Resource created</Trans>} arrow>
             <TimelineDot color="info" variant="outlined">
               <AddCircleIcon fontSize="small" />
             </TimelineDot>
@@ -25,7 +25,7 @@ export const inventoryRenderNodeChangeCell = (params: GridRenderCellParams<Works
     case 'node_updated':
       return (
         <Stack direction="row" spacing={1} alignItems="center">
-          <Tooltip title={<Trans>Configuration changed</Trans>}>
+          <Tooltip title={<Trans>Configuration changed</Trans>} arrow>
             <TimelineDot color="primary" variant="outlined">
               <UpdateIcon fontSize="small" />
             </TimelineDot>
@@ -35,7 +35,7 @@ export const inventoryRenderNodeChangeCell = (params: GridRenderCellParams<Works
     case 'node_deleted':
       return (
         <Stack direction="row" spacing={1} alignItems="center">
-          <Tooltip title={<Trans>Resource deleted</Trans>}>
+          <Tooltip title={<Trans>Resource deleted</Trans>} arrow>
             <TimelineDot color="error" variant="outlined">
               <RemoveCircleIcon fontSize="small" />
             </TimelineDot>
@@ -45,7 +45,7 @@ export const inventoryRenderNodeChangeCell = (params: GridRenderCellParams<Works
     case 'node_compliant':
       return (
         <Stack direction="row" spacing={1} alignItems="center">
-          <Tooltip title={<Trans>Resource Secured</Trans>}>
+          <Tooltip title={<Trans>Resource Secured</Trans>} arrow>
             <TimelineDot color="success" variant="outlined">
               <GppGoodIcon fontSize="small" />
             </TimelineDot>
@@ -55,7 +55,7 @@ export const inventoryRenderNodeChangeCell = (params: GridRenderCellParams<Works
     case 'node_vulnerable':
       return (
         <Stack direction="row" spacing={1} alignItems="center">
-          <Tooltip title={<Trans>Security posture changed</Trans>}>
+          <Tooltip title={<Trans>Security posture changed</Trans>} arrow>
             <TimelineDot color="warning" variant="outlined">
               <GppMaybeIcon fontSize="small" />
             </TimelineDot>
diff --git a/src/pages/panel/resource-detail/ResourceDetailView.tsx b/src/pages/panel/resource-detail/ResourceDetailView.tsx
index c887491e..3fdfcb05 100644
--- a/src/pages/panel/resource-detail/ResourceDetailView.tsx
+++ b/src/pages/panel/resource-detail/ResourceDetailView.tsx
@@ -86,6 +86,7 @@ const GridItem = ({ property, value, color, isReactNode }: GridItemProps) => {
           (value as ReactNode)
         ) : (
           <Tooltip
+            arrow
             slotProps={{ tooltip: { sx: { maxWidth: '100vw', maxHeight: '100vh', overflow: 'auto', p: 1 } } }}
             title={
               isSimpleValue ? (
diff --git a/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountTableTitle.tsx b/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountTableTitle.tsx
index 722b7489..5d20b22d 100644
--- a/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountTableTitle.tsx
+++ b/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountTableTitle.tsx
@@ -1,13 +1,19 @@
-import { Box, Stack, Typography } from '@mui/material'
-import { PropsWithChildren } from 'react'
-import { AddAccountButton } from 'src/shared/add-account-button'
+import { Box, Stack, Tooltip, Typography } from '@mui/material'
+import { PropsWithChildren, ReactNode } from 'react'
+import { AddAccountButton, AddAccountButtonDisabled } from 'src/shared/add-account-button'
 
 interface WorkspaceSettingsAccountTableTitleProps extends PropsWithChildren {
   isTop: boolean
   withAddButton?: boolean
+  errorModalContent?: ReactNode
 }
 
-export const WorkspaceSettingsAccountTableTitle = ({ isTop, withAddButton, children }: WorkspaceSettingsAccountTableTitleProps) =>
+export const WorkspaceSettingsAccountTableTitle = ({
+  isTop,
+  withAddButton,
+  children,
+  errorModalContent,
+}: WorkspaceSettingsAccountTableTitleProps) =>
   isTop ? (
     <Stack
       mb={{ xs: 0, sm: 1 }}
@@ -17,7 +23,15 @@ export const WorkspaceSettingsAccountTableTitle = ({ isTop, withAddButton, child
       justifyContent={isTop ? 'space-between' : undefined}
     >
       <Typography variant="h4">{children}</Typography>
-      {withAddButton ? <AddAccountButton /> : null}
+      {withAddButton ? (
+        <AddAccountButton />
+      ) : (
+        <Tooltip title={errorModalContent} slotProps={{ tooltip: { sx: { p: 0 } } }} arrow>
+          <Box>
+            <AddAccountButtonDisabled />
+          </Box>
+        </Tooltip>
+      )}
     </Stack>
   ) : (
     <Box mb={{ xs: 0, sm: 1 }}>
diff --git a/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx b/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx
index d10b990e..29dd202e 100644
--- a/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx
+++ b/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTable.tsx
@@ -1,4 +1,4 @@
-import { plural, t, Trans } from '@lingui/macro'
+import { t, Trans } from '@lingui/macro'
 import { Alert, AlertTitle } from '@mui/material'
 import { useSuspenseQueries } from '@tanstack/react-query'
 import { useUserProfile } from 'src/core/auth'
@@ -39,18 +39,8 @@ export const WorkspaceSettingsAccountsTable = () => {
     <Alert severity="warning">
       <AlertTitle>
         <Trans>
-          You currently have{' '}
-          {plural(accountLength, {
-            one: '# enabled cloud account',
-            other: '# enabled cloud accounts',
-          })}
-          . There must only be{' '}
-          {plural(accountLimit ?? 1, {
-            one: '# cloud account',
-            other: '# cloud accounts',
-          })}{' '}
-          enabled in {selectedWorkspace?.tier} tier. To increase your cloud account limit, you can upgrade your product tier{' '}
-          <InternalLink to="/workspace-settings/billing-receipts">here</InternalLink>.
+          You have reached the maximum number of cloud accounts allowed for the {selectedWorkspace?.tier} tier. To add more accounts, please{' '}
+          <InternalLink to="/workspace-settings/billing-receipts">Upgrade Your Subscription</InternalLink>.
         </Trans>
       </AlertTitle>
     </Alert>
diff --git a/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx b/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx
index 180d05f1..bd7f8584 100644
--- a/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx
+++ b/src/pages/panel/workspace-settings-accounts/WorkspaceSettingsAccountsTableItem.tsx
@@ -38,7 +38,7 @@ export const WorkspaceSettingsAccountsTableItem = ({
   )
   return (
     <Box mb={isBottom ? undefined : { xs: 8, sm: 5 }} mt={isTop ? undefined : { sm: 3 }}>
-      <WorkspaceSettingsAccountTableTitle isTop={isTop} withAddButton={canInviteBasedOnTier}>
+      <WorkspaceSettingsAccountTableTitle isTop={isTop} withAddButton={canInviteBasedOnTier} errorModalContent={enableErrorModalContent}>
         {title}
       </WorkspaceSettingsAccountTableTitle>
       <TableView
diff --git a/src/shared/add-account-button/AddAccountButtonDisabled.tsx b/src/shared/add-account-button/AddAccountButtonDisabled.tsx
new file mode 100644
index 00000000..e00b9484
--- /dev/null
+++ b/src/shared/add-account-button/AddAccountButtonDisabled.tsx
@@ -0,0 +1,10 @@
+import { Trans } from '@lingui/macro'
+import AddIcon from '@mui/icons-material/Add'
+import { Button } from '@mui/material'
+import { useThemeMode } from 'src/core/theme'
+
+export const AddAccountButtonDisabled = () => (
+  <Button startIcon={<AddIcon />} variant={useThemeMode().mode === 'dark' ? 'outlined' : 'contained'} disabled>
+    <Trans>Add an account</Trans>
+  </Button>
+)
diff --git a/src/shared/add-account-button/index.ts b/src/shared/add-account-button/index.ts
index e568763d..9a1217ba 100644
--- a/src/shared/add-account-button/index.ts
+++ b/src/shared/add-account-button/index.ts
@@ -1 +1,2 @@
 export { AddAccountButton } from './AddAccountButton'
+export { AddAccountButtonDisabled } from './AddAccountButtonDisabled'
diff --git a/src/shared/cloud-avatar/CloudAvatar.tsx b/src/shared/cloud-avatar/CloudAvatar.tsx
index 5b87a534..0b1a3a0f 100644
--- a/src/shared/cloud-avatar/CloudAvatar.tsx
+++ b/src/shared/cloud-avatar/CloudAvatar.tsx
@@ -52,7 +52,7 @@ const cloudDefaultTooltip = (cloud: AccountCloud) => {
 }
 
 export const CloudAvatar = ({ cloud, small, withCrown, tooltip, error, onErrorClick }: CloudAvatarProps) => (
-  <Tooltip title={tooltip === true ? cloudDefaultTooltip(cloud) : tooltip}>
+  <Tooltip title={tooltip === true ? cloudDefaultTooltip(cloud) : tooltip} arrow>
     <Box position="relative">
       <Box margin="0 auto">
         <CloudIcon cloud={cloud} small={small} withCrown={withCrown} />
@@ -70,7 +70,7 @@ export const CloudAvatar = ({ cloud, small, withCrown, tooltip, error, onErrorCl
         </>
       ) : null}
       {error ? (
-        <Tooltip title={error}>
+        <Tooltip title={error} arrow>
           <Box
             onClick={onErrorClick}
             component={Paper}