diff --git a/pass/Views/FillPasswordTableViewCell.xib b/pass/Views/FillPasswordTableViewCell.xib
index 228c84a..e12467d 100644
--- a/pass/Views/FillPasswordTableViewCell.xib
+++ b/pass/Views/FillPasswordTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -32,20 +32,22 @@
                         </connections>
                     </textField>
                     <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SZJ-aY-45Y" userLabel="Setting">
-                        <rect key="frame" x="285" y="8" width="20" height="73.5"/>
+                        <rect key="frame" x="275" y="8" width="30" height="73.5"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="20" id="D9D-FC-ANz"/>
+                            <constraint firstAttribute="width" constant="30" id="D9D-FC-ANz"/>
                         </constraints>
+                        <inset key="contentEdgeInsets" minX="5" minY="10" maxX="5" maxY="10"/>
                         <state key="normal" image="HorizontalSettings"/>
                         <connections>
                             <action selector="showHidePasswordSettings" destination="KGk-i7-Jjw" eventType="touchUpInside" id="3I8-S0-qlo"/>
                         </connections>
                     </button>
                     <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hTh-ek-Xam" userLabel="Generate">
-                        <rect key="frame" x="255" y="8" width="20" height="73.5"/>
+                        <rect key="frame" x="245" y="8" width="30" height="73.5"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="20" id="l0l-7B-Tws"/>
+                            <constraint firstAttribute="width" constant="30" id="l0l-7B-Tws"/>
                         </constraints>
+                        <inset key="contentEdgeInsets" minX="5" minY="10" maxX="5" maxY="10"/>
                         <state key="normal" image="Refresh"/>
                         <connections>
                             <action selector="generatePassword:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="M61-hs-PCP"/>
@@ -57,7 +59,7 @@
                     <constraint firstAttribute="trailingMargin" secondItem="SZJ-aY-45Y" secondAttribute="trailing" constant="7" id="5bp-bm-9vv"/>
                     <constraint firstAttribute="bottomMargin" secondItem="SZJ-aY-45Y" secondAttribute="bottom" id="CMF-1f-MdG"/>
                     <constraint firstItem="hTh-ek-Xam" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="OjQ-mD-CWV"/>
-                    <constraint firstItem="SZJ-aY-45Y" firstAttribute="leading" secondItem="hTh-ek-Xam" secondAttribute="trailing" constant="10" id="UlR-NB-9So"/>
+                    <constraint firstItem="SZJ-aY-45Y" firstAttribute="leading" secondItem="hTh-ek-Xam" secondAttribute="trailing" id="UlR-NB-9So"/>
                     <constraint firstAttribute="bottomMargin" secondItem="hTh-ek-Xam" secondAttribute="bottom" id="bvu-Q0-QAG"/>
                     <constraint firstAttribute="bottomMargin" secondItem="k0U-2N-YaX" secondAttribute="bottom" id="lRv-MC-Cru"/>
                     <constraint firstItem="k0U-2N-YaX" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="sUk-sk-JLT"/>
diff --git a/pass/Views/LabelTableViewCell.swift b/pass/Views/LabelTableViewCell.swift
index 2ffbc5c..c113004 100644
--- a/pass/Views/LabelTableViewCell.swift
+++ b/pass/Views/LabelTableViewCell.swift
@@ -144,35 +144,44 @@ class LabelTableViewCell: UITableViewCell {
     func updateButtons() {
         passwordDisplayButton = nil
         buttons = nil
+        
+        // total width and height of a button
+        let height = min(self.bounds.height, 36.0)
+        let width = max(height * 0.8, Globals.tableCellButtonSize)
+        
+        // margins (between button boundary and icon)
+        let marginY = max((height - Globals.tableCellButtonSize) / 2, 0.0)
+        let marginX = max((width - Globals.tableCellButtonSize) / 2, 0.0)
+        
         if isPasswordCell {
             // password button
             passwordDisplayButton = UIButton(type: .system)
-            passwordDisplayButton!.frame = CGRect(x: 0, y: 0, width: Globals.tableCellButtonSize, height: Globals.tableCellButtonSize)
+            passwordDisplayButton!.frame = CGRect(x: 0, y: 0, width: width, height: height)
             passwordDisplayButton!.setImage(#imageLiteral(resourceName: "Visible"), for: .normal)
             passwordDisplayButton!.imageView?.contentMode = .scaleAspectFit
+            passwordDisplayButton!.contentEdgeInsets = UIEdgeInsetsMake(marginY, marginX, marginY, marginX)
             passwordDisplayButton!.addTarget(self, action: #selector(reversePasswordDisplay), for: UIControlEvents.touchUpInside)
             buttons = passwordDisplayButton
         } else if isHOTPCell {
-            let spacing = CGFloat(10.0)
-            
             // hotp button
             let nextButton = UIButton(type: .system)
-            nextButton.frame = CGRect(x: 0, y: 0,
-                                      width: Globals.tableCellButtonSize, height: Globals.tableCellButtonSize)
+            nextButton.frame = CGRect(x: 0, y: 0, width: width, height: height)
             nextButton.setImage(#imageLiteral(resourceName: "Refresh"), for: .normal)
             nextButton.imageView?.contentMode = .scaleAspectFit
+            nextButton.contentEdgeInsets = UIEdgeInsetsMake(marginY, marginX, marginY, marginX)
             nextButton.addTarget(self, action: #selector(getNextHOTP), for: UIControlEvents.touchUpInside)
             
             // password button
             passwordDisplayButton = UIButton(type: .system)
-            passwordDisplayButton!.frame = CGRect(x: Globals.tableCellButtonSize + spacing, y: 0,
-                                                 width: Globals.tableCellButtonSize, height: Globals.tableCellButtonSize)
+            passwordDisplayButton!.frame = CGRect(x: width, y: 0, width: width, height: height)
+
             passwordDisplayButton!.setImage(#imageLiteral(resourceName: "Visible"), for: .normal)
             passwordDisplayButton!.imageView?.contentMode = .scaleAspectFit
+            passwordDisplayButton!.contentEdgeInsets = UIEdgeInsetsMake(marginY, marginX, marginY, marginX)
             passwordDisplayButton!.addTarget(self, action: #selector(reversePasswordDisplay), for: UIControlEvents.touchUpInside)
             
             buttons = UIView()
-            buttons!.frame = CGRect(x: 0, y: 0, width: Globals.tableCellButtonSize * 2 + spacing, height: Globals.tableCellButtonSize)
+            buttons!.frame = CGRect(x: 0, y: 0, width: width * 2, height: height)
             buttons!.addSubview(nextButton)
             buttons!.addSubview(passwordDisplayButton!)
         }