diff --git a/static/app-strings.json b/static/app-strings.json
index 15a17a80f..6a06505ea 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -2256,19 +2256,6 @@
   "Move Up": "Move Up",
   "Move Down": "Move Down",
   "Trending for #Game": "Trending for #Game",
-  "Help the P2P data network by hosting data.": "Help the P2P data network by hosting data.",
-  "History hosting lets you choose how much storage to use helping content you've consumed.": "History hosting lets you choose how much storage to use helping content you've consumed.",
-  "Automatic hosting lets you delegate some amount of storage for the network to automatically download ad host.": "Automatic hosting lets you delegate some amount of storage for the network to automatically download ad host.",
-  "Playing videos may exceed your history hosting limit until cleanup runs every 30 minutes.": "Playing videos may exceed your history hosting limit until cleanup runs every 30 minutes.",
-  "History: Limit (GB)": "History: Limit (GB)",
-  "Automatic: Allow (GB)": "Automatic: Allow (GB)",
-  "Automatic hosting lets you delegate some amount of storage for the network to automatically download and host.": "Automatic hosting lets you delegate some amount of storage for the network to automatically download and host.",
-  "History Hosting": "History Hosting",
-  "Automatic Hosting": "Automatic Hosting",
-  "History Hosting lets you choose how much storage to use helping content you've consumed.": "History Hosting lets you choose how much storage to use helping content you've consumed.",
-  "Automatic Hosting lets you delegate some amount of storage for the network to automatically download and host.": "Automatic Hosting lets you delegate some amount of storage for the network to automatically download and host.",
-  "Help improve the P2P data network (and make LBRY happy) by hosting data.": "Help improve the P2P data network (and make LBRY happy) by hosting data.",
-  "Limit Hosting of Content History": "Limit Hosting of Content History",
   "Remove custom comment server": "Remove custom comment server",
   "Use Https": "Use Https",
   "Server URL": "Server URL",
@@ -2328,5 +2315,15 @@
   "Automatic Hosting downloads a small slice of content currently active on the network.": "Automatic Hosting downloads a small slice of content currently active on the network.",
   "Automatic Hosting (GB)": "Automatic Hosting (GB)",
   "* Note that as peer-to-peer software, your IP address and potentially other system information can be sent to other users, though this information is not stored permanently.": "* Note that as peer-to-peer software, your IP address and potentially other system information can be sent to other users, though this information is not stored permanently.",
+  "Help improve the P2P data network (and make LBRY users happy) by hosting data.": "Help improve the P2P data network (and make LBRY users happy) by hosting data.",
+  "View History Hosting lets you choose how much storage to use hosting content you've consumed.": "View History Hosting lets you choose how much storage to use hosting content you've consumed.",
+  "Automatic Hosting downloads a small portion of content active on the network.": "Automatic Hosting downloads a small portion of content active on the network.",
+  "Publishes --[legend, storage category]--": "Publishes",
+  "Auto Hosting --[legend, storage category]--": "Auto Hosting",
+  "View Hosting --[legend, storage category]--": "View Hosting",
+  "%spaceUsed% of %limit% GB": "%spaceUsed% of %limit% GB",
+  "%spaceUsed% of %limit% Free GB": "%spaceUsed% of %limit% Free GB",
+  "Disabled": "Disabled",
+  "Free --[legend, unused disk space]--": "Free",
   "--end--": "--end--"
 }
diff --git a/ui/component/appStorageVisualization/view.jsx b/ui/component/appStorageVisualization/view.jsx
index 5a1b64f89..c8d40cbe9 100644
--- a/ui/component/appStorageVisualization/view.jsx
+++ b/ui/component/appStorageVisualization/view.jsx
@@ -86,16 +86,6 @@ function StorageViz(props: Props) {
                   %spaceUsed% of %limit% GB
                 </I18nMessage>
               )}
-              {
-                <I18nMessage
-                  tokens={{
-                    spaceUsed: getGB(viewBlobSpace),
-                    limit: viewHostingLimit !== 0 ? getGB(viewHostingLimit) : getGB(viewFree),
-                  }}
-                >
-                  %spaceUsed% of %limit% Free GB
-                </I18nMessage>
-              }
             </div>
           </div>
         </div>
diff --git a/ui/component/settingViewHosting/view.jsx b/ui/component/settingViewHosting/view.jsx
index d89e371da..a4b881187 100644
--- a/ui/component/settingViewHosting/view.jsx
+++ b/ui/component/settingViewHosting/view.jsx
@@ -117,7 +117,7 @@ function SettingViewHosting(props: Props) {
               <Button
                 disabled={
                   // disabled if settings are equal or not valid amounts
-                  (viewHostingLimit === 1 && contentBlobSpaceLimitGB === '0') ||
+                  (viewHostingLimit === 1 && contentBlobSpaceLimitGB <= MINIMUM_VIEW_SETTING) ||
                   (unlimited && viewHostingLimit === 0) ||
                   (!unlimited &&
                     String(viewHostingLimit) ===
@@ -136,7 +136,7 @@ function SettingViewHosting(props: Props) {
               <Button
                 disabled={
                   // disabled if settings are equal or not valid amounts
-                  (viewHostingLimit === 1 && contentBlobSpaceLimitGB === '0') ||
+                  (viewHostingLimit === 1 && contentBlobSpaceLimitGB <= MINIMUM_VIEW_SETTING) ||
                   (unlimited && viewHostingLimit === 0) ||
                   (!unlimited &&
                     (String(viewHostingLimit) === convertGbToMbStr(contentBlobSpaceLimitGB) ||