diff --git a/apple/Sources/Watch/IronStorageWatchApp.swift b/apple/Sources/Watch/IronStorageWatchApp.swift
index 9e33c05..59b4655 100644
--- a/apple/Sources/Watch/IronStorageWatchApp.swift
+++ b/apple/Sources/Watch/IronStorageWatchApp.swift
@@ -195,13 +195,11 @@ private struct WatchRootView: View {
                                 VStack(alignment: .leading, spacing: 2) {
                                     Text(record.issuer ?? record.account)
                                         .font(.headline)
-                                    Text(record.account)
-                                        .font(.caption)
-                                        .foregroundStyle(.secondary)
-                                    Text(record.code)
-                                        .font(.system(.title3, design: .rounded, weight: .semibold))
-                                        .monospacedDigit()
-                                        .privacySensitive()
+                                    if record.issuer != nil {
+                                        Text(record.account)
+                                            .font(.caption)
+                                            .foregroundStyle(.secondary)
+                                    }
                                 }
                             }
                         }
@@ -234,13 +232,13 @@ private struct WatchTotpDetail: View {
                         .foregroundStyle(.secondary)
                         .multilineTextAlignment(.center)
                     Text(record.code)
-                        .font(.system(.largeTitle, design: .rounded, weight: .bold))
+                        .font(.system(size: 42, weight: .bold, design: .rounded))
                         .monospacedDigit()
                         .minimumScaleFactor(0.7)
                         .lineLimit(1)
                         .privacySensitive()
                     ProgressView(
-                        value: Double(record.period - min(record.remaining, record.period)),
+                        value: Double(min(record.remaining, record.period)),
                         total: Double(record.period)
                     )
                     .accessibilityLabel("Code validity")