diff --git a/Resources/Prototypes/Actions/item_actions.yml b/Resources/Prototypes/Actions/item_actions.yml
index 2c49352814..d2eb257e33 100644
--- a/Resources/Prototypes/Actions/item_actions.yml
+++ b/Resources/Prototypes/Actions/item_actions.yml
@@ -17,8 +17,8 @@
 
 - type: itemAction
   actionType: ToggleLight
-  icon: Objects/Tools/flashlight.rsi/lantern_off.png
-  iconOn: Objects/Tools/flashlight.rsi/lantern_on.png
+  icon: Objects/Tools/flashlight.rsi/flashlight.png
+  iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
   name: "Toggle Light"
   description: "Turn the light on."
   filters:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
index 2e8d8954a9..6156430251 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
@@ -16,8 +16,8 @@
   - type: Sprite
     sprite: Objects/Tools/flashlight.rsi
     layers:
-      - state: lantern_off
-      - state: HandheldLightOnOverlay
+      - state: flashlight
+      - state: flashlight-overlay
         shader: unshaded
         visible: false
   - type: Item
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/HandheldLightOnOverlay.png b/Resources/Textures/Objects/Tools/flashlight.rsi/HandheldLightOnOverlay.png
deleted file mode 100644
index dc69a9359b..0000000000
Binary files a/Resources/Textures/Objects/Tools/flashlight.rsi/HandheldLightOnOverlay.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight-on.png b/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight-on.png
new file mode 100644
index 0000000000..b83e7537c6
Binary files /dev/null and b/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight-on.png differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight-overlay.png b/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight-overlay.png
new file mode 100644
index 0000000000..e00af6680d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight-overlay.png differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight.png b/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight.png
new file mode 100644
index 0000000000..b2a0eaa270
Binary files /dev/null and b/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight.png differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/lantern_off.png b/Resources/Textures/Objects/Tools/flashlight.rsi/lantern_off.png
deleted file mode 100644
index a7b3b4678d..0000000000
Binary files a/Resources/Textures/Objects/Tools/flashlight.rsi/lantern_off.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/lantern_on.png b/Resources/Textures/Objects/Tools/flashlight.rsi/lantern_on.png
deleted file mode 100644
index ff8752b672..0000000000
Binary files a/Resources/Textures/Objects/Tools/flashlight.rsi/lantern_on.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
index 9214fb0c88..a470271bdd 100644
--- a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
@@ -1,20 +1,20 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/lighting.dmi",
+  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/lighting.dmi",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "lantern_off"
+      "name": "flashlight"
     },
     {
-      "name": "lantern_on"
+      "name": "flashlight-on"
     },
     {
-      "name": "HandheldLightOnOverlay"
+      "name": "flashlight-overlay"
     },
     {
       "name": "off-inhand-left",
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png
index 442f14902e..2bede8bc3b 100644
Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png differ
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png
index f71f681402..565ebc24f6 100644
Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png differ
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png
index d0366ed70f..9d0d820dda 100644
Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png
index 0c96e5d41a..f331df4390 100644
Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png
index 48faa078cf..a68f4c1257 100644
Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png
index ca7018e746..3f79cb157c 100644
Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png differ