diff --git a/pass/Views/LabelTableViewCell.swift b/pass/Views/LabelTableViewCell.swift
index 2eef4e2..a0739ab 100644
--- a/pass/Views/LabelTableViewCell.swift
+++ b/pass/Views/LabelTableViewCell.swift
@@ -62,9 +62,11 @@ class LabelTableViewCell: UITableViewCell {
             case "url":
                 type = .URL
                 contentLabel.text = content
+                contentLabel.font = UIFont.systemFont(ofSize: contentLabel.font.pointSize)
             default:
                 type = .other
                 contentLabel.text = content
+                contentLabel.font = UIFont.systemFont(ofSize: contentLabel.font.pointSize)
             }
             updateButtons()
         }
@@ -79,13 +81,6 @@ class LabelTableViewCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
     }
-    
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        if buttons != nil {
-            self.accessoryView = buttons
-        }
-    }
 
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
@@ -208,5 +203,6 @@ class LabelTableViewCell: UITableViewCell {
             passwordDisplayButton = nil
             buttons = nil
         }
+        self.accessoryView = buttons
     }
 }