diff --git a/src/Bootstrap/dist/css/bootstrap-theme.css b/src/Bootstrap/dist/css/bootstrap-theme.css
index cdac068cad..09f03c60f2 100644
--- a/src/Bootstrap/dist/css/bootstrap-theme.css
+++ b/src/Bootstrap/dist/css/bootstrap-theme.css
@@ -319,7 +319,7 @@ h2 a:focus,
 h3 a:focus,
 h2 a:active,
 h3 a:active {
-  color: #000;
+  color: var(--neutralForeground1Rest);
   text-decoration: none;
 }
 @media screen and (max-width: 768px) {
@@ -1245,16 +1245,16 @@ p.frameworktableinfo-text {
   width: 20%;
 }
 .page-admin-popularity-transfers .col-group-from-header {
-  background-color: #f2f2f2;
+  background-color: transparent;
 }
 .page-admin-popularity-transfers .col-group-to-header {
-  background-color: #ebebeb;
+  background-color: var(--neutralBackground1Rest);
 }
 .page-admin-popularity-transfers .col-group-from-data {
-  background-color: #f2f2f2;
+  background-color: transparent;
 }
 .page-admin-popularity-transfers .col-group-to-data {
-  background-color: #ebebeb;
+  background-color: var(--neutralBackground1Rest);
 }
 .page-api-keys .example-commands {
   background-color: #002440;
diff --git a/src/Bootstrap/dist/css/bootstrap.css b/src/Bootstrap/dist/css/bootstrap.css
index 87ea341618..d290db558d 100644
--- a/src/Bootstrap/dist/css/bootstrap.css
+++ b/src/Bootstrap/dist/css/bootstrap.css
@@ -303,6 +303,8 @@ a:focus {
 }
 a:focus {
   outline: 4px solid -webkit-focus-ring-color;
+  outline: 2px solid var(--neutralStrokeFocus2Rest);
+  border-radius: 4px;
   outline-offset: -2px;
 }
 figure {
@@ -2067,6 +2069,8 @@ input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
   outline: 4px solid -webkit-focus-ring-color;
+  outline: 2px solid var(--neutralStrokeFocus2Rest);
+  border-radius: 4px;
   outline-offset: -2px;
 }
 @media (forced-colors: active) {
@@ -2814,6 +2818,8 @@ select[multiple].input-lg {
 .btn:active.focus,
 .btn.active.focus {
   outline: 4px solid -webkit-focus-ring-color;
+  outline: 2px solid var(--neutralStrokeFocus2Rest);
+  border-radius: 4px;
   outline-offset: -2px;
 }
 .btn:hover,
@@ -3291,7 +3297,6 @@ fieldset[disabled] .btn-danger.focus {
   border: 2px solid transparent;
   -webkit-box-shadow: none !important;
   box-shadow: none !important;
-  padding: 5px 12px;
 }
 .btn-brand-danger:hover,
 .btn-brand-danger:focus:hover {
@@ -3310,7 +3315,7 @@ fieldset[disabled] .btn-danger.focus {
 }
 .btn-link {
   font-weight: 400;
-  color: #337ab7;
+  color: var(--brandForegroundLinkRest);
   border-radius: 0;
 }
 .btn-link,
@@ -3330,7 +3335,7 @@ fieldset[disabled] .btn-link {
 }
 .btn-link:hover,
 .btn-link:focus {
-  color: #23527c;
+  color: var(--brandForegroundLinkHover);
   text-decoration: underline;
   background-color: transparent;
 }
@@ -3338,7 +3343,7 @@ fieldset[disabled] .btn-link {
 fieldset[disabled] .btn-link:hover,
 .btn-link[disabled]:focus,
 fieldset[disabled] .btn-link:focus {
-  color: #666666;
+  color: var(--neutralForegroundDisabledRest);
   text-decoration: none;
 }
 .btn-lg,
diff --git a/src/Bootstrap/less/buttons.less b/src/Bootstrap/less/buttons.less
index 3deadca918..c25c8a3029 100644
--- a/src/Bootstrap/less/buttons.less
+++ b/src/Bootstrap/less/buttons.less
@@ -223,7 +223,6 @@
   border-radius: var(--Medium, 4px);
   border: 2px solid transparent;
   box-shadow: none !important;
-  padding: 5px 12px;
 
   &:hover,
   &:focus:hover {
@@ -250,7 +249,7 @@
 // Make a button look and behave like a link
 .btn-link {
   font-weight: 400;
-  color: @link-color;
+  color: var(--brandForegroundLinkRest);
   border-radius: 0;
 
   &,
@@ -269,7 +268,7 @@
   }
   &:hover,
   &:focus {
-    color: @link-hover-color;
+    color: var(--brandForegroundLinkHover);
     text-decoration: @link-hover-decoration;
     background-color: transparent;
   }
@@ -277,7 +276,7 @@
   fieldset[disabled] & {
     &:hover,
     &:focus {
-      color: @btn-link-disabled-color;
+      color: var(--neutralForegroundDisabledRest);
       text-decoration: none;
     }
   }
diff --git a/src/Bootstrap/less/mixins/tab-focus.less b/src/Bootstrap/less/mixins/tab-focus.less
index bf9814baee..91b15de561 100644
--- a/src/Bootstrap/less/mixins/tab-focus.less
+++ b/src/Bootstrap/less/mixins/tab-focus.less
@@ -5,6 +5,8 @@
   // (Initially tried to also force default via `outline: initial`,
   // but that seems to erroneously remove the outline in Firefox altogether.)
   outline: 4px solid -webkit-focus-ring-color;
+  outline: 2px solid var(--neutralStrokeFocus2Rest);
+  border-radius: 4px;
   outline-offset: -2px;
 }
 
diff --git a/src/Bootstrap/less/theme/base.less b/src/Bootstrap/less/theme/base.less
index 87fbfef248..04eb71a8fb 100644
--- a/src/Bootstrap/less/theme/base.less
+++ b/src/Bootstrap/less/theme/base.less
@@ -390,7 +390,7 @@ h2, h3 {
   }
 
   a, a:hover, a:focus, a:active {
-    color: @text-color;
+    color: var(--neutralForeground1Rest);
     text-decoration: none;
   }
 }
diff --git a/src/Bootstrap/less/theme/page-admin-popularity-transfers.less b/src/Bootstrap/less/theme/page-admin-popularity-transfers.less
index 52c05fbc29..8c52dd796b 100644
--- a/src/Bootstrap/less/theme/page-admin-popularity-transfers.less
+++ b/src/Bootstrap/less/theme/page-admin-popularity-transfers.less
@@ -21,18 +21,18 @@
     }
     
     .col-group-from-header {
-        background-color: #f2f2f2;
+        background-color: transparent;
     }
     
     .col-group-to-header {
-        background-color: #ebebeb;
+        background-color: var(--neutralBackground1Rest);
     }
     
     .col-group-from-data {
-        background-color: #f2f2f2;
+        background-color: transparent;
     }
     
     .col-group-to-data {
-        background-color: #ebebeb;
+        background-color: var(--neutralBackground1Rest);
     }
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/Areas/Admin/Views/ApiKeys/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/ApiKeys/Index.cshtml
index 950c607994..7c34ed27e9 100644
--- a/src/NuGetGallery/Areas/Admin/Views/ApiKeys/Index.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/ApiKeys/Index.cshtml
@@ -12,8 +12,8 @@
         {"ApiKey":"oy2apikey2","LeakedUrl":"https://leakedUrl2","RevocationSource":"GitHub"}
     </p>
     <form>
-        <textarea class="form-control" placeholder="Verify API keys to revoke" autocomplete="off" autofocus rows="5" data-bind="value: verifyQuery"></textarea><br />
-        <input type="button" value="Verify" data-bind="click: verify" /><br />
+        <textarea class="form-control textarea-brand" placeholder="Verify API keys to revoke" autocomplete="off" autofocus rows="5" data-bind="value: verifyQuery"></textarea><br />
+        <input type="button" class="btn btn-brand-secondary" value="Verify" data-bind="click: verify" /><br />
     </form>
     <div style="display: none" data-bind="visible: Error">
         @ViewHelpers.AlertDanger(@<text><span data-bind="html: Error"></span></text>)
@@ -34,7 +34,7 @@
             <tbody data-bind="foreach: verifiedResults">
                 <tr>
                     <td class="col-sm-1" style="vertical-align: middle">
-                        <input type="checkbox" name="SelectedApiKeys" data-bind="visible: IsRevocable, checked: Selected, value: ko.toJSON($data)" />
+                        <input type="checkbox" class="brand-checkbox" name="SelectedApiKeys" data-bind="visible: IsRevocable, checked: Selected, value: ko.toJSON($data)" />
                     </td>
                     <td class="col-sm-5" style="vertical-align: middle">
                         <span data-bind="text: ApiKey"></span>
@@ -84,7 +84,7 @@
                 This will expire and revoke the selected API keys, and send the emails to notify customers!
             </p>
             <hr />
-            <input type="submit" class="btn btn-danger form-control" value="I understand the consequences, revoke the API keys" />
+            <input type="submit" class="btn btn-brand-danger form-control" value="I understand the consequences, revoke the API keys" />
         </div>
     }
 </section>
diff --git a/src/NuGetGallery/Areas/Admin/Views/Features/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/Features/Index.cshtml
index 8bcae35f91..f3a9ba3a7b 100644
--- a/src/NuGetGallery/Areas/Admin/Views/Features/Index.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/Features/Index.cshtml
@@ -104,8 +104,10 @@
                 </li>
             </ul>
 
-            <input type="text" data-bind="value: toAdd" />
-            <input type="submit" class="btn btn-primary" data-bind="click: add" value="Add" />
+            <div class="row-checkbox-label">
+                <input type="text" class="input-brand" data-bind="value: toAdd" />
+                <input type="submit" class="btn btn-brand" data-bind="click: add" value="Add" />
+            </div>
         </div>
     </script>
     <script type="text/javascript">
diff --git a/src/NuGetGallery/Areas/Admin/Views/Features/_AddFeature.cshtml b/src/NuGetGallery/Areas/Admin/Views/Features/_AddFeature.cshtml
index b8cae56884..a0a18198bc 100644
--- a/src/NuGetGallery/Areas/Admin/Views/Features/_AddFeature.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/Features/_AddFeature.cshtml
@@ -13,19 +13,19 @@
     <div class="row">
         <div class="col-sm-6 form-group @Html.HasErrorFor(m => m.Name)">
             @Html.ShowLabelFor(m => m.Name)<br />
-            @Html.ShowTextBoxFor(m => m.Name)
+            @Html.ShowTextBoxFor(m => m.Name, customClass: "input-brand")
             @Html.ShowValidationMessagesFor(m => m.Name)
         </div>
 
         <div class="col-sm-3 form-group @Html.HasErrorFor(m => m.Status)">
             @Html.ShowLabelFor(m => m.Status)<br />
-            @Html.EnumDropDownListFor(m => m.Status)
+            @Html.EnumDropDownListFor(m => m.Status, new { @class = "select-brand" })
             @Html.ShowValidationMessagesFor(m => m.Status)
         </div>
 
         <div class="col-sm-3">
             <br />
-            <input id="Add" type="submit" class="btn btn-primary form-control" value="Add" />
+            <input id="Add" type="submit" class="btn btn-brand form-control" value="Add" />
         </div>
     </div>
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/Areas/Admin/Views/Features/_AddFlight.cshtml b/src/NuGetGallery/Areas/Admin/Views/Features/_AddFlight.cshtml
index b8a89b6eea..bd8fa8f941 100644
--- a/src/NuGetGallery/Areas/Admin/Views/Features/_AddFlight.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/Features/_AddFlight.cshtml
@@ -17,20 +17,20 @@
     <div class="row">
         <div class="col-sm-3 form-group @Html.HasErrorFor(m => m.Name)">
             @Html.ShowLabelFor(m => m.Name)<br />
-            @Html.ShowTextBoxFor(m => m.Name)
+            @Html.ShowTextBoxFor(m => m.Name, customClass: "input-brand")
             @Html.ShowValidationMessagesFor(m => m.Name)
         </div>
 
         <div class="col-sm-1 form-group @Html.HasErrorFor(m => m.All)" onchange="FlightFormToggleAll('@formNotAllId', '@formAddId')">
             @Html.ShowLabelFor(m => m.All)<br />
-            @Html.ShowCheckboxFor(m => m.All)
+            @Html.ShowCheckboxFor(m => m.All, customClass: "brand-checkbox")
             @Html.ShowValidationMessagesFor(m => m.All)
         </div>
 
         <div id="@formNotAllId" style="@(Model.All ? "display: none" : "")">
             <div class="col-sm-1 form-group @Html.HasErrorFor(m => m.SiteAdmins)">
                 @Html.ShowLabelFor(m => m.SiteAdmins)<br />
-                @Html.ShowCheckboxFor(m => m.SiteAdmins)
+                @Html.ShowCheckboxFor(m => m.SiteAdmins, customClass: "brand-checkbox")
                 @Html.ShowValidationMessagesFor(m => m.SiteAdmins)
             </div>
 
@@ -40,7 +40,7 @@
 
         <div class="col-sm-1 @(Model.All ? "col-sm-offset-7" : "")" id="@formAddId">
             <br />
-            <input id="Add" type="submit" class="btn btn-primary form-control" value="Add" />
+            <input id="Add" type="submit" class="btn btn-brand form-control" value="Add" />
         </div>
     </div>
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/Areas/Admin/Views/Features/_EditFeature.cshtml b/src/NuGetGallery/Areas/Admin/Views/Features/_EditFeature.cshtml
index fc882635c2..ca9ce7023a 100644
--- a/src/NuGetGallery/Areas/Admin/Views/Features/_EditFeature.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/Features/_EditFeature.cshtml
@@ -12,11 +12,11 @@
             @Html.Hidden("Name", Model.Name)
 
             <div class="row">
-                <div class="col-sm-6 form-group">
-                    @Html.EnumDropDownListFor(m => m.Status)
+                <div class="col-md-6 form-group">
+                    @Html.EnumDropDownListFor(m => m.Status, new { @class = "select-brand"})
                 </div>
-                <div class="col-sm-6 form-group">
-                    <input id="Update" type="submit" class="btn btn-primary" value="Update" />
+                <div class="col-md-6 form-group">
+                    <input id="Update" type="submit" class="btn btn-brand" value="Update" />
                 </div>
             </div>
         }
@@ -28,7 +28,7 @@
             @Html.Hidden("ContentId", Model.ContentId)
             @Html.Hidden("Name", Model.Name)
 
-            <input id="Delete" type="submit" class="btn btn-danger" value="Delete" onclick="return FormDeleteConfirmation(event, '@Model.Name', 'feature')" />
+            <input id="Delete" type="submit" class="btn btn-brand-danger" value="Delete" onclick="return FormDeleteConfirmation(event, '@Model.Name', 'feature')" />
         }
     </td>
 </tr>
\ No newline at end of file
diff --git a/src/NuGetGallery/Areas/Admin/Views/Features/_EditFlight.cshtml b/src/NuGetGallery/Areas/Admin/Views/Features/_EditFlight.cshtml
index 6aca2a3805..435900b522 100644
--- a/src/NuGetGallery/Areas/Admin/Views/Features/_EditFlight.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/Features/_EditFlight.cshtml
@@ -28,7 +28,7 @@
         </ul>
     </td>
     <td class="@rowClass">
-        <button class="btn btn-primary" onclick="$('.@rowClass').hide(); $('#@rowFormId').show()">Update</button>
+        <button class="btn btn-brand" onclick="$('.@rowClass').hide(); $('#@rowFormId').show()">Update</button>
     </td>
     <td colspan="5" id="@rowFormId" style="display: none">
         @using (Html.BeginForm("EditFlight", "Features", FormMethod.Post))
@@ -36,31 +36,30 @@
             @Html.AntiForgeryToken()
             @Html.Hidden("ContentId", Model.ContentId)
             @Html.Hidden("Name", Model.Name)
-
-            <div class="row">
-                <div class="col-sm-2 form-group @Html.HasErrorFor(m => m.All)" onchange="FlightFormToggleAll('@rowFormNotAllId', '@rowFormSubmitId')">
+            <div class="row-checkbox-label">
+                <div class="form-group @Html.HasErrorFor(m => m.All)" onchange="FlightFormToggleAll('@rowFormNotAllId', '@rowFormSubmitId')">
                     @Html.ShowLabelFor(m => m.All)
-                    @Html.ShowCheckboxFor(m => m.All)
+                    @Html.ShowCheckboxFor(m => m.All, customClass: "brand-checkbox")
                     @Html.ShowValidationMessagesFor(m => m.All)
                 </div>
 
-                <div id="@rowFormNotAllId" style="@(Model.All ? "display: none" : "")">
-                    <div class="col-sm-2 form-group @Html.HasErrorFor(m => m.SiteAdmins)">
+                <div id="@rowFormNotAllId" style="@(Model.All ? "display: none" : "flex-grow: 1")">
+                    <div class="form-group @Html.HasErrorFor(m => m.SiteAdmins)">
                         @Html.ShowLabelFor(m => m.SiteAdmins)
-                        @Html.ShowCheckboxFor(m => m.SiteAdmins)
+                        @Html.ShowCheckboxFor(m => m.SiteAdmins, customClass: "brand-checkbox")
                         @Html.ShowValidationMessagesFor(m => m.SiteAdmins)
                     </div>
 
-                    <div class="flight-array col-sm-3" name="Accounts" data-items="@string.Join(";", Model.Accounts ?? new string[0])" data-bind="template: { name: 'flight-array', data: $data }"></div>
-                    <div class="flight-array col-sm-3" name="Domains" data-items="@string.Join(";", Model.Domains ?? new string[0])" data-bind="template: { name: 'flight-array', data: $data }"></div>
+                    <div class="flight-array" name="Accounts" data-items="@string.Join(";", Model.Accounts ?? new string[0])" data-bind="template: { name: 'flight-array', data: $data }"></div>
+                    <div class="flight-array" name="Domains" data-items="@string.Join(";", Model.Domains ?? new string[0])" data-bind="template: { name: 'flight-array', data: $data }"></div>
                 </div>
 
-                <div class="col-sm-2 @(Model.All ? "col-sm-offset-7" : "")" id="@rowFormSubmitId">
+                <div style="margin-left: auto" id="@rowFormSubmitId">
                     <div class="form-group">
-                        <input id="Update" type="submit" class="btn btn-primary form-control" value="Update" />
+                        <input id="Update" type="submit" class="btn btn-brand form-control" value="Update" />
                     </div>
                     <div class="form-group">
-                        <button type="button" class="btn btn-default form-control" onclick="$('.@rowClass').show(); $('#@rowFormId').hide()">Cancel</button>
+                        <button type="button" class="btn btn-brand-secondary form-control" onclick="$('.@rowClass').show(); $('#@rowFormId').hide()">Cancel</button>
                     </div>
                 </div>
             </div>
@@ -74,7 +73,7 @@
             @Html.Hidden("Name", Model.Name)
 
             <div class="form-group">
-                <input id="Delete" type="submit" class="btn btn-danger form-control" value="Delete" onclick="return FormDeleteConfirmation(event, '@Model.Name', 'flight')" />
+                <input id="Delete" type="submit" class="btn btn-brand-danger form-control" value="Delete" onclick="return FormDeleteConfirmation(event, '@Model.Name', 'flight')" />
             </div>
         }
     </td>
