diff --git a/AltStore/Helper/DateFormatterHelper.swift b/AltStore/Helper/DateFormatterHelper.swift
index 62ef062e..106229be 100644
--- a/AltStore/Helper/DateFormatterHelper.swift
+++ b/AltStore/Helper/DateFormatterHelper.swift
@@ -22,25 +22,18 @@ struct DateFormatterHelper {
         let startDate = Date()
         let interval = date.timeIntervalSince(startDate)
         guard interval > 0 else {
-            return ""
+            return "EXPIRED"
         }
         
-        if interval < (1 * 60 * 60) {
+        if interval < (24 * 60 * 60) {
             self.appExpirationDateFormatter.unitsStyle = .positional
             self.appExpirationDateFormatter.allowedUnits = [.minute, .second]
-        }
-        else if interval < (2 * 24 * 60 * 60)
-        {
-            self.appExpirationDateFormatter.unitsStyle = .positional
-            self.appExpirationDateFormatter.allowedUnits = [.hour, .minute, .second]
-        }
-        else
-        {
+        } else {
             self.appExpirationDateFormatter.unitsStyle = .full
             self.appExpirationDateFormatter.allowedUnits = [.day]
+        }
             
-//            let numberOfDays = endDate.numberOfCalendarDays(since: startDate)
-//            text = String(format: NSLocalizedString("%@ DAYS", comment: ""), NSNumber(value: numberOfDays))
+        return self.appExpirationDateFormatter.string(from: startDate, to: date) ?? ""
         }
         
         return self.appExpirationDateFormatter.string(from: startDate, to: date) ?? ""
diff --git a/AltStore/View Components/AppPillButton.swift b/AltStore/View Components/AppPillButton.swift
index 69589678..c8266d5a 100644
--- a/AltStore/View Components/AppPillButton.swift	
+++ b/AltStore/View Components/AppPillButton.swift	
@@ -51,10 +51,10 @@ struct AppPillButton: View {
     }
     
     var body: some View {
-        SwiftUI.Button(action: handleButton, label: {
+        SwiftUI.Button(action: handleButton) {
             Text(buttonText.uppercased())
                 .bold()
-        })
+        }
         .buttonStyle(PillButtonStyle(tintColor: storeApp?.tintColor ?? .black, progress: progress))
     }
     
diff --git a/AltStore/View Extensions/Styles/PillButtonStyle.swift b/AltStore/View Extensions/Styles/PillButtonStyle.swift
index c1bd0a39..00197e85 100644
--- a/AltStore/View Extensions/Styles/PillButtonStyle.swift	
+++ b/AltStore/View Extensions/Styles/PillButtonStyle.swift	
@@ -25,7 +25,7 @@ struct PillButtonStyle: ButtonStyle {
         }
         .frame(minWidth: 40)
         .padding(.horizontal, 16)
-        .padding(.vertical, 8)
+        .padding(.vertical, 6)
         .background(background)
         .foregroundColor(self.progress == nil ? .white : Color(tintColor))
         .clipShape(Capsule())
@@ -44,3 +44,16 @@ struct PillButtonStyle: ButtonStyle {
         }
     }
 }
+
+
+struct PillButtonStyle_Previews: PreviewProvider {
+
+    static var previews: some View {
+        SwiftUI.Button {
+
+        } label: {
+            Text("Label").bold()
+        }
+        .buttonStyle(PillButtonStyle(tintColor: Asset.accentColor.color))
+    }
+}