diff --git a/saas/app/views/account/subscriptions/_upgrade.html.erb b/saas/app/views/account/subscriptions/_upgrade.html.erb
index d1c06e7f0..449fecf16 100644
--- a/saas/app/views/account/subscriptions/_upgrade.html.erb
+++ b/saas/app/views/account/subscriptions/_upgrade.html.erb
@@ -1,12 +1,9 @@
 <div class="settings-subscription__notch card-perma__notch card-perma__notch--bottom">
   <% if Current.user.admin? %>
-    <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 %>
+    <%= render "account/subscriptions/notices/admin_exceeding_card_limit" if Current.account.exceeding_card_limit? %>
+    <%= render "account/subscriptions/notices/admin_exceeding_storage_limit" if Current.account.exceeding_storage_limit? %>
   <% else %>
-    <div class="pad-inline pad-block-half">
-      <strong>This account has used <u><%= Plan.free.card_limit %></u> free cards. Upgrade to get more.</strong>
-    </div>
+    <%= render "account/subscriptions/notices/user_exceeding_card_limit" if Current.account.exceeding_card_limit? %>
+    <%= render "account/subscriptions/notices/user_exceeding_storage_limit" if Current.account.exceeding_storage_limit? %>
   <% end %>
 </div>
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
new file mode 100644
index 000000000..e6c714ed4
--- /dev/null
+++ b/saas/app/views/account/subscriptions/notices/_admin_exceeding_card_limit.html.erb
@@ -0,0 +1,4 @@
+<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
new file mode 100644
index 000000000..9f7c6c370
--- /dev/null
+++ b/saas/app/views/account/subscriptions/notices/_admin_exceeding_storage_limit.html.erb
@@ -0,0 +1,4 @@
+<strong>You've used your <u><%= storage_to_human_size(Plan.free.storage_limit) %></u> free storage.</strong>
+<%= link_to account_settings_path(anchor: "subscription"), class: "btn settings-subscription__button" do %>
+  <span>Upgrade for more storage</span>
+<% end %>
diff --git a/saas/app/views/account/subscriptions/notices/_user_exceeding_card_limit.html.erb b/saas/app/views/account/subscriptions/notices/_user_exceeding_card_limit.html.erb
new file mode 100644
index 000000000..f3f65f3be
--- /dev/null
+++ b/saas/app/views/account/subscriptions/notices/_user_exceeding_card_limit.html.erb
@@ -0,0 +1,3 @@
+<div class="pad-inline pad-block-half">
+  <strong>This account has used <u><%= Plan.free.card_limit %></u> free cards. Upgrade to get more.</strong>
+</div>
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
new file mode 100644
index 000000000..51d4a5cdd
--- /dev/null
+++ b/saas/app/views/account/subscriptions/notices/_user_exceeding_storage_limit.html.erb
@@ -0,0 +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>
+</div>
diff --git a/saas/app/views/cards/container/footer/saas/_create.html.erb b/saas/app/views/cards/container/footer/saas/_create.html.erb
index 295c9bd19..8b0edd308 100644
--- a/saas/app/views/cards/container/footer/saas/_create.html.erb
+++ b/saas/app/views/cards/container/footer/saas/_create.html.erb
@@ -1,4 +1,4 @@
-<% if Current.account.exceeding_card_limit? %>
+<% if Current.account.exceeding_limits? %>
   <%= render "account/subscriptions/upgrade" %>
 <% else %>
   <%= render "cards/container/footer/create", card: card %>
diff --git a/saas/app/views/cards/container/footer/saas/_near_notice.html.erb b/saas/app/views/cards/container/footer/saas/_near_notice.html.erb
index e40aa9fb5..8dc739e67 100644
--- a/saas/app/views/cards/container/footer/saas/_near_notice.html.erb
+++ b/saas/app/views/cards/container/footer/saas/_near_notice.html.erb
@@ -1,9 +1,9 @@
-<% if Current.account.nearing_plan_cards_limit? %>
-  <div class="settings_subscription__warning full-width pad-inline center margin-block-half">
-    <% if Current.user.admin? %>
-      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>.
-    <% else %>
-      This account has used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. <strong>Upgrade soon</strong>
-    <% end %>
-  </div>
-<% end %>
+<div class="settings_subscription__warning full-width pad-inline center margin-block-half">
+  <% if Current.user.admin? %>
+    <%= render "cards/container/footer/saas/notices/admin_nearing_storage_limit" if Current.account.nearing_plan_storage_limit? %>
+    <%= render "cards/container/footer/saas/notices/admin_nearing_card_limit" if Current.account.nearing_plan_cards_limit? %>
+  <% else %>
+    <%= render "cards/container/footer/saas/notices/user_nearing_storage_limit" if Current.account.nearing_plan_storage_limit? %>
+    <%= render "cards/container/footer/saas/notices/user_nearing_card_limit" if Current.account.nearing_plan_cards_limit? %>
+  <% end %>
+</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
new file mode 100644
index 000000000..1b303e62b
--- /dev/null
+++ b/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_card_limit.html.erb
@@ -0,0 +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>.
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
new file mode 100644
index 000000000..904d29657
--- /dev/null
+++ b/saas/app/views/cards/container/footer/saas/notices/_admin_nearing_storage_limit.html.erb
@@ -0,0 +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>.
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
new file mode 100644
index 000000000..30f7b5f14
--- /dev/null
+++ b/saas/app/views/cards/container/footer/saas/notices/_user_nearing_card_limit.html.erb
@@ -0,0 +1 @@
+This account has used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. <strong>Upgrade soon</strong>
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
new file mode 100644
index 000000000..c9df3e874
--- /dev/null
+++ b/saas/app/views/cards/container/footer/saas/notices/_user_nearing_storage_limit.html.erb
@@ -0,0 +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>