diff --git a/src/NuGetGallery/Areas/Admin/Views/Lucene/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/Lucene/Index.cshtml
index ec2a93f4b0..f657d6dc81 100644
--- a/src/NuGetGallery/Areas/Admin/Views/Lucene/Index.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/Lucene/Index.cshtml
@@ -39,7 +39,7 @@
         {
             @Html.AntiForgeryToken()
             <fieldset class="form">
-                <input type="submit" value="Rebuild Now" />
+                <input type="submit" class="btn-brand" value="Rebuild Now" />
                 <p>NOTE: This will only affect the current instance!</p>
             </fieldset>
         }
diff --git a/src/NuGetGallery/Areas/Admin/Views/PopularityTransfer/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/PopularityTransfer/Index.cshtml
index 3e4bc89d27..0eb8c9df04 100644
--- a/src/NuGetGallery/Areas/Admin/Views/PopularityTransfer/Index.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/PopularityTransfer/Index.cshtml
@@ -35,7 +35,7 @@
 
 <section role="main" class="container main-container page-admin-popularity-transfers">
     <div class="row col-md-12" style="display:none" data-bind="visible: successMessage">
-        <div id="popularityTransferSuccessMessage" class="alert alert-success" role="alert" data-bind="text: successMessage"></div>
+        <div id="popularityTransferSuccessMessage" class="alert alert-brand-success" role="alert" data-bind="text: successMessage"></div>
     </div>
 
     <div>
