diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
new file mode 100644
index 0000000000..773a5eae0a
--- /dev/null
+++ b/ATTRIBUTIONS.md
@@ -0,0 +1,39 @@
+**File:** `maps/tether/submaps/om_ships/aro2.dmi`
+**Creator:** Nia Tahl, deriv by Aronai.
+**License:** CC BY-NC-SA 4.0 (https://creativecommons.org/licenses/by-nc-sa/4.0/)
+**URL:** http://fractalsoftworks.com/forum/index.php?topic=14935.0
+**Notes:** Permission to use assets also given in writing.
+
+**File:** `maps/tether/submaps/om_ships/cruiser.dmi`
+**Creator:** Gwyvern & Tartiflette
+**License:** CC BY-NC-SA (Unspecified Version) (https://creativecommons.org/licenses/by-nc-sa/4.0/)
+**URL:** http://fractalsoftworks.com/forum/index.php?topic=13667.0
+**Notes:** Permission to use assets also given in writing.
+
+**File:** `icons/mecha/fighters64x64.dmi`
+**Icon-States:** `baron`, derivs by Aronai.
+**Creator:** Gwyvern & Tartiflette
+**License:** CC BY-NC-SA (Unspecified Version) (https://creativecommons.org/licenses/by-nc-sa/4.0/)
+**URL:** http://fractalsoftworks.com/forum/index.php?topic=13667.0
+**Notes:** Permission to use assets also given in writing.
+
+**File:** `icons/mecha/fighters64x64.dmi`
+**Icon-States:** `pinnace`, derivs by Aronai.
+**Creator:** Tartiflette
+**License:** CC BY-NC-SA 4.0 (https://creativecommons.org/licenses/by-nc-sa/4.0/)
+**URL:** http://fractalsoftworks.com/forum/index.php?topic=17856.0
+**Notes:** Permission to use assets also given in writing.
+
+**File:** `icons/mecha/fighters64x64.dmi`
+**Icon-States:** `allure`, derivs by Aronai.
+**Creator:** Tartiflette
+**License:** CC BY-NC-SA 4.0 (https://creativecommons.org/licenses/by-nc-sa/4.0/)
+**URL:** http://fractalsoftworks.com/forum/index.php?topic=11646.0
+**Notes:** Permission to use assets also given in writing.
+
+**File:** `icons/mecha/fighters64x64.dmi`
+**Icon-States:** `scoralis`, derivs by Aronai.
+**Creator:** Nia Tahl
+**License:** CC BY-NC-SA 4.0 (https://creativecommons.org/licenses/by-nc-sa/4.0/)
+**URL:** http://fractalsoftworks.com/forum/index.php?topic=14935.0
+**Notes:** Permission to use assets also given in writing.
diff --git a/README.md b/README.md
index cab1589aca..2780275b94 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,8 @@ Creative Commons 3.0 BY-NC-SA license
 
 All assets including icons and sound are under a [CC BY-SA 3.0](http://creativecommons.org/licenses/by-sa/3.0/) license unless otherwise indicated.
 
+Attributions and other licenses with links to original works are noted in [ATTRIBUTIONS.md](./ATTRIBUTIONS.md).
+
 ### GETTING THE CODE
 The simplest way to obtain the code is using the github .zip feature. If you do this, you won't be able to make a Pull Request later, though. You'll need to use the git method.
 
diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm
index f4fb5f0f97..5b04451dce 100644
--- a/code/game/mecha/combat/fighter.dm
+++ b/code/game/mecha/combat/fighter.dm
@@ -8,7 +8,7 @@
 	var/stabilization_enabled = TRUE //If our anti-space-drift is on
 	var/ground_capable = FALSE //If we can fly over normal turfs and not just space
 
-	icon = 'icons/mecha/fighters64x64.dmi'
+	icon = 'icons/mecha/fighters64x64.dmi' //See ATTRIBUTIONS.md for details on license
 
 	icon_state = ""
 	initial_icon = ""
diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm
index 96d6cbaa12..25d088fb56 100644
--- a/code/modules/overmap/overmap_object.dm
+++ b/code/modules/overmap/overmap_object.dm
@@ -12,7 +12,7 @@
 	var/skybox_icon_state	//Icon state to use for skybox
 	var/skybox_pixel_x		//Shift from lower left corner of skybox
 	var/skybox_pixel_y		//Shift from lower left corner of skybox
-	var/cached_skybox_image	//Cachey
+	var/image/cached_skybox_image	//Cachey
 
 //Overlay of how this object should look on other skyboxes
 /obj/effect/overmap/proc/get_skybox_representation()
diff --git a/icons/mecha/fighters64x64.dmi b/icons/mecha/fighters64x64.dmi
index 2022efbd51..7240417552 100644
Binary files a/icons/mecha/fighters64x64.dmi and b/icons/mecha/fighters64x64.dmi differ
diff --git a/maps/tether/submaps/om_ships/aro.dm b/maps/tether/submaps/om_ships/aro.dm
index a927ffed0d..b6ef237453 100644
--- a/maps/tether/submaps/om_ships/aro.dm
+++ b/maps/tether/submaps/om_ships/aro.dm
@@ -51,7 +51,7 @@
 	initial_generic_waypoints = list("aronai_fore", "aronai_aft", "aronai_port", "aronai_starboard")
 	initial_restricted_waypoints = list("Aro's Ship's Boat" = list("omship_spawn_aroboat"))
 
-	skybox_icon = 'aro.dmi'
+	skybox_icon = 'aro2.dmi'
 	skybox_icon_state = "skybox"
 	skybox_pixel_x = 120
 	skybox_pixel_y = 120
diff --git a/maps/tether/submaps/om_ships/aro.dmi b/maps/tether/submaps/om_ships/aro.dmi
deleted file mode 100644
index 139ef42bbe..0000000000
Binary files a/maps/tether/submaps/om_ships/aro.dmi and /dev/null differ
diff --git a/maps/tether/submaps/om_ships/aro2.dm b/maps/tether/submaps/om_ships/aro2.dm
index 0e4be8cbaf..3cd331c28a 100644
--- a/maps/tether/submaps/om_ships/aro2.dm
+++ b/maps/tether/submaps/om_ships/aro2.dm
@@ -68,11 +68,17 @@
 	initial_restricted_waypoints = list("Aro's Boat" = list("omship_spawn_aroboat2"))
 	fore_dir = EAST
 
-	skybox_icon = 'aro2.dmi' //Art by Harmful Mechanic, distributed under Creative Commons license
+	skybox_icon = 'aro2.dmi' //Art by Nia Tahl, see ATTRIBUTIONS.md
 	skybox_icon_state = "skybox"
 	skybox_pixel_x = 80
 	skybox_pixel_y = 100
 
+/obj/effect/overmap/visitable/ship/aro2/build_skybox_representation()
+	..()
+	if(!cached_skybox_image)
+		return
+	cached_skybox_image.add_overlay("glow")
+
 // The shuttle's 'shuttle' computer
 /obj/machinery/computer/shuttle_control/explore/aroboat2
 	name = "boat control console"
diff --git a/maps/tether/submaps/om_ships/aro2.dmi b/maps/tether/submaps/om_ships/aro2.dmi
index 546411b634..7e5ba5ecba 100644
Binary files a/maps/tether/submaps/om_ships/aro2.dmi and b/maps/tether/submaps/om_ships/aro2.dmi differ
diff --git a/maps/tether/submaps/om_ships/cruiser.dm b/maps/tether/submaps/om_ships/cruiser.dm
index 2347aac527..f07d1e8bf1 100644
--- a/maps/tether/submaps/om_ships/cruiser.dm
+++ b/maps/tether/submaps/om_ships/cruiser.dm
@@ -137,7 +137,7 @@
 	vessel_size = SHIP_SIZE_LARGE
 	initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard", "ws_port_dock_1", "ws_port_dock_2", "ws_starboard_dock_1", "ws_starboard_dock_2")
 
-	skybox_icon = 'cruiser.dmi' //Art by Gwyvern, distributed under Creative Commons license
+	skybox_icon = 'cruiser.dmi' //Art by Gwyvern, see ATTRIBUTIONS.md
 	skybox_icon_state = "skybox"
 	skybox_pixel_x = 370
 	skybox_pixel_y = 370