diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed.png
index 979c79540e..224cc0e31e 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closing.png
index 905ba30ebc..8aa96e8406 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/lights_green.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/lights_green.png
new file mode 100644
index 0000000000..35d3f00e5d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/lights_green.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/lights_red.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/lights_red.png
new file mode 100644
index 0000000000..d926a0f83b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/lights_red.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json
index fb51d45117..d1c6c68dc3 100644
--- a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f",
+  "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc for docking improvements",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,12 @@
     {
       "name": "open"
     },
+    {
+      "name": "lights_green"
+    },
+    {
+      "name": "lights_red"
+    },
     {
       "name": "closing",
       "delays": [
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open.png
index 4a4e534504..5b2e45d833 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/opening.png
index 2e19084260..078ccd9e58 100644
Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/opening.png differ