@@ -47,14 +47,14 @@
                 <i>List the Package IDs you want to transfer popularity <b>from</b> and <b>to</b>.</i>
                 <div class="form-group col-md-12">
                     <label for="packagesFromInput" class="control-label">From</label>
-                    <textarea class="form-control" rows="5" id="packagesFromInput" name="packagesFromInput" placeholder="Package IDs to transfer popularity FROM, one per line" data-bind="value: packagesFromInput"></textarea>
+                    <textarea class="form-control textarea-brand" rows="5" id="packagesFromInput" name="packagesFromInput" placeholder="Package IDs to transfer popularity FROM, one per line" data-bind="value: packagesFromInput"></textarea>
                 </div>
                 <div class="form-group col-md-12">
                     <label for="packagesToInput" class="control-label">To</label>
-                    <textarea class="form-control" rows="5" id="packagesToInput" name="packagesToInput" placeholder="Package IDs to transfer popularity TO, one per line" data-bind="value: packagesToInput"></textarea>
+                    <textarea class="form-control textarea-brand" rows="5" id="packagesToInput" name="packagesToInput" placeholder="Package IDs to transfer popularity TO, one per line" data-bind="value: packagesToInput"></textarea>
                 </div>
                 <div class="form-group col-md-12">
-                    <button type="submit" class="btn btn-block btn-primary" data-bind="click: validateInputs">Validate input</button>
+                    <button type="submit" class="btn btn-block btn-brand" data-bind="click: validateInputs">Validate input</button>
                 </div>
             </form>
         </div>
