diff --git a/app/client/ui/DocTour.ts b/app/client/ui/DocTour.ts
index d1c2385f5c..61d5a6e884 100644
--- a/app/client/ui/DocTour.ts
+++ b/app/client/ui/DocTour.ts
@@ -10,6 +10,9 @@ import {IconList, IconName} from 'app/client/ui2018/IconList';
 import {DocData} from 'app/common/DocData';
 import {dom} from 'grainjs';
 import sortBy = require('lodash/sortBy');
+import {marked} from "marked";
+import {renderer} from 'app/client/ui/DocTourRenderer';
+import {sanitizeTourHTML} from "app/client/ui/sanitizeHTML";
 
 const t = makeT('DocTour');
 
@@ -44,17 +47,22 @@ async function makeDocTour(docData: DocData, docComm: DocComm): Promise<IOnBoard
       return String(tableData.getValue(rowId, colId) || "");
     }
     const title = getValue("Title");
-    let body: HTMLElement | string = getValue("Body");
+    const bodyValue = getValue("Body");
+
+    if (!title && !(bodyValue.trim()) ) {
+      return null;
+    }
+
+    const element = sanitizeTourHTML(marked.parse(bodyValue, {
+      async: false, renderer
+    }));
+
     const linkText = getValue("Link_Text");
     const linkUrl = getValue("Link_URL");
     const linkIcon = getValue("Link_Icon") as IconName;
     const locationValue = getValue("Location");
     let placement = getValue("Placement");
 
-    if (!(title || body)) {
-      return null;
-    }
-
     const urlState = sameDocumentUrlState(locationValue);
     if (isNarrowScreen() || !placements.includes(placement as Placement)) {
       placement = "auto";
@@ -67,10 +75,12 @@ async function makeDocTour(docData: DocData, docComm: DocComm): Promise<IOnBoard
       validLinkUrl = false;
     }
 
