diff --git a/.github/workflows/html.yaml b/.github/workflows/html.yaml
new file mode 100644
index 0000000000..069da7cbb4
--- /dev/null
+++ b/.github/workflows/html.yaml
@@ -0,0 +1,54 @@
+# Check javascript template files
+
+name: HTML Templates
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+    branches-ignore:
+      - l10*
+
+jobs:
+
+  html:
+    runs-on: ubuntu-latest
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      INVENTREE_DB_ENGINE: sqlite3
+      INVENTREE_DB_NAME: inventree
+      INVENTREE_MEDIA_ROOT: ./media
+      INVENTREE_STATIC_ROOT: ./static
+    steps:
+      - name: Install node.js
+        uses: actions/setup-node@v2
+      - run: npm install
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+          pip3 install invoke
+          invoke install
+          invoke static
+      - name: Check HTML Files
+        run: |
+          npm install markuplint
+          npx markuplint InvenTree/build/templates/build/*.html
+          npx markuplint InvenTree/common/templates/common/*.html
+          npx markuplint InvenTree/company/templates/company/*.html
+          npx markuplint InvenTree/order/templates/order/*.html
+          npx markuplint InvenTree/part/templates/part/*.html
+          npx markuplint InvenTree/stock/templates/stock/*.html
+          npx markuplint InvenTree/templates/*.html
+          npx markuplint InvenTree/templates/InvenTree/*.html
+          npx markuplint InvenTree/templates/InvenTree/settings/*.html
+
diff --git a/InvenTree/part/templates/part/prices.html b/InvenTree/part/templates/part/prices.html
index 69412ab2bb..9b829c179b 100644
--- a/InvenTree/part/templates/part/prices.html
+++ b/InvenTree/part/templates/part/prices.html
@@ -179,7 +179,7 @@
 </div>
 <div class='panel-content'>
     <h4>{% trans 'Stock Pricing' %}
-        <i class="fas fa-info-circle" title="Shows the purchase prices of stock for this part.&#10;The Supplier Unit Cost is the current purchase price for that supplier part."></em>
+        <em class="fas fa-info-circle" title="Shows the purchase prices of stock for this part.&#10;The Supplier Unit Cost is the current purchase price for that supplier part."></em>
     </h4>
         {% if price_history|length > 0 %}
             <div style="max-width: 99%; min-height: 300px">
diff --git a/InvenTree/templates/about.html b/InvenTree/templates/about.html
index 5b589bf47c..0750b9711a 100644
--- a/InvenTree/templates/about.html
+++ b/InvenTree/templates/about.html
@@ -87,7 +87,7 @@
                                 <td>
                                     <span style="display: none;" id="about-copy-text">{% include "version.html" %}</span>
                                     <span class="float-right">
-                                    <button class="btn clip-btn-version" type="button" data-toggle='tooltip' title='{% trans "copy to clipboard" %}'><i class="fas fa-copy"></em> {% trans "copy version information" %}</button>
+                                        <button class="btn clip-btn-version" type="button" data-toggle='tooltip' title='{% trans "copy to clipboard" %}'><em class="fas fa-copy"></em> {% trans "copy version information" %}</button>
                                     </span>
                                 </td>
                             </tr>
diff --git a/InvenTree/templates/clip.html b/InvenTree/templates/clip.html
index d4232b02b4..b0edff2fb3 100644
--- a/InvenTree/templates/clip.html
+++ b/InvenTree/templates/clip.html
@@ -1,5 +1,5 @@
 {% load i18n %}
 
 <span class="float-right">
-    <button class="btn clip-btn" type="button" data-toggle='tooltip' title='{% trans "copy to clipboard" %}'><i class="fas fa-copy"></em></button>
+    <button class="btn clip-btn" type="button" data-toggle='tooltip' title='{% trans "copy to clipboard" %}'><em class="fas fa-copy"></em></button>
 </span>
\ No newline at end of file