@@ -86,7 +86,7 @@
         @AddPopularityTransferItemTable("existingPackageRenamesTransitive", "existingRenamesTransitiveResult", "existing popularity transfers for the selected packages")
 
         <div class="form-group col-md-12">
-            <button type="submit" class="btn btn-block btn-primary" data-bind="click: submitInputs">Submit changes</button>
+            <button type="submit" class="btn btn-block btn-brand" data-bind="click: submitInputs">Submit changes</button>
         </div>
     </div>
 </section>
diff --git a/src/NuGetGallery/Areas/Admin/Views/ReservedNamespace/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/ReservedNamespace/Index.cshtml
index 120d98e4e0..31417c469f 100644
--- a/src/NuGetGallery/Areas/Admin/Views/ReservedNamespace/Index.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/ReservedNamespace/Index.cshtml
@@ -14,9 +14,9 @@
             </div>
             <h2>Reserve namespace</h2>
             <form data-bind="submit: prefixSearch">
-                <div class="form-horizontal">
-                    <input type="text" placeholder="Specific namespace" autocomplete="on" autofocus data-bind="value: prefixSearchQuery" />
-                    <input type="submit" value="Search" title="Search" />
+                <div class="row-checkbox-label">
+                    <input type="text" class="input-brand" placeholder="Specific namespace" autocomplete="on" autofocus data-bind="value: prefixSearchQuery" />
+                    <input type="submit" class="btn btn-brand" value="Search" title="Search" />
                 </div>
             </form>
             <br />
