diff --git a/data/images/hexes/StandardIncludes/StandardElevator.tileinc b/data/images/hexes/StandardIncludes/StandardElevator.tileinc
index 197a84e60a..2ff8a5cb98 100644
--- a/data/images/hexes/StandardIncludes/StandardElevator.tileinc
+++ b/data/images/hexes/StandardIncludes/StandardElevator.tileinc
@@ -17,24 +17,24 @@
 
 # Standard elevator signs
 
-super * "elevator:0" "" "boring/elevator1.gif"
-super * "elevator:1" "" "boring/elevator1.gif"
-super * "elevator:2" "" "boring/elevator2.gif"
-super * "elevator:3" "" "boring/elevator2.gif"
-super * "elevator:4" "" "boring/elevator2.gif"
-super * "elevator:5" "" "boring/elevator3.gif"
-super * "elevator:6" "" "boring/elevator3.gif"
-super * "elevator:7" "" "boring/elevator3.gif"
-super * "elevator:8" "" "boring/elevator4.gif"
-super * "elevator:9" "" "boring/elevator4.gif"
-super * "elevator:10" "" "boring/elevator4.gif"
-super * "elevator:-1" "" "boring/elevator5.gif"
-super * "elevator:-2" "" "boring/elevator5.gif"
-super * "elevator:-3" "" "boring/elevator5.gif"
-super * "elevator:-4" "" "boring/elevator5.gif"
-super * "elevator:-5" "" "boring/elevator6.gif"
-super * "elevator:-6" "" "boring/elevator6.gif"
-super * "elevator:-7" "" "boring/elevator6.gif"
-super * "elevator:-8" "" "boring/elevator6.gif"
-super * "elevator:-9" "" "boring/elevator6.gif"
-super * "elevator:-10" "" "boring/elevator6.gif"
+super * "solaris_elevator:0" "" "boring/elevator1.gif"
+super * "solaris_elevator:1" "" "boring/elevator1.gif"
+super * "solaris_elevator:2" "" "boring/elevator2.gif"
+super * "solaris_elevator:3" "" "boring/elevator2.gif"
+super * "solaris_elevator:4" "" "boring/elevator2.gif"
+super * "solaris_elevator:5" "" "boring/elevator3.gif"
+super * "solaris_elevator:6" "" "boring/elevator3.gif"
+super * "solaris_elevator:7" "" "boring/elevator3.gif"
+super * "solaris_elevator:8" "" "boring/elevator4.gif"
+super * "solaris_elevator:9" "" "boring/elevator4.gif"
+super * "solaris_elevator:10" "" "boring/elevator4.gif"
+super * "solaris_elevator:-1" "" "boring/elevator5.gif"
+super * "solaris_elevator:-2" "" "boring/elevator5.gif"
+super * "solaris_elevator:-3" "" "boring/elevator5.gif"
+super * "solaris_elevator:-4" "" "boring/elevator5.gif"
+super * "solaris_elevator:-5" "" "boring/elevator6.gif"
+super * "solaris_elevator:-6" "" "boring/elevator6.gif"
+super * "solaris_elevator:-7" "" "boring/elevator6.gif"
+super * "solaris_elevator:-8" "" "boring/elevator6.gif"
+super * "solaris_elevator:-9" "" "boring/elevator6.gif"
+super * "solaris_elevator:-10" "" "boring/elevator6.gif"
diff --git a/data/images/hexes/StandardIncludes/StandardFluff.tileinc b/data/images/hexes/StandardIncludes/StandardFluff.tileinc
index e7bbcaebca..67571eaef9 100644
--- a/data/images/hexes/StandardIncludes/StandardFluff.tileinc
+++ b/data/images/hexes/StandardIncludes/StandardFluff.tileinc
@@ -17,12 +17,12 @@
 
 # Standard fluff images
 
