diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js
index 193d99e1c9533..faadfd4bb26d7 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js
@@ -21,6 +21,6 @@ export const demodata = () => ({
   name: 'demodata',
   displayName: strings.getDisplayName(),
   help: strings.getHelp(),
-  image: 'logoElasticStack',
+  image: 'training',
   template: templateFromReactComponent(DemodataDatasource),
 });
diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/datasources/esdocs.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/esdocs.js
similarity index 58%
rename from x-pack/legacy/plugins/canvas/public/expression_types/datasources/esdocs.js
rename to x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/esdocs.js
index eacb7e891b482..282ec17e94c9b 100644
--- a/x-pack/legacy/plugins/canvas/public/expression_types/datasources/esdocs.js
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/esdocs.js
@@ -6,15 +6,24 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { EuiFormRow, EuiSelect, EuiTextArea, EuiCallOut, EuiSpacer } from '@elastic/eui';
-import { getSimpleArg, setSimpleArg } from '../../lib/arg_helpers';
-import { ESFieldsSelect } from '../../components/es_fields_select';
-import { ESFieldSelect } from '../../components/es_field_select';
-import { ESIndexSelect } from '../../components/es_index_select';
-import { templateFromReactComponent } from '../../lib/template_from_react_component';
-import { ExpressionDataSourceStrings } from '../../../i18n';
-
-const { ESDocs: strings } = ExpressionDataSourceStrings;
+import {
+  EuiFormRow,
+  EuiAccordion,
+  EuiSelect,
+  EuiTextArea,
+  EuiCallOut,
+  EuiSpacer,
+  EuiLink,
+  EuiText,
+} from '@elastic/eui';
+import { getSimpleArg, setSimpleArg } from '../../../public/lib/arg_helpers';
+import { ESFieldsSelect } from '../../../public/components/es_fields_select';
+import { ESFieldSelect } from '../../../public/components/es_field_select';
+import { ESIndexSelect } from '../../../public/components/es_index_select';
+import { templateFromReactComponent } from '../../../public/lib/template_from_react_component';
+import { DataSourceStrings, LUCENE_QUERY_URL } from '../../../i18n';
+
+const { ESDocs: strings } = DataSourceStrings;
 
 const EsdocsDatasource = ({ args, updateArgs, defaultIndex }) => {
   const setArg = (name, value) => {
@@ -74,12 +83,6 @@ const EsdocsDatasource = ({ args, updateArgs, defaultIndex }) => {
 
   return (
     <div>
-      <EuiCallOut size="s" title={strings.getWarningTitle()} iconType="alert" color="warning">
-        <p>{strings.getWarning()}</p>
-      </EuiCallOut>
-
-      <EuiSpacer size="m" />
-
       <EuiFormRow
         label={strings.getIndexTitle()}
         helpText={strings.getIndexLabel()}
@@ -88,18 +91,6 @@ const EsdocsDatasource = ({ args, updateArgs, defaultIndex }) => {
         <ESIndexSelect value={index} onChange={index => setArg('index', index)} />
       </EuiFormRow>
 
-      <EuiFormRow
-        label={strings.getQueryTitle()}
-        helpText={strings.getQueryLabel()}
-        display="rowCompressed"
-      >
-        <EuiTextArea
-          value={getQuery()}
-          onChange={e => setArg(getArgName(), e.target.value)}
-          compressed
-        />
-      </EuiFormRow>
-
       <EuiFormRow
         label={strings.getFieldsTitle()}
         helpText={fields.length <= 10 ? strings.getFieldsLabel() : strings.getFieldsWarningLabel()}
@@ -112,30 +103,54 @@ const EsdocsDatasource = ({ args, updateArgs, defaultIndex }) => {
         />
       </EuiFormRow>
 
-      <EuiFormRow
-        label={strings.getSortFieldTitle()}
-        helpText={strings.getSortFieldLabel()}
-        display="columnCompressed"
+      <EuiSpacer size="s" />
+      <EuiAccordion
+        id="accordionAdvancedSettings"
+        buttonContent="Advanced settings"
+        className="canvasArg__accordion"
       >
-        <ESFieldSelect
-          index={index}
-          value={sortField}
-          onChange={field => setArg('sort', [field, sortOrder].join(', '))}
-        />
-      </EuiFormRow>
+        <EuiSpacer size="s" />
+        <EuiFormRow label={strings.getSortFieldTitle()} display="columnCompressed">
+          <ESFieldSelect
+            index={index}
+            value={sortField}
+            onChange={field => setArg('sort', [field, sortOrder].join(', '))}
+          />
+        </EuiFormRow>
+
+        <EuiFormRow label={strings.getSortOrderTitle()} display="columnCompressed">
+          <EuiSelect
+            value={sortOrder.toLowerCase()}
+            onChange={e => setArg('sort', [sortField, e.target.value].join(', '))}
+            options={sortOptions}
+            compressed
+          />
+        </EuiFormRow>
+
+        <EuiFormRow
+          label={strings.getQueryTitle()}
+          labelAppend={
+            <EuiText size="xs">
+              <EuiLink href={LUCENE_QUERY_URL} target="_blank">
+                {strings.getQueryLabel()}
+              </EuiLink>
+            </EuiText>
+          }
+          display="rowCompressed"
+        >
+          <EuiTextArea
+            value={getQuery()}
+            onChange={e => setArg(getArgName(), e.target.value)}
+            compressed
+          />
+        </EuiFormRow>
+      </EuiAccordion>
 
-      <EuiFormRow
-        label={strings.getSortOrderTitle()}
-        helpText={strings.getSortOrderLabel()}
-        display="columnCompressed"
-      >
-        <EuiSelect
-          value={sortOrder.toLowerCase()}
-          onChange={e => setArg('sort', [sortField, e.target.value].join(', '))}
-          options={sortOptions}
-          compressed
-        />
-      </EuiFormRow>
+      <EuiSpacer size="m" />
+
+      <EuiCallOut size="s" title={strings.getWarningTitle()} iconType="alert" color="warning">
+        <p>{strings.getWarning()}</p>
+      </EuiCallOut>
     </div>
   );
 };
@@ -150,6 +165,6 @@ export const esdocs = () => ({
   name: 'esdocs',
   displayName: strings.getDisplayName(),
   help: strings.getHelp(),
-  image: 'logoElasticsearch',
+  image: 'documents',
   template: templateFromReactComponent(EsdocsDatasource),
 });
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
index 707f2305e1368..44e335dd7b41f 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
@@ -95,7 +95,6 @@ export const essql = () => ({
   name: 'essql',
   displayName: strings.getDisplayName(),
   help: strings.getHelp(),
-  // Replace this with a SQL logo when we have one in EUI
-  image: 'logoElasticsearch',
+  image: 'database',
   template: templateFromReactComponent(EssqlDatasource),
 });
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/index.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/index.js
index 13aa2a06306a0..5bddf1d3f4b6b 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/index.js
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/index.js
@@ -4,8 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { demodata } from './demodata';
 import { essql } from './essql';
+import { esdocs } from './esdocs';
+import { demodata } from './demodata';
 import { timelion } from './timelion';
 
-export const datasourceSpecs = [demodata, essql, timelion];
+export const datasourceSpecs = [essql, esdocs, demodata, timelion];
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js
index b30e43c1c3c57..b36f1a747f120 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js
@@ -13,12 +13,13 @@ import {
   EuiSpacer,
   EuiCode,
   EuiTextArea,
+  EuiText,
+  EuiLink,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { getSimpleArg, setSimpleArg } from '../../../public/lib/arg_helpers';
 import { templateFromReactComponent } from '../../../public/lib/template_from_react_component';
-import { DataSourceStrings, TIMELION, CANVAS } from '../../../i18n';
-import { TooltipIcon } from '../../../public/components/tooltip_icon';
+import { DataSourceStrings, TIMELION_QUERY_URL, TIMELION, CANVAS } from '../../../i18n';
 
 const { Timelion: strings } = DataSourceStrings;
 
@@ -86,8 +87,14 @@ const TimelionDatasource = ({ args, updateArgs, defaultIndex }) => {
 
       <EuiFormRow
         label={strings.getQueryLabel()}
-        helpText={strings.getQueryHelp()}
-        labelAppend={<TooltipIcon content={strings.getAbout()} />}
+        labelAppend={
+          <EuiText size="xs">
+            <EuiLink href={TIMELION_QUERY_URL} target="_blank">
+              {strings.queryLabel()}
+            </EuiLink>
+          </EuiText>
+        }
+        display="rowCompressed"
       >
         <EuiTextArea
           className="canvasTextArea__code"
@@ -96,6 +103,7 @@ const TimelionDatasource = ({ args, updateArgs, defaultIndex }) => {
           rows={15}
         />
       </EuiFormRow>
+
       {
         // TODO: Time timelion interval picker should be a drop down
       }
@@ -124,6 +132,6 @@ export const timelion = () => ({
   name: 'timelion',
   displayName: TIMELION,
   help: strings.getHelp(),
-  image: 'timelionApp',
+  image: 'visTimelion',
   template: templateFromReactComponent(TimelionDatasource),
 });
diff --git a/x-pack/legacy/plugins/canvas/i18n/constants.ts b/x-pack/legacy/plugins/canvas/i18n/constants.ts
index 4cb05b0426fa1..099effc697fc5 100644
--- a/x-pack/legacy/plugins/canvas/i18n/constants.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/constants.ts
@@ -25,6 +25,7 @@ export const JS = 'JavaScript';
 export const JSON = 'JSON';
 export const KIBANA = 'Kibana';
 export const LUCENE = 'Lucene';
+export const LUCENE_QUERY_URL = 'https://www.elastic.co/guide/en/kibana/current/lucene-query.html';
 export const MARKDOWN = 'Markdown';
 export const MOMENTJS = 'MomentJS';
 export const MOMENTJS_TIMEZONE_URL = 'https://momentjs.com/timezone/';
@@ -37,6 +38,7 @@ export const SQL_URL =
   'https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-spec.html';
 export const SVG = 'SVG';
 export const TIMELION = 'Timelion';
+export const TIMELION_QUERY_URL = 'https://www.elastic.co/blog/timelion-tutorial-from-zero-to-hero';
 export const TINYMATH = '`TinyMath`';
 export const TINYMATH_URL =
   'https://www.elastic.co/guide/en/kibana/current/canvas-tinymath-functions.html';
diff --git a/x-pack/legacy/plugins/canvas/i18n/expression_types.ts b/x-pack/legacy/plugins/canvas/i18n/expression_types.ts
index bdd190f26c97a..5d3a3cd742bb4 100644
--- a/x-pack/legacy/plugins/canvas/i18n/expression_types.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/expression_types.ts
@@ -5,7 +5,6 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { LUCENE, ELASTICSEARCH } from './constants';
 
 export const ArgTypesStrings = {
   Color: {
@@ -143,86 +142,3 @@ export const ArgTypesStrings = {
       }),
   },
 };
-
-export const ExpressionDataSourceStrings = {
-  ESDocs: {
-    getDisplayName: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocsTitle', {
-        defaultMessage: 'Elasticsearch raw documents',
-      }),
-    getHelp: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocsLabel', {
-        defaultMessage: 'Pull back raw documents from elasticsearch',
-      }),
-    getWarningTitle: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.warningTitle', {
-        defaultMessage: 'Query with caution',
-      }),
-    getWarning: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.warningDescription', {
-        defaultMessage: `
-          This datasource pulls directly from {elasticsearch}
-          without the use of aggregations. It is best used with low volume datasets and in
-          situations where you need to view raw documents or plot exact, non-aggregated values on a
-          chart.`,
-        values: {
-          elasticsearch: ELASTICSEARCH,
-        },
-      }),
-    getIndexTitle: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.indexTitle', {
-        defaultMessage: 'Index',
-      }),
-    getIndexLabel: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.indexLabel', {
-        defaultMessage: 'Enter an index name or select an index pattern',
-      }),
-    getQueryTitle: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.queryTitle', {
-        defaultMessage: 'Query',
-      }),
-    getQueryLabel: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.queryLabel', {
-        defaultMessage: '{lucene} query string syntax',
-        values: {
-          lucene: LUCENE,
-        },
-      }),
-    getSortFieldTitle: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.sortFieldTitle', {
-        defaultMessage: 'Sort Field',
-      }),
-    getSortFieldLabel: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.sortFieldLabel', {
-        defaultMessage: 'Document sort field',
-      }),
-    getSortOrderTitle: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.sortOrderTitle', {
-        defaultMessage: 'Sort Order',
-      }),
-    getSortOrderLabel: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.sortOrderLabel', {
-        defaultMessage: 'Document sort order',
-      }),
-    getFieldsTitle: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.fieldsTitle', {
-        defaultMessage: 'Fields',
-      }),
-    getFieldsLabel: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.fieldsLabel', {
-        defaultMessage: 'The fields to extract. Kibana scripted fields are not currently available',
-      }),
-    getFieldsWarningLabel: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.fieldsWarningLabel', {
-        defaultMessage: 'This datasource performs best with 10 or fewer fields',
-      }),
-    getAscendingOption: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.ascendingDropDown', {
-        defaultMessage: 'Ascending',
-      }),
-    getDescendingOption: () =>
-      i18n.translate('xpack.canvas.expressionTypes.datasources.esdocs.descendingDropDown', {
-        defaultMessage: 'Descending',
-      }),
-  },
-};
diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/demodata.ts b/x-pack/legacy/plugins/canvas/i18n/functions/dict/demodata.ts
index 20c7a88ea4f4d..caedbfdec5be4 100644
--- a/x-pack/legacy/plugins/canvas/i18n/functions/dict/demodata.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/functions/dict/demodata.ts
@@ -13,7 +13,7 @@ import { DemoRows } from '../../../canvas_plugin_src/functions/server/demodata/g
 export const help: FunctionHelp<FunctionFactory<typeof demodata>> = {
   help: i18n.translate('xpack.canvas.functions.demodataHelpText', {
     defaultMessage:
-      'A mock data set that includes project {ci} times with usernames, countries, and run phases.',
+      'A sample data set that includes project {ci} times with usernames, countries, and run phases.',
     values: {
       ci: 'CI',
     },
diff --git a/x-pack/legacy/plugins/canvas/i18n/ui.ts b/x-pack/legacy/plugins/canvas/i18n/ui.ts
index 5b94cb0435b31..1abe56c99dc89 100644
--- a/x-pack/legacy/plugins/canvas/i18n/ui.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/ui.ts
@@ -308,6 +308,7 @@ export const ArgumentStrings = {
 };
 
 export const DataSourceStrings = {
+  // Demo data source
   DemoData: {
     getDisplayName: () =>
       i18n.translate('xpack.canvas.uis.dataSources.demoDataTitle', {
@@ -319,7 +320,7 @@ export const DataSourceStrings = {
       }),
     getHelp: () =>
       i18n.translate('xpack.canvas.uis.dataSources.demoDataLabel', {
-        defaultMessage: 'Mock data set with usernames, prices, projects, countries, and phases',
+        defaultMessage: 'Sample data set used to populate default elements',
       }),
     getDescription: () =>
       i18n.translate('xpack.canvas.uis.dataSources.demoDataDescription', {
@@ -330,6 +331,88 @@ export const DataSourceStrings = {
         },
       }),
   },
+  // Elasticsearch documents datasource
+  ESDocs: {
+    getDisplayName: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocsTitle', {
+        defaultMessage: '{elasticsearch} documents',
+        values: {
+          elasticsearch: ELASTICSEARCH,
+        },
+      }),
+    getHelp: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocsLabel', {
+        defaultMessage: 'Pull data directly from {elasticsearch} without the use of aggregations',
+        values: {
+          elasticsearch: ELASTICSEARCH,
+        },
+      }),
+    getWarningTitle: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.warningTitle', {
+        defaultMessage: 'Query with caution',
+      }),
+    getWarning: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.warningDescription', {
+        defaultMessage: `
+        Using this data source with larger data sets can result in slower performance. Use this source only when you need exact values.`,
+      }),
+    getIndexTitle: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.indexTitle', {
+        defaultMessage: 'Index',
+      }),
+    getIndexLabel: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.indexLabel', {
+        defaultMessage: 'Enter an index name or select an index pattern',
+      }),
+    getQueryTitle: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.queryTitle', {
+        defaultMessage: 'Query',
+      }),
+    getQueryLabel: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.queryLabel', {
+        defaultMessage: '{lucene} query string syntax',
+        values: {
+          lucene: LUCENE,
+        },
+      }),
+    getSortFieldTitle: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.sortFieldTitle', {
+        defaultMessage: 'Sort field',
+      }),
+    getSortFieldLabel: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.sortFieldLabel', {
+        defaultMessage: 'Document sort field',
+      }),
+    getSortOrderTitle: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.sortOrderTitle', {
+        defaultMessage: 'Sort order',
+      }),
+    getSortOrderLabel: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.sortOrderLabel', {
+        defaultMessage: 'Document sort order',
+      }),
+    getFieldsTitle: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.fieldsTitle', {
+        defaultMessage: 'Fields',
+      }),
+    getFieldsLabel: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.fieldsLabel', {
+        defaultMessage: 'Scripted fields are unavailable',
+      }),
+    getFieldsWarningLabel: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.fieldsWarningLabel', {
+        defaultMessage: 'This datasource performs best with 10 or fewer fields',
+      }),
+    getAscendingOption: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.ascendingDropDown', {
+        defaultMessage: 'Ascending',
+      }),
+    getDescendingOption: () =>
+      i18n.translate('xpack.canvas.uis.dataSources.esdocs.descendingDropDown', {
+        defaultMessage: 'Descending',
+      }),
+  },
+  // Elasticsearch SQL data source
   Essql: {
     getDisplayName: () =>
       i18n.translate('xpack.canvas.uis.dataSources.essqlTitle', {
@@ -341,7 +424,7 @@ export const DataSourceStrings = {
       }),
     getHelp: () =>
       i18n.translate('xpack.canvas.uis.dataSources.essqlLabel', {
-        defaultMessage: 'Use {elasticsearch} {sql} to get a data table',
+        defaultMessage: 'Write an {elasticsearch} {sql} query to retrieve data',
         values: {
           elasticsearch: ELASTICSEARCH,
           sql: SQL,
@@ -353,18 +436,18 @@ export const DataSourceStrings = {
       }),
     getLabelAppend: () =>
       i18n.translate('xpack.canvas.uis.dataSources.essql.queryTitleAppend', {
-        defaultMessage: 'Learn {elasticsearchShort} {sql} syntax',
+        defaultMessage: 'Learn {elasticsearchShort} {sql} query syntax',
         values: {
           elasticsearchShort: ELASTICSEARCH_SHORT,
           sql: SQL,
         },
       }),
   },
+  // Timelion datasource
   Timelion: {
     getAbout: () =>
       i18n.translate('xpack.canvas.uis.dataSources.timelion.aboutDetail', {
-        defaultMessage:
-          'Use {timelion} queries to pull back timeseries data that can be used with {canvas} elements.',
+        defaultMessage: 'Use {timelion} syntax in {canvas} to retrieve timeseries data',
         values: {
           timelion: TIMELION,
           canvas: CANVAS,
@@ -372,7 +455,7 @@ export const DataSourceStrings = {
       }),
     getHelp: () =>
       i18n.translate('xpack.canvas.uis.dataSources.timelionLabel', {
-        defaultMessage: 'Use {timelion} syntax to retrieve a timeseries',
+        defaultMessage: 'Use {timelion} syntax to retrieve timeseries data',
         values: {
           timelion: TIMELION,
         },
@@ -392,11 +475,11 @@ export const DataSourceStrings = {
       i18n.translate('xpack.canvas.uis.dataSources.timelion.intervalTitle', {
         defaultMessage: 'Interval',
       }),
-    getQueryHelp: () =>
+    queryLabel: () =>
       i18n.translate('xpack.canvas.uis.dataSources.timelion.queryLabel', {
-        defaultMessage: '{lucene} Query String syntax',
+        defaultMessage: '{timelion} Query String syntax',
         values: {
-          lucene: LUCENE,
+          timelion: TIMELION,
         },
       }),
     getQueryLabel: () =>
diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource.scss b/x-pack/legacy/plugins/canvas/public/components/datasource/datasource.scss
index 2407dcbbce593..52c473ac2dd38 100644
--- a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource.scss
+++ b/x-pack/legacy/plugins/canvas/public/components/datasource/datasource.scss
@@ -6,8 +6,13 @@
   padding: 0 $euiSizeS;
 }
 
-.canvasDataSource__section {
-  padding: $euiSizeM;
+.canvasDataSource__section,
+.canvasDataSource__list {
+  padding: $euiSizeM $euiSizeM 0;
+}
+
+.canvasDataSource__sectionFooter {
+  padding: 0 $euiSizeM;
 }
 
 .canvasDataSource__triggerButton {
@@ -19,10 +24,6 @@
   margin-right: $euiSizeS;
 }
 
-.canvasDataSource__list {
-  padding: $euiSizeM;
-}
-
 .canvasDataSource__card .euiCard__content {
   padding-top: 0 !important; // sass-lint:disable-line no-important
 }
diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_component.js b/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_component.js
index 8b0061e047f33..285b69f057cd8 100644
--- a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_component.js
+++ b/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_component.js
@@ -153,7 +153,7 @@ export class DatasourceComponent extends PureComponent {
             flush="left"
             size="s"
           >
-            <EuiIcon type="database" className="canvasDataSource__triggerButtonIcon" />
+            <EuiIcon type={stateDatasource.image} className="canvasDataSource__triggerButtonIcon" />
             {stateDatasource.displayName}
           </EuiButtonEmpty>
           <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_selector.js b/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_selector.js
index 92f9b92cb1f06..153a8a7ef75e6 100644
--- a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_selector.js
+++ b/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_selector.js
@@ -15,6 +15,7 @@ export const DatasourceSelector = ({ onSelect, datasources, current }) => (
         key={d.name}
         title={d.displayName}
         titleElement="h5"
+        titleSize="xs"
         icon={<EuiIcon type={d.image} size="l" />}
         description={d.help}
         layout="horizontal"
diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/datasources/index.js b/x-pack/legacy/plugins/canvas/public/expression_types/datasources/index.js
deleted file mode 100644
index 91dca7d275f8b..0000000000000
--- a/x-pack/legacy/plugins/canvas/public/expression_types/datasources/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { esdocs } from './esdocs';
-
-export const datasourceSpecs = [esdocs];
diff --git a/x-pack/legacy/plugins/canvas/public/lib/find_expression_type.js b/x-pack/legacy/plugins/canvas/public/lib/find_expression_type.js
index d6d395feade8b..2cd7c5efb74e9 100644
--- a/x-pack/legacy/plugins/canvas/public/lib/find_expression_type.js
+++ b/x-pack/legacy/plugins/canvas/public/lib/find_expression_type.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { datasourceRegistry } from '../expression_types/datasource';
+//import { datasourceRegistry } from '../expression_types/datasource';
 import { transformRegistry } from '../expression_types/transform';
 import { modelRegistry } from '../expression_types/model';
 import { viewRegistry } from '../expression_types/view';
@@ -28,9 +28,6 @@ export function findExpressionType(name, type) {
       case 'transform':
         expression = transformRegistry.get(name);
         return !expression ? acc : acc.concat(expression);
-      case 'datasource':
-        expression = datasourceRegistry.get(name);
-        return !expression ? acc : acc.concat(expression);
       default:
         return acc;
     }
diff --git a/x-pack/legacy/plugins/canvas/public/lib/load_expression_types.js b/x-pack/legacy/plugins/canvas/public/lib/load_expression_types.js
index fb23f9459d30b..82699eb5b88fa 100644
--- a/x-pack/legacy/plugins/canvas/public/lib/load_expression_types.js
+++ b/x-pack/legacy/plugins/canvas/public/lib/load_expression_types.js
@@ -5,11 +5,9 @@
  */
 
 import { argTypeSpecs } from '../expression_types/arg_types';
-import { datasourceSpecs } from '../expression_types/datasources';
-import { argTypeRegistry, datasourceRegistry } from '../expression_types';
+import { argTypeRegistry } from '../expression_types';
 
 export function loadExpressionTypes() {
   // register default args, arg types, and expression types
   argTypeSpecs.forEach(expFn => argTypeRegistry.register(expFn));
-  datasourceSpecs.forEach(expFn => datasourceRegistry.register(expFn));
 }
diff --git a/x-pack/legacy/plugins/canvas/public/plugin.tsx b/x-pack/legacy/plugins/canvas/public/plugin.tsx
index 0a3faca1a2522..f4a3aed28a0a4 100644
--- a/x-pack/legacy/plugins/canvas/public/plugin.tsx
+++ b/x-pack/legacy/plugins/canvas/public/plugin.tsx
@@ -11,8 +11,6 @@ import { initLoadingIndicator } from './lib/loading_indicator';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
 import { ExpressionsSetup, ExpressionsStart } from '../../../../../src/plugins/expressions/public';
 // @ts-ignore untyped local
-import { datasourceSpecs } from './expression_types/datasources';
-// @ts-ignore untyped local
 import { argTypeSpecs } from './expression_types/arg_types';
 import { transitions } from './transitions';
 import { legacyRegistries } from './legacy_plugin_support';
@@ -90,7 +88,6 @@ export class CanvasPlugin
 
     // Register core canvas stuff
     canvasApi.addFunctions(initFunctions({ typesRegistry: plugins.expressions.__LEGACY.types }));
-    canvasApi.addDatasourceUIs(datasourceSpecs);
     canvasApi.addArgumentUIs(argTypeSpecs);
     canvasApi.addTransitions(transitions);
 
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 640ae9df83ad3..60182dfa20aae 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -4465,22 +4465,6 @@
     "xpack.canvas.expressionTypes.argTypes.seriesStyle.styleLabel": "スタイル",
     "xpack.canvas.expressionTypes.argTypes.seriesStyleLabel": "選択された名前付きの数列のスタイルを設定",
     "xpack.canvas.expressionTypes.argTypes.seriesStyleTitle": "数列スタイル",
-    "xpack.canvas.expressionTypes.datasources.esdocs.ascendingDropDown": "昇順",
-    "xpack.canvas.expressionTypes.datasources.esdocs.descendingDropDown": "降順",
-    "xpack.canvas.expressionTypes.datasources.esdocs.fieldsLabel": "抽出するフィールドです。Kibana スクリプトフィールドは現在利用できません",
-    "xpack.canvas.expressionTypes.datasources.esdocs.fieldsTitle": "フィールド",
-    "xpack.canvas.expressionTypes.datasources.esdocs.fieldsWarningLabel": "このデータソースは、10 個以下のフィールドで最も高い性能を発揮します",
-    "xpack.canvas.expressionTypes.datasources.esdocs.indexLabel": "インデックス名を入力するか、インデックスパターンを選択してください",
-    "xpack.canvas.expressionTypes.datasources.esdocs.indexTitle": "インデックス",
-    "xpack.canvas.expressionTypes.datasources.esdocs.queryLabel": "{lucene} クエリ文字列の構文",
-    "xpack.canvas.expressionTypes.datasources.esdocs.queryTitle": "クエリ",
-    "xpack.canvas.expressionTypes.datasources.esdocs.sortFieldLabel": "ドキュメントソートフィールド",
-    "xpack.canvas.expressionTypes.datasources.esdocs.sortFieldTitle": "ソートフィールド",
-    "xpack.canvas.expressionTypes.datasources.esdocs.sortOrderLabel": "ドキュメントの並べ替え順",
-    "xpack.canvas.expressionTypes.datasources.esdocs.sortOrderTitle": "並べ替え順",
-    "xpack.canvas.expressionTypes.datasources.esdocs.warningTitle": "ご注意ください",
-    "xpack.canvas.expressionTypes.datasources.esdocsLabel": "Elasticsearch から未加工のドキュメントを読み込みます",
-    "xpack.canvas.expressionTypes.datasources.esdocsTitle": "Elasticsearch 未加工ドキュメント",
     "xpack.canvas.functionForm.contextError": "エラー: {errorMessage}",
     "xpack.canvas.functionForm.functionUnknown.unknownArgumentTypeError": "未知の表現タイプ「{expressionType}」",
     "xpack.canvas.functions.all.args.conditionHelpText": "確認する条件です。",
@@ -4991,13 +4975,29 @@
     "xpack.canvas.uis.arguments.textareaTitle": "テキストエリア",
     "xpack.canvas.uis.arguments.toggleLabel": "true/false トグルスイッチ",
     "xpack.canvas.uis.arguments.toggleTitle": "切り替え",
+    "xpack.canvas.uis.dataSources.esdocs.ascendingDropDown": "昇順",
+    "xpack.canvas.uis.dataSources.esdocs.descendingDropDown": "降順",
+    "xpack.canvas.uis.dataSources.esdocs.fieldsLabel": "抽出するフィールドです。Kibana スクリプトフィールドは現在利用できません",
+    "xpack.canvas.uis.dataSources.esdocs.fieldsTitle": "フィールド",
+    "xpack.canvas.uis.dataSources.esdocs.fieldsWarningLabel": "このデータソースは、10 個以下のフィールドで最も高い性能を発揮します",
+    "xpack.canvas.uis.dataSources.esdocs.indexLabel": "インデックス名を入力するか、インデックスパターンを選択してください",
+    "xpack.canvas.uis.dataSources.esdocs.indexTitle": "インデックス",
+    "xpack.canvas.uis.dataSources.esdocs.queryLabel": "{lucene} クエリ文字列の構文",
+    "xpack.canvas.uis.dataSources.esdocs.queryTitle": "クエリ",
+    "xpack.canvas.uis.dataSources.esdocs.sortFieldLabel": "ドキュメントソートフィールド",
+    "xpack.canvas.uis.dataSources.esdocs.sortFieldTitle": "ソートフィールド",
+    "xpack.canvas.uis.dataSources.esdocs.sortOrderLabel": "ドキュメントの並べ替え順",
+    "xpack.canvas.uis.dataSources.esdocs.sortOrderTitle": "並べ替え順",
+    "xpack.canvas.uis.dataSources.esdocs.warningTitle": "ご注意ください",
+    "xpack.canvas.uis.dataSources.esdocsLabel": "{elasticsearch} から未加工のドキュメントを読み込みます",
+    "xpack.canvas.uis.dataSources.esdocsTitle": "{elasticsearch} 未加工ドキュメント",
     "xpack.canvas.uis.dataSources.demoData.headingTitle": "デモデータを使用中です",
     "xpack.canvas.uis.dataSources.demoDataLabel": "ユーザー名、価格、プロジェクト、国、フェーズを含む模擬データセット",
     "xpack.canvas.uis.dataSources.demoDataTitle": "デモデータ",
     "xpack.canvas.uis.dataSources.essqlLabel": "{elasticsearch} {sql} でデータ表を取得します",
     "xpack.canvas.uis.dataSources.essqlTitle": "{elasticsearch} {sql}",
     "xpack.canvas.uis.dataSources.timelion.intervalTitle": "間隔",
-    "xpack.canvas.uis.dataSources.timelion.queryLabel": "{lucene} クエリ文字列の構文",
+    "xpack.canvas.uis.dataSources.timelion.queryLabel": "{timelion} クエリ文字列の構文",
     "xpack.canvas.uis.dataSources.timelion.queryTitle": "クエリ",
     "xpack.canvas.uis.dataSources.timelion.tips.functions": "{functionExample} などの一部 {timelion} 関数は {canvas} データ表に変換できません。データ操作に関する機能は正常に動作するはずです。",
     "xpack.canvas.uis.dataSources.timelion.tips.time": "{timelion} には時間範囲が必要です。ページのどこかに時間フィルターを追加するか、コードエディターで時間フィルターを渡す必要があります。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 3523a81b5717d..bd0fe0e03f684 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4466,22 +4466,6 @@
     "xpack.canvas.expressionTypes.argTypes.seriesStyle.styleLabel": "样式",
     "xpack.canvas.expressionTypes.argTypes.seriesStyleLabel": "设置选定已命名序列的样式",
     "xpack.canvas.expressionTypes.argTypes.seriesStyleTitle": "序列样式",
-    "xpack.canvas.expressionTypes.datasources.esdocs.ascendingDropDown": "升序",
-    "xpack.canvas.expressionTypes.datasources.esdocs.descendingDropDown": "降序",
-    "xpack.canvas.expressionTypes.datasources.esdocs.fieldsLabel": "要提取的字段。Kibana 脚本字段当前不可用",
-    "xpack.canvas.expressionTypes.datasources.esdocs.fieldsTitle": "字段",
-    "xpack.canvas.expressionTypes.datasources.esdocs.fieldsWarningLabel": "字段不超过 10 个时，此数据源性能最佳",
-    "xpack.canvas.expressionTypes.datasources.esdocs.indexLabel": "输入索引名称或选择索引模式",
-    "xpack.canvas.expressionTypes.datasources.esdocs.indexTitle": "索引",
-    "xpack.canvas.expressionTypes.datasources.esdocs.queryLabel": "{lucene} 查询字符串语法",
-    "xpack.canvas.expressionTypes.datasources.esdocs.queryTitle": "查询",
-    "xpack.canvas.expressionTypes.datasources.esdocs.sortFieldLabel": "文档排序字段",
-    "xpack.canvas.expressionTypes.datasources.esdocs.sortFieldTitle": "排序字段",
-    "xpack.canvas.expressionTypes.datasources.esdocs.sortOrderLabel": "文档排序顺序",
-    "xpack.canvas.expressionTypes.datasources.esdocs.sortOrderTitle": "排序顺序",
-    "xpack.canvas.expressionTypes.datasources.esdocs.warningTitle": "务必谨慎操作",
-    "xpack.canvas.expressionTypes.datasources.esdocsLabel": "从 Elasticsearch 拉取原始文档",
-    "xpack.canvas.expressionTypes.datasources.esdocsTitle": "Elasticsearch 原始文档",
     "xpack.canvas.functionForm.contextError": "错误：{errorMessage}",
     "xpack.canvas.functionForm.functionUnknown.unknownArgumentTypeError": "表达式类型“{expressionType}”未知",
     "xpack.canvas.functions.all.args.conditionHelpText": "要检查的条件。",
@@ -4992,13 +4976,29 @@
     "xpack.canvas.uis.arguments.textareaTitle": "文本区域",
     "xpack.canvas.uis.arguments.toggleLabel": "True/False 切换开关",
     "xpack.canvas.uis.arguments.toggleTitle": "切换",
+    "xpack.canvas.uis.dataSources.esdocs.ascendingDropDown": "升序",
+    "xpack.canvas.uis.dataSources.esdocs.descendingDropDown": "降序",
+    "xpack.canvas.uis.dataSources.esdocs.fieldsLabel": "要提取的字段。Kibana 脚本字段当前不可用",
+    "xpack.canvas.uis.dataSources.esdocs.fieldsTitle": "字段",
+    "xpack.canvas.uis.dataSources.esdocs.fieldsWarningLabel": "字段不超过 10 个时，此数据源性能最佳",
+    "xpack.canvas.uis.dataSources.esdocs.indexLabel": "输入索引名称或选择索引模式",
+    "xpack.canvas.uis.dataSources.esdocs.indexTitle": "索引",
+    "xpack.canvas.uis.dataSources.esdocs.queryLabel": "{lucene} 查询字符串语法",
+    "xpack.canvas.uis.dataSources.esdocs.queryTitle": "查询",
+    "xpack.canvas.uis.dataSources.esdocs.sortFieldLabel": "文档排序字段",
+    "xpack.canvas.uis.dataSources.esdocs.sortFieldTitle": "排序字段",
+    "xpack.canvas.uis.dataSources.esdocs.sortOrderLabel": "文档排序顺序",
+    "xpack.canvas.uis.dataSources.esdocs.sortOrderTitle": "排序顺序",
+    "xpack.canvas.uis.dataSources.esdocs.warningTitle": "务必谨慎操作",
+    "xpack.canvas.uis.dataSources.esdocsLabel": "从 {elasticsearch} 拉取原始文档",
+    "xpack.canvas.uis.dataSources.esdocsTitle": "{elasticsearch} 原始文档",
     "xpack.canvas.uis.dataSources.demoData.headingTitle": "您正在使用演示数据",
     "xpack.canvas.uis.dataSources.demoDataLabel": "使用用户名、价格、项目、国家/地区和阶段模拟数据集",
     "xpack.canvas.uis.dataSources.demoDataTitle": "演示数据",
     "xpack.canvas.uis.dataSources.essqlLabel": "使用 {elasticsearch} {sql} 以获取数据表",
     "xpack.canvas.uis.dataSources.essqlTitle": "{elasticsearch} {sql}",
     "xpack.canvas.uis.dataSources.timelion.intervalTitle": "时间间隔",
-    "xpack.canvas.uis.dataSources.timelion.queryLabel": "{lucene} 查询字符串语法",
+    "xpack.canvas.uis.dataSources.timelion.queryLabel": "{timelion} 查询字符串语法",
     "xpack.canvas.uis.dataSources.timelion.queryTitle": "查询",
     "xpack.canvas.uis.dataSources.timelion.tips.functions": "一些 {timelion} 函数（如 {functionExample}）不转换成 {canvas} 数据表。任何与数据操作有关的内容都适用。",
     "xpack.canvas.uis.dataSources.timelion.tips.time": "{timelion} 需要时间范围，您应将时间筛选元素添加到页面上的某个位置，或使用代码编辑器传入时间筛选。",