@@ -35,13 +35,15 @@
                                             <span data-bind="text: $data.prefix.Value" />
                                         </div>
                                         <div>
-                                            <label>
-                                                <input type="checkbox" data-bind="checked: $data.prefix.IsSharedNamespace, disable: $data.isExisting" />IsSharedNamespace
+                                            <label class="brand-checkbox">
+                                                <input type="checkbox" data-bind="checked: $data.prefix.IsSharedNamespace, disable: $data.isExisting" />
+                                                <span>IsSharedNamespace</span>
                                             </label>
                                         </div>
                                         <div>
-                                            <label>
-                                                <input type="checkbox" data-bind="checked: $data.prefix.IsPrefix, disable: $data.isExisting" value="IsPrefix" />IsPrefix
+                                            <label class="brand-checkbox">
+                                                <input type="checkbox" data-bind="checked: $data.prefix.IsPrefix, disable: $data.isExisting" value="IsPrefix" />
+                                                <span>IsPrefix</span>
                                             </label>
                                         </div>
                                         <div>
@@ -59,11 +61,11 @@
                                         </div>
                                         <!-- /ko -->
                                         <!-- ko if: $data.isExisting -->
-                                        <input style="margin-top: 5px" type="submit" value="Deallocate Namespace" title="Delete this namespace"
+                                        <input style="margin-top: 5px" class="btn btn-brand-danger" type="submit" value="Deallocate Namespace" title="Delete this namespace"
                                                data-bind="click: $parent.managePrefix.bind(this, $data.prefix, false, $data.parents)" />
                                         <!-- /ko -->
                                         <!-- ko ifnot: $data.isExisting -->
