diff --git a/AltStore/App IDs/AppIDsViewController.swift b/AltStore/App IDs/AppIDsViewController.swift
index d575098e..450984df 100644
--- a/AltStore/App IDs/AppIDsViewController.swift	
+++ b/AltStore/App IDs/AppIDsViewController.swift	
@@ -97,6 +97,15 @@ private extension AppIDsViewController
                 formatter.includesTimeRemainingPhrase = false
                 formatter.allowedUnits = [.minute, .hour, .day]
                 
+                let numberOfDays = expirationDate.numberOfCalendarDays(since: Date())
+
+                
+                switch numberOfDays
+                {
+                case 1...: formatter.allowedUnits = [.day]
+                case 0: formatter.allowedUnits = [.hour, .minute]
+                default: formatter.allowedUnits = [.day]
+                }
                 
                 cell.bannerView.button.setTitle(formatter.string(from: Date(), to: expirationDate)?.uppercased(), for: .normal)
                 
diff --git a/AltStore/My Apps/MyAppsViewController.swift b/AltStore/My Apps/MyAppsViewController.swift
index 79e29153..f9360e33 100644
--- a/AltStore/My Apps/MyAppsViewController.swift	
+++ b/AltStore/My Apps/MyAppsViewController.swift	
@@ -334,8 +334,15 @@ private extension MyAppsViewController
             formatter.unitsStyle = .full
             formatter.includesApproximationPhrase = false
             formatter.includesTimeRemainingPhrase = false
-            formatter.allowedUnits = [.minute, .hour, .day]
-
+            switch numberOfDays
+            {
+            case 1...: formatter.allowedUnits = [.day]
+            case 0: formatter.allowedUnits = [.hour, .minute]
+            default: formatter.allowedUnits = [.day]
+            }
+            
+            
+            
             cell.bannerView.button.setTitle(formatter.string(from: currentDate, to: installedApp.expirationDate)?.uppercased(), for: .normal)
             
             cell.bannerView.button.accessibilityLabel = String(format: NSLocalizedString("Refresh %@", comment: ""), installedApp.name)