diff --git a/packages/kbn-ui-framework/dist/ui_framework.css b/packages/kbn-ui-framework/dist/ui_framework.css
index 38773b36cc014..63ceaf5b57cad 100644
--- a/packages/kbn-ui-framework/dist/ui_framework.css
+++ b/packages/kbn-ui-framework/dist/ui_framework.css
@@ -2762,7 +2762,7 @@ main {
    */
 .kuiLocalSearchAssistedInput__assistance {
   position: absolute;
-  right: 12px;
+  right: 6px;
   top: 50%;
   /* 1 */
   z-index: 2;
diff --git a/packages/kbn-ui-framework/src/components/local_nav/_local_search.scss b/packages/kbn-ui-framework/src/components/local_nav/_local_search.scss
index a6da753b2961f..ea917cb9ed114 100644
--- a/packages/kbn-ui-framework/src/components/local_nav/_local_search.scss
+++ b/packages/kbn-ui-framework/src/components/local_nav/_local_search.scss
@@ -40,7 +40,7 @@
    */
   .kuiLocalSearchAssistedInput__assistance {
     position: absolute;
-    right: $kuiFormControlHorizontalPadding;
+    right: $kuiFormControlHorizontalPadding/2;
     top: 50%; /* 1 */
     z-index: 2;
     transform: translateY(-50%); /* 1 */
diff --git a/src/ui/public/query_bar/directive/query_popover.js b/src/ui/public/query_bar/directive/query_popover.js
index 688a589d42199..af76cdcba39fc 100644
--- a/src/ui/public/query_bar/directive/query_popover.js
+++ b/src/ui/public/query_bar/directive/query_popover.js
@@ -11,6 +11,8 @@ import {
   EuiLink,
   EuiText,
   EuiSpacer,
+  EuiHorizontalRule,
+  EuiPopoverTitle,
 } from '@elastic/eui';
 
 const luceneQuerySyntaxDocs = documentationLinks.query.luceneQuerySyntax;
@@ -52,7 +54,6 @@ module.directive('queryPopover', function (localStorage) {
         const button = (
           <EuiButtonEmpty
             size="xs"
-            flush="right"
             onClick={togglePopover}
           >
             Options
@@ -67,7 +68,9 @@ module.directive('queryPopover', function (localStorage) {
             button={button}
             isOpen={$scope.isPopoverOpen}
             closePopover={closePopover}
+            withTitle
           >
+            <EuiPopoverTitle>Syntax options</EuiPopoverTitle>
             <div style={{ width: '350px' }}>
               <EuiText>
                 <p>
@@ -77,13 +80,13 @@ module.directive('queryPopover', function (localStorage) {
                       href={kueryQuerySyntaxDocs}
                       target="_blank"
                     >
-                    Learn more
+                    See docs
                     </EuiLink>
                   )}
                 </p>
               </EuiText>
 
-              <EuiSpacer size="s" />
+              <EuiSpacer size="m" />
 
               <EuiForm>
                 <EuiFormRow>
@@ -97,7 +100,7 @@ module.directive('queryPopover', function (localStorage) {
                 </EuiFormRow>
               </EuiForm>
 
-              <EuiSpacer size="s" />
+              <EuiHorizontalRule margin="s" />
 
               <EuiText size="xs">
                 <p>