-                                        <input style="margin-top: 5px" type="submit" value="Reserve Namespace" title="Add this namespace"
+                                        <input style="margin-top: 5px" class="btn btn-brand" type="submit" value="Reserve Namespace" title="Add this namespace"
                                                data-bind="click: $parent.managePrefix.bind(this, $data.prefix, true, $data.parents)" />
                                         <!-- /ko -->
                                     </div>
@@ -73,14 +75,14 @@
                                     <span style="font-weight: bold">Owners:</span>
                                     <div style="margin-left: 20px">
                                         <div id="prefixOwners" data-bind="foreach: $data.owners">
-                                            <div style="margin: 5px">
+                                            <div style="margin: 5px" class="row-checkbox-label">
                                                 <a href="#" target="_blank" data-bind="text: $data, attr: { href: $root.generateUserUrl($data) }"></a>
-                                                <input style="float: right" type="button" value="Remove" title="Remove this owner" data-bind="click: $root.removeOwner.bind(this, $data, $parent.prefix)" />
+                                                <input style="float: right" type="button" class="btn btn-brand" value="Remove" title="Remove this owner" data-bind="click: $root.removeOwner.bind(this, $data, $parent.prefix)" />
                                             </div>
                                         </div>
-                                        <div style="margin: 5px">
-                                            <input type="text" placeholder="Enter username" autocomplete="off" data-bind="value: $parent.newOwner, valueUpdate: 'afterkeydown'" />
-                                            <input type="button" value="Add" title="Add new owner for this prefix" data-bind="click: $parent.addOwner.bind(this, $data.prefix), enable: $parent.newOwner().length > 0" />
+                                        <div class="row-checkbox-label" style="margin: 5px">
+                                            <input type="text" class="input-brand" placeholder="Enter username" autocomplete="off" data-bind="value: $parent.newOwner, valueUpdate: 'afterkeydown'" />
+                                            <input type="button" class="btn btn-brand" value="Add" title="Add new owner for this prefix" data-bind="click: $parent.addOwner.bind(this, $data.prefix), enable: $parent.newOwner().length > 0" />
                                         </div>
                                     </div>
                                     <!-- /ko -->
