diff --git a/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx b/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx
index 86b6324daed5..ebfd2b30e42b 100644
--- a/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx
+++ b/superset-frontend/src/components/Form/LabeledErrorBoundInput.test.jsx
@@ -66,7 +66,7 @@ describe('LabeledErrorBoundInput', () => {
 
     const label = screen.getByText(/username/i);
     const textboxInput = screen.getByRole('textbox');
-    const tooltipIcon = screen.getByTestId('info-solid-small');
+    const tooltipIcon = screen.getByRole('img');
 
     fireEvent.mouseOver(tooltipIcon);
 
diff --git a/superset-frontend/src/components/InfoTooltip/index.tsx b/superset-frontend/src/components/InfoTooltip/index.tsx
index 1df2ea893d8d..7aa9afaebd84 100644
--- a/superset-frontend/src/components/InfoTooltip/index.tsx
+++ b/superset-frontend/src/components/InfoTooltip/index.tsx
@@ -20,7 +20,7 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
-import { Icon } from 'src/common/components';
+import Icons from 'src/components/Icons';
 
 export interface InfoTooltipProps {
   className?: string;
@@ -65,7 +65,6 @@ export default function InfoTooltip({
   trigger = 'hover',
   overlayStyle = defaultOverlayStyle,
   bgColor = defaultColor,
-  viewBox = '0 -2 24 24',
 }: InfoTooltipProps) {
   return (
     <StyledTooltip
@@ -75,7 +74,7 @@ export default function InfoTooltip({
       overlayStyle={overlayStyle}
       color={bgColor}
     >
-      <Icon name="info-solid-small" viewBox={viewBox} />
+      <Icons.InfoSolidSmall className="info-solid-small" />
     </StyledTooltip>
   );
 }
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
index 8a9e52137307..a2a49b2f707b 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
@@ -124,35 +124,12 @@ const ExtraOptions = ({
                     placeholder={t('Create or select schema...')}
                     onChange={onInputChange}
                   />
-                  <InfoTooltip
-                    tooltip={t('Allow creation of new tables based on queries')}
-                  />
                 </div>
                 <div className="helper">
                   {t(
                     'Force all tables and views to be created in this schema when clicking CTAS or CVAS in SQL Lab.',
                   )}
                 </div>
-                <StyledInputContainer
-                  className={cx('expandable', { open: createAsOpen })}
-                >
-                  <div className="control-label">{t('CTAS & CVAS SCHEMA')}</div>
-                  <div className="input-container">
-                    <input
-                      type="text"
-                      name="force_ctas_schema"
-                      value={db?.force_ctas_schema || ''}
-                      placeholder={t('Search or select schema')}
-                      onChange={onInputChange}
-                    />
-                  </div>
-                  <div className="helper">
-                    {t(
-                      'When allowing CREATE TABLE AS option in SQL Lab, this option ' +
-                        'forces the table to be created in this schema.',
-                    )}
-                  </div>
-                </StyledInputContainer>
               </StyledInputContainer>
             </StyledInputContainer>
             <StyledInputContainer css={no_margin_bottom}>
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
index 012368f6b512..eb6722f03cc7 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
@@ -538,7 +538,7 @@ describe('DatabaseModal', () => {
         name: /checkbox-off/i,
       });
       const tooltipIcons = screen.getAllByRole('img', {
-        name: /info-solid-small/i,
+        name: /info-solid_small/i,
       });
       const exposeInSQLLabCheckbox = screen.getByRole('checkbox', {
         name: /expose database in sql lab/i,