diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/service.js
index 9bc611a671bf..f1ac58b8dad3 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/service.js
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/service.js
@@ -361,7 +361,7 @@ const getCustomAssetUrls = () => {
'size-medium': `${TL_ICON_PATHS}/size-medium.svg`,
'size-large': `${TL_ICON_PATHS}/size-large.svg`,
'size-extra-large': `${TL_ICON_PATHS}/size-extra-large.svg`,
- 'font-draw': `${TL_ICON_PATHS}/font-draw.svg`,
+ 'font-draw': `${TL_ICON_PATHS}/font-amt.svg`,
'font-sans': `${TL_ICON_PATHS}/font-sans.svg`,
'font-serif': `${TL_ICON_PATHS}/font-serif.svg`,
'font-mono': `${TL_ICON_PATHS}/font-mono.svg`,
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.js b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.js
index 90a8fcba642d..8377ec7276b4 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.js
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.js
@@ -167,6 +167,15 @@ const TldrawV2GlobalStyle = createGlobalStyle`
.tlui-kbd > span {
font-family: 'Arial', sans-serif !important;
}
+
+ .tl-text-shape__wrapper[data-font='draw'] {
+ /* font-family: 'tldraw_draw', 'KosugiMaruSubset', sans-serif; */
+ font-family: 'AMT', 'MRY', sans-serif;
+ }
+
+ #.tl-text-shape__wrapper[data-font='serif'] {
+ font-family: 'Times New Roman', 'MM', serif;
+ }
[data-side="bottom"][data-align="end"][data-state="open"][role="dialog"] {
right: 3.5rem !important;
diff --git a/bigbluebutton-html5/public/fonts/KosugiMaru/KosugiMaru-Regular.woff2 b/bigbluebutton-html5/public/fonts/KosugiMaru/KosugiMaru-Regular.woff2
new file mode 100644
index 000000000000..410bb44d2889
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/KosugiMaru/KosugiMaru-Regular.woff2 differ
diff --git a/bigbluebutton-html5/public/fonts/MA/AMT.woff2 b/bigbluebutton-html5/public/fonts/MA/AMT.woff2
new file mode 100644
index 000000000000..03e23182f816
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/MA/AMT.woff2 differ
diff --git a/bigbluebutton-html5/public/fonts/MA/MRY-subset.woff2 b/bigbluebutton-html5/public/fonts/MA/MRY-subset.woff2
new file mode 100644
index 000000000000..fd25bd9ecfdd
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/MA/MRY-subset.woff2 differ
diff --git a/bigbluebutton-html5/public/fonts/MA/MRY.woff2 b/bigbluebutton-html5/public/fonts/MA/MRY.woff2
new file mode 100644
index 000000000000..eb5aa23da54d
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/MA/MRY.woff2 differ
diff --git a/bigbluebutton-html5/public/fonts/MS/MG-subset.woff2 b/bigbluebutton-html5/public/fonts/MS/MG-subset.woff2
new file mode 100644
index 000000000000..fe3943d73a6d
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/MS/MG-subset.woff2 differ
diff --git a/bigbluebutton-html5/public/fonts/MS/MM-subset.woff2 b/bigbluebutton-html5/public/fonts/MS/MM-subset.woff2
new file mode 100644
index 000000000000..438cc2033e46
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/MS/MM-subset.woff2 differ
diff --git a/bigbluebutton-html5/public/stylesheets/fonts.css b/bigbluebutton-html5/public/stylesheets/fonts.css
index 7b9731645470..f3da3af55690 100644
--- a/bigbluebutton-html5/public/stylesheets/fonts.css
+++ b/bigbluebutton-html5/public/stylesheets/fonts.css
@@ -214,3 +214,67 @@
url('../fonts/SourceSansPro/SourceSansPro-BoldItalic.woff?v=VERSION') format('woff');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
}
+/* Japanese pop font, compatible to tldraw-draw font */
+@font-face {
+ font-family: 'KosugiMaruSubset';
+ font-style: normal;
+ font-weight: 400;
+ src: url('../fonts/KosugiMaru/KosugiMaru-Regular.woff2') format('woff2');
+ unicode-range:
+ U+4E00-9FFF, /* Common Chinese character */
+ U+3000-303F, /* CJK symbols*/
+ U+3040-309F, /* Hiragana */
+ U+30A0-30FF, /* Katakana */
+ U+31F0-31FF, /* Katakana extended */
+ U+FF00-FFEF; /* 2 byte symbols */
+}
+/* MA fonts */
+@font-face {
+ font-family: 'MRY';
+ font-style: normal;
+ font-weight: 400;
+ src: url('../fonts/MA/MRY-subset.woff2') format('woff2');
+ unicode-range:
+ U+4E00-9FFF, /* Common Chinese character */
+ U+3000-303F, /* CJK symbols*/
+ U+3040-309F, /* Hiragana */
+ U+30A0-30FF, /* Katakana */
+ U+31F0-31FF, /* Katakana extended */
+ U+FF00-FFEF; /* 2 byte symbols */
+}
+/* MA fonts */
+@font-face {
+ font-family: 'AMT';
+ font-style: normal;
+ font-weight: 300;
+ src: url('../fonts/MA/AMT.woff2') format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* MS fonts */
+@font-face {
+ font-family: 'MG';
+ font-style: normal;
+ font-weight: 400;
+ src: url('../fonts/MS/MG-subset.woff2') format('woff2');
+ unicode-range:
+ U+4E00-9FFF, /* Common Chinese character */
+ U+3000-303F, /* CJK symbols*/
+ U+3040-309F, /* Hiragana */
+ U+30A0-30FF, /* Katakana */
+ U+31F0-31FF, /* Katakana extended */
+ U+FF00-FFEF; /* 2 byte symbols */
+}
+/* MS fonts */
+@font-face {
+ font-family: 'MM';
+ font-style: normal;
+ font-weight: 400;
+ src: url('../fonts/MS/MM-subset.woff2') format('woff2');
+ unicode-range:
+ U+4E00-9FFF, /* Common Chinese character */
+ U+3000-303F, /* CJK symbols*/
+ U+3040-309F, /* Hiragana */
+ U+30A0-30FF, /* Katakana */
+ U+31F0-31FF, /* Katakana extended */
+ U+FF00-FFEF; /* 2 byte symbols */
+}
diff --git a/bigbluebutton-html5/public/svgs/tldraw/font-amt.svg b/bigbluebutton-html5/public/svgs/tldraw/font-amt.svg
new file mode 100644
index 000000000000..c695815d0fde
--- /dev/null
+++ b/bigbluebutton-html5/public/svgs/tldraw/font-amt.svg
@@ -0,0 +1,21 @@
+
+
+
+