@@ -97,9 +99,9 @@
         <div class="col-xs-12">
             <h2>Find namespaces by prefix</h2>
             <form method="get" action="@Url.Action("FindNamespacesByPrefix")">
-                <div class="form-horizontal">
-                    <input type="text" placeholder="Namespace prefix" autocomplete="on" name="prefix" value="@Model.ReservedNamespacesQuery" />
-                    <input type="submit" value="Search" />
+                <div class="row-checkbox-label">
+                    <input type="text" class="input-brand" placeholder="Namespace prefix" autocomplete="on" name="prefix" value="@Model.ReservedNamespacesQuery" />
+                    <input type="submit" class="btn btn-brand" value="Search" />
                 </div>
             </form>
             <br />
@@ -146,9 +148,9 @@
         <div class="col-xs-12">
             <h2>Find package registrations by prefix</h2>
             <form method="get" action="@Url.Action("FindPackagesByPrefix")">
-                <div class="form-horizontal">
-                    <input type="text" placeholder="Package ID prefix" autocomplete="on" name="prefix" value="@Model.PackageRegistrationsQuery" />
-                    <input type="submit" value="Search" />
+                <div class="row-checkbox-label">
+                    <input type="text" class="input-brand" placeholder="Package ID prefix" autocomplete="on" name="prefix" value="@Model.PackageRegistrationsQuery" />
+                    <input type="submit" class="btn btn-brand" value="Search" />
                 </div>
             </form>
             <br />
diff --git a/src/NuGetGallery/Areas/Admin/Views/Revalidation/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/Revalidation/Index.cshtml
index 59a8562f11..11a01921ef 100644
--- a/src/NuGetGallery/Areas/Admin/Views/Revalidation/Index.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/Revalidation/Index.cshtml
@@ -39,12 +39,12 @@
                                     </text>)
 
                                 <input type="hidden" name="killswitch" value="false" />
-                                <input type="submit" class="btn btn-primary form-control" value="Enable Revalidations" />
+                                <input type="submit" class="btn btn-brand form-control" value="Enable Revalidations" />
                             }
                             else
                             {
                                 <input type="hidden" name="killswitch" value="true" />
-                                <input type="submit" class="btn btn-primary btn-danger form-control" value="Activate the Killswitch" />
+                                <input type="submit" class="btn btn-brand-danger form-control" value="Activate the Killswitch" />
                             }
                         </div>
                     }
diff --git a/src/NuGetGallery/Areas/Admin/Views/UpdateListed/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/UpdateListed/Index.cshtml
index 139b6fc5d8..2cd7942311 100644
--- a/src/NuGetGallery/Areas/Admin/Views/UpdateListed/Index.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/UpdateListed/Index.cshtml
@@ -6,8 +6,8 @@
     <h2>Unlist/relist packages</h2>
 
     <form>