-super * "elevator:*:01" "" "boring/elevator1.gif"
-super * "elevator:*:02" "" "boring/elevator2.gif"
-super * "elevator:*:04" "" "boring/elevator3.gif"
-super * "elevator:*:08" "" "boring/elevator4.gif"
-super * "elevator:*:16" "" "boring/elevator5.gif"
-super * "elevator:*:32" "" "boring/elevator6.gif"
+super * "solaris_elevator:*:01" "" "boring/elevator1.gif"
+super * "solaris_elevator:*:02" "" "boring/elevator2.gif"
+super * "solaris_elevator:*:04" "" "boring/elevator3.gif"
+super * "solaris_elevator:*:08" "" "boring/elevator4.gif"
+super * "solaris_elevator:*:16" "" "boring/elevator5.gif"
+super * "solaris_elevator:*:32" "" "boring/elevator6.gif"
 
 super * "geyser:1" "" "boring/geyservent.gif"
 super * "geyser:2" "" "boring/geysererupt.gif"
diff --git a/data/images/hexes/defaulthexset.txt b/data/images/hexes/defaulthexset.txt
index fd06b7440c..41270e067b 100644
--- a/data/images/hexes/defaulthexset.txt
+++ b/data/images/hexes/defaulthexset.txt
@@ -86,8 +86,8 @@ ortho * "bridge:*:61;bridge_elev:*;bridge_cf:*" "" "bridge/bridge_61.gif"
 ortho * "bridge:*:62;bridge_elev:*;bridge_cf:*" "" "bridge/bridge_62.gif"
 ortho * "bridge:*:63;bridge_elev:*;bridge_cf:*" "" "bridge/bridge_63.gif"
 
-super * "elevator:10" "" "boring/elevator1.gif"
-super * "elevator:2" "" "boring/elevator2.gif"
+super * "solaris_elevator:10" "" "boring/elevator1.gif"
+super * "solaris_elevator:2" "" "boring/elevator2.gif"
 
 super * "geyser:1" "" "boring/geyservent.gif"
 super * "geyser:2" "" "boring/geysererupt.gif"
diff --git a/data/images/hexes/hq_saxarba.tileset b/data/images/hexes/hq_saxarba.tileset
index dfbae44f5c..3af7d97c39 100644
--- a/data/images/hexes/hq_saxarba.tileset
+++ b/data/images/hexes/hq_saxarba.tileset
@@ -122,28 +122,52 @@ include "saxarba/SMV_Fluff/GardenLakes.tileinc"
 super * "water:0" "" "saxarba/water/water_anim_0.gif"
 
 #ELEVATOR
