diff --git a/src/app/settings/options.component.html b/src/app/settings/options.component.html
index e02742be399..329cddc1319 100644
--- a/src/app/settings/options.component.html
+++ b/src/app/settings/options.component.html
@@ -6,7 +6,12 @@
     <div class="row">
         <div class="col-6">
             <div class="form-group">
-                <label for="locale">{{'language' | i18n}}</label>
+                <div class="d-flex">
+                    <label for="locale">{{'language' | i18n}}</label>
+                    <a class="ml-auto" href="https://help.bitwarden.com/article/localization/" target="_blank" rel="noopener" title="{{'learnMore' | i18n}}">
+                        <i class="fa fa-question-circle-o"></i>
+                    </a>
+                </div>
                 <select id="locale" name="Locale" [(ngModel)]="locale" class="form-control">
                     <option *ngFor="let o of localeOptions" [ngValue]="o.value">{{o.name}}</option>
                 </select>
@@ -20,6 +25,9 @@
             <label class="form-check-label" for="disableIcons">
                 {{'disableIcons' | i18n}}
             </label>
+            <a href="https://help.bitwarden.com/article/website-icons/" target="_blank" rel="noopener" title="{{'learnMore' | i18n}}">
+                <i class="fa fa-question-circle-o"></i>
+            </a>
         </div>
         <small class="form-text text-muted">{{'disableIconsDesc' | i18n}}</small>
     </div>
diff --git a/src/app/settings/payment.component.html b/src/app/settings/payment.component.html
index 3e9c4e54498..4a90e25d62c 100644
--- a/src/app/settings/payment.component.html
+++ b/src/app/settings/payment.component.html
@@ -23,7 +23,7 @@
                 autocomplete="cc-number">
         </div>
         <div class="form-group col-7 d-flex align-items-end">
-            <img src="../../images/cards.png" alt="" width="323" height="32">
+            <img src="../../images/cards.png" alt="Visa, MasterCard, Discover, AmEx, JCB, Diners Club, UnionPay" width="323" height="32">
         </div>
         <div class="form-group col-4">
             <label for="exp_month">{{'expirationMonth' | i18n}}</label>
@@ -40,8 +40,8 @@
         <div class="form-group col-4">
             <label for="cvc" class="d-flex">
                 {{'securityCode' | i18n}}
-                <a href="https://www.cvvnumber.com/cvv.html" target="_blank" rel="noopener noreferrer" class="ml-auto">
-                    <i class="fa fa-question-circle"></i>
+                <a href="https://www.cvvnumber.com/cvv.html" target="_blank" rel="noopener noreferrer" class="ml-auto" title="{{'learnMore' | i18n}}">
+                    <i class="fa fa-question-circle-o"></i>
                 </a>
             </label>
             <input id="cvc" class="form-control" type="text" name="cvc" [(ngModel)]="card.cvc" required autocomplete="cc-csc">
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 4315ffd4066..508798f6bc3 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -124,9 +124,14 @@
                                 </div>
                             </div>
                             <div class="col-5 form-group">
-                                <label for="loginUriMatch{{i}}">
-                                    {{'matchDetection' | i18n}}
-                                </label>
+                                <div class="d-flex">
+                                    <label for="loginUriMatch{{i}}">
+                                        {{'matchDetection' | i18n}}
+                                    </label>
+                                    <a class="ml-auto" href="https://help.bitwarden.com/article/uri-match-detection/" target="_blank" rel="noopener" title="{{'learnMore' | i18n}}">
+                                        <i class="fa fa-question-circle-o"></i>
+                                    </a>
+                                </div>
                                 <div class="d-flex">
                                     <select class="form-control" id="loginUriMatch{{i}}" name="Login.Uris[{{i}}].Match" [(ngModel)]="u.match" (change)="loginUriMatchChanged(u)">
                                         <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">{{o.name}}</option>
@@ -305,7 +310,12 @@
                 <ng-container *ngIf="cipher.hasFields">
                     <div class="row" appBoxRow *ngFor="let f of cipher.fields; let i = index">
                         <div class="col-5 form-group">
-                            <label for="fieldName{{i}}">{{'name' | i18n}}</label>
+                            <div class="d-flex">
+                                <label for="fieldName{{i}}">{{'name' | i18n}}</label>
+                                <a class="ml-auto" href="https://help.bitwarden.com/article/custom-fields/" target="_blank" rel="noopener" title="{{'learnMore' | i18n}}">
+                                    <i class="fa fa-question-circle-o"></i>
+                                </a>
+                            </div>
                             <input id="fieldName{{i}}" type="text" name="Field.Name{{i}}" [(ngModel)]="f.name" class="form-control" appInputVerbatim>
                         </div>
                         <div class="col-7 form-group">
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index d715ca47f94..8b436360137 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -73,8 +73,11 @@
                 </div>
             </div>
             <div class="card">
-                <div class="card-header">
+                <div class="card-header d-flex">
                     {{'organizations' | i18n}}
+                    <a class="ml-auto" href="https://help.bitwarden.com/article/what-is-an-organization/" target="_blank" rel="noopener" title="{{'learnMore' | i18n}}">
+                        <i class="fa fa-question-circle-o"></i>
+                    </a>
                 </div>
                 <div class="card-body">
                     <app-organizations [vault]="true"></app-organizations>