diff --git a/superset-frontend/src/SqlLab/components/SqlEditor.jsx b/superset-frontend/src/SqlLab/components/SqlEditor.jsx
index 4496aab637b..6964d70037c 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditor.jsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditor.jsx
@@ -534,6 +534,7 @@ class SqlEditor extends React.PureComponent {
         <div className="rightItems">
           <Button
             className="autocomplete"
+            buttonSize="small"
             onClick={this.handleToggleAutocompleteEnabled}
           >
             <Checkbox checked={this.state.autocompleteEnabled} />{' '}
diff --git a/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx b/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx
index 1993ec61938..85ea0cebf37 100644
--- a/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx
+++ b/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx
@@ -123,7 +123,7 @@ export default class TemplateParamsEditor extends React.Component {
       <ModalTrigger
         modalTitle={t('Template Parameters')}
         triggerNode={
-          <Button tooltip={t('Edit template parameters')}>
+          <Button tooltip={t('Edit template parameters')} buttonSize="small">
             {`${t('parameters')} `}
             {paramCount > 0 && <Badge>{paramCount}</Badge>}
             {!this.state.isValid && (
diff --git a/superset-frontend/src/SqlLab/main.less b/superset-frontend/src/SqlLab/main.less
index df1c493942d..8f259f9f620 100644
--- a/superset-frontend/src/SqlLab/main.less
+++ b/superset-frontend/src/SqlLab/main.less
@@ -134,7 +134,7 @@ div.Workspace {
 
 .sql-toolbar {
   padding: 10px 10px 5px 10px;
-  background-color: @gray-bg;
+  background-color: @lightest;
   display: flex;
   justify-content: space-between;
   border: 1px solid @gray-light;