-super * "elevator:10" "" "saxarba/misc/elevator_10.png"
-super * "elevator:9" "" "saxarba/misc/elevator_9.png"
-super * "elevator:8" "" "saxarba/misc/elevator_8.png"
-super * "elevator:7" "" "saxarba/misc/elevator_7.png"
-super * "elevator:6" "" "saxarba/misc/elevator_6.png"
-super * "elevator:5" "" "saxarba/misc/elevator_5.png"
-super * "elevator:4" "" "saxarba/misc/elevator_4.png"
-super * "elevator:3" "" "saxarba/misc/elevator_3.png"
-super * "elevator:2" "" "saxarba/misc/elevator_2.png"
-super * "elevator:1" "" "saxarba/misc/elevator_1.png"
-super * "elevator:0" "" "saxarba/misc/elevator_0.png"
-super * "elevator:-1" "" "saxarba/misc/elevator_-1.png"
-super * "elevator:-2" "" "saxarba/misc/elevator_-2.png"
-super * "elevator:-3" "" "saxarba/misc/elevator_-3.png"
-super * "elevator:-4" "" "saxarba/misc/elevator_-4.png"
-super * "elevator:-5" "" "saxarba/misc/elevator_-5.png"
-super * "elevator:-6" "" "saxarba/misc/elevator_-6.png"
-super * "elevator:-7" "" "saxarba/misc/elevator_-7.png"
-super * "elevator:-8" "" "saxarba/misc/elevator_-8.png"
-super * "elevator:-9" "" "saxarba/misc/elevator_-9.png"
-super * "elevator:-10" "" "saxarba/misc/elevator_-10.png"
-super * "elevator:*" "" "saxarba/misc/elevator_0.png"
+super * "solaris_elevator:10" "" "saxarba/misc/elevator_10.png"
+super * "solaris_elevator:9" "" "saxarba/misc/elevator_9.png"
+super * "solaris_elevator:8" "" "saxarba/misc/elevator_8.png"
+super * "solaris_elevator:7" "" "saxarba/misc/elevator_7.png"
+super * "solaris_elevator:6" "" "saxarba/misc/elevator_6.png"
+super * "solaris_elevator:5" "" "saxarba/misc/elevator_5.png"
+super * "solaris_elevator:4" "" "saxarba/misc/elevator_4.png"
+super * "solaris_elevator:3" "" "saxarba/misc/elevator_3.png"
+super * "solaris_elevator:2" "" "saxarba/misc/elevator_2.png"
+super * "solaris_elevator:1" "" "saxarba/misc/elevator_1.png"
+super * "solaris_elevator:0" "" "saxarba/misc/elevator_0.png"
+super * "solaris_elevator:-1" "" "saxarba/misc/elevator_-1.png"
+super * "solaris_elevator:-2" "" "saxarba/misc/elevator_-2.png"
+super * "solaris_elevator:-3" "" "saxarba/misc/elevator_-3.png"
+super * "solaris_elevator:-4" "" "saxarba/misc/elevator_-4.png"
+super * "solaris_elevator:-5" "" "saxarba/misc/elevator_-5.png"
+super * "solaris_elevator:-6" "" "saxarba/misc/elevator_-6.png"
+super * "solaris_elevator:-7" "" "saxarba/misc/elevator_-7.png"
+super * "solaris_elevator:-8" "" "saxarba/misc/elevator_-8.png"
+super * "solaris_elevator:-9" "" "saxarba/misc/elevator_-9.png"
+super * "solaris_elevator:-10" "" "saxarba/misc/elevator_-10.png"
+super * "solaris_elevator:*" "" "saxarba/misc/elevator_0.png"
+
+#INDUSTRIAL ELEVATOR
+super * "industrial_elevator:10" "" "saxarba/misc/elevator_10.png"
+super * "industrial_elevator:9" "" "saxarba/misc/elevator_9.png"
+super * "industrial_elevator:8" "" "saxarba/misc/elevator_8.png"
+super * "industrial_elevator:7" "" "saxarba/misc/elevator_7.png"
+super * "industrial_elevator:6" "" "saxarba/misc/elevator_6.png"
+super * "industrial_elevator:5" "" "saxarba/misc/elevator_5.png"
+super * "industrial_elevator:4" "" "saxarba/misc/elevator_4.png"
+super * "industrial_elevator:3" "" "saxarba/misc/elevator_3.png"
+super * "industrial_elevator:2" "" "saxarba/misc/elevator_2.png"
+super * "industrial_elevator:1" "" "saxarba/misc/elevator_1.png"
+super * "industrial_elevator:0" "" "saxarba/misc/elevator_0.png"
+super * "industrial_elevator:-1" "" "saxarba/misc/elevator_-1.png"
+super * "industrial_elevator:-2" "" "saxarba/misc/elevator_-2.png"
+super * "industrial_elevator:-3" "" "saxarba/misc/elevator_-3.png"
+super * "industrial_elevator:-4" "" "saxarba/misc/elevator_-4.png"
+super * "industrial_elevator:-5" "" "saxarba/misc/elevator_-5.png"
+super * "industrial_elevator:-6" "" "saxarba/misc/elevator_-6.png"
+super * "industrial_elevator:-7" "" "saxarba/misc/elevator_-7.png"
+super * "industrial_elevator:-8" "" "saxarba/misc/elevator_-8.png"
+super * "industrial_elevator:-9" "" "saxarba/misc/elevator_-9.png"
+super * "industrial_elevator:-10" "" "saxarba/misc/elevator_-10.png"
+super * "industrial_elevator:*" "" "saxarba/misc/elevator_0.png"
 
 #Basement states have no graphical representation
 super * "bldg_basement_type:*" "" "saxarba/misc/blank.png"