+    let body: HTMLElement = dom('span', element);
+
     if (validLinkUrl && linkText) {
       body = dom(
-        'div',
-        dom('p', body),
+        'span',
+        body,
         dom('p',
           cssButtons(cssLinkBtn(
             IconList.includes(linkIcon) ? cssLinkIcon(linkIcon) : null,
diff --git a/app/client/ui/DocTourRenderer.ts b/app/client/ui/DocTourRenderer.ts
new file mode 100644
index 0000000000..be6b919c8c
--- /dev/null
+++ b/app/client/ui/DocTourRenderer.ts
@@ -0,0 +1,11 @@
+import {constructUrl} from 'app/client/models/gristUrlState';
+import {gristIconLink} from 'app/client/ui2018/links';
+import {marked} from 'marked';
+import escape from "lodash/escape";
+
+export const renderer = new marked.Renderer();
+
+renderer.link = ({href, text}) =>
+  gristIconLink(constructUrl(href), text).outerHTML;
+
+renderer.html = ({raw}) => escape(raw);
diff --git a/app/client/ui/sanitizeHTML.ts b/app/client/ui/sanitizeHTML.ts
index 31d6f7e261..f506b67a99 100644
--- a/app/client/ui/sanitizeHTML.ts
+++ b/app/client/ui/sanitizeHTML.ts
@@ -26,6 +26,19 @@ export function sanitizeHTMLIntoDOM(source: string | Node): DocumentFragment {
   }
 }
 
+export function sanitizeTourHTML(source: string | Node): DocumentFragment {
+  return tourPurifier.sanitize(source, {
+    RETURN_DOM_FRAGMENT: true,
+    ALLOWED_TAGS: [
+      'p', 'span', 'h1', 'h2', 'h3', 'h4',  'table', 'tr', 'td',
+      'strong', 'em', 'bold', 'code', 'pre', 'blockquote', 'ul', 'ol', 'li', 'del',
+      'br', 'img', 'iframe', 'a'
+      ],
+    ADD_ATTR: ['allowFullscreen']
+  });
+
+}
+
 export function sanitizeTutorialHTML(source: string | Node): string {
   return tutorialPurifier.sanitize(source, {
     ADD_TAGS: ['iframe'],
@@ -35,6 +48,7 @@ export function sanitizeTutorialHTML(source: string | Node): string {
 
 const defaultPurifier = createDOMPurifier();
 const tutorialPurifier = createDOMPurifier();
+const tourPurifier = createDOMPurifier();
 
 // If we are executed in a browser, we can add hooks to the purifiers to customize their behavior.
 // But sometimes this code is included in tests, where `window` is not defined.
diff --git a/test/fixtures/docs/doctour.grist b/test/fixtures/docs/doctour.grist
index 9c95eeb874..d939024129 100644
Binary files a/test/fixtures/docs/doctour.grist and b/test/fixtures/docs/doctour.grist differ
diff --git a/test/nbrowser/DocTour.ts b/test/nbrowser/DocTour.ts
index 1d20a0b260..4923ba5624 100644
--- a/test/nbrowser/DocTour.ts
+++ b/test/nbrowser/DocTour.ts
@@ -47,7 +47,9 @@ describe('DocTour', function () {
     const docTour = await driver.executeScript('return window._gristDocTour()');
     assert.deepEqual(docTour, [
       {
-        body: 'General Kenobi!',
+        body: '<span>' +
+          '<p>General Kenobi!</p>\n' +
+          '</span>',
         placement: 'bottom',
         selector: '.active_cursor',
         showHasModal: false,
@@ -55,7 +57,9 @@ describe('DocTour', function () {
         urlState: {colRef: 2, rowId: 2, sectionId: 1}
       },
       {
-        body: 'no title',
+        body: '<span>' +
+          '<p>no title</p>\n' +
+          '</span>',
         placement: 'auto',
         selector: '.active_cursor',
         showHasModal: true,
@@ -63,15 +67,15 @@ describe('DocTour', function () {
         urlState: null,
       },
       {
-        body: '<div>' +
-          '<p></p>' +
+        body: '<span>' +
+          '<span></span>' +
           '<p><div class="_grainXXX_">' +
           '<a href="https://www.getgrist.com/" target="_blank" class="_grainXXX_ _grainXXX_">' +
           '<div class="_grainXXX_ _grainXXX_" style="mask-image: var(--icon-Page);"></div>' +
           'A link with an icon' +
           '</a>' +
           '</div></p>' +
-          '</div>',
+          '</span>',
         placement: 'auto',
         selector: '.active_cursor',
         showHasModal: false,
@@ -79,19 +83,139 @@ describe('DocTour', function () {
         urlState: {colRef: 4, rowId: 4, sectionId: 1}
       },
       {
-        body: '<div>' +
-          '<p>Good riddance</p>' +
+        body: '<span><span>' +
+          '<p>Good riddance</p>\n</span>' +
           '<p><div class="_grainXXX_">' +
           '<a href="https://xkcd.com/" target="_blank" class="_grainXXX_ _grainXXX_">' +
           'Test link here' +
           '</a>' +
           '</div></p>' +
-          '</div>',
+          '</span>',
         placement: 'auto',
         selector: '.active_cursor',
         showHasModal: true,
         title: 'Bye',
         urlState: null,
+      },
+      {
+        body: '<span><p>' +
+          '<strong>bold</strong>' +
+          ' <em>italicized</em>' +
+          ' <code>code</code>' +
+          ' <del>strikethrough</del>' +
+          '</p>\n' +
+          '</span>',
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: true,
+        title: 'Markdown formating',
+        urlState: null,
+      },
+      {
+        body: '<span><p>' +
+          '<img alt=\"Grist text as image alt\" src=\"https://www.getgrist.com/wp-content/uploads/2023/03/Grist-Logo.png\">' +
+          '</p>\n</span>',
+
+
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: false,
+        title: 'Markdown image',
+        urlState: {
+            "colRef": 8,
+            "rowId": 8,
+            "sectionId": 1
+          },
+      },
+      {
+        body: '<span>' +
+          '<h1>H1</h1>\n<h2>H2</h2>\n<h3>H3</h3>\n' +
+          '</span>',
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: true,
+        title: 'Markdown headings',
+        urlState: null,
+      },
+      {
+        body: '<span>' +
+          '<ol>\n<li>First item</li>\n<li>Second item</li>\n<li>Third item</li>\n</ol>\n' +
+          '</span>',
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: false,
+        title: 'Markdown ordered list',
+        urlState: {
+            "colRef": 10,
+            "rowId": 10,
+            "sectionId": 1
+          },
+      },
+      {
+        body: '<span>' +
+          '<ul>\n<li>First item</li>\n<li>Second item</li>\n<li>Third item</li>\n</ul>\n' +
+          '</span>',
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: true,
+        title: 'Markdown unordered list',
+        urlState: null,
+      },
+      {
+        body: '<span>' +
+          '<blockquote>\n<p>blockquote</p>\n</blockquote>\n' +
+          '</span>',
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: false,
+        title: 'Markdown quote',
+        urlState: {
+            "colRef": 12,
+            "rowId": 12,
+            "sectionId": 1
+          },
+      },
+      {
+        body: '<span>' +
+          '<pre><code>{\n  ' +
+          '"firstName": "John",\n  "lastName": "Smith",\n  "age": 25\n' +
+          '}\n' +
+          '</code></pre>\n' +
+          '</span>',
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: true,
+        title: 'Markdown code block',
+        urlState: null
+      },
+      {
+        body: '<span>' +
+          '<p><span class=\"test-text-link _grainXXX_\"><a class=\"_grainXXX_\" rel=\"noopener noreferrer\" href=\"https://www.example.com/\"><span class=\"_grainXXX_ _grainXXX_ _grainXXX_\"><span style=\"mask-image: var(--icon-FieldLink);\" class=\"test-tb-link-icon _grainXXX_\"></span></span></a><span class=\"_grainXXX_\">title</span></span></p>\n' +
+          '</span>',
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: false,
+        title: 'Markdown link',
+        urlState: {
+            "colRef": 14,
+            "rowId": 14,
+            "sectionId": 1
+          },
+      },
+      {
+        body: '<span>' +
+          '<p>Do not render HTML only Markdown</p>\n<h1>This is a H1 Title</h1>\n' +
+          '<p>Previous SHOULD BE a level 1 Title.</p>\n' +
+          '<p>Next should NOT BE a level 1 Title :</p>\n' +
+          '&lt;H1&gt;Level 1 title&lt;/H1&gt; \n\n' +
+          '<p>The HTML &lt;H1&gt; within this text should not be rendered but the previous Markdown # should</p>\n' +
+          '<p>This is another test where the following text SHOULD NOT BE BOLD : &lt;b&gt;should just render the tags without bold &lt;/b&gt;</p>\n' +
+          '</span>',
+        placement: 'auto',
+        selector: '.active_cursor',
+        showHasModal: true,
+        title: 'Markdown with HTML',
+        urlState: null
       }
     ]);
   });
@@ -154,7 +278,9 @@ describe('DocTour', function () {
 
   async function checkDocTourPresent() {
     // Check the expected message.
-    assert.match(await driver.findWait('.test-onboarding-popup', 500).getText(), /General Kenobi/);
+     assert.isTrue(await driver.findWait('.test-onboarding-popup', 500)
+       .findContent('div', 'General Kenobi!').isPresent());
+
     // Check that there is only one popup, and no errors.
     assert.lengthOf(await driver.findAll('.test-onboarding-popup'), 1);
     await gu.checkForErrors();