diff --git a/saas/app/views/account/subscriptions/notices/_admin_exceeding_card_limit.html.erb b/saas/app/views/account/subscriptions/notices/_admin_exceeding_card_limit.html.erb
index e6c714ed4..3dc759d9e 100644
--- a/saas/app/views/account/subscriptions/notices/_admin_exceeding_card_limit.html.erb
+++ b/saas/app/views/account/subscriptions/notices/_admin_exceeding_card_limit.html.erb
@@ -1,4 +1,4 @@
-<strong>You've used your <u><%= Plan.free.card_limit %></u> free cards.</strong>
+<strong>You’ve used your <u><%= Plan.free.card_limit %></u> free cards.</strong>
 <%= link_to account_settings_path(anchor: "subscription"), class: "btn settings-subscription__button" do %>
   <span>Upgrade to Unlimited</span>
 <% end %>
diff --git a/saas/app/views/account/subscriptions/notices/_admin_exceeding_storage_limit.html.erb b/saas/app/views/account/subscriptions/notices/_admin_exceeding_storage_limit.html.erb
index 9f7c6c370..8770c1460 100644
--- a/saas/app/views/account/subscriptions/notices/_admin_exceeding_storage_limit.html.erb
+++ b/saas/app/views/account/subscriptions/notices/_admin_exceeding_storage_limit.html.erb
@@ -1,4 +1,4 @@
-<strong>You've used your <u><%= storage_to_human_size(Plan.free.storage_limit) %></u> free storage.</strong>
+<strong>You’ve run out of <%= Current.account.plan.free? ? "free storage" : "storage" %>.</strong>
 <%= link_to account_settings_path(anchor: "subscription"), class: "btn settings-subscription__button" do %>
-  <span>Upgrade for more storage</span>
+  <span>Upgrade to get more</span>
 <% end %>
diff --git a/saas/app/views/account/subscriptions/notices/_user_exceeding_storage_limit.html.erb b/saas/app/views/account/subscriptions/notices/_user_exceeding_storage_limit.html.erb
index 51d4a5cdd..f230443a1 100644
--- a/saas/app/views/account/subscriptions/notices/_user_exceeding_storage_limit.html.erb
+++ b/saas/app/views/account/subscriptions/notices/_user_exceeding_storage_limit.html.erb
@@ -1,3 +1,3 @@
 <div class="pad-inline pad-block-half">
-  <strong>This account has used <u><%= storage_to_human_size(Plan.free.storage_limit) %></u> free storage. Upgrade to get more.</strong>
+  <strong>This account has run out of <%= Current.account.plan.free? ? "free storage" : "storage" %>. Upgrade to get more.</strong>
 </div>
diff --git a/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_card_limit.html.erb b/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_card_limit.html.erb
index 1b303e62b..caa7bd958 100644
--- a/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_card_limit.html.erb
+++ b/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_card_limit.html.erb
@@ -1 +1 @@
-You've used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. <strong><%= link_to "Upgrade to unlimited", account_settings_path(anchor: "subscription") %></strong>.
+You’ve used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. <strong><%= link_to "Upgrade to unlimited", account_settings_path(anchor: "subscription") %></strong>.
diff --git a/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_storage_limit.html.erb b/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_storage_limit.html.erb
index 904d29657..ab1a3ca34 100644
--- a/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_storage_limit.html.erb
+++ b/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_storage_limit.html.erb
@@ -1 +1 @@
-You've used <%= storage_to_human_size(Current.account.billed_bytes_used) %> out of <%= storage_to_human_size(Plan.free.storage_limit) %> free storage. <strong><%= link_to "Upgrade for more", account_settings_path(anchor: "subscription") %></strong>.
+You’ve used <%= storage_to_human_size(Current.account.billed_bytes_used) %> out of <%= storage_to_human_size(Current.account.plan.storage_limit) %> <%= Current.account.plan.free? ? "free storage" : "storage" %>. <strong><%= link_to "Upgrade to get more", account_settings_path(anchor: "subscription") %></strong>.
diff --git a/saas/app/views/cards/container/footer/saas/notices/_user_nearing_card_limit.html.erb b/saas/app/views/cards/container/footer/saas/notices/_user_nearing_card_limit.html.erb
index 30f7b5f14..8ab80e162 100644
--- a/saas/app/views/cards/container/footer/saas/notices/_user_nearing_card_limit.html.erb
+++ b/saas/app/views/cards/container/footer/saas/notices/_user_nearing_card_limit.html.erb
@@ -1 +1 @@
-This account has used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. <strong>Upgrade soon</strong>
+This account has used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. Upgrade soon.
diff --git a/saas/app/views/cards/container/footer/saas/notices/_user_nearing_storage_limit.html.erb b/saas/app/views/cards/container/footer/saas/notices/_user_nearing_storage_limit.html.erb
index c9df3e874..25428980a 100644
--- a/saas/app/views/cards/container/footer/saas/notices/_user_nearing_storage_limit.html.erb
+++ b/saas/app/views/cards/container/footer/saas/notices/_user_nearing_storage_limit.html.erb
@@ -1 +1 @@
-This account has used <%= storage_to_human_size(Current.account.billed_bytes_used) %> out of <%= storage_to_human_size(Plan.free.storage_limit) %> free storage. <strong>Upgrade soon</strong>
+This account has used <%= storage_to_human_size(Current.account.billed_bytes_used) %> out of <%= storage_to_human_size(Current.account.plan.storage_limit) %> <%= Current.account.plan.free? ? "free storage" : "storage" %>. Upgrade soon.