diff --git a/data/images/hexes/saxarba.tileset b/data/images/hexes/saxarba.tileset
index fdb0f2134e..a872418db4 100644
--- a/data/images/hexes/saxarba.tileset
+++ b/data/images/hexes/saxarba.tileset
@@ -125,28 +125,52 @@ include "saxarba/SMV_Fluff/GardenLakes.tileinc"
 include "Structured_Water/Structured_Water - Saxarba - 0.tileinc"
 
 #ELEVATOR
-super * "elevator:10" "" "saxarba/misc/elevator_10.png"
-super * "elevator:9" "" "saxarba/misc/elevator_9.png"
-super * "elevator:8" "" "saxarba/misc/elevator_8.png"
-super * "elevator:7" "" "saxarba/misc/elevator_7.png"
-super * "elevator:6" "" "saxarba/misc/elevator_6.png"
-super * "elevator:5" "" "saxarba/misc/elevator_5.png"
-super * "elevator:4" "" "saxarba/misc/elevator_4.png"
-super * "elevator:3" "" "saxarba/misc/elevator_3.png"
-super * "elevator:2" "" "saxarba/misc/elevator_2.png"
-super * "elevator:1" "" "saxarba/misc/elevator_1.png"
-super * "elevator:0" "" "saxarba/misc/elevator_0.png"
-super * "elevator:-1" "" "saxarba/misc/elevator_-1.png"
-super * "elevator:-2" "" "saxarba/misc/elevator_-2.png"
-super * "elevator:-3" "" "saxarba/misc/elevator_-3.png"
-super * "elevator:-4" "" "saxarba/misc/elevator_-4.png"
-super * "elevator:-5" "" "saxarba/misc/elevator_-5.png"
-super * "elevator:-6" "" "saxarba/misc/elevator_-6.png"
-super * "elevator:-7" "" "saxarba/misc/elevator_-7.png"
-super * "elevator:-8" "" "saxarba/misc/elevator_-8.png"
-super * "elevator:-9" "" "saxarba/misc/elevator_-9.png"
-super * "elevator:-10" "" "saxarba/misc/elevator_-10.png"
-super * "elevator:*" "" "saxarba/misc/elevator_0.png"
+super * "solaris_elevator:10" "" "saxarba/misc/elevator_10.png"
+super * "solaris_elevator:9" "" "saxarba/misc/elevator_9.png"
+super * "solaris_elevator:8" "" "saxarba/misc/elevator_8.png"
+super * "solaris_elevator:7" "" "saxarba/misc/elevator_7.png"
+super * "solaris_elevator:6" "" "saxarba/misc/elevator_6.png"
+super * "solaris_elevator:5" "" "saxarba/misc/elevator_5.png"
+super * "solaris_elevator:4" "" "saxarba/misc/elevator_4.png"
+super * "solaris_elevator:3" "" "saxarba/misc/elevator_3.png"
+super * "solaris_elevator:2" "" "saxarba/misc/elevator_2.png"
+super * "solaris_elevator:1" "" "saxarba/misc/elevator_1.png"
+super * "solaris_elevator:0" "" "saxarba/misc/elevator_0.png"
+super * "solaris_elevator:-1" "" "saxarba/misc/elevator_-1.png"
+super * "solaris_elevator:-2" "" "saxarba/misc/elevator_-2.png"
+super * "solaris_elevator:-3" "" "saxarba/misc/elevator_-3.png"
+super * "solaris_elevator:-4" "" "saxarba/misc/elevator_-4.png"
+super * "solaris_elevator:-5" "" "saxarba/misc/elevator_-5.png"
+super * "solaris_elevator:-6" "" "saxarba/misc/elevator_-6.png"
+super * "solaris_elevator:-7" "" "saxarba/misc/elevator_-7.png"
+super * "solaris_elevator:-8" "" "saxarba/misc/elevator_-8.png"
+super * "solaris_elevator:-9" "" "saxarba/misc/elevator_-9.png"
+super * "solaris_elevator:-10" "" "saxarba/misc/elevator_-10.png"
+super * "solaris_elevator:*" "" "saxarba/misc/elevator_0.png"
+
+#INDUSTRIAL ELEVATOR
+super * "industrial_elevator:10" "" "saxarba/misc/elevator_10.png"
+super * "industrial_elevator:9" "" "saxarba/misc/elevator_9.png"
+super * "industrial_elevator:8" "" "saxarba/misc/elevator_8.png"
+super * "industrial_elevator:7" "" "saxarba/misc/elevator_7.png"
+super * "industrial_elevator:6" "" "saxarba/misc/elevator_6.png"
+super * "industrial_elevator:5" "" "saxarba/misc/elevator_5.png"
+super * "industrial_elevator:4" "" "saxarba/misc/elevator_4.png"
+super * "industrial_elevator:3" "" "saxarba/misc/elevator_3.png"
+super * "industrial_elevator:2" "" "saxarba/misc/elevator_2.png"
+super * "industrial_elevator:1" "" "saxarba/misc/elevator_1.png"
+super * "industrial_elevator:0" "" "saxarba/misc/elevator_0.png"
+super * "industrial_elevator:-1" "" "saxarba/misc/elevator_-1.png"
+super * "industrial_elevator:-2" "" "saxarba/misc/elevator_-2.png"
+super * "industrial_elevator:-3" "" "saxarba/misc/elevator_-3.png"
+super * "industrial_elevator:-4" "" "saxarba/misc/elevator_-4.png"
+super * "industrial_elevator:-5" "" "saxarba/misc/elevator_-5.png"
+super * "industrial_elevator:-6" "" "saxarba/misc/elevator_-6.png"
+super * "industrial_elevator:-7" "" "saxarba/misc/elevator_-7.png"
+super * "industrial_elevator:-8" "" "saxarba/misc/elevator_-8.png"
+super * "industrial_elevator:-9" "" "saxarba/misc/elevator_-9.png"
+super * "industrial_elevator:-10" "" "saxarba/misc/elevator_-10.png"
+super * "industrial_elevator:*" "" "saxarba/misc/elevator_0.png"
 
 #Basement states have no graphical representation
 super * "bldg_basement_type:*" "" "saxarba/misc/blank.png"
