diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index a34ea3f3f0f1..eee96b8eda07 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -691,7 +691,7 @@ html|input.urlbar-input {
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"] {
   -moz-box-pack: center;
   color: -moz-fieldText;
-  min-height: 40px;
+  min-height: 2.6666em;
   border-top: 1px solid rgba(38,38,38,.15);
   background-color: hsla(0,0%,80%,.35); /* match arrowpanel-dimmed */;
 }
diff --git a/browser/themes/shared/autocomplete.inc.css b/browser/themes/shared/autocomplete.inc.css
index db8686b9d03b..723f29eda72f 100644
--- a/browser/themes/shared/autocomplete.inc.css
+++ b/browser/themes/shared/autocomplete.inc.css
@@ -93,6 +93,9 @@
   padding: 4px;
 }
 
+#PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"] > .two-line-wrapper > .labels-wrapper > .line2-label {
+  font-family: monospace;
+}
 
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] + richlistitem[originaltype="generatedPassword"],
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] + richlistitem[originaltype="generatedPassword"] {