diff --git a/rsc/VivyRessources.qrc b/rsc/VivyRessources.qrc
index 0f6f69913c557afae767cb9ddda9c2726912ce01..dcfe44e1bdf40c813527a1927603d2cb320b5c3c 100644
--- a/rsc/VivyRessources.qrc
+++ b/rsc/VivyRessources.qrc
@@ -1,9 +1,12 @@
+<!-- vim: ft=xml
+-->
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
     <file>icons/vivy.png</file>
 
     <!-- Fonts, FiraCode is OFL-1.1, NotoSans is APACHE-2.0 -->
     <file>fonts/FiraCode-Regular.ttf</file>
+    <file>fonts/FiraCode-Bold.ttf</file>
     <file>fonts/NotoSans-Bold.ttf</file>
     <file>fonts/NotoSans-Italic.ttf</file>
     <file>fonts/NotoSans-Regular.ttf</file>
diff --git a/rsc/fonts/FiraCode-Bold.ttf b/rsc/fonts/FiraCode-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..39265a19da744d4a4f9dc2a3c32f184745829a93
Binary files /dev/null and b/rsc/fonts/FiraCode-Bold.ttf differ
diff --git a/src/UI/ScriptViews/ScriptEditor.cc b/src/UI/ScriptViews/ScriptEditor.cc
index 5f9d7f5905e8af4da4f2bbbb561818180d15023e..b8a77b34de21b0b07968f985d80cdefcde100399 100644
--- a/src/UI/ScriptViews/ScriptEditor.cc
+++ b/src/UI/ScriptViews/ScriptEditor.cc
@@ -42,7 +42,7 @@ ScriptEditor::keyPressEvent(QKeyEvent *e) noexcept
 {
     if (e->key() == Qt::Key_Tab) {
         QTextCursor cursor = textCursor();
-        cursor.insertText("    ");
+        cursor.insertText(spacesForTab);
         e->accept();
     }
 
diff --git a/src/UI/ScriptViews/ScriptEditor.hh b/src/UI/ScriptViews/ScriptEditor.hh
index 076e51fc136dc83f80813f5af2ab8c154b48fbc8..601a2ed1305420342f0c81f57b35fe9a28c8dc29 100644
--- a/src/UI/ScriptViews/ScriptEditor.hh
+++ b/src/UI/ScriptViews/ScriptEditor.hh
@@ -28,6 +28,10 @@ class ScriptEditor final : public QPlainTextEdit {
         ScriptEditor *scriptEditor{ nullptr };
     };
 
+    // Number of spaces in a tab
+    static constexpr int spacesPerTab        = 4;
+    static inline const QString spacesForTab = QString(QStringLiteral(" ")).repeated(spacesPerTab);
+
 public:
     ScriptEditor(QWidget *parent) noexcept;
 
diff --git a/src/VivyApplication.cc b/src/VivyApplication.cc
index 1ac4bde6e9a5a1213f738f74a96b5b3814fa0b60..dfa981ae4529707f029fb6d89e136155541ba138 100644
--- a/src/VivyApplication.cc
+++ b/src/VivyApplication.cc
@@ -16,11 +16,12 @@ int
 VivyApplication::exec() noexcept
 {
     // Add fonts
-    fontIdMonospace  = QFontDatabase::addApplicationFont(":/fonts/FiraCode-Regular.ttf");
-    fontIdRegular    = QFontDatabase::addApplicationFont(":/fonts/NotoSans-Regular.ttf");
-    fontIdItalic     = QFontDatabase::addApplicationFont(":/fonts/NotoSans-Italic.ttf");
-    fontIdBold       = QFontDatabase::addApplicationFont(":/fonts/NotoSans-Bold.ttf");
-    fontIdBoldItalic = QFontDatabase::addApplicationFont(":/fonts/NotoSans-BoldItalic.ttf");
+    fontIdMonospace     = QFontDatabase::addApplicationFont(":/fonts/FiraCode-Regular.ttf");
+    fontIdMonospaceBold = QFontDatabase::addApplicationFont(":/fonts/FiraCode-Bold.ttf");
+    fontIdRegular       = QFontDatabase::addApplicationFont(":/fonts/NotoSans-Regular.ttf");
+    fontIdItalic        = QFontDatabase::addApplicationFont(":/fonts/NotoSans-Italic.ttf");
+    fontIdBold          = QFontDatabase::addApplicationFont(":/fonts/NotoSans-Bold.ttf");
+    fontIdBoldItalic    = QFontDatabase::addApplicationFont(":/fonts/NotoSans-BoldItalic.ttf");
 
     // Setup some things
     setAttribute(Qt::AA_DontShowIconsInMenus, false);
@@ -52,6 +53,9 @@ VivyApplication::getApplicationFont(Font id) const noexcept
     case Font::Monospace:
         return QFont(QFontDatabase::applicationFontFamilies(fontIdMonospace).at(0));
 
+    case Font::MonospaceBold:
+        return QFont(QFontDatabase::applicationFontFamilies(fontIdMonospaceBold).at(0));
+
     case Font::DefaultItalic:
         return QFont(QFontDatabase::applicationFontFamilies(fontIdItalic).at(0));
 
diff --git a/src/VivyApplication.hh b/src/VivyApplication.hh
index 5cc29c4040da1e7c14c011f30d5ee3d0ece4e97d..9d02e6b8bf87d1fa764a5372a15773819e22a586 100644
--- a/src/VivyApplication.hh
+++ b/src/VivyApplication.hh
@@ -37,6 +37,7 @@ public:
 
     enum class Font {
         Monospace,
+        MonospaceBold,
         Default,
         DefaultItalic,
         DefaultBold,
@@ -45,6 +46,7 @@ public:
 
 private:
     int fontIdMonospace;
+    int fontIdMonospaceBold;
     int fontIdRegular;
     int fontIdItalic;
     int fontIdBold;
@@ -52,7 +54,6 @@ private:
 
 public:
     VivyApplication(int &argc, char **argv);
-    ~VivyApplication() = default;
 
     int exec() noexcept;