diff --git a/data/images/hexes/saxarba/Includes/StandardFluff.tileinc b/data/images/hexes/saxarba/Includes/StandardFluff.tileinc
index e992e6877f..301bc8f61a 100644
--- a/data/images/hexes/saxarba/Includes/StandardFluff.tileinc
+++ b/data/images/hexes/saxarba/Includes/StandardFluff.tileinc
@@ -17,12 +17,12 @@
 
 # Standard fluff images
 
-super * "elevator:*:01" "" "boring/elevator1.gif"
-super * "elevator:*:02" "" "boring/elevator2.gif"
-super * "elevator:*:04" "" "boring/elevator3.gif"
-super * "elevator:*:08" "" "boring/elevator4.gif"
-super * "elevator:*:16" "" "boring/elevator5.gif"
-super * "elevator:*:32" "" "boring/elevator6.gif"
+super * "solaris_elevator:*:01" "" "boring/elevator1.gif"
+super * "solaris_elevator:*:02" "" "boring/elevator2.gif"
+super * "solaris_elevator:*:04" "" "boring/elevator3.gif"
+super * "solaris_elevator:*:08" "" "boring/elevator4.gif"
+super * "solaris_elevator:*:16" "" "boring/elevator5.gif"
+super * "solaris_elevator:*:32" "" "boring/elevator6.gif"
 
 super * "fluff:5:00" "" "fluff/cars_1.gif"
 super * "fluff:5:01" "" "fluff/cars_2.gif"
