diff --git a/superset-frontend/src/showSavedQuery/index.jsx b/superset-frontend/src/showSavedQuery/index.jsx
index 12259cb0d4d4..6b8adcd60d7a 100644
--- a/superset-frontend/src/showSavedQuery/index.jsx
+++ b/superset-frontend/src/showSavedQuery/index.jsx
@@ -20,7 +20,7 @@ import React from 'react';
 import ReactDom from 'react-dom';
 import Form from 'react-jsonschema-form';
 import { interpolate } from 'src/showSavedQuery/utils';
-import './index.less';
+import { styled } from '@superset-ui/core';
 
 const scheduleInfoContainer = document.getElementById('schedule-info');
 const bootstrapData = JSON.parse(
@@ -31,12 +31,27 @@ const { query } = bootstrapData.common;
 const scheduleInfo = query.extra_json.schedule_info;
 const linkback = config.linkback ? interpolate(config.linkback, query) : null;
 
+const StyledSavedQueryContainer = styled.div`
+  .btn-add {
+    display: none;
+  }
+`;
+
+const StyledLinkBack = styled.div`
+  ${({ theme }) => `
+    padding-top: 0;
+    padding-right: ${theme.gridUnit * 2 + 2}px;
+    padding-bottom: ${theme.gridUnit * 5}px;
+    padding-left: ${theme.gridUnit / 2}px;
+`}
+`;
+
 if (scheduleInfo && config) {
   // hide instructions when showing schedule info
   config.JSONSCHEMA.description = '';
 
   ReactDom.render(
-    <div>
+    <StyledSavedQueryContainer>
       <Form
         schema={config.JSONSCHEMA}
         uiSchema={config.UISCHEMA}
@@ -46,14 +61,14 @@ if (scheduleInfo && config) {
         <br />
       </Form>
       {linkback && (
-        <div className="linkback">
+        <StyledLinkBack className="linkback">
           <a href={linkback}>
             <i className="fa fa-link" />
             &nbsp; Pipeline status
           </a>
-        </div>
+        </StyledLinkBack>
       )}
-    </div>,
+    </StyledSavedQueryContainer>,
     scheduleInfoContainer,
   );
 }
diff --git a/superset-frontend/src/showSavedQuery/index.less b/superset-frontend/src/showSavedQuery/index.less
deleted file mode 100644
index 7008bec9ea8a..000000000000
--- a/superset-frontend/src/showSavedQuery/index.less
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 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.
- */
-.btn-add {
-  display: none;
-}
-
-.linkback {
-  padding: 0 10px 20px 2px;
-}