diff --git a/docs/assets/images/fix_unstuck_screen/DSC08633.jpg b/docs/assets/images/fix_unstuck_screen/DSC08633.jpg
new file mode 100644
index 0000000..4b7359e
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08633.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08638.jpg b/docs/assets/images/fix_unstuck_screen/DSC08638.jpg
new file mode 100644
index 0000000..24aea5e
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08638.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08639.jpg b/docs/assets/images/fix_unstuck_screen/DSC08639.jpg
new file mode 100644
index 0000000..f9ba941
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08639.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08640.jpg b/docs/assets/images/fix_unstuck_screen/DSC08640.jpg
new file mode 100644
index 0000000..8244618
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08640.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08641.jpg b/docs/assets/images/fix_unstuck_screen/DSC08641.jpg
new file mode 100644
index 0000000..e16f7d9
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08641.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08643.jpg b/docs/assets/images/fix_unstuck_screen/DSC08643.jpg
new file mode 100644
index 0000000..ea3ac1e
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08643.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08644.jpg b/docs/assets/images/fix_unstuck_screen/DSC08644.jpg
new file mode 100644
index 0000000..2ff3875
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08644.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08645.jpg b/docs/assets/images/fix_unstuck_screen/DSC08645.jpg
new file mode 100644
index 0000000..a81d012
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08645.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08646.jpg b/docs/assets/images/fix_unstuck_screen/DSC08646.jpg
new file mode 100644
index 0000000..81a335a
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08646.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08650.jpg b/docs/assets/images/fix_unstuck_screen/DSC08650.jpg
new file mode 100644
index 0000000..d33e15b
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08650.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08651.jpg b/docs/assets/images/fix_unstuck_screen/DSC08651.jpg
new file mode 100644
index 0000000..fe4c92f
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08651.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08652.jpg b/docs/assets/images/fix_unstuck_screen/DSC08652.jpg
new file mode 100644
index 0000000..362a1ed
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08652.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08654.jpg b/docs/assets/images/fix_unstuck_screen/DSC08654.jpg
new file mode 100644
index 0000000..7918f43
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08654.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08655.jpg b/docs/assets/images/fix_unstuck_screen/DSC08655.jpg
new file mode 100644
index 0000000..12d4699
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08655.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08656.jpg b/docs/assets/images/fix_unstuck_screen/DSC08656.jpg
new file mode 100644
index 0000000..0d8b121
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08656.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/DSC08660.jpg b/docs/assets/images/fix_unstuck_screen/DSC08660.jpg
new file mode 100644
index 0000000..190c1ae
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/DSC08660.jpg differ
diff --git a/docs/assets/images/fix_unstuck_screen/unstuck_example.png b/docs/assets/images/fix_unstuck_screen/unstuck_example.png
new file mode 100644
index 0000000..d1918bf
Binary files /dev/null and b/docs/assets/images/fix_unstuck_screen/unstuck_example.png differ
diff --git a/docs/user_manual/tutorials/hardware/fix_unstuck_screen.md b/docs/user_manual/tutorials/hardware/fix_unstuck_screen.md
new file mode 100644
index 0000000..62663f5
--- /dev/null
+++ b/docs/user_manual/tutorials/hardware/fix_unstuck_screen.md
@@ -0,0 +1,65 @@
+Some FunKey S consoles coming from the first production batch might have an issue with the front glass not sticking correctly to the left side of the casing:
+
+![unstuck_screen_example](/assets/images/fix_unstuck_screen/unstuck_example.png)
+
+
+The following tutorial explains how to simply stick back the screen using standard cyanoacrylate glue. The necessary material is:
+
+- Standard cyanoacrylate glue (US: Gorilla Super Glue, Europe: Loctite Superglue) 
+- A toothpick 
+- Tape
+
+![unstuck_screen_example](/assets/images/fix_unstuck_screen/DSC08633.jpg)
+
+
+### **STEP 1 - Protecting the plastic casing with tape** {.step-title}
+
+![tape](/assets/images/fix_unstuck_screen/DSC08640.jpg){.step-thumb}
+![tape](/assets/images/fix_unstuck_screen/DSC08641.jpg){.step-thumb}
+
+Stick a thin layer of tape on the plastic casing to the left side of the screen. This will avoid any glue to come in contact with it.
+
+### **STEP 2 - Preparing the glue** {.step-title}
+
+![prepare glue](/assets/images/fix_unstuck_screen/DSC08643.jpg){.step-thumb}
+![prepare glue](/assets/images/fix_unstuck_screen/DSC08644.jpg){.step-thumb}
+![prepare glue](/assets/images/fix_unstuck_screen/DSC08645.jpg){.step-thumb}
+
+Appy one drop of glue on a flat impermeable surface (the back of some tape for example). One drop is enough.
+
+### **STEP 3 - Applying the glue** {.step-title}
+
+![apply glue](/assets/images/fix_unstuck_screen/DSC08646.jpg){.step-thumb}
+![apply glue](/assets/images/fix_unstuck_screen/DSC08650.jpg){.step-thumb}
+![apply glue](/assets/images/fix_unstuck_screen/DSC08651.jpg){.step-thumb}
+
+Dip the tip of the toothpick in the glue and apply it inside the plastic casing alongside the left edge. Multiple dips can be necessary to cover the whole side.
+
+The toothpick tip will soften with the glue and act as a paintbrush.
+
+!!! note
+    Careful not to put too much glue in the casing.
+
+
+
+### **STEP 4 - Sticking the glass** {.step-title}
+
+![apply force](/assets/images/fix_unstuck_screen/DSC08652.jpg){.step-thumb}
+![apply force](/assets/images/fix_unstuck_screen/DSC08654.jpg){.step-thumb}
+![apply force](/assets/images/fix_unstuck_screen/DSC08655.jpg){.step-thumb}
+
+Use your thumb to apply force on the left side of the glass for at least 2 minutes (the longer the better, this leaves more time for the glue to stick). 
+
+You can remove the protective tape in the meantime.
+
+
+### **STEP 5 - All done** {.step-title}
+
+![apply force](/assets/images/fix_unstuck_screen/DSC08656.jpg){.step-thumb}
+![apply force](/assets/images/fix_unstuck_screen/DSC08660.jpg){.step-thumb}
+
+The glass should now hold tightly to the left side of the casing, you're ready to play!
+
+--8<--
+includes/glossary.md
+--8<--
diff --git a/mkdocs.yml b/mkdocs.yml
index a6e1081..7ca0a74 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -156,6 +156,7 @@ nav:
         - 'Teardown': 'user_manual/tutorials/hardware/teardown.md'
         - 'Flash & Change micro-SD Card': 'user_manual/tutorials/hardware/flash_change_sd_card.md'
         - 'Change the Buttons': 'user_manual/tutorials/hardware/change_buttons.md'
+        - 'Fix unstuck glass': 'user_manual/tutorials/hardware/fix_unstuck_screen.md'
        # - 'Force Shutdown': 'user_manual/tutorials/hardware/force_shutdown.md'
   - Developer's Guide:
     - Hardware Reference: