diff --git a/README.md b/README.md
index 99fe8e9..af7ac7b 100644
--- a/README.md
+++ b/README.md
@@ -7,14 +7,14 @@
 
 <img height="200" width="200" src="assets/header.svg">
 
-This is a (Firefox) add-on (WebExtension) that allows you to autocorrect common text sequences and convert text characters to a look like a special font.
+This is a (Firefox and Thunderbird) add-on (WebExtension) that allows you to autocorrect common text sequences and convert text characters to a look like a special font.
 For instance, it converts quotes like `"these"` to `“these”`, which are typographically more correct.
 
 In contrast to many other add-ons, …
 
 It is/has/features…
 
-It is inspired by …. This extension only works with modern Firefox v78 or higher.
+It is inspired by …. This extension only works with modern Firefox and Thunderbird v78 or higher.
 
 ## Download
 
@@ -30,7 +30,7 @@ See:
 
 ## Features
 * Puts your privacy first! Privacy is the default here.
-* Follows the [Firefox Photon Design](https://design.firefox.com/photon).
+* Follows the [Firefox](https://design.firefox.com/photon) and [Thunderbird](https://style.thunderbird.net/) Photon Design.
 * Has a simple, but intuitive and usable User Interface.
 * Translated in several languages already. [Contribute your own language!](CONTRIBUTING.md#Translations)
 * Compatible with Firefox for Android
diff --git a/src/background/background.js b/src/background/background.js
index cab9788..d7b3677 100644
--- a/src/background/background.js
+++ b/src/background/background.js
@@ -1,5 +1,5 @@
 import * as AutocorrectHandler from "/common/modules/AutocorrectHandler.js";
-import * as UnicodeFontHandler from "/common/modules/UnicodeFontHandler.js";
+import * as UnicodeFontHandler from "./modules/UnicodeFontHandler.js";
 
 // init modules
 AutocorrectHandler.init();
diff --git a/src/common/modules/UnicodeFontHandler.js b/src/background/modules/UnicodeFontHandler.js
similarity index 97%
rename from src/common/modules/UnicodeFontHandler.js
rename to src/background/modules/UnicodeFontHandler.js
index cc5a763..fc6a64c 100644
--- a/src/common/modules/UnicodeFontHandler.js
+++ b/src/background/modules/UnicodeFontHandler.js
@@ -2,7 +2,7 @@
 
 import * as AddonSettings from "/common/modules/AddonSettings/AddonSettings.js";
 import * as BrowserCommunication from "/common/modules/BrowserCommunication/BrowserCommunication.js";
-import { isMobile } from "./MobileHelper.js";
+import { isMobile } from "/common/modules/MobileHelper.js";
 
 import { COMMUNICATION_MESSAGE_TYPE } from "/common/modules/data/BrowserCommunicationTypes.js";
 import { caseIds, fontIds, fonts } from "/common/modules/data/Fonts.js";
@@ -207,6 +207,7 @@ function applySettings(unicodeFont) {
  * @returns {void}
  */
 export async function init() {
+	// Remove once https://bugzilla.mozilla.org/show_bug.cgi?id=1595822 is fixed
 	if (await isMobile()) {
 		return;
 	}
diff --git a/src/options/options.html b/src/options/options.html
index be1c0da..ebdccf2 100644
--- a/src/options/options.html
+++ b/src/options/options.html
@@ -87,6 +87,7 @@ <h1 data-i18n="">Unicode autocorrection</h1>
 				</ul>
 			</section>
 
+			<!-- Remove "mobile-incompatible" once https://bugzilla.mozilla.org/show_bug.cgi?id=1595822 is fixed -->
 			<section class="mobile-incompatible">
 				<ul>
 					<h1 data-i18n="">Context menu</h1>