diff --git a/data/images/hexes/saxarba/elevator_-1.png b/data/images/hexes/saxarba/elevator_-1.png
deleted file mode 100644
index 7c6f97bdc1..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-1.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-10.png b/data/images/hexes/saxarba/elevator_-10.png
deleted file mode 100644
index 679ff12b7f..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-10.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-2.png b/data/images/hexes/saxarba/elevator_-2.png
deleted file mode 100644
index 9792a3da47..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-2.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-3.png b/data/images/hexes/saxarba/elevator_-3.png
deleted file mode 100644
index d77a13b681..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-3.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-4.png b/data/images/hexes/saxarba/elevator_-4.png
deleted file mode 100644
index ca44c42120..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-4.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-5.png b/data/images/hexes/saxarba/elevator_-5.png
deleted file mode 100644
index 63a1ce35b4..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-5.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-6.png b/data/images/hexes/saxarba/elevator_-6.png
deleted file mode 100644
index 74c4f344b8..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-6.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-7.png b/data/images/hexes/saxarba/elevator_-7.png
deleted file mode 100644
index 5f3714ebe4..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-7.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-8.png b/data/images/hexes/saxarba/elevator_-8.png
deleted file mode 100644
index 968321ee50..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-8.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_-9.png b/data/images/hexes/saxarba/elevator_-9.png
deleted file mode 100644
index bfd47d5dd6..0000000000
Binary files a/data/images/hexes/saxarba/elevator_-9.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_0.png b/data/images/hexes/saxarba/elevator_0.png
deleted file mode 100644
index 79516870ed..0000000000
Binary files a/data/images/hexes/saxarba/elevator_0.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_1.png b/data/images/hexes/saxarba/elevator_1.png
deleted file mode 100644
index b93f13240d..0000000000
Binary files a/data/images/hexes/saxarba/elevator_1.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_10.png b/data/images/hexes/saxarba/elevator_10.png
deleted file mode 100644
index 2fa2cbb439..0000000000
Binary files a/data/images/hexes/saxarba/elevator_10.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_2.png b/data/images/hexes/saxarba/elevator_2.png
deleted file mode 100644
index 9358a5cd11..0000000000
Binary files a/data/images/hexes/saxarba/elevator_2.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_3.png b/data/images/hexes/saxarba/elevator_3.png
deleted file mode 100644
index 756e624b12..0000000000
Binary files a/data/images/hexes/saxarba/elevator_3.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_4.png b/data/images/hexes/saxarba/elevator_4.png
deleted file mode 100644
index 7fefc50acf..0000000000
Binary files a/data/images/hexes/saxarba/elevator_4.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_5.png b/data/images/hexes/saxarba/elevator_5.png
deleted file mode 100644
index cb7e552bfa..0000000000
Binary files a/data/images/hexes/saxarba/elevator_5.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_6.png b/data/images/hexes/saxarba/elevator_6.png
deleted file mode 100644
index 4c460b4717..0000000000
Binary files a/data/images/hexes/saxarba/elevator_6.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_7.png b/data/images/hexes/saxarba/elevator_7.png
deleted file mode 100644
index 57ee91a195..0000000000
Binary files a/data/images/hexes/saxarba/elevator_7.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_8.png b/data/images/hexes/saxarba/elevator_8.png
deleted file mode 100644
index 1e29b8899b..0000000000
Binary files a/data/images/hexes/saxarba/elevator_8.png and /dev/null differ
diff --git a/data/images/hexes/saxarba/elevator_9.png b/data/images/hexes/saxarba/elevator_9.png
deleted file mode 100644
index a14e047a28..0000000000
Binary files a/data/images/hexes/saxarba/elevator_9.png and /dev/null differ