diff --git a/superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx b/superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx
index 207b26e59a..89b4ee60ea 100644
--- a/superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx
+++ b/superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx
@@ -25,6 +25,7 @@ import { t } from '@superset-ui/translation';
 
 import Button from '../../components/Button';
 import ModalTrigger from '../../components/ModalTrigger';
+import './ScheduleQueryButton.less';
 
 const validators = {
   greater: (a, b) => a > b,
@@ -159,12 +160,14 @@ class ScheduleQueryButton extends React.PureComponent {
         </Row>
         <Row>
           <Col md={12}>
-            <Form
-              schema={getJSONSchema()}
-              uiSchema={getUISchema()}
-              onSubmit={this.onSchedule}
-              validate={getValidator()}
-            />
+            <div className="json-schema">
+              <Form
+                schema={getJSONSchema()}
+                uiSchema={getUISchema()}
+                onSubmit={this.onSchedule}
+                validate={getValidator()}
+              />
+            </div>
           </Col>
         </Row>
         {this.props.scheduleQueryWarning && (
@@ -194,7 +197,7 @@ class ScheduleQueryButton extends React.PureComponent {
               disabled={this.props.disabled}
               tooltip={this.props.tooltip}
             >
-              <i className="fa fa-calendar" /> {t('Schedule Query')}
+              <i className="fa fa-calendar" /> {t('Schedule')}
             </Button>
           }
           bsSize="medium"
diff --git a/superset-frontend/src/SqlLab/components/ScheduleQueryButton.less b/superset-frontend/src/SqlLab/components/ScheduleQueryButton.less
new file mode 100644
index 0000000000..4ae5847227
--- /dev/null
+++ b/superset-frontend/src/SqlLab/components/ScheduleQueryButton.less
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// -------------------------------------------------------------
+// Glyphicons are not supported and used by react-json-schema
+// -------------------------------------------------------------
+.json-schema {
+  i.glyphicon {
+    display: none;
+  }
+  .btn-add::after {
+    content: '+';
+  }
+  .array-item-move-up::after {
+    content: '↑';
+  }
+  .array-item-move-down::after {
+    content: '↓';
+  }
+  .array-item-remove::after {
+    content: '-';
+  }
+}
+// -------------------------------------------------------------
diff --git a/superset/views/sql_lab.py b/superset/views/sql_lab.py
index 534c6fb664..6096349a92 100644
--- a/superset/views/sql_lab.py
+++ b/superset/views/sql_lab.py
@@ -162,6 +162,7 @@ class SavedQueryViewApi(SavedQueryView):  # pylint: disable=too-many-ancestors
         "description",
         "sql",
         "extra_json",
+        "extra",
     ]
     add_columns = ["label", "db_id", "schema", "description", "sql", "extra_json"]
     edit_columns = add_columns