-        <textarea placeholder="Search for packages to unlist/relist (e.g. jQuery 1.8.0)" autocomplete="off" autofocus style="width: 100%;" rows="5" data-bind="value: searchQuery"></textarea><br />
-        <input type="button" value="Search" data-bind="click: search" />
+        <textarea placeholder="Search for packages to unlist/relist (e.g. jQuery 1.8.0)" autocomplete="off" autofocus style="width: 100%;" rows="5" class="textarea-brand" data-bind="value: searchQuery"></textarea><br />
+        <input type="button" class="btn btn-brand-secondary" value="Search" data-bind="click: search" />
         <button type="button" class="btn btn-link" data-bind="click: selectListed">Select listed</button>
         <button type="button" class="btn btn-link" data-bind="click: selectUnlisted">Select unlisted</button>
     </form>
@@ -18,7 +18,7 @@
         <table class="table" id="searchResults" style="display: none" data-bind="visible: searchResults().length > 0" aria-label="Search results">
             <thead>
                 <tr>
-                    <th><input type="checkbox" data-bind="click: toggleSelectAll, checked: selectAllState" /></th>
+                    <th><input type="checkbox" class="brand-checkbox" data-bind="click: toggleSelectAll, checked: selectAllState" /></th>
                     <th>Package</th>
                     <th>Version</th>
                     <th>Downloads</th>
@@ -30,7 +30,7 @@
             </thead>
             <tbody data-bind="foreach: searchResults">
                 <tr>
-                    <td><input type="checkbox" name="Packages[]" data-bind="checked: Selected, value: $parent.generateValue($data)" /></td>
+                    <td><input type="checkbox" class="brand-checkbox" name="Packages[]" data-bind="checked: Selected, value: $parent.generateValue($data)" /></td>
                     <td><a href="#" data-bind="text: PackageId, attr: { href: $parent.generatePackageUrl($data) }"></a></td>
                     <td><span data-bind="text: PackageVersionNormalized"></span></td>
                     <td><span data-bind="text: DownloadCount"></span></td>
@@ -49,10 +49,10 @@
 
         <div class="danger-zone" style="display: none;" data-bind="visible: arePackagesSelected">
             <div class="form-group">
-                <button type="submit" class="btn btn-danger form-control" name="listed" value="true">Make selected packages <b>LISTED</b>.</button>
+                <button type="submit" class="btn btn-brand-danger form-control" name="listed" value="true">Make selected packages <b>LISTED</b>.</button>
             </div>
             <div class="form-group">
-                <button type="submit" class="btn btn-danger form-control" name="listed" value="false">Make selected packages <b>UNLISTED</b>.</button>
+                <button type="submit" class="btn btn-brand-danger form-control" name="listed" value="false">Make selected packages <b>UNLISTED</b>.</button>
             </div>
         </div>
     }
diff --git a/src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml b/src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml
index bc9e1d5492..251f3c8ea7 100644
--- a/src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml
+++ b/src/NuGetGallery/Areas/Admin/Views/Validation/Index.cshtml
@@ -51,10 +51,10 @@
 
     <form method="get" action="@Url.Action(actionName: "Search")">
         <p>
-            <textarea name="q" placeholder="Search for package validations..." autocomplete="off" autofocus style="width: 100%" rows="5">@Model.Query</textarea>
+            <textarea name="q" placeholder="Search for package validations..." autocomplete="off" autofocus style="width: 100%" rows="5" class="textarea-brand">@Model.Query</textarea>
         </p>
         <p>
-            <input type="submit" value="Search" />
+            <input type="submit" class="btn btn-brand-secondary" value="Search" />
         </p>
     </form>
 
diff --git a/src/NuGetGallery/ExtensionMethods.cs b/src/NuGetGallery/ExtensionMethods.cs
index ce4e3fe4b4..524830aabd 100644
--- a/src/NuGetGallery/ExtensionMethods.cs
+++ b/src/NuGetGallery/ExtensionMethods.cs
@@ -250,7 +250,7 @@ private static Dictionary<string, object> GetHtmlAttributes<TModel, TProperty>(
             {
                 htmlAttributes["class"] = $"form-control {customClass}";
             }
-            else
+            else if (!string.IsNullOrEmpty(customClass))
             {
                 htmlAttributes["class"] = $"{customClass}";
             }