diff --git a/assets/fonts/TwemojiCountryFlags/LICENCE.md b/assets/fonts/TwemojiCountryFlags/LICENCE.md
new file mode 100644
index 000000000..ed54fa8e7
--- /dev/null
+++ b/assets/fonts/TwemojiCountryFlags/LICENCE.md
@@ -0,0 +1,32 @@
+## License for the Visual Design
+
+The Emoji art in the "Twemoji Country Flags" font comes from [Twemoji](https://twitter.github.io/twemoji),
+and is used and redistributed under the CC-BY-4.0 [license terms](https://github.com/twitter/twemoji#license)
+offered by the Twemoji project.
+
+### Creative Commons Attribution 4.0 International (CC BY 4.0)
+https://creativecommons.org/licenses/by/4.0/legalcode
+or for the human readable summary: https://creativecommons.org/licenses/by/4.0/
+
+
+#### You are free to:
+**Share** — copy and redistribute the material in any medium or format
+
+**Adapt** — remix, transform, and build upon the material for any purpose, even commercially.
+
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+
+#### Under the following terms:    
+**Attribution** — You must give appropriate credit, provide a link to the license,
+and indicate if changes were made.
+You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
+
+**No additional restrictions** — You may not apply legal terms or **technological measures**
+that legally restrict others from doing anything the license permits.
+
+#### Notices:
+You do not have to comply with the license for elements of the material in the public domain
+or where your use is permitted by an applicable exception or limitation. No warranties are given.
+The license may not give you all of the permissions necessary for your intended use.
+For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
\ No newline at end of file
diff --git a/assets/fonts/TwemojiCountryFlags.woff2 b/assets/fonts/TwemojiCountryFlags/TwemojiCountryFlags.woff2
similarity index 100%
rename from assets/fonts/TwemojiCountryFlags.woff2
rename to assets/fonts/TwemojiCountryFlags/TwemojiCountryFlags.woff2
diff --git a/assets/js/country-flag-emoji-polyfill.js b/assets/js/country-flag-emoji-polyfill.js
index ad68a62b2..f6c55ae84 100644
--- a/assets/js/country-flag-emoji-polyfill.js
+++ b/assets/js/country-flag-emoji-polyfill.js
@@ -1,3 +1,27 @@
+// ## License for the Code (MIT)
+
+// Copyright (c) 2022 TalkJS
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+// SOURCE: https://github.com/talkjs/country-flag-emoji-polyfill
+
 const r = '"Twemoji Mozilla","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji","EmojiOne Color","Android Emoji",sans-serif';
 function a() {
   const o = document.createElement("canvas");
@@ -12,7 +36,7 @@ function l(o) {
   const t = a(), e = i(t, o, "#fff"), n = i(t, o, "#000");
   return n === e && !n.startsWith("0,0,0,");
 }
-function f(o = "Twemoji Country Flags", t = base_url + 'assets/fonts/TwemojiCountryFlags.woff2') {
+function f(o = "Twemoji Country Flags", t = base_url + 'assets/fonts/TwemojiCountryFlags/TwemojiCountryFlags.woff2') {
   if (typeof window < "u" && l("\u{1F60A}") && !l("\u{1F1E8}\u{1F1ED}")) {
     const e = document.createElement("style");
     return e.textContent = `@font-face {