diff --git a/generated_sprites/AtB/dark.json b/generated_sprites/AtB/dark.json
index 5f696e92..5c743535 100644
--- a/generated_sprites/AtB/dark.json
+++ b/generated_sprites/AtB/dark.json
@@ -1 +1 @@
-{"geofencingzone_allowed_dark":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":143},"geofencingzone_noentry_dark":{"height":44,"pixelRatio":1,"width":44,"x":605,"y":92},"geofencingzone_noparking_dark":{"height":44,"pixelRatio":1,"width":44,"x":634,"y":44},"geofencingzone_parking_dark":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":187},"geofencingzone_slow_dark":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":404},"interactivepin_default_dark":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_dark":{"height":51,"pixelRatio":1,"width":47,"x":558,"y":92},"interactivepin_valid_dark":{"height":51,"pixelRatio":1,"width":47,"x":444,"y":308},"stationpin_citybike_bikes_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":429},"stationpin_citybike_bikes_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":451},"stationpin_citybike_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":640,"y":379},"stationpin_citybike_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_cars_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":335},"stationpin_sharedcar_cars_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"stationpin_sharedcar_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":461},"stationpin_sharedcar_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":540,"y":353},"stoppin_boat_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":688,"y":272},"stoppin_boat_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":256},"stoppin_bus_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":448},"stoppin_bus_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":210},"stoppin_bus_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":321},"stoppin_busandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":558,"y":48},"stoppin_busandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":126,"y":478},"stoppin_busandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":397},"stoppin_commuterparking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":106},"stoppin_commuterparking_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":386},"stoppin_ferry_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":353},"stoppin_ferry_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":138},"stoppin_ferry_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_metro_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":587,"y":305},"stoppin_metro_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":170},"stoppin_metro_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_metroandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":618,"y":0},"stoppin_metroandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":649,"y":88},"stoppin_metroandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":616,"y":231},"stoppin_plane_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":411},"stoppin_plane_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_train_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":441},"stoppin_train_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":672,"y":367},"stoppin_train_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":444,"y":195},"stoppin_tram_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":624,"y":136},"stoppin_tram_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":304},"stoppin_tram_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_boat_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_boat_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":616,"y":275},"vehiclepin_bus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":64},"vehiclepin_bus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":128},"vehiclepin_bus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":628,"y":349},"vehiclepin_citybike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":192},"vehiclepin_citybike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_citybike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":678,"y":44},"vehiclepin_citybike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":444,"y":359},"vehiclepin_citybike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":256},"vehiclepin_citybike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":631,"y":305},"vehiclepin_citybike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":242},"vehiclepin_citybike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":320},"vehiclepin_ebike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":444,"y":260},"vehiclepin_ebike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":694,"y":0},"vehiclepin_ebike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":491,"y":308},"vehiclepin_ebike_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":520,"y":257},"vehiclepin_ebike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":384},"vehiclepin_ebike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":652,"y":275},"vehiclepin_ebike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":202},"vehiclepin_ebike_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":443},"vehiclepin_ebike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ferry_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":448},"vehiclepin_ferry_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ferry_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":212},"vehiclepin_loading_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_metro_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_metro_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_metro_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":242},"vehiclepin_otherbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_otherbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_otherbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":120},"vehiclepin_othertrain_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_othertrain_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_othertrain_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":701,"y":76},"vehiclepin_regionalbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_regionalbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_regionalbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":722,"y":32},"vehiclepin_scooter_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_scooter_cluster_generic_dark":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":161},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":44,"x":624,"y":180},"vehiclepin_scooter_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":407},"vehiclepin_scooter_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":492,"y":356},"vehiclepin_scooter_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":539,"y":305},"vehiclepin_scooter_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":568,"y":257},"vehiclepin_scooter_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_scooter_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":738,"y":0},"vehiclepin_scooter_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":475},"vehiclepin_scooter_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":106},"vehiclepin_scooter_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":737,"y":62},"vehiclepin_scooter_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":758,"y":30},"vehiclepin_scooter_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_scooter_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_scooter_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_sharedcar_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_sharedcar_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":209},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":596,"y":397},"vehiclepin_sharedcar_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":455},"vehiclepin_sharedcar_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_sharedcar_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":150},"vehiclepin_sharedcar_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":138},"vehiclepin_sharedcar_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_shuttlebus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_shuttlebus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_shuttlebus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":180},"vehiclepin_train_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_train_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_train_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":429},"vehiclepin_tram_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_tram_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_tram_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":459}}
\ No newline at end of file
+{"geofencingzone_allowed_dark":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":288},"geofencingzone_noentry_dark":{"height":44,"pixelRatio":1,"width":44,"x":603,"y":332},"geofencingzone_noparking_dark":{"height":44,"pixelRatio":1,"width":44,"x":628,"y":288},"geofencingzone_parking_dark":{"height":28,"pixelRatio":1,"width":28,"x":756,"y":426},"geofencingzone_slow_dark":{"height":44,"pixelRatio":1,"width":44,"x":604,"y":376},"interactivepin_default_dark":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_dark":{"height":51,"pixelRatio":1,"width":47,"x":192,"y":453},"interactivepin_valid_dark":{"height":51,"pixelRatio":1,"width":47,"x":508,"y":345},"stationpin_citybike_bikes_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":454},"stationpin_citybike_bikes_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":455},"stationpin_citybike_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":752,"y":454},"stationpin_citybike_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":460,"y":455},"stationpin_sharedcar_cars_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":106},"stationpin_sharedcar_cars_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":32},"stationpin_sharedcar_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":647,"y":332},"stoppin_boat_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":706,"y":0},"stoppin_boat_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_bus_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":420},"stoppin_bus_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":64},"stoppin_bus_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_busandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":257},"stoppin_busandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":606,"y":92},"stoppin_busandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":648,"y":376},"stoppin_commuterparking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":138},"stoppin_commuterparking_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_ferry_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":464},"stoppin_ferry_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":170},"stoppin_ferry_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":195},"stoppin_metro_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":420},"stoppin_metro_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":202},"stoppin_metro_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":260},"stoppin_metroandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":301},"stoppin_metroandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":650,"y":44},"stoppin_metroandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":464},"stoppin_plane_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":234},"stoppin_plane_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":325},"stoppin_train_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":606,"y":48},"stoppin_train_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":708,"y":266},"stoppin_train_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":390},"stoppin_tram_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":618,"y":0},"stoppin_tram_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":298},"stoppin_tram_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":69},"vehiclepin_boat_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":133},"vehiclepin_boat_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":220},"vehiclepin_bus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":197},"vehiclepin_bus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":261},"vehiclepin_bus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":250},"vehiclepin_citybike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":325},"vehiclepin_citybike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"vehiclepin_citybike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":662,"y":0},"vehiclepin_citybike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":508,"y":396},"vehiclepin_citybike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":389},"vehiclepin_citybike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":124},"vehiclepin_citybike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":330},"vehiclepin_citybike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ebike_cluster__dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_ebike_cluster_minimized__dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":124},"vehiclepin_ebike_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":555,"y":345},"vehiclepin_ebike_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":536,"y":444},"vehiclepin_ebike_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":556,"y":393},"vehiclepin_ebike_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":441},"vehiclepin_ebike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_ebike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":658,"y":76},"vehiclepin_ebike_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":362},"vehiclepin_ebike_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":756,"y":394},"vehiclepin_ebike_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":426},"vehiclepin_ebike_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":458},"vehiclepin_ebike_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ebike_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_ebike_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_ferry_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_ferry_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_ferry_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":154},"vehiclepin_loading_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_metro_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_metro_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_metro_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":184},"vehiclepin_otherbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_otherbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_otherbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":214},"vehiclepin_othertrain_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_othertrain_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_othertrain_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":244},"vehiclepin_regionalbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_regionalbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_regionalbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":672,"y":274},"vehiclepin_scooter_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_scooter_cluster_generic_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":161},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":156},"vehiclepin_scooter_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":48},"vehiclepin_scooter_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":96},"vehiclepin_scooter_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":144},"vehiclepin_scooter_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":192},"vehiclepin_scooter_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_scooter_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":304},"vehiclepin_scooter_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":96},"vehiclepin_scooter_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":32},"vehiclepin_scooter_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":738,"y":0},"vehiclepin_scooter_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":64},"vehiclepin_scooter_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_scooter_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_scooter_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_sharedcar_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_sharedcar_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":209},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":188},"vehiclepin_sharedcar_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":240},"vehiclepin_sharedcar_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_sharedcar_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":334},"vehiclepin_sharedcar_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":128},"vehiclepin_sharedcar_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_shuttlebus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_shuttlebus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_shuttlebus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":692,"y":364},"vehiclepin_train_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_train_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":256},"vehiclepin_train_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":394},"vehiclepin_tram_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":320},"vehiclepin_tram_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":384},"vehiclepin_tram_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":424}}
\ No newline at end of file
diff --git a/generated_sprites/AtB/dark.png b/generated_sprites/AtB/dark.png
index bb03d48d..ed408b0c 100644
Binary files a/generated_sprites/AtB/dark.png and b/generated_sprites/AtB/dark.png differ
diff --git a/generated_sprites/AtB/dark@2x.json b/generated_sprites/AtB/dark@2x.json
index 1398c11d..538b02ea 100644
--- a/generated_sprites/AtB/dark@2x.json
+++ b/generated_sprites/AtB/dark@2x.json
@@ -1 +1 @@
-{"geofencingzone_allowed_dark":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":286},"geofencingzone_noentry_dark":{"height":88,"pixelRatio":2,"width":88,"x":1210,"y":184},"geofencingzone_noparking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1268,"y":88},"geofencingzone_parking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":374},"geofencingzone_slow_dark":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":808},"interactivepin_default_dark":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_dark":{"height":102,"pixelRatio":2,"width":94,"x":1116,"y":184},"interactivepin_valid_dark":{"height":102,"pixelRatio":2,"width":94,"x":888,"y":616},"stationpin_citybike_bikes_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":858},"stationpin_citybike_bikes_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":902},"stationpin_citybike_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1280,"y":758},"stationpin_citybike_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_cars_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":670},"stationpin_sharedcar_cars_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"stationpin_sharedcar_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":922},"stationpin_sharedcar_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1080,"y":706},"stoppin_boat_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1376,"y":544},"stoppin_boat_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":512},"stoppin_bus_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":896},"stoppin_bus_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":420},"stoppin_bus_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":642},"stoppin_busandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1116,"y":96},"stoppin_busandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":252,"y":956},"stoppin_busandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":794},"stoppin_commuterparking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":212},"stoppin_commuterparking_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":772},"stoppin_ferry_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":706},"stoppin_ferry_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":276},"stoppin_ferry_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_metro_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1174,"y":610},"stoppin_metro_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":340},"stoppin_metro_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_metroandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1236,"y":0},"stoppin_metroandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1298,"y":176},"stoppin_metroandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1232,"y":462},"stoppin_plane_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":822},"stoppin_plane_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_train_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":882},"stoppin_train_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1344,"y":734},"stoppin_train_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":888,"y":390},"stoppin_tram_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1248,"y":272},"stoppin_tram_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":608},"stoppin_tram_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_boat_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_boat_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1232,"y":550},"vehiclepin_bus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":128},"vehiclepin_bus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":256},"vehiclepin_bus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1256,"y":698},"vehiclepin_citybike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":384},"vehiclepin_citybike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_citybike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1356,"y":88},"vehiclepin_citybike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":888,"y":718},"vehiclepin_citybike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":512},"vehiclepin_citybike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1262,"y":610},"vehiclepin_citybike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":484},"vehiclepin_citybike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":640},"vehiclepin_ebike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":888,"y":520},"vehiclepin_ebike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1388,"y":0},"vehiclepin_ebike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":982,"y":616},"vehiclepin_ebike_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1040,"y":514},"vehiclepin_ebike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":768},"vehiclepin_ebike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1304,"y":550},"vehiclepin_ebike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":404},"vehiclepin_ebike_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":886},"vehiclepin_ebike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ferry_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":896},"vehiclepin_ferry_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ferry_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":424},"vehiclepin_loading_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_metro_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_metro_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_metro_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":484},"vehiclepin_otherbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_otherbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_otherbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":240},"vehiclepin_othertrain_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_othertrain_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_othertrain_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1402,"y":152},"vehiclepin_regionalbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_regionalbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_regionalbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1444,"y":64},"vehiclepin_scooter_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_scooter_cluster_generic_dark":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":322},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":88,"x":1248,"y":360},"vehiclepin_scooter_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":814},"vehiclepin_scooter_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":984,"y":712},"vehiclepin_scooter_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1078,"y":610},"vehiclepin_scooter_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1136,"y":514},"vehiclepin_scooter_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_scooter_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1476,"y":0},"vehiclepin_scooter_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":950},"vehiclepin_scooter_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":212},"vehiclepin_scooter_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1474,"y":124},"vehiclepin_scooter_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1516,"y":60},"vehiclepin_scooter_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_scooter_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_scooter_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_sharedcar_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_sharedcar_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":418},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1192,"y":794},"vehiclepin_sharedcar_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":910},"vehiclepin_sharedcar_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_sharedcar_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":300},"vehiclepin_sharedcar_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":276},"vehiclepin_sharedcar_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_shuttlebus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_shuttlebus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_shuttlebus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":360},"vehiclepin_train_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_train_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_train_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":858},"vehiclepin_tram_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_tram_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_tram_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":918}}
\ No newline at end of file
+{"geofencingzone_allowed_dark":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":576},"geofencingzone_noentry_dark":{"height":88,"pixelRatio":2,"width":88,"x":1206,"y":664},"geofencingzone_noparking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1256,"y":576},"geofencingzone_parking_dark":{"height":56,"pixelRatio":2,"width":56,"x":1512,"y":852},"geofencingzone_slow_dark":{"height":88,"pixelRatio":2,"width":88,"x":1208,"y":752},"interactivepin_default_dark":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_dark":{"height":102,"pixelRatio":2,"width":94,"x":384,"y":906},"interactivepin_valid_dark":{"height":102,"pixelRatio":2,"width":94,"x":1016,"y":690},"stationpin_citybike_bikes_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":908},"stationpin_citybike_bikes_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":910},"stationpin_citybike_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1504,"y":908},"stationpin_citybike_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":920,"y":910},"stationpin_sharedcar_cars_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":212},"stationpin_sharedcar_cars_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":64},"stationpin_sharedcar_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1294,"y":664},"stoppin_boat_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1412,"y":0},"stoppin_boat_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_bus_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":840},"stoppin_bus_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":128},"stoppin_bus_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_busandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":514},"stoppin_busandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1212,"y":184},"stoppin_busandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1296,"y":752},"stoppin_commuterparking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":276},"stoppin_commuterparking_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_ferry_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":928},"stoppin_ferry_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":340},"stoppin_ferry_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":390},"stoppin_metro_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":840},"stoppin_metro_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":404},"stoppin_metro_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":520},"stoppin_metroandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":602},"stoppin_metroandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1300,"y":88},"stoppin_metroandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":928},"stoppin_plane_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":468},"stoppin_plane_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":650},"stoppin_train_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1212,"y":96},"stoppin_train_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1416,"y":532},"stoppin_train_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":780},"stoppin_tram_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1236,"y":0},"stoppin_tram_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":596},"stoppin_tram_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":138},"vehiclepin_boat_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":266},"vehiclepin_boat_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":440},"vehiclepin_bus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":394},"vehiclepin_bus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":522},"vehiclepin_bus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":500},"vehiclepin_citybike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":650},"vehiclepin_citybike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"vehiclepin_citybike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1324,"y":0},"vehiclepin_citybike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1016,"y":792},"vehiclepin_citybike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":778},"vehiclepin_citybike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":248},"vehiclepin_citybike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":660},"vehiclepin_citybike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ebike_cluster__dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_ebike_cluster_minimized__dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":248},"vehiclepin_ebike_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":1110,"y":690},"vehiclepin_ebike_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":1072,"y":888},"vehiclepin_ebike_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1112,"y":786},"vehiclepin_ebike_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":882},"vehiclepin_ebike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_ebike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1316,"y":152},"vehiclepin_ebike_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":724},"vehiclepin_ebike_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1512,"y":788},"vehiclepin_ebike_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":852},"vehiclepin_ebike_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":916},"vehiclepin_ebike_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ebike_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_ebike_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_ferry_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_ferry_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_ferry_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":308},"vehiclepin_loading_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_metro_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_metro_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_metro_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":368},"vehiclepin_otherbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_otherbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_otherbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":428},"vehiclepin_othertrain_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_othertrain_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_othertrain_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":488},"vehiclepin_regionalbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_regionalbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_regionalbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1344,"y":548},"vehiclepin_scooter_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_scooter_cluster_generic_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":322},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":312},"vehiclepin_scooter_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":96},"vehiclepin_scooter_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":192},"vehiclepin_scooter_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":288},"vehiclepin_scooter_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":384},"vehiclepin_scooter_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_scooter_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":608},"vehiclepin_scooter_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":192},"vehiclepin_scooter_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":64},"vehiclepin_scooter_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1476,"y":0},"vehiclepin_scooter_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":128},"vehiclepin_scooter_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_scooter_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_scooter_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_sharedcar_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_sharedcar_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":418},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":376},"vehiclepin_sharedcar_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":480},"vehiclepin_sharedcar_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_sharedcar_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":668},"vehiclepin_sharedcar_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":256},"vehiclepin_sharedcar_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_shuttlebus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_shuttlebus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_shuttlebus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1384,"y":728},"vehiclepin_train_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_train_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":512},"vehiclepin_train_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":788},"vehiclepin_tram_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":640},"vehiclepin_tram_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":768},"vehiclepin_tram_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":848}}
\ No newline at end of file
diff --git a/generated_sprites/AtB/dark@2x.png b/generated_sprites/AtB/dark@2x.png
index 88b635c2..c92445a3 100644
Binary files a/generated_sprites/AtB/dark@2x.png and b/generated_sprites/AtB/dark@2x.png differ
diff --git a/generated_sprites/AtB/light.json b/generated_sprites/AtB/light.json
index ec63551a..1e7eaecc 100644
--- a/generated_sprites/AtB/light.json
+++ b/generated_sprites/AtB/light.json
@@ -1 +1 @@
-{"geofencingzone_allowed_light":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":143},"geofencingzone_noentry_light":{"height":44,"pixelRatio":1,"width":44,"x":605,"y":92},"geofencingzone_noparking_light":{"height":44,"pixelRatio":1,"width":44,"x":634,"y":44},"geofencingzone_parking_light":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":187},"geofencingzone_slow_light":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":404},"interactivepin_default_light":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_light":{"height":51,"pixelRatio":1,"width":47,"x":558,"y":92},"interactivepin_valid_light":{"height":51,"pixelRatio":1,"width":47,"x":444,"y":308},"stationpin_citybike_bikes_default_light":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":429},"stationpin_citybike_bikes_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":451},"stationpin_citybike_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":640,"y":379},"stationpin_citybike_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_cars_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":335},"stationpin_sharedcar_cars_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"stationpin_sharedcar_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":461},"stationpin_sharedcar_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_light":{"height":44,"pixelRatio":1,"width":44,"x":540,"y":353},"stoppin_boat_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":688,"y":272},"stoppin_boat_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":256},"stoppin_bus_default_light":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":448},"stoppin_bus_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":210},"stoppin_bus_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":321},"stoppin_busandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":558,"y":48},"stoppin_busandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":126,"y":478},"stoppin_busandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_light":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":397},"stoppin_commuterparking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":106},"stoppin_commuterparking_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":386},"stoppin_ferry_default_light":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":353},"stoppin_ferry_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":138},"stoppin_ferry_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_metro_default_light":{"height":44,"pixelRatio":1,"width":44,"x":587,"y":305},"stoppin_metro_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":170},"stoppin_metro_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_metroandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":618,"y":0},"stoppin_metroandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":649,"y":88},"stoppin_metroandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_light":{"height":44,"pixelRatio":1,"width":44,"x":616,"y":231},"stoppin_plane_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":411},"stoppin_plane_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_train_default_light":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":441},"stoppin_train_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":672,"y":367},"stoppin_train_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":444,"y":195},"stoppin_tram_default_light":{"height":44,"pixelRatio":1,"width":44,"x":624,"y":136},"stoppin_tram_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":304},"stoppin_tram_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_light":{"height":64,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_boat_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_boat_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":616,"y":275},"vehiclepin_bus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":64},"vehiclepin_bus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":128},"vehiclepin_bus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":628,"y":349},"vehiclepin_citybike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":192},"vehiclepin_citybike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_citybike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":678,"y":44},"vehiclepin_citybike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":444,"y":359},"vehiclepin_citybike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":256},"vehiclepin_citybike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":631,"y":305},"vehiclepin_citybike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":242},"vehiclepin_citybike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":320},"vehiclepin_ebike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":444,"y":260},"vehiclepin_ebike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":694,"y":0},"vehiclepin_ebike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":491,"y":308},"vehiclepin_ebike_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":520,"y":257},"vehiclepin_ebike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":384},"vehiclepin_ebike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":652,"y":275},"vehiclepin_ebike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":202},"vehiclepin_ebike_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":443},"vehiclepin_ebike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ferry_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":448},"vehiclepin_ferry_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ferry_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":212},"vehiclepin_loading_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_metro_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_metro_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_metro_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":242},"vehiclepin_otherbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_otherbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_otherbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":120},"vehiclepin_othertrain_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_othertrain_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_othertrain_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":701,"y":76},"vehiclepin_regionalbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_regionalbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_regionalbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":722,"y":32},"vehiclepin_scooter_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_scooter_cluster_generic_light":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":161},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":32,"pixelRatio":1,"width":44,"x":624,"y":180},"vehiclepin_scooter_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":407},"vehiclepin_scooter_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":492,"y":356},"vehiclepin_scooter_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":539,"y":305},"vehiclepin_scooter_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":568,"y":257},"vehiclepin_scooter_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_scooter_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":738,"y":0},"vehiclepin_scooter_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":475},"vehiclepin_scooter_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":106},"vehiclepin_scooter_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":737,"y":62},"vehiclepin_scooter_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":758,"y":30},"vehiclepin_scooter_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_scooter_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_scooter_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_sharedcar_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_sharedcar_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":209},"vehiclepin_sharedcar_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":596,"y":397},"vehiclepin_sharedcar_default_light":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":455},"vehiclepin_sharedcar_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_sharedcar_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":150},"vehiclepin_sharedcar_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":138},"vehiclepin_sharedcar_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_shuttlebus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_shuttlebus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_shuttlebus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":180},"vehiclepin_train_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_train_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_train_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":429},"vehiclepin_tram_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_tram_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_tram_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":459}}
\ No newline at end of file
+{"geofencingzone_allowed_light":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":288},"geofencingzone_noentry_light":{"height":44,"pixelRatio":1,"width":44,"x":603,"y":332},"geofencingzone_noparking_light":{"height":44,"pixelRatio":1,"width":44,"x":628,"y":288},"geofencingzone_parking_light":{"height":28,"pixelRatio":1,"width":28,"x":756,"y":426},"geofencingzone_slow_light":{"height":44,"pixelRatio":1,"width":44,"x":604,"y":376},"interactivepin_default_light":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_light":{"height":51,"pixelRatio":1,"width":47,"x":192,"y":453},"interactivepin_valid_light":{"height":51,"pixelRatio":1,"width":47,"x":508,"y":345},"stationpin_citybike_bikes_default_light":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":454},"stationpin_citybike_bikes_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":455},"stationpin_citybike_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":752,"y":454},"stationpin_citybike_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_light":{"height":48,"pixelRatio":1,"width":76,"x":460,"y":455},"stationpin_sharedcar_cars_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":106},"stationpin_sharedcar_cars_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":32},"stationpin_sharedcar_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_light":{"height":44,"pixelRatio":1,"width":44,"x":647,"y":332},"stoppin_boat_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":706,"y":0},"stoppin_boat_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_bus_default_light":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":420},"stoppin_bus_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":64},"stoppin_bus_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_busandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":257},"stoppin_busandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":606,"y":92},"stoppin_busandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_light":{"height":44,"pixelRatio":1,"width":44,"x":648,"y":376},"stoppin_commuterparking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":138},"stoppin_commuterparking_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_ferry_default_light":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":464},"stoppin_ferry_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":170},"stoppin_ferry_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":195},"stoppin_metro_default_light":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":420},"stoppin_metro_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":202},"stoppin_metro_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":260},"stoppin_metroandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":301},"stoppin_metroandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":650,"y":44},"stoppin_metroandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_light":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":464},"stoppin_plane_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":234},"stoppin_plane_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":325},"stoppin_train_default_light":{"height":44,"pixelRatio":1,"width":44,"x":606,"y":48},"stoppin_train_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":708,"y":266},"stoppin_train_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":390},"stoppin_tram_default_light":{"height":44,"pixelRatio":1,"width":44,"x":618,"y":0},"stoppin_tram_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":298},"stoppin_tram_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":69},"vehiclepin_boat_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":133},"vehiclepin_boat_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":220},"vehiclepin_bus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":197},"vehiclepin_bus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":261},"vehiclepin_bus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":250},"vehiclepin_citybike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":325},"vehiclepin_citybike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"vehiclepin_citybike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":662,"y":0},"vehiclepin_citybike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":508,"y":396},"vehiclepin_citybike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":389},"vehiclepin_citybike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":124},"vehiclepin_citybike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":330},"vehiclepin_citybike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ebike_cluster__light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_ebike_cluster_minimized__light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":124},"vehiclepin_ebike_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":555,"y":345},"vehiclepin_ebike_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":536,"y":444},"vehiclepin_ebike_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":556,"y":393},"vehiclepin_ebike_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":441},"vehiclepin_ebike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_ebike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":658,"y":76},"vehiclepin_ebike_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":362},"vehiclepin_ebike_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":756,"y":394},"vehiclepin_ebike_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":426},"vehiclepin_ebike_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":458},"vehiclepin_ebike_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ebike_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_ebike_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_ferry_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_ferry_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_ferry_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":154},"vehiclepin_loading_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_metro_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_metro_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_metro_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":184},"vehiclepin_otherbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_otherbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_otherbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":214},"vehiclepin_othertrain_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_othertrain_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_othertrain_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":244},"vehiclepin_regionalbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_regionalbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_regionalbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":672,"y":274},"vehiclepin_scooter_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_scooter_cluster_generic_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":161},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":156},"vehiclepin_scooter_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":48},"vehiclepin_scooter_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":96},"vehiclepin_scooter_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":144},"vehiclepin_scooter_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":192},"vehiclepin_scooter_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_scooter_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":304},"vehiclepin_scooter_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":96},"vehiclepin_scooter_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":32},"vehiclepin_scooter_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":738,"y":0},"vehiclepin_scooter_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":64},"vehiclepin_scooter_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_scooter_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_scooter_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_sharedcar_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_sharedcar_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":209},"vehiclepin_sharedcar_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":188},"vehiclepin_sharedcar_default_light":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":240},"vehiclepin_sharedcar_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_sharedcar_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":334},"vehiclepin_sharedcar_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":128},"vehiclepin_sharedcar_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_shuttlebus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_shuttlebus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_shuttlebus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":692,"y":364},"vehiclepin_train_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_train_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":256},"vehiclepin_train_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":394},"vehiclepin_tram_active_light":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":320},"vehiclepin_tram_error_light":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":384},"vehiclepin_tram_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":424}}
\ No newline at end of file
diff --git a/generated_sprites/AtB/light.png b/generated_sprites/AtB/light.png
index b5bbefea..d13c8370 100644
Binary files a/generated_sprites/AtB/light.png and b/generated_sprites/AtB/light.png differ
diff --git a/generated_sprites/AtB/light@2x.json b/generated_sprites/AtB/light@2x.json
index 2d2fee41..a83019e1 100644
--- a/generated_sprites/AtB/light@2x.json
+++ b/generated_sprites/AtB/light@2x.json
@@ -1 +1 @@
-{"geofencingzone_allowed_light":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":286},"geofencingzone_noentry_light":{"height":88,"pixelRatio":2,"width":88,"x":1210,"y":184},"geofencingzone_noparking_light":{"height":88,"pixelRatio":2,"width":88,"x":1268,"y":88},"geofencingzone_parking_light":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":374},"geofencingzone_slow_light":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":808},"interactivepin_default_light":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_light":{"height":102,"pixelRatio":2,"width":94,"x":1116,"y":184},"interactivepin_valid_light":{"height":102,"pixelRatio":2,"width":94,"x":888,"y":616},"stationpin_citybike_bikes_default_light":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":858},"stationpin_citybike_bikes_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":902},"stationpin_citybike_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1280,"y":758},"stationpin_citybike_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_cars_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":670},"stationpin_sharedcar_cars_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"stationpin_sharedcar_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":922},"stationpin_sharedcar_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1080,"y":706},"stoppin_boat_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1376,"y":544},"stoppin_boat_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":512},"stoppin_bus_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":896},"stoppin_bus_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":420},"stoppin_bus_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":642},"stoppin_busandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1116,"y":96},"stoppin_busandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":252,"y":956},"stoppin_busandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":794},"stoppin_commuterparking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":212},"stoppin_commuterparking_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":772},"stoppin_ferry_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":706},"stoppin_ferry_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":276},"stoppin_ferry_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_metro_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1174,"y":610},"stoppin_metro_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":340},"stoppin_metro_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_metroandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1236,"y":0},"stoppin_metroandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1298,"y":176},"stoppin_metroandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1232,"y":462},"stoppin_plane_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":822},"stoppin_plane_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_train_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":882},"stoppin_train_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1344,"y":734},"stoppin_train_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":888,"y":390},"stoppin_tram_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1248,"y":272},"stoppin_tram_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":608},"stoppin_tram_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_light":{"height":128,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_boat_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_boat_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1232,"y":550},"vehiclepin_bus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":128},"vehiclepin_bus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":256},"vehiclepin_bus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1256,"y":698},"vehiclepin_citybike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":384},"vehiclepin_citybike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_citybike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1356,"y":88},"vehiclepin_citybike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":888,"y":718},"vehiclepin_citybike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":512},"vehiclepin_citybike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1262,"y":610},"vehiclepin_citybike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":484},"vehiclepin_citybike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":640},"vehiclepin_ebike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":888,"y":520},"vehiclepin_ebike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1388,"y":0},"vehiclepin_ebike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":982,"y":616},"vehiclepin_ebike_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1040,"y":514},"vehiclepin_ebike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":768},"vehiclepin_ebike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1304,"y":550},"vehiclepin_ebike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":404},"vehiclepin_ebike_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":886},"vehiclepin_ebike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ferry_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":896},"vehiclepin_ferry_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ferry_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":424},"vehiclepin_loading_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_metro_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_metro_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_metro_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":484},"vehiclepin_otherbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_otherbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_otherbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":240},"vehiclepin_othertrain_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_othertrain_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_othertrain_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1402,"y":152},"vehiclepin_regionalbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_regionalbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_regionalbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1444,"y":64},"vehiclepin_scooter_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_scooter_cluster_generic_light":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":322},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":64,"pixelRatio":2,"width":88,"x":1248,"y":360},"vehiclepin_scooter_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":814},"vehiclepin_scooter_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":984,"y":712},"vehiclepin_scooter_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1078,"y":610},"vehiclepin_scooter_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1136,"y":514},"vehiclepin_scooter_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_scooter_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1476,"y":0},"vehiclepin_scooter_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":950},"vehiclepin_scooter_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":212},"vehiclepin_scooter_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1474,"y":124},"vehiclepin_scooter_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1516,"y":60},"vehiclepin_scooter_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_scooter_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_scooter_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_sharedcar_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_sharedcar_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":418},"vehiclepin_sharedcar_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1192,"y":794},"vehiclepin_sharedcar_default_light":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":910},"vehiclepin_sharedcar_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_sharedcar_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":300},"vehiclepin_sharedcar_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":276},"vehiclepin_sharedcar_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_shuttlebus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_shuttlebus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_shuttlebus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":360},"vehiclepin_train_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_train_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_train_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":858},"vehiclepin_tram_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_tram_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_tram_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":918}}
\ No newline at end of file
+{"geofencingzone_allowed_light":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":576},"geofencingzone_noentry_light":{"height":88,"pixelRatio":2,"width":88,"x":1206,"y":664},"geofencingzone_noparking_light":{"height":88,"pixelRatio":2,"width":88,"x":1256,"y":576},"geofencingzone_parking_light":{"height":56,"pixelRatio":2,"width":56,"x":1512,"y":852},"geofencingzone_slow_light":{"height":88,"pixelRatio":2,"width":88,"x":1208,"y":752},"interactivepin_default_light":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_light":{"height":102,"pixelRatio":2,"width":94,"x":384,"y":906},"interactivepin_valid_light":{"height":102,"pixelRatio":2,"width":94,"x":1016,"y":690},"stationpin_citybike_bikes_default_light":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":908},"stationpin_citybike_bikes_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":910},"stationpin_citybike_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1504,"y":908},"stationpin_citybike_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_light":{"height":96,"pixelRatio":2,"width":152,"x":920,"y":910},"stationpin_sharedcar_cars_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":212},"stationpin_sharedcar_cars_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":64},"stationpin_sharedcar_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1294,"y":664},"stoppin_boat_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1412,"y":0},"stoppin_boat_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_bus_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":840},"stoppin_bus_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":128},"stoppin_bus_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_busandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":514},"stoppin_busandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1212,"y":184},"stoppin_busandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1296,"y":752},"stoppin_commuterparking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":276},"stoppin_commuterparking_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_ferry_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":928},"stoppin_ferry_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":340},"stoppin_ferry_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":390},"stoppin_metro_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":840},"stoppin_metro_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":404},"stoppin_metro_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":520},"stoppin_metroandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":602},"stoppin_metroandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1300,"y":88},"stoppin_metroandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":928},"stoppin_plane_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":468},"stoppin_plane_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":650},"stoppin_train_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1212,"y":96},"stoppin_train_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1416,"y":532},"stoppin_train_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":780},"stoppin_tram_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1236,"y":0},"stoppin_tram_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":596},"stoppin_tram_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":138},"vehiclepin_boat_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":266},"vehiclepin_boat_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":440},"vehiclepin_bus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":394},"vehiclepin_bus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":522},"vehiclepin_bus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":500},"vehiclepin_citybike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":650},"vehiclepin_citybike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"vehiclepin_citybike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1324,"y":0},"vehiclepin_citybike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1016,"y":792},"vehiclepin_citybike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":778},"vehiclepin_citybike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":248},"vehiclepin_citybike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":660},"vehiclepin_citybike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ebike_cluster__light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_ebike_cluster_minimized__light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":248},"vehiclepin_ebike_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":1110,"y":690},"vehiclepin_ebike_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":1072,"y":888},"vehiclepin_ebike_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1112,"y":786},"vehiclepin_ebike_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":882},"vehiclepin_ebike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_ebike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1316,"y":152},"vehiclepin_ebike_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":724},"vehiclepin_ebike_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1512,"y":788},"vehiclepin_ebike_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":852},"vehiclepin_ebike_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":916},"vehiclepin_ebike_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ebike_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_ebike_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_ferry_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_ferry_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_ferry_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":308},"vehiclepin_loading_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_metro_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_metro_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_metro_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":368},"vehiclepin_otherbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_otherbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_otherbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":428},"vehiclepin_othertrain_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_othertrain_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_othertrain_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":488},"vehiclepin_regionalbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_regionalbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_regionalbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1344,"y":548},"vehiclepin_scooter_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_scooter_cluster_generic_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":322},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":312},"vehiclepin_scooter_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":96},"vehiclepin_scooter_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":192},"vehiclepin_scooter_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":288},"vehiclepin_scooter_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":384},"vehiclepin_scooter_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_scooter_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":608},"vehiclepin_scooter_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":192},"vehiclepin_scooter_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":64},"vehiclepin_scooter_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1476,"y":0},"vehiclepin_scooter_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":128},"vehiclepin_scooter_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_scooter_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_scooter_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_sharedcar_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_sharedcar_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":418},"vehiclepin_sharedcar_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":376},"vehiclepin_sharedcar_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":480},"vehiclepin_sharedcar_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_sharedcar_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":668},"vehiclepin_sharedcar_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":256},"vehiclepin_sharedcar_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_shuttlebus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_shuttlebus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_shuttlebus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1384,"y":728},"vehiclepin_train_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_train_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":512},"vehiclepin_train_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":788},"vehiclepin_tram_active_light":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":640},"vehiclepin_tram_error_light":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":768},"vehiclepin_tram_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":848}}
\ No newline at end of file
diff --git a/generated_sprites/AtB/light@2x.png b/generated_sprites/AtB/light@2x.png
index 5577a23d..ce273134 100644
Binary files a/generated_sprites/AtB/light@2x.png and b/generated_sprites/AtB/light@2x.png differ
diff --git a/generated_sprites/FRAM/dark.json b/generated_sprites/FRAM/dark.json
index 5f696e92..63ab2655 100644
--- a/generated_sprites/FRAM/dark.json
+++ b/generated_sprites/FRAM/dark.json
@@ -1 +1 @@
-{"geofencingzone_allowed_dark":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":143},"geofencingzone_noentry_dark":{"height":44,"pixelRatio":1,"width":44,"x":605,"y":92},"geofencingzone_noparking_dark":{"height":44,"pixelRatio":1,"width":44,"x":634,"y":44},"geofencingzone_parking_dark":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":187},"geofencingzone_slow_dark":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":404},"interactivepin_default_dark":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_dark":{"height":51,"pixelRatio":1,"width":47,"x":558,"y":92},"interactivepin_valid_dark":{"height":51,"pixelRatio":1,"width":47,"x":444,"y":308},"stationpin_citybike_bikes_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":429},"stationpin_citybike_bikes_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":451},"stationpin_citybike_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":640,"y":379},"stationpin_citybike_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_cars_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":335},"stationpin_sharedcar_cars_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"stationpin_sharedcar_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":461},"stationpin_sharedcar_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":540,"y":353},"stoppin_boat_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":688,"y":272},"stoppin_boat_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":256},"stoppin_bus_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":448},"stoppin_bus_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":210},"stoppin_bus_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":321},"stoppin_busandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":558,"y":48},"stoppin_busandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":126,"y":478},"stoppin_busandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":397},"stoppin_commuterparking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":106},"stoppin_commuterparking_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":386},"stoppin_ferry_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":353},"stoppin_ferry_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":138},"stoppin_ferry_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_metro_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":587,"y":305},"stoppin_metro_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":170},"stoppin_metro_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_metroandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":618,"y":0},"stoppin_metroandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":649,"y":88},"stoppin_metroandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":616,"y":231},"stoppin_plane_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":411},"stoppin_plane_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_train_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":441},"stoppin_train_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":672,"y":367},"stoppin_train_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":444,"y":195},"stoppin_tram_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":624,"y":136},"stoppin_tram_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":304},"stoppin_tram_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_boat_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_boat_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":616,"y":275},"vehiclepin_bus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":64},"vehiclepin_bus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":128},"vehiclepin_bus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":628,"y":349},"vehiclepin_citybike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":192},"vehiclepin_citybike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_citybike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":678,"y":44},"vehiclepin_citybike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":444,"y":359},"vehiclepin_citybike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":256},"vehiclepin_citybike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":631,"y":305},"vehiclepin_citybike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":242},"vehiclepin_citybike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":320},"vehiclepin_ebike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":444,"y":260},"vehiclepin_ebike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":694,"y":0},"vehiclepin_ebike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":491,"y":308},"vehiclepin_ebike_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":520,"y":257},"vehiclepin_ebike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":384},"vehiclepin_ebike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":652,"y":275},"vehiclepin_ebike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":202},"vehiclepin_ebike_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":443},"vehiclepin_ebike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ferry_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":448},"vehiclepin_ferry_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ferry_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":212},"vehiclepin_loading_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_metro_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_metro_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_metro_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":242},"vehiclepin_otherbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_otherbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_otherbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":120},"vehiclepin_othertrain_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_othertrain_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_othertrain_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":701,"y":76},"vehiclepin_regionalbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_regionalbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_regionalbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":722,"y":32},"vehiclepin_scooter_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_scooter_cluster_generic_dark":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":161},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":44,"x":624,"y":180},"vehiclepin_scooter_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":407},"vehiclepin_scooter_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":492,"y":356},"vehiclepin_scooter_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":539,"y":305},"vehiclepin_scooter_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":568,"y":257},"vehiclepin_scooter_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_scooter_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":738,"y":0},"vehiclepin_scooter_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":475},"vehiclepin_scooter_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":106},"vehiclepin_scooter_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":737,"y":62},"vehiclepin_scooter_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":758,"y":30},"vehiclepin_scooter_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_scooter_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_scooter_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_sharedcar_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_sharedcar_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":209},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":596,"y":397},"vehiclepin_sharedcar_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":455},"vehiclepin_sharedcar_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_sharedcar_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":150},"vehiclepin_sharedcar_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":138},"vehiclepin_sharedcar_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_shuttlebus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_shuttlebus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_shuttlebus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":180},"vehiclepin_train_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_train_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_train_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":429},"vehiclepin_tram_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_tram_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_tram_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":459}}
\ No newline at end of file
+{"geofencingzone_allowed_dark":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":288},"geofencingzone_noentry_dark":{"height":44,"pixelRatio":1,"width":44,"x":603,"y":332},"geofencingzone_noparking_dark":{"height":44,"pixelRatio":1,"width":44,"x":628,"y":288},"geofencingzone_parking_dark":{"height":28,"pixelRatio":1,"width":28,"x":756,"y":426},"geofencingzone_slow_dark":{"height":44,"pixelRatio":1,"width":44,"x":604,"y":376},"interactivepin_default_dark":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_dark":{"height":51,"pixelRatio":1,"width":47,"x":192,"y":453},"interactivepin_valid_dark":{"height":51,"pixelRatio":1,"width":47,"x":508,"y":345},"stationpin_citybike_bikes_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":454},"stationpin_citybike_bikes_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":455},"stationpin_citybike_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":752,"y":454},"stationpin_citybike_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":460,"y":455},"stationpin_sharedcar_cars_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":106},"stationpin_sharedcar_cars_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":32},"stationpin_sharedcar_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":647,"y":332},"stoppin_boat_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":706,"y":0},"stoppin_boat_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_bus_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":420},"stoppin_bus_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":64},"stoppin_bus_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_busandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":257},"stoppin_busandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":606,"y":92},"stoppin_busandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":648,"y":376},"stoppin_commuterparking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":138},"stoppin_commuterparking_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_ferry_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":464},"stoppin_ferry_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":170},"stoppin_ferry_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":195},"stoppin_metro_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":420},"stoppin_metro_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":202},"stoppin_metro_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":260},"stoppin_metroandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":301},"stoppin_metroandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":650,"y":44},"stoppin_metroandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":464},"stoppin_plane_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":234},"stoppin_plane_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":325},"stoppin_train_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":606,"y":48},"stoppin_train_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":708,"y":266},"stoppin_train_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":390},"stoppin_tram_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":618,"y":0},"stoppin_tram_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":298},"stoppin_tram_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":69},"vehiclepin_boat_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":133},"vehiclepin_boat_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":220},"vehiclepin_bus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":197},"vehiclepin_bus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":261},"vehiclepin_bus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":250},"vehiclepin_citybike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":325},"vehiclepin_citybike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"vehiclepin_citybike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":662,"y":0},"vehiclepin_citybike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":508,"y":396},"vehiclepin_citybike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":389},"vehiclepin_citybike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":124},"vehiclepin_citybike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":330},"vehiclepin_citybike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ebike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_ebike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":124},"vehiclepin_ebike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":555,"y":345},"vehiclepin_ebike_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":536,"y":444},"vehiclepin_ebike_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":556,"y":393},"vehiclepin_ebike_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":441},"vehiclepin_ebike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_ebike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":658,"y":76},"vehiclepin_ebike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":362},"vehiclepin_ebike_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":756,"y":394},"vehiclepin_ebike_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":426},"vehiclepin_ebike_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":458},"vehiclepin_ebike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ebike_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_ebike_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_ferry_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_ferry_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_ferry_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":154},"vehiclepin_loading_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_metro_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_metro_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_metro_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":184},"vehiclepin_otherbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_otherbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_otherbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":214},"vehiclepin_othertrain_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_othertrain_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_othertrain_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":244},"vehiclepin_regionalbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_regionalbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_regionalbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":672,"y":274},"vehiclepin_scooter_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_scooter_cluster_generic_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":161},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":156},"vehiclepin_scooter_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":48},"vehiclepin_scooter_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":96},"vehiclepin_scooter_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":144},"vehiclepin_scooter_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":192},"vehiclepin_scooter_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_scooter_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":304},"vehiclepin_scooter_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":96},"vehiclepin_scooter_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":32},"vehiclepin_scooter_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":738,"y":0},"vehiclepin_scooter_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":64},"vehiclepin_scooter_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_scooter_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_scooter_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_sharedcar_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_sharedcar_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":209},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":188},"vehiclepin_sharedcar_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":240},"vehiclepin_sharedcar_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_sharedcar_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":334},"vehiclepin_sharedcar_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":128},"vehiclepin_sharedcar_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_shuttlebus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_shuttlebus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_shuttlebus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":692,"y":364},"vehiclepin_train_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_train_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":256},"vehiclepin_train_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":394},"vehiclepin_tram_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":320},"vehiclepin_tram_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":384},"vehiclepin_tram_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":424}}
\ No newline at end of file
diff --git a/generated_sprites/FRAM/dark.png b/generated_sprites/FRAM/dark.png
index 8ab844f6..a5e5c275 100644
Binary files a/generated_sprites/FRAM/dark.png and b/generated_sprites/FRAM/dark.png differ
diff --git a/generated_sprites/FRAM/dark@2x.json b/generated_sprites/FRAM/dark@2x.json
index 1398c11d..b1c044cf 100644
--- a/generated_sprites/FRAM/dark@2x.json
+++ b/generated_sprites/FRAM/dark@2x.json
@@ -1 +1 @@
-{"geofencingzone_allowed_dark":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":286},"geofencingzone_noentry_dark":{"height":88,"pixelRatio":2,"width":88,"x":1210,"y":184},"geofencingzone_noparking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1268,"y":88},"geofencingzone_parking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":374},"geofencingzone_slow_dark":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":808},"interactivepin_default_dark":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_dark":{"height":102,"pixelRatio":2,"width":94,"x":1116,"y":184},"interactivepin_valid_dark":{"height":102,"pixelRatio":2,"width":94,"x":888,"y":616},"stationpin_citybike_bikes_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":858},"stationpin_citybike_bikes_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":902},"stationpin_citybike_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1280,"y":758},"stationpin_citybike_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_cars_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":670},"stationpin_sharedcar_cars_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"stationpin_sharedcar_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":922},"stationpin_sharedcar_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1080,"y":706},"stoppin_boat_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1376,"y":544},"stoppin_boat_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":512},"stoppin_bus_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":896},"stoppin_bus_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":420},"stoppin_bus_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":642},"stoppin_busandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1116,"y":96},"stoppin_busandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":252,"y":956},"stoppin_busandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":794},"stoppin_commuterparking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":212},"stoppin_commuterparking_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":772},"stoppin_ferry_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":706},"stoppin_ferry_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":276},"stoppin_ferry_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_metro_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1174,"y":610},"stoppin_metro_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":340},"stoppin_metro_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_metroandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1236,"y":0},"stoppin_metroandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1298,"y":176},"stoppin_metroandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1232,"y":462},"stoppin_plane_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":822},"stoppin_plane_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_train_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":882},"stoppin_train_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1344,"y":734},"stoppin_train_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":888,"y":390},"stoppin_tram_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1248,"y":272},"stoppin_tram_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":608},"stoppin_tram_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_boat_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_boat_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1232,"y":550},"vehiclepin_bus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":128},"vehiclepin_bus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":256},"vehiclepin_bus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1256,"y":698},"vehiclepin_citybike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":384},"vehiclepin_citybike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_citybike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1356,"y":88},"vehiclepin_citybike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":888,"y":718},"vehiclepin_citybike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":512},"vehiclepin_citybike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1262,"y":610},"vehiclepin_citybike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":484},"vehiclepin_citybike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":640},"vehiclepin_ebike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":888,"y":520},"vehiclepin_ebike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1388,"y":0},"vehiclepin_ebike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":982,"y":616},"vehiclepin_ebike_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1040,"y":514},"vehiclepin_ebike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":768},"vehiclepin_ebike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1304,"y":550},"vehiclepin_ebike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":404},"vehiclepin_ebike_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":886},"vehiclepin_ebike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ferry_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":896},"vehiclepin_ferry_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ferry_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":424},"vehiclepin_loading_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_metro_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_metro_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_metro_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":484},"vehiclepin_otherbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_otherbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_otherbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":240},"vehiclepin_othertrain_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_othertrain_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_othertrain_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1402,"y":152},"vehiclepin_regionalbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_regionalbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_regionalbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1444,"y":64},"vehiclepin_scooter_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_scooter_cluster_generic_dark":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":322},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":88,"x":1248,"y":360},"vehiclepin_scooter_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":814},"vehiclepin_scooter_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":984,"y":712},"vehiclepin_scooter_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1078,"y":610},"vehiclepin_scooter_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1136,"y":514},"vehiclepin_scooter_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_scooter_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1476,"y":0},"vehiclepin_scooter_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":950},"vehiclepin_scooter_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":212},"vehiclepin_scooter_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1474,"y":124},"vehiclepin_scooter_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1516,"y":60},"vehiclepin_scooter_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_scooter_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_scooter_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_sharedcar_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_sharedcar_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":418},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1192,"y":794},"vehiclepin_sharedcar_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":910},"vehiclepin_sharedcar_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_sharedcar_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":300},"vehiclepin_sharedcar_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":276},"vehiclepin_sharedcar_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_shuttlebus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_shuttlebus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_shuttlebus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":360},"vehiclepin_train_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_train_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_train_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":858},"vehiclepin_tram_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_tram_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_tram_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":918}}
\ No newline at end of file
+{"geofencingzone_allowed_dark":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":576},"geofencingzone_noentry_dark":{"height":88,"pixelRatio":2,"width":88,"x":1206,"y":664},"geofencingzone_noparking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1256,"y":576},"geofencingzone_parking_dark":{"height":56,"pixelRatio":2,"width":56,"x":1512,"y":852},"geofencingzone_slow_dark":{"height":88,"pixelRatio":2,"width":88,"x":1208,"y":752},"interactivepin_default_dark":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_dark":{"height":102,"pixelRatio":2,"width":94,"x":384,"y":906},"interactivepin_valid_dark":{"height":102,"pixelRatio":2,"width":94,"x":1016,"y":690},"stationpin_citybike_bikes_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":908},"stationpin_citybike_bikes_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":910},"stationpin_citybike_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1504,"y":908},"stationpin_citybike_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":920,"y":910},"stationpin_sharedcar_cars_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":212},"stationpin_sharedcar_cars_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":64},"stationpin_sharedcar_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1294,"y":664},"stoppin_boat_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1412,"y":0},"stoppin_boat_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_bus_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":840},"stoppin_bus_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":128},"stoppin_bus_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_busandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":514},"stoppin_busandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1212,"y":184},"stoppin_busandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1296,"y":752},"stoppin_commuterparking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":276},"stoppin_commuterparking_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_ferry_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":928},"stoppin_ferry_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":340},"stoppin_ferry_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":390},"stoppin_metro_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":840},"stoppin_metro_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":404},"stoppin_metro_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":520},"stoppin_metroandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":602},"stoppin_metroandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1300,"y":88},"stoppin_metroandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":928},"stoppin_plane_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":468},"stoppin_plane_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":650},"stoppin_train_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1212,"y":96},"stoppin_train_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1416,"y":532},"stoppin_train_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":780},"stoppin_tram_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1236,"y":0},"stoppin_tram_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":596},"stoppin_tram_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":138},"vehiclepin_boat_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":266},"vehiclepin_boat_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":440},"vehiclepin_bus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":394},"vehiclepin_bus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":522},"vehiclepin_bus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":500},"vehiclepin_citybike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":650},"vehiclepin_citybike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"vehiclepin_citybike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1324,"y":0},"vehiclepin_citybike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1016,"y":792},"vehiclepin_citybike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":778},"vehiclepin_citybike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":248},"vehiclepin_citybike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":660},"vehiclepin_citybike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ebike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_ebike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":248},"vehiclepin_ebike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1110,"y":690},"vehiclepin_ebike_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":1072,"y":888},"vehiclepin_ebike_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1112,"y":786},"vehiclepin_ebike_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":882},"vehiclepin_ebike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_ebike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1316,"y":152},"vehiclepin_ebike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":724},"vehiclepin_ebike_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1512,"y":788},"vehiclepin_ebike_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":852},"vehiclepin_ebike_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":916},"vehiclepin_ebike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ebike_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_ebike_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_ferry_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_ferry_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_ferry_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":308},"vehiclepin_loading_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_metro_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_metro_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_metro_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":368},"vehiclepin_otherbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_otherbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_otherbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":428},"vehiclepin_othertrain_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_othertrain_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_othertrain_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":488},"vehiclepin_regionalbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_regionalbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_regionalbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1344,"y":548},"vehiclepin_scooter_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_scooter_cluster_generic_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":322},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":312},"vehiclepin_scooter_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":96},"vehiclepin_scooter_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":192},"vehiclepin_scooter_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":288},"vehiclepin_scooter_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":384},"vehiclepin_scooter_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_scooter_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":608},"vehiclepin_scooter_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":192},"vehiclepin_scooter_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":64},"vehiclepin_scooter_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1476,"y":0},"vehiclepin_scooter_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":128},"vehiclepin_scooter_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_scooter_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_scooter_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_sharedcar_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_sharedcar_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":418},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":376},"vehiclepin_sharedcar_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":480},"vehiclepin_sharedcar_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_sharedcar_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":668},"vehiclepin_sharedcar_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":256},"vehiclepin_sharedcar_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_shuttlebus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_shuttlebus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_shuttlebus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1384,"y":728},"vehiclepin_train_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_train_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":512},"vehiclepin_train_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":788},"vehiclepin_tram_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":640},"vehiclepin_tram_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":768},"vehiclepin_tram_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":848}}
\ No newline at end of file
diff --git a/generated_sprites/FRAM/dark@2x.png b/generated_sprites/FRAM/dark@2x.png
index 649df763..db325381 100644
Binary files a/generated_sprites/FRAM/dark@2x.png and b/generated_sprites/FRAM/dark@2x.png differ
diff --git a/generated_sprites/FRAM/light.json b/generated_sprites/FRAM/light.json
index ec63551a..c9d0ab07 100644
--- a/generated_sprites/FRAM/light.json
+++ b/generated_sprites/FRAM/light.json
@@ -1 +1 @@
-{"geofencingzone_allowed_light":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":143},"geofencingzone_noentry_light":{"height":44,"pixelRatio":1,"width":44,"x":605,"y":92},"geofencingzone_noparking_light":{"height":44,"pixelRatio":1,"width":44,"x":634,"y":44},"geofencingzone_parking_light":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":187},"geofencingzone_slow_light":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":404},"interactivepin_default_light":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_light":{"height":51,"pixelRatio":1,"width":47,"x":558,"y":92},"interactivepin_valid_light":{"height":51,"pixelRatio":1,"width":47,"x":444,"y":308},"stationpin_citybike_bikes_default_light":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":429},"stationpin_citybike_bikes_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":451},"stationpin_citybike_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":640,"y":379},"stationpin_citybike_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_cars_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":335},"stationpin_sharedcar_cars_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"stationpin_sharedcar_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":461},"stationpin_sharedcar_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_light":{"height":44,"pixelRatio":1,"width":44,"x":540,"y":353},"stoppin_boat_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":688,"y":272},"stoppin_boat_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":256},"stoppin_bus_default_light":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":448},"stoppin_bus_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":210},"stoppin_bus_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":321},"stoppin_busandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":558,"y":48},"stoppin_busandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":126,"y":478},"stoppin_busandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_light":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":397},"stoppin_commuterparking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":106},"stoppin_commuterparking_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":386},"stoppin_ferry_default_light":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":353},"stoppin_ferry_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":138},"stoppin_ferry_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_metro_default_light":{"height":44,"pixelRatio":1,"width":44,"x":587,"y":305},"stoppin_metro_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":170},"stoppin_metro_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_metroandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":618,"y":0},"stoppin_metroandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":649,"y":88},"stoppin_metroandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_light":{"height":44,"pixelRatio":1,"width":44,"x":616,"y":231},"stoppin_plane_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":411},"stoppin_plane_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_train_default_light":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":441},"stoppin_train_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":672,"y":367},"stoppin_train_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":444,"y":195},"stoppin_tram_default_light":{"height":44,"pixelRatio":1,"width":44,"x":624,"y":136},"stoppin_tram_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":304},"stoppin_tram_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_light":{"height":64,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_boat_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_boat_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":616,"y":275},"vehiclepin_bus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":64},"vehiclepin_bus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":128},"vehiclepin_bus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":628,"y":349},"vehiclepin_citybike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":192},"vehiclepin_citybike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_citybike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":678,"y":44},"vehiclepin_citybike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":444,"y":359},"vehiclepin_citybike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":256},"vehiclepin_citybike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":631,"y":305},"vehiclepin_citybike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":242},"vehiclepin_citybike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":320},"vehiclepin_ebike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":444,"y":260},"vehiclepin_ebike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":694,"y":0},"vehiclepin_ebike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":491,"y":308},"vehiclepin_ebike_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":520,"y":257},"vehiclepin_ebike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":384},"vehiclepin_ebike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":652,"y":275},"vehiclepin_ebike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":202},"vehiclepin_ebike_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":443},"vehiclepin_ebike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ferry_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":448},"vehiclepin_ferry_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ferry_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":212},"vehiclepin_loading_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_metro_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_metro_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_metro_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":242},"vehiclepin_otherbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_otherbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_otherbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":120},"vehiclepin_othertrain_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_othertrain_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_othertrain_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":701,"y":76},"vehiclepin_regionalbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_regionalbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_regionalbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":722,"y":32},"vehiclepin_scooter_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_scooter_cluster_generic_light":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":161},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":32,"pixelRatio":1,"width":44,"x":624,"y":180},"vehiclepin_scooter_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":407},"vehiclepin_scooter_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":492,"y":356},"vehiclepin_scooter_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":539,"y":305},"vehiclepin_scooter_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":568,"y":257},"vehiclepin_scooter_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_scooter_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":738,"y":0},"vehiclepin_scooter_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":475},"vehiclepin_scooter_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":106},"vehiclepin_scooter_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":737,"y":62},"vehiclepin_scooter_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":758,"y":30},"vehiclepin_scooter_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_scooter_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_scooter_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_sharedcar_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_sharedcar_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":209},"vehiclepin_sharedcar_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":596,"y":397},"vehiclepin_sharedcar_default_light":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":455},"vehiclepin_sharedcar_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_sharedcar_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":150},"vehiclepin_sharedcar_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":138},"vehiclepin_sharedcar_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_shuttlebus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_shuttlebus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_shuttlebus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":180},"vehiclepin_train_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_train_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_train_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":429},"vehiclepin_tram_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_tram_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_tram_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":459}}
\ No newline at end of file
+{"geofencingzone_allowed_light":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":288},"geofencingzone_noentry_light":{"height":44,"pixelRatio":1,"width":44,"x":603,"y":332},"geofencingzone_noparking_light":{"height":44,"pixelRatio":1,"width":44,"x":628,"y":288},"geofencingzone_parking_light":{"height":28,"pixelRatio":1,"width":28,"x":756,"y":426},"geofencingzone_slow_light":{"height":44,"pixelRatio":1,"width":44,"x":604,"y":376},"interactivepin_default_light":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_light":{"height":51,"pixelRatio":1,"width":47,"x":192,"y":453},"interactivepin_valid_light":{"height":51,"pixelRatio":1,"width":47,"x":508,"y":345},"stationpin_citybike_bikes_default_light":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":454},"stationpin_citybike_bikes_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":455},"stationpin_citybike_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":752,"y":454},"stationpin_citybike_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_light":{"height":48,"pixelRatio":1,"width":76,"x":460,"y":455},"stationpin_sharedcar_cars_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":106},"stationpin_sharedcar_cars_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":32},"stationpin_sharedcar_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_light":{"height":44,"pixelRatio":1,"width":44,"x":647,"y":332},"stoppin_boat_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":706,"y":0},"stoppin_boat_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_bus_default_light":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":420},"stoppin_bus_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":64},"stoppin_bus_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_busandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":257},"stoppin_busandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":606,"y":92},"stoppin_busandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_light":{"height":44,"pixelRatio":1,"width":44,"x":648,"y":376},"stoppin_commuterparking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":138},"stoppin_commuterparking_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_ferry_default_light":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":464},"stoppin_ferry_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":170},"stoppin_ferry_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":195},"stoppin_metro_default_light":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":420},"stoppin_metro_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":202},"stoppin_metro_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":260},"stoppin_metroandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":301},"stoppin_metroandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":650,"y":44},"stoppin_metroandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_light":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":464},"stoppin_plane_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":234},"stoppin_plane_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":325},"stoppin_train_default_light":{"height":44,"pixelRatio":1,"width":44,"x":606,"y":48},"stoppin_train_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":708,"y":266},"stoppin_train_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":390},"stoppin_tram_default_light":{"height":44,"pixelRatio":1,"width":44,"x":618,"y":0},"stoppin_tram_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":298},"stoppin_tram_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":69},"vehiclepin_boat_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":133},"vehiclepin_boat_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":220},"vehiclepin_bus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":197},"vehiclepin_bus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":261},"vehiclepin_bus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":250},"vehiclepin_citybike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":325},"vehiclepin_citybike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"vehiclepin_citybike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":662,"y":0},"vehiclepin_citybike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":508,"y":396},"vehiclepin_citybike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":389},"vehiclepin_citybike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":124},"vehiclepin_citybike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":330},"vehiclepin_citybike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ebike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_ebike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":124},"vehiclepin_ebike_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":555,"y":345},"vehiclepin_ebike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":536,"y":444},"vehiclepin_ebike_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":556,"y":393},"vehiclepin_ebike_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":441},"vehiclepin_ebike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_ebike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":658,"y":76},"vehiclepin_ebike_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":362},"vehiclepin_ebike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":756,"y":394},"vehiclepin_ebike_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":426},"vehiclepin_ebike_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":458},"vehiclepin_ebike_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ebike_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_ebike_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_ferry_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_ferry_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_ferry_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":154},"vehiclepin_loading_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_metro_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_metro_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_metro_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":184},"vehiclepin_otherbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_otherbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_otherbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":214},"vehiclepin_othertrain_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_othertrain_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_othertrain_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":244},"vehiclepin_regionalbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_regionalbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_regionalbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":672,"y":274},"vehiclepin_scooter_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_scooter_cluster_generic_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":161},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":156},"vehiclepin_scooter_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":48},"vehiclepin_scooter_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":96},"vehiclepin_scooter_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":144},"vehiclepin_scooter_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":192},"vehiclepin_scooter_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_scooter_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":304},"vehiclepin_scooter_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":96},"vehiclepin_scooter_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":32},"vehiclepin_scooter_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":738,"y":0},"vehiclepin_scooter_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":64},"vehiclepin_scooter_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_scooter_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_scooter_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_sharedcar_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_sharedcar_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":209},"vehiclepin_sharedcar_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":188},"vehiclepin_sharedcar_default_light":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":240},"vehiclepin_sharedcar_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_sharedcar_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":334},"vehiclepin_sharedcar_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":128},"vehiclepin_sharedcar_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_shuttlebus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_shuttlebus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_shuttlebus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":692,"y":364},"vehiclepin_train_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_train_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":256},"vehiclepin_train_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":394},"vehiclepin_tram_active_light":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":320},"vehiclepin_tram_error_light":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":384},"vehiclepin_tram_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":424}}
\ No newline at end of file
diff --git a/generated_sprites/FRAM/light.png b/generated_sprites/FRAM/light.png
index ca9d9e66..9a4b1871 100644
Binary files a/generated_sprites/FRAM/light.png and b/generated_sprites/FRAM/light.png differ
diff --git a/generated_sprites/FRAM/light@2x.json b/generated_sprites/FRAM/light@2x.json
index 2d2fee41..55a7765e 100644
--- a/generated_sprites/FRAM/light@2x.json
+++ b/generated_sprites/FRAM/light@2x.json
@@ -1 +1 @@
-{"geofencingzone_allowed_light":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":286},"geofencingzone_noentry_light":{"height":88,"pixelRatio":2,"width":88,"x":1210,"y":184},"geofencingzone_noparking_light":{"height":88,"pixelRatio":2,"width":88,"x":1268,"y":88},"geofencingzone_parking_light":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":374},"geofencingzone_slow_light":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":808},"interactivepin_default_light":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_light":{"height":102,"pixelRatio":2,"width":94,"x":1116,"y":184},"interactivepin_valid_light":{"height":102,"pixelRatio":2,"width":94,"x":888,"y":616},"stationpin_citybike_bikes_default_light":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":858},"stationpin_citybike_bikes_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":902},"stationpin_citybike_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1280,"y":758},"stationpin_citybike_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_cars_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":670},"stationpin_sharedcar_cars_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"stationpin_sharedcar_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":922},"stationpin_sharedcar_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1080,"y":706},"stoppin_boat_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1376,"y":544},"stoppin_boat_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":512},"stoppin_bus_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":896},"stoppin_bus_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":420},"stoppin_bus_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":642},"stoppin_busandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1116,"y":96},"stoppin_busandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":252,"y":956},"stoppin_busandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":794},"stoppin_commuterparking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":212},"stoppin_commuterparking_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":772},"stoppin_ferry_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":706},"stoppin_ferry_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":276},"stoppin_ferry_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_metro_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1174,"y":610},"stoppin_metro_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":340},"stoppin_metro_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_metroandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1236,"y":0},"stoppin_metroandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1298,"y":176},"stoppin_metroandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1232,"y":462},"stoppin_plane_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":822},"stoppin_plane_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_train_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":882},"stoppin_train_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1344,"y":734},"stoppin_train_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":888,"y":390},"stoppin_tram_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1248,"y":272},"stoppin_tram_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":608},"stoppin_tram_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_light":{"height":128,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_boat_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_boat_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1232,"y":550},"vehiclepin_bus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":128},"vehiclepin_bus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":256},"vehiclepin_bus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1256,"y":698},"vehiclepin_citybike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":384},"vehiclepin_citybike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_citybike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1356,"y":88},"vehiclepin_citybike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":888,"y":718},"vehiclepin_citybike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":512},"vehiclepin_citybike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1262,"y":610},"vehiclepin_citybike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":484},"vehiclepin_citybike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":640},"vehiclepin_ebike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":888,"y":520},"vehiclepin_ebike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1388,"y":0},"vehiclepin_ebike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":982,"y":616},"vehiclepin_ebike_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1040,"y":514},"vehiclepin_ebike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":768},"vehiclepin_ebike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1304,"y":550},"vehiclepin_ebike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":404},"vehiclepin_ebike_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":886},"vehiclepin_ebike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ferry_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":896},"vehiclepin_ferry_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ferry_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":424},"vehiclepin_loading_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_metro_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_metro_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_metro_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":484},"vehiclepin_otherbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_otherbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_otherbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":240},"vehiclepin_othertrain_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_othertrain_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_othertrain_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1402,"y":152},"vehiclepin_regionalbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_regionalbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_regionalbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1444,"y":64},"vehiclepin_scooter_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_scooter_cluster_generic_light":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":322},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":64,"pixelRatio":2,"width":88,"x":1248,"y":360},"vehiclepin_scooter_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":814},"vehiclepin_scooter_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":984,"y":712},"vehiclepin_scooter_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1078,"y":610},"vehiclepin_scooter_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1136,"y":514},"vehiclepin_scooter_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_scooter_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1476,"y":0},"vehiclepin_scooter_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":950},"vehiclepin_scooter_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":212},"vehiclepin_scooter_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1474,"y":124},"vehiclepin_scooter_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1516,"y":60},"vehiclepin_scooter_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_scooter_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_scooter_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_sharedcar_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_sharedcar_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":418},"vehiclepin_sharedcar_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1192,"y":794},"vehiclepin_sharedcar_default_light":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":910},"vehiclepin_sharedcar_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_sharedcar_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":300},"vehiclepin_sharedcar_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":276},"vehiclepin_sharedcar_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_shuttlebus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_shuttlebus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_shuttlebus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":360},"vehiclepin_train_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_train_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_train_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":858},"vehiclepin_tram_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_tram_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_tram_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":918}}
\ No newline at end of file
+{"geofencingzone_allowed_light":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":576},"geofencingzone_noentry_light":{"height":88,"pixelRatio":2,"width":88,"x":1206,"y":664},"geofencingzone_noparking_light":{"height":88,"pixelRatio":2,"width":88,"x":1256,"y":576},"geofencingzone_parking_light":{"height":56,"pixelRatio":2,"width":56,"x":1512,"y":852},"geofencingzone_slow_light":{"height":88,"pixelRatio":2,"width":88,"x":1208,"y":752},"interactivepin_default_light":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_light":{"height":102,"pixelRatio":2,"width":94,"x":384,"y":906},"interactivepin_valid_light":{"height":102,"pixelRatio":2,"width":94,"x":1016,"y":690},"stationpin_citybike_bikes_default_light":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":908},"stationpin_citybike_bikes_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":910},"stationpin_citybike_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1504,"y":908},"stationpin_citybike_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_light":{"height":96,"pixelRatio":2,"width":152,"x":920,"y":910},"stationpin_sharedcar_cars_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":212},"stationpin_sharedcar_cars_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":64},"stationpin_sharedcar_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1294,"y":664},"stoppin_boat_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1412,"y":0},"stoppin_boat_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_bus_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":840},"stoppin_bus_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":128},"stoppin_bus_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_busandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":514},"stoppin_busandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1212,"y":184},"stoppin_busandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1296,"y":752},"stoppin_commuterparking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":276},"stoppin_commuterparking_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_ferry_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":928},"stoppin_ferry_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":340},"stoppin_ferry_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":390},"stoppin_metro_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":840},"stoppin_metro_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":404},"stoppin_metro_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":520},"stoppin_metroandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":602},"stoppin_metroandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1300,"y":88},"stoppin_metroandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":928},"stoppin_plane_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":468},"stoppin_plane_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":650},"stoppin_train_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1212,"y":96},"stoppin_train_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1416,"y":532},"stoppin_train_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":780},"stoppin_tram_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1236,"y":0},"stoppin_tram_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":596},"stoppin_tram_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":138},"vehiclepin_boat_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":266},"vehiclepin_boat_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":440},"vehiclepin_bus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":394},"vehiclepin_bus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":522},"vehiclepin_bus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":500},"vehiclepin_citybike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":650},"vehiclepin_citybike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"vehiclepin_citybike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1324,"y":0},"vehiclepin_citybike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1016,"y":792},"vehiclepin_citybike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":778},"vehiclepin_citybike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":248},"vehiclepin_citybike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":660},"vehiclepin_citybike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ebike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_ebike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":248},"vehiclepin_ebike_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":1110,"y":690},"vehiclepin_ebike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1072,"y":888},"vehiclepin_ebike_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1112,"y":786},"vehiclepin_ebike_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":882},"vehiclepin_ebike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_ebike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1316,"y":152},"vehiclepin_ebike_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":724},"vehiclepin_ebike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1512,"y":788},"vehiclepin_ebike_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":852},"vehiclepin_ebike_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":916},"vehiclepin_ebike_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ebike_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_ebike_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_ferry_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_ferry_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_ferry_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":308},"vehiclepin_loading_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_metro_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_metro_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_metro_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":368},"vehiclepin_otherbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_otherbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_otherbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":428},"vehiclepin_othertrain_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_othertrain_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_othertrain_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":488},"vehiclepin_regionalbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_regionalbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_regionalbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1344,"y":548},"vehiclepin_scooter_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_scooter_cluster_generic_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":322},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":312},"vehiclepin_scooter_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":96},"vehiclepin_scooter_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":192},"vehiclepin_scooter_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":288},"vehiclepin_scooter_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":384},"vehiclepin_scooter_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_scooter_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":608},"vehiclepin_scooter_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":192},"vehiclepin_scooter_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":64},"vehiclepin_scooter_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1476,"y":0},"vehiclepin_scooter_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":128},"vehiclepin_scooter_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_scooter_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_scooter_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_sharedcar_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_sharedcar_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":418},"vehiclepin_sharedcar_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":376},"vehiclepin_sharedcar_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":480},"vehiclepin_sharedcar_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_sharedcar_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":668},"vehiclepin_sharedcar_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":256},"vehiclepin_sharedcar_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_shuttlebus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_shuttlebus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_shuttlebus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1384,"y":728},"vehiclepin_train_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_train_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":512},"vehiclepin_train_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":788},"vehiclepin_tram_active_light":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":640},"vehiclepin_tram_error_light":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":768},"vehiclepin_tram_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":848}}
\ No newline at end of file
diff --git a/generated_sprites/FRAM/light@2x.png b/generated_sprites/FRAM/light@2x.png
index d069a985..527071f2 100644
Binary files a/generated_sprites/FRAM/light@2x.png and b/generated_sprites/FRAM/light@2x.png differ
diff --git a/generated_sprites/NFK/dark.json b/generated_sprites/NFK/dark.json
index 5f696e92..63ab2655 100644
--- a/generated_sprites/NFK/dark.json
+++ b/generated_sprites/NFK/dark.json
@@ -1 +1 @@
-{"geofencingzone_allowed_dark":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":143},"geofencingzone_noentry_dark":{"height":44,"pixelRatio":1,"width":44,"x":605,"y":92},"geofencingzone_noparking_dark":{"height":44,"pixelRatio":1,"width":44,"x":634,"y":44},"geofencingzone_parking_dark":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":187},"geofencingzone_slow_dark":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":404},"interactivepin_default_dark":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_dark":{"height":51,"pixelRatio":1,"width":47,"x":558,"y":92},"interactivepin_valid_dark":{"height":51,"pixelRatio":1,"width":47,"x":444,"y":308},"stationpin_citybike_bikes_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":429},"stationpin_citybike_bikes_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":451},"stationpin_citybike_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":640,"y":379},"stationpin_citybike_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_cars_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":335},"stationpin_sharedcar_cars_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"stationpin_sharedcar_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":461},"stationpin_sharedcar_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":540,"y":353},"stoppin_boat_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":688,"y":272},"stoppin_boat_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":256},"stoppin_bus_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":448},"stoppin_bus_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":210},"stoppin_bus_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":321},"stoppin_busandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":558,"y":48},"stoppin_busandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":126,"y":478},"stoppin_busandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":397},"stoppin_commuterparking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":106},"stoppin_commuterparking_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":386},"stoppin_ferry_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":353},"stoppin_ferry_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":138},"stoppin_ferry_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_metro_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":587,"y":305},"stoppin_metro_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":170},"stoppin_metro_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_metroandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":618,"y":0},"stoppin_metroandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":649,"y":88},"stoppin_metroandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":616,"y":231},"stoppin_plane_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":411},"stoppin_plane_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_train_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":441},"stoppin_train_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":672,"y":367},"stoppin_train_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":444,"y":195},"stoppin_tram_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":624,"y":136},"stoppin_tram_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":304},"stoppin_tram_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_boat_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_boat_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":616,"y":275},"vehiclepin_bus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":64},"vehiclepin_bus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":128},"vehiclepin_bus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":628,"y":349},"vehiclepin_citybike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":192},"vehiclepin_citybike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_citybike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":678,"y":44},"vehiclepin_citybike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":444,"y":359},"vehiclepin_citybike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":256},"vehiclepin_citybike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":631,"y":305},"vehiclepin_citybike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":242},"vehiclepin_citybike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":320},"vehiclepin_ebike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":444,"y":260},"vehiclepin_ebike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":694,"y":0},"vehiclepin_ebike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":491,"y":308},"vehiclepin_ebike_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":520,"y":257},"vehiclepin_ebike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":384},"vehiclepin_ebike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":652,"y":275},"vehiclepin_ebike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":202},"vehiclepin_ebike_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":443},"vehiclepin_ebike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ferry_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":448},"vehiclepin_ferry_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ferry_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":212},"vehiclepin_loading_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_metro_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_metro_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_metro_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":242},"vehiclepin_otherbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_otherbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_otherbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":120},"vehiclepin_othertrain_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_othertrain_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_othertrain_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":701,"y":76},"vehiclepin_regionalbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_regionalbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_regionalbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":722,"y":32},"vehiclepin_scooter_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_scooter_cluster_generic_dark":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":161},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":44,"x":624,"y":180},"vehiclepin_scooter_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":407},"vehiclepin_scooter_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":492,"y":356},"vehiclepin_scooter_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":539,"y":305},"vehiclepin_scooter_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":568,"y":257},"vehiclepin_scooter_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_scooter_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":738,"y":0},"vehiclepin_scooter_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":475},"vehiclepin_scooter_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":106},"vehiclepin_scooter_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":737,"y":62},"vehiclepin_scooter_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":758,"y":30},"vehiclepin_scooter_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_scooter_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_scooter_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_sharedcar_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_sharedcar_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":209},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":596,"y":397},"vehiclepin_sharedcar_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":455},"vehiclepin_sharedcar_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_sharedcar_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":150},"vehiclepin_sharedcar_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":138},"vehiclepin_sharedcar_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_shuttlebus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_shuttlebus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_shuttlebus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":180},"vehiclepin_train_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_train_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_train_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":429},"vehiclepin_tram_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_tram_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_tram_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":459}}
\ No newline at end of file
+{"geofencingzone_allowed_dark":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":288},"geofencingzone_noentry_dark":{"height":44,"pixelRatio":1,"width":44,"x":603,"y":332},"geofencingzone_noparking_dark":{"height":44,"pixelRatio":1,"width":44,"x":628,"y":288},"geofencingzone_parking_dark":{"height":28,"pixelRatio":1,"width":28,"x":756,"y":426},"geofencingzone_slow_dark":{"height":44,"pixelRatio":1,"width":44,"x":604,"y":376},"interactivepin_default_dark":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_dark":{"height":51,"pixelRatio":1,"width":47,"x":192,"y":453},"interactivepin_valid_dark":{"height":51,"pixelRatio":1,"width":47,"x":508,"y":345},"stationpin_citybike_bikes_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":454},"stationpin_citybike_bikes_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":455},"stationpin_citybike_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":752,"y":454},"stationpin_citybike_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":460,"y":455},"stationpin_sharedcar_cars_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":106},"stationpin_sharedcar_cars_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":32},"stationpin_sharedcar_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":647,"y":332},"stoppin_boat_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":706,"y":0},"stoppin_boat_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_bus_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":420},"stoppin_bus_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":64},"stoppin_bus_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_busandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":257},"stoppin_busandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":606,"y":92},"stoppin_busandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":648,"y":376},"stoppin_commuterparking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":138},"stoppin_commuterparking_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_ferry_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":464},"stoppin_ferry_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":170},"stoppin_ferry_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":195},"stoppin_metro_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":420},"stoppin_metro_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":202},"stoppin_metro_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":260},"stoppin_metroandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":301},"stoppin_metroandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":650,"y":44},"stoppin_metroandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":464},"stoppin_plane_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":234},"stoppin_plane_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":325},"stoppin_train_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":606,"y":48},"stoppin_train_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":708,"y":266},"stoppin_train_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":390},"stoppin_tram_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":618,"y":0},"stoppin_tram_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":298},"stoppin_tram_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":69},"vehiclepin_boat_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":133},"vehiclepin_boat_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":220},"vehiclepin_bus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":197},"vehiclepin_bus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":261},"vehiclepin_bus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":250},"vehiclepin_citybike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":325},"vehiclepin_citybike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"vehiclepin_citybike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":662,"y":0},"vehiclepin_citybike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":508,"y":396},"vehiclepin_citybike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":389},"vehiclepin_citybike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":124},"vehiclepin_citybike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":330},"vehiclepin_citybike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ebike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_ebike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":124},"vehiclepin_ebike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":555,"y":345},"vehiclepin_ebike_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":536,"y":444},"vehiclepin_ebike_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":556,"y":393},"vehiclepin_ebike_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":441},"vehiclepin_ebike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_ebike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":658,"y":76},"vehiclepin_ebike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":362},"vehiclepin_ebike_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":756,"y":394},"vehiclepin_ebike_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":426},"vehiclepin_ebike_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":458},"vehiclepin_ebike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ebike_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_ebike_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_ferry_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_ferry_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_ferry_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":154},"vehiclepin_loading_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_metro_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_metro_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_metro_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":184},"vehiclepin_otherbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_otherbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_otherbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":214},"vehiclepin_othertrain_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_othertrain_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_othertrain_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":244},"vehiclepin_regionalbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_regionalbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_regionalbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":672,"y":274},"vehiclepin_scooter_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_scooter_cluster_generic_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":161},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":156},"vehiclepin_scooter_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":48},"vehiclepin_scooter_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":96},"vehiclepin_scooter_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":144},"vehiclepin_scooter_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":192},"vehiclepin_scooter_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_scooter_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":304},"vehiclepin_scooter_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":96},"vehiclepin_scooter_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":32},"vehiclepin_scooter_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":738,"y":0},"vehiclepin_scooter_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":64},"vehiclepin_scooter_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_scooter_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_scooter_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_sharedcar_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_sharedcar_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":209},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":188},"vehiclepin_sharedcar_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":240},"vehiclepin_sharedcar_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_sharedcar_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":334},"vehiclepin_sharedcar_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":128},"vehiclepin_sharedcar_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_shuttlebus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_shuttlebus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_shuttlebus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":692,"y":364},"vehiclepin_train_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_train_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":256},"vehiclepin_train_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":394},"vehiclepin_tram_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":320},"vehiclepin_tram_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":384},"vehiclepin_tram_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":424}}
\ No newline at end of file
diff --git a/generated_sprites/NFK/dark.png b/generated_sprites/NFK/dark.png
index 9fc79278..0a76d5a8 100644
Binary files a/generated_sprites/NFK/dark.png and b/generated_sprites/NFK/dark.png differ
diff --git a/generated_sprites/NFK/dark@2x.json b/generated_sprites/NFK/dark@2x.json
index 1398c11d..b1c044cf 100644
--- a/generated_sprites/NFK/dark@2x.json
+++ b/generated_sprites/NFK/dark@2x.json
@@ -1 +1 @@
-{"geofencingzone_allowed_dark":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":286},"geofencingzone_noentry_dark":{"height":88,"pixelRatio":2,"width":88,"x":1210,"y":184},"geofencingzone_noparking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1268,"y":88},"geofencingzone_parking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":374},"geofencingzone_slow_dark":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":808},"interactivepin_default_dark":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_dark":{"height":102,"pixelRatio":2,"width":94,"x":1116,"y":184},"interactivepin_valid_dark":{"height":102,"pixelRatio":2,"width":94,"x":888,"y":616},"stationpin_citybike_bikes_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":858},"stationpin_citybike_bikes_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":902},"stationpin_citybike_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1280,"y":758},"stationpin_citybike_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_cars_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":670},"stationpin_sharedcar_cars_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"stationpin_sharedcar_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":922},"stationpin_sharedcar_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1080,"y":706},"stoppin_boat_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1376,"y":544},"stoppin_boat_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":512},"stoppin_bus_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":896},"stoppin_bus_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":420},"stoppin_bus_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":642},"stoppin_busandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1116,"y":96},"stoppin_busandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":252,"y":956},"stoppin_busandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":794},"stoppin_commuterparking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":212},"stoppin_commuterparking_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":772},"stoppin_ferry_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":706},"stoppin_ferry_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":276},"stoppin_ferry_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_metro_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1174,"y":610},"stoppin_metro_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":340},"stoppin_metro_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_metroandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1236,"y":0},"stoppin_metroandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1298,"y":176},"stoppin_metroandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1232,"y":462},"stoppin_plane_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":822},"stoppin_plane_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_train_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":882},"stoppin_train_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1344,"y":734},"stoppin_train_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":888,"y":390},"stoppin_tram_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1248,"y":272},"stoppin_tram_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":608},"stoppin_tram_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_boat_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_boat_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1232,"y":550},"vehiclepin_bus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":128},"vehiclepin_bus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":256},"vehiclepin_bus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1256,"y":698},"vehiclepin_citybike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":384},"vehiclepin_citybike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_citybike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1356,"y":88},"vehiclepin_citybike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":888,"y":718},"vehiclepin_citybike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":512},"vehiclepin_citybike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1262,"y":610},"vehiclepin_citybike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":484},"vehiclepin_citybike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":640},"vehiclepin_ebike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":888,"y":520},"vehiclepin_ebike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1388,"y":0},"vehiclepin_ebike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":982,"y":616},"vehiclepin_ebike_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1040,"y":514},"vehiclepin_ebike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":768},"vehiclepin_ebike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1304,"y":550},"vehiclepin_ebike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":404},"vehiclepin_ebike_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":886},"vehiclepin_ebike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ferry_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":896},"vehiclepin_ferry_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ferry_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":424},"vehiclepin_loading_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_metro_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_metro_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_metro_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":484},"vehiclepin_otherbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_otherbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_otherbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":240},"vehiclepin_othertrain_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_othertrain_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_othertrain_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1402,"y":152},"vehiclepin_regionalbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_regionalbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_regionalbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1444,"y":64},"vehiclepin_scooter_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_scooter_cluster_generic_dark":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":322},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":88,"x":1248,"y":360},"vehiclepin_scooter_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":814},"vehiclepin_scooter_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":984,"y":712},"vehiclepin_scooter_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1078,"y":610},"vehiclepin_scooter_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1136,"y":514},"vehiclepin_scooter_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_scooter_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1476,"y":0},"vehiclepin_scooter_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":950},"vehiclepin_scooter_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":212},"vehiclepin_scooter_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1474,"y":124},"vehiclepin_scooter_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1516,"y":60},"vehiclepin_scooter_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_scooter_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_scooter_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_sharedcar_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_sharedcar_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":418},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1192,"y":794},"vehiclepin_sharedcar_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":910},"vehiclepin_sharedcar_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_sharedcar_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":300},"vehiclepin_sharedcar_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":276},"vehiclepin_sharedcar_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_shuttlebus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_shuttlebus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_shuttlebus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":360},"vehiclepin_train_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_train_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_train_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":858},"vehiclepin_tram_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_tram_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_tram_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":918}}
\ No newline at end of file
+{"geofencingzone_allowed_dark":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":576},"geofencingzone_noentry_dark":{"height":88,"pixelRatio":2,"width":88,"x":1206,"y":664},"geofencingzone_noparking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1256,"y":576},"geofencingzone_parking_dark":{"height":56,"pixelRatio":2,"width":56,"x":1512,"y":852},"geofencingzone_slow_dark":{"height":88,"pixelRatio":2,"width":88,"x":1208,"y":752},"interactivepin_default_dark":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_dark":{"height":102,"pixelRatio":2,"width":94,"x":384,"y":906},"interactivepin_valid_dark":{"height":102,"pixelRatio":2,"width":94,"x":1016,"y":690},"stationpin_citybike_bikes_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":908},"stationpin_citybike_bikes_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":910},"stationpin_citybike_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1504,"y":908},"stationpin_citybike_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":920,"y":910},"stationpin_sharedcar_cars_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":212},"stationpin_sharedcar_cars_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":64},"stationpin_sharedcar_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1294,"y":664},"stoppin_boat_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1412,"y":0},"stoppin_boat_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_bus_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":840},"stoppin_bus_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":128},"stoppin_bus_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_busandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":514},"stoppin_busandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1212,"y":184},"stoppin_busandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1296,"y":752},"stoppin_commuterparking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":276},"stoppin_commuterparking_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_ferry_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":928},"stoppin_ferry_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":340},"stoppin_ferry_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":390},"stoppin_metro_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":840},"stoppin_metro_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":404},"stoppin_metro_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":520},"stoppin_metroandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":602},"stoppin_metroandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1300,"y":88},"stoppin_metroandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":928},"stoppin_plane_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":468},"stoppin_plane_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":650},"stoppin_train_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1212,"y":96},"stoppin_train_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1416,"y":532},"stoppin_train_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":780},"stoppin_tram_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1236,"y":0},"stoppin_tram_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":596},"stoppin_tram_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":138},"vehiclepin_boat_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":266},"vehiclepin_boat_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":440},"vehiclepin_bus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":394},"vehiclepin_bus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":522},"vehiclepin_bus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":500},"vehiclepin_citybike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":650},"vehiclepin_citybike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"vehiclepin_citybike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1324,"y":0},"vehiclepin_citybike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1016,"y":792},"vehiclepin_citybike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":778},"vehiclepin_citybike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":248},"vehiclepin_citybike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":660},"vehiclepin_citybike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ebike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_ebike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":248},"vehiclepin_ebike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1110,"y":690},"vehiclepin_ebike_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":1072,"y":888},"vehiclepin_ebike_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1112,"y":786},"vehiclepin_ebike_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":882},"vehiclepin_ebike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_ebike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1316,"y":152},"vehiclepin_ebike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":724},"vehiclepin_ebike_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1512,"y":788},"vehiclepin_ebike_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":852},"vehiclepin_ebike_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":916},"vehiclepin_ebike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ebike_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_ebike_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_ferry_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_ferry_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_ferry_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":308},"vehiclepin_loading_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_metro_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_metro_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_metro_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":368},"vehiclepin_otherbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_otherbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_otherbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":428},"vehiclepin_othertrain_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_othertrain_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_othertrain_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":488},"vehiclepin_regionalbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_regionalbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_regionalbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1344,"y":548},"vehiclepin_scooter_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_scooter_cluster_generic_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":322},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":312},"vehiclepin_scooter_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":96},"vehiclepin_scooter_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":192},"vehiclepin_scooter_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":288},"vehiclepin_scooter_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":384},"vehiclepin_scooter_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_scooter_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":608},"vehiclepin_scooter_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":192},"vehiclepin_scooter_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":64},"vehiclepin_scooter_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1476,"y":0},"vehiclepin_scooter_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":128},"vehiclepin_scooter_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_scooter_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_scooter_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_sharedcar_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_sharedcar_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":418},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":376},"vehiclepin_sharedcar_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":480},"vehiclepin_sharedcar_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_sharedcar_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":668},"vehiclepin_sharedcar_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":256},"vehiclepin_sharedcar_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_shuttlebus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_shuttlebus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_shuttlebus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1384,"y":728},"vehiclepin_train_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_train_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":512},"vehiclepin_train_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":788},"vehiclepin_tram_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":640},"vehiclepin_tram_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":768},"vehiclepin_tram_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":848}}
\ No newline at end of file
diff --git a/generated_sprites/NFK/dark@2x.png b/generated_sprites/NFK/dark@2x.png
index 1785b8f9..f58a8704 100644
Binary files a/generated_sprites/NFK/dark@2x.png and b/generated_sprites/NFK/dark@2x.png differ
diff --git a/generated_sprites/NFK/light.json b/generated_sprites/NFK/light.json
index ec63551a..c9d0ab07 100644
--- a/generated_sprites/NFK/light.json
+++ b/generated_sprites/NFK/light.json
@@ -1 +1 @@
-{"geofencingzone_allowed_light":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":143},"geofencingzone_noentry_light":{"height":44,"pixelRatio":1,"width":44,"x":605,"y":92},"geofencingzone_noparking_light":{"height":44,"pixelRatio":1,"width":44,"x":634,"y":44},"geofencingzone_parking_light":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":187},"geofencingzone_slow_light":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":404},"interactivepin_default_light":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_light":{"height":51,"pixelRatio":1,"width":47,"x":558,"y":92},"interactivepin_valid_light":{"height":51,"pixelRatio":1,"width":47,"x":444,"y":308},"stationpin_citybike_bikes_default_light":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":429},"stationpin_citybike_bikes_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":451},"stationpin_citybike_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":640,"y":379},"stationpin_citybike_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_cars_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":335},"stationpin_sharedcar_cars_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"stationpin_sharedcar_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":461},"stationpin_sharedcar_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_light":{"height":44,"pixelRatio":1,"width":44,"x":540,"y":353},"stoppin_boat_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":688,"y":272},"stoppin_boat_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":256},"stoppin_bus_default_light":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":448},"stoppin_bus_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":210},"stoppin_bus_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":321},"stoppin_busandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":558,"y":48},"stoppin_busandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":126,"y":478},"stoppin_busandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_light":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":397},"stoppin_commuterparking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":106},"stoppin_commuterparking_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":386},"stoppin_ferry_default_light":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":353},"stoppin_ferry_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":138},"stoppin_ferry_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_metro_default_light":{"height":44,"pixelRatio":1,"width":44,"x":587,"y":305},"stoppin_metro_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":170},"stoppin_metro_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_metroandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":618,"y":0},"stoppin_metroandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":649,"y":88},"stoppin_metroandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_light":{"height":44,"pixelRatio":1,"width":44,"x":616,"y":231},"stoppin_plane_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":411},"stoppin_plane_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_train_default_light":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":441},"stoppin_train_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":672,"y":367},"stoppin_train_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":444,"y":195},"stoppin_tram_default_light":{"height":44,"pixelRatio":1,"width":44,"x":624,"y":136},"stoppin_tram_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":304},"stoppin_tram_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_light":{"height":64,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_boat_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_boat_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":616,"y":275},"vehiclepin_bus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":64},"vehiclepin_bus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":128},"vehiclepin_bus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":628,"y":349},"vehiclepin_citybike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":192},"vehiclepin_citybike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_citybike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":678,"y":44},"vehiclepin_citybike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":444,"y":359},"vehiclepin_citybike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":256},"vehiclepin_citybike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":631,"y":305},"vehiclepin_citybike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":242},"vehiclepin_citybike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":320},"vehiclepin_ebike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":444,"y":260},"vehiclepin_ebike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":694,"y":0},"vehiclepin_ebike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":491,"y":308},"vehiclepin_ebike_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":520,"y":257},"vehiclepin_ebike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":384},"vehiclepin_ebike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":652,"y":275},"vehiclepin_ebike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":202},"vehiclepin_ebike_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":443},"vehiclepin_ebike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ferry_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":448},"vehiclepin_ferry_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ferry_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":212},"vehiclepin_loading_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_metro_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_metro_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_metro_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":242},"vehiclepin_otherbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_otherbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_otherbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":120},"vehiclepin_othertrain_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_othertrain_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_othertrain_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":701,"y":76},"vehiclepin_regionalbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_regionalbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_regionalbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":722,"y":32},"vehiclepin_scooter_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_scooter_cluster_generic_light":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":161},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":32,"pixelRatio":1,"width":44,"x":624,"y":180},"vehiclepin_scooter_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":407},"vehiclepin_scooter_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":492,"y":356},"vehiclepin_scooter_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":539,"y":305},"vehiclepin_scooter_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":568,"y":257},"vehiclepin_scooter_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_scooter_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":738,"y":0},"vehiclepin_scooter_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":475},"vehiclepin_scooter_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":106},"vehiclepin_scooter_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":737,"y":62},"vehiclepin_scooter_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":758,"y":30},"vehiclepin_scooter_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_scooter_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_scooter_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_sharedcar_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_sharedcar_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":209},"vehiclepin_sharedcar_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":596,"y":397},"vehiclepin_sharedcar_default_light":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":455},"vehiclepin_sharedcar_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_sharedcar_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":150},"vehiclepin_sharedcar_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":138},"vehiclepin_sharedcar_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_shuttlebus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_shuttlebus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_shuttlebus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":180},"vehiclepin_train_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_train_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_train_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":429},"vehiclepin_tram_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_tram_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_tram_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":459}}
\ No newline at end of file
+{"geofencingzone_allowed_light":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":288},"geofencingzone_noentry_light":{"height":44,"pixelRatio":1,"width":44,"x":603,"y":332},"geofencingzone_noparking_light":{"height":44,"pixelRatio":1,"width":44,"x":628,"y":288},"geofencingzone_parking_light":{"height":28,"pixelRatio":1,"width":28,"x":756,"y":426},"geofencingzone_slow_light":{"height":44,"pixelRatio":1,"width":44,"x":604,"y":376},"interactivepin_default_light":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_light":{"height":51,"pixelRatio":1,"width":47,"x":192,"y":453},"interactivepin_valid_light":{"height":51,"pixelRatio":1,"width":47,"x":508,"y":345},"stationpin_citybike_bikes_default_light":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":454},"stationpin_citybike_bikes_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":455},"stationpin_citybike_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":752,"y":454},"stationpin_citybike_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_light":{"height":48,"pixelRatio":1,"width":76,"x":460,"y":455},"stationpin_sharedcar_cars_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":106},"stationpin_sharedcar_cars_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":32},"stationpin_sharedcar_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_light":{"height":44,"pixelRatio":1,"width":44,"x":647,"y":332},"stoppin_boat_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":706,"y":0},"stoppin_boat_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_bus_default_light":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":420},"stoppin_bus_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":64},"stoppin_bus_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_busandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":257},"stoppin_busandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":606,"y":92},"stoppin_busandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_light":{"height":44,"pixelRatio":1,"width":44,"x":648,"y":376},"stoppin_commuterparking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":138},"stoppin_commuterparking_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_ferry_default_light":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":464},"stoppin_ferry_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":170},"stoppin_ferry_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":195},"stoppin_metro_default_light":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":420},"stoppin_metro_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":202},"stoppin_metro_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":260},"stoppin_metroandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":301},"stoppin_metroandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":650,"y":44},"stoppin_metroandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_light":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":464},"stoppin_plane_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":234},"stoppin_plane_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":325},"stoppin_train_default_light":{"height":44,"pixelRatio":1,"width":44,"x":606,"y":48},"stoppin_train_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":708,"y":266},"stoppin_train_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":390},"stoppin_tram_default_light":{"height":44,"pixelRatio":1,"width":44,"x":618,"y":0},"stoppin_tram_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":298},"stoppin_tram_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":69},"vehiclepin_boat_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":133},"vehiclepin_boat_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":220},"vehiclepin_bus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":197},"vehiclepin_bus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":261},"vehiclepin_bus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":250},"vehiclepin_citybike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":325},"vehiclepin_citybike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"vehiclepin_citybike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":662,"y":0},"vehiclepin_citybike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":508,"y":396},"vehiclepin_citybike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":389},"vehiclepin_citybike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":124},"vehiclepin_citybike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":330},"vehiclepin_citybike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ebike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_ebike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":124},"vehiclepin_ebike_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":555,"y":345},"vehiclepin_ebike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":536,"y":444},"vehiclepin_ebike_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":556,"y":393},"vehiclepin_ebike_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":441},"vehiclepin_ebike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_ebike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":658,"y":76},"vehiclepin_ebike_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":362},"vehiclepin_ebike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":756,"y":394},"vehiclepin_ebike_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":426},"vehiclepin_ebike_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":458},"vehiclepin_ebike_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ebike_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_ebike_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_ferry_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_ferry_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_ferry_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":154},"vehiclepin_loading_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_metro_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_metro_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_metro_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":184},"vehiclepin_otherbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_otherbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_otherbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":214},"vehiclepin_othertrain_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_othertrain_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_othertrain_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":244},"vehiclepin_regionalbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_regionalbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_regionalbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":672,"y":274},"vehiclepin_scooter_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_scooter_cluster_generic_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":161},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":156},"vehiclepin_scooter_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":48},"vehiclepin_scooter_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":96},"vehiclepin_scooter_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":144},"vehiclepin_scooter_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":192},"vehiclepin_scooter_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_scooter_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":304},"vehiclepin_scooter_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":96},"vehiclepin_scooter_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":32},"vehiclepin_scooter_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":738,"y":0},"vehiclepin_scooter_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":64},"vehiclepin_scooter_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_scooter_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_scooter_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_sharedcar_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_sharedcar_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":209},"vehiclepin_sharedcar_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":188},"vehiclepin_sharedcar_default_light":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":240},"vehiclepin_sharedcar_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_sharedcar_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":334},"vehiclepin_sharedcar_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":128},"vehiclepin_sharedcar_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_shuttlebus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_shuttlebus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_shuttlebus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":692,"y":364},"vehiclepin_train_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_train_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":256},"vehiclepin_train_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":394},"vehiclepin_tram_active_light":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":320},"vehiclepin_tram_error_light":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":384},"vehiclepin_tram_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":424}}
\ No newline at end of file
diff --git a/generated_sprites/NFK/light.png b/generated_sprites/NFK/light.png
index b77198e5..926ecf42 100644
Binary files a/generated_sprites/NFK/light.png and b/generated_sprites/NFK/light.png differ
diff --git a/generated_sprites/NFK/light@2x.json b/generated_sprites/NFK/light@2x.json
index 2d2fee41..55a7765e 100644
--- a/generated_sprites/NFK/light@2x.json
+++ b/generated_sprites/NFK/light@2x.json
@@ -1 +1 @@
-{"geofencingzone_allowed_light":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":286},"geofencingzone_noentry_light":{"height":88,"pixelRatio":2,"width":88,"x":1210,"y":184},"geofencingzone_noparking_light":{"height":88,"pixelRatio":2,"width":88,"x":1268,"y":88},"geofencingzone_parking_light":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":374},"geofencingzone_slow_light":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":808},"interactivepin_default_light":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_light":{"height":102,"pixelRatio":2,"width":94,"x":1116,"y":184},"interactivepin_valid_light":{"height":102,"pixelRatio":2,"width":94,"x":888,"y":616},"stationpin_citybike_bikes_default_light":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":858},"stationpin_citybike_bikes_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":902},"stationpin_citybike_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1280,"y":758},"stationpin_citybike_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_cars_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":670},"stationpin_sharedcar_cars_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"stationpin_sharedcar_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":922},"stationpin_sharedcar_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1080,"y":706},"stoppin_boat_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1376,"y":544},"stoppin_boat_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":512},"stoppin_bus_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":896},"stoppin_bus_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":420},"stoppin_bus_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":642},"stoppin_busandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1116,"y":96},"stoppin_busandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":252,"y":956},"stoppin_busandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":794},"stoppin_commuterparking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":212},"stoppin_commuterparking_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":772},"stoppin_ferry_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":706},"stoppin_ferry_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":276},"stoppin_ferry_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_metro_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1174,"y":610},"stoppin_metro_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":340},"stoppin_metro_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_metroandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1236,"y":0},"stoppin_metroandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1298,"y":176},"stoppin_metroandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1232,"y":462},"stoppin_plane_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":822},"stoppin_plane_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_train_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":882},"stoppin_train_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1344,"y":734},"stoppin_train_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":888,"y":390},"stoppin_tram_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1248,"y":272},"stoppin_tram_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":608},"stoppin_tram_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_light":{"height":128,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_boat_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_boat_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1232,"y":550},"vehiclepin_bus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":128},"vehiclepin_bus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":256},"vehiclepin_bus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1256,"y":698},"vehiclepin_citybike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":384},"vehiclepin_citybike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_citybike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1356,"y":88},"vehiclepin_citybike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":888,"y":718},"vehiclepin_citybike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":512},"vehiclepin_citybike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1262,"y":610},"vehiclepin_citybike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":484},"vehiclepin_citybike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":640},"vehiclepin_ebike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":888,"y":520},"vehiclepin_ebike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1388,"y":0},"vehiclepin_ebike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":982,"y":616},"vehiclepin_ebike_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1040,"y":514},"vehiclepin_ebike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":768},"vehiclepin_ebike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1304,"y":550},"vehiclepin_ebike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":404},"vehiclepin_ebike_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":886},"vehiclepin_ebike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ferry_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":896},"vehiclepin_ferry_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ferry_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":424},"vehiclepin_loading_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_metro_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_metro_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_metro_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":484},"vehiclepin_otherbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_otherbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_otherbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":240},"vehiclepin_othertrain_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_othertrain_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_othertrain_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1402,"y":152},"vehiclepin_regionalbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_regionalbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_regionalbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1444,"y":64},"vehiclepin_scooter_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_scooter_cluster_generic_light":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":322},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":64,"pixelRatio":2,"width":88,"x":1248,"y":360},"vehiclepin_scooter_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":814},"vehiclepin_scooter_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":984,"y":712},"vehiclepin_scooter_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1078,"y":610},"vehiclepin_scooter_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1136,"y":514},"vehiclepin_scooter_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_scooter_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1476,"y":0},"vehiclepin_scooter_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":950},"vehiclepin_scooter_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":212},"vehiclepin_scooter_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1474,"y":124},"vehiclepin_scooter_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1516,"y":60},"vehiclepin_scooter_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_scooter_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_scooter_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_sharedcar_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_sharedcar_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":418},"vehiclepin_sharedcar_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1192,"y":794},"vehiclepin_sharedcar_default_light":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":910},"vehiclepin_sharedcar_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_sharedcar_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":300},"vehiclepin_sharedcar_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":276},"vehiclepin_sharedcar_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_shuttlebus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_shuttlebus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_shuttlebus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":360},"vehiclepin_train_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_train_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_train_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":858},"vehiclepin_tram_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_tram_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_tram_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":918}}
\ No newline at end of file
+{"geofencingzone_allowed_light":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":576},"geofencingzone_noentry_light":{"height":88,"pixelRatio":2,"width":88,"x":1206,"y":664},"geofencingzone_noparking_light":{"height":88,"pixelRatio":2,"width":88,"x":1256,"y":576},"geofencingzone_parking_light":{"height":56,"pixelRatio":2,"width":56,"x":1512,"y":852},"geofencingzone_slow_light":{"height":88,"pixelRatio":2,"width":88,"x":1208,"y":752},"interactivepin_default_light":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_light":{"height":102,"pixelRatio":2,"width":94,"x":384,"y":906},"interactivepin_valid_light":{"height":102,"pixelRatio":2,"width":94,"x":1016,"y":690},"stationpin_citybike_bikes_default_light":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":908},"stationpin_citybike_bikes_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":910},"stationpin_citybike_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1504,"y":908},"stationpin_citybike_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_light":{"height":96,"pixelRatio":2,"width":152,"x":920,"y":910},"stationpin_sharedcar_cars_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":212},"stationpin_sharedcar_cars_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":64},"stationpin_sharedcar_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1294,"y":664},"stoppin_boat_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1412,"y":0},"stoppin_boat_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_bus_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":840},"stoppin_bus_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":128},"stoppin_bus_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_busandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":514},"stoppin_busandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1212,"y":184},"stoppin_busandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1296,"y":752},"stoppin_commuterparking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":276},"stoppin_commuterparking_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_ferry_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":928},"stoppin_ferry_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":340},"stoppin_ferry_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":390},"stoppin_metro_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":840},"stoppin_metro_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":404},"stoppin_metro_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":520},"stoppin_metroandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":602},"stoppin_metroandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1300,"y":88},"stoppin_metroandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":928},"stoppin_plane_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":468},"stoppin_plane_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":650},"stoppin_train_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1212,"y":96},"stoppin_train_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1416,"y":532},"stoppin_train_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":780},"stoppin_tram_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1236,"y":0},"stoppin_tram_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":596},"stoppin_tram_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":138},"vehiclepin_boat_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":266},"vehiclepin_boat_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":440},"vehiclepin_bus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":394},"vehiclepin_bus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":522},"vehiclepin_bus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":500},"vehiclepin_citybike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":650},"vehiclepin_citybike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"vehiclepin_citybike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1324,"y":0},"vehiclepin_citybike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1016,"y":792},"vehiclepin_citybike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":778},"vehiclepin_citybike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":248},"vehiclepin_citybike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":660},"vehiclepin_citybike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ebike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_ebike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":248},"vehiclepin_ebike_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":1110,"y":690},"vehiclepin_ebike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1072,"y":888},"vehiclepin_ebike_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1112,"y":786},"vehiclepin_ebike_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":882},"vehiclepin_ebike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_ebike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1316,"y":152},"vehiclepin_ebike_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":724},"vehiclepin_ebike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1512,"y":788},"vehiclepin_ebike_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":852},"vehiclepin_ebike_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":916},"vehiclepin_ebike_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ebike_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_ebike_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_ferry_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_ferry_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_ferry_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":308},"vehiclepin_loading_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_metro_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_metro_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_metro_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":368},"vehiclepin_otherbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_otherbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_otherbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":428},"vehiclepin_othertrain_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_othertrain_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_othertrain_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":488},"vehiclepin_regionalbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_regionalbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_regionalbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1344,"y":548},"vehiclepin_scooter_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_scooter_cluster_generic_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":322},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":312},"vehiclepin_scooter_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":96},"vehiclepin_scooter_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":192},"vehiclepin_scooter_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":288},"vehiclepin_scooter_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":384},"vehiclepin_scooter_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_scooter_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":608},"vehiclepin_scooter_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":192},"vehiclepin_scooter_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":64},"vehiclepin_scooter_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1476,"y":0},"vehiclepin_scooter_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":128},"vehiclepin_scooter_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_scooter_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_scooter_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_sharedcar_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_sharedcar_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":418},"vehiclepin_sharedcar_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":376},"vehiclepin_sharedcar_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":480},"vehiclepin_sharedcar_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_sharedcar_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":668},"vehiclepin_sharedcar_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":256},"vehiclepin_sharedcar_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_shuttlebus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_shuttlebus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_shuttlebus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1384,"y":728},"vehiclepin_train_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_train_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":512},"vehiclepin_train_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":788},"vehiclepin_tram_active_light":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":640},"vehiclepin_tram_error_light":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":768},"vehiclepin_tram_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":848}}
\ No newline at end of file
diff --git a/generated_sprites/NFK/light@2x.png b/generated_sprites/NFK/light@2x.png
index c9dffeb0..2c4761a0 100644
Binary files a/generated_sprites/NFK/light@2x.png and b/generated_sprites/NFK/light@2x.png differ
diff --git a/generated_sprites/Troms/dark.json b/generated_sprites/Troms/dark.json
index 5f696e92..63ab2655 100644
--- a/generated_sprites/Troms/dark.json
+++ b/generated_sprites/Troms/dark.json
@@ -1 +1 @@
-{"geofencingzone_allowed_dark":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":143},"geofencingzone_noentry_dark":{"height":44,"pixelRatio":1,"width":44,"x":605,"y":92},"geofencingzone_noparking_dark":{"height":44,"pixelRatio":1,"width":44,"x":634,"y":44},"geofencingzone_parking_dark":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":187},"geofencingzone_slow_dark":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":404},"interactivepin_default_dark":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_dark":{"height":51,"pixelRatio":1,"width":47,"x":558,"y":92},"interactivepin_valid_dark":{"height":51,"pixelRatio":1,"width":47,"x":444,"y":308},"stationpin_citybike_bikes_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":429},"stationpin_citybike_bikes_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":451},"stationpin_citybike_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":640,"y":379},"stationpin_citybike_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_cars_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":335},"stationpin_sharedcar_cars_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"stationpin_sharedcar_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":461},"stationpin_sharedcar_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":540,"y":353},"stoppin_boat_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":688,"y":272},"stoppin_boat_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":256},"stoppin_bus_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":448},"stoppin_bus_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":210},"stoppin_bus_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":321},"stoppin_busandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":558,"y":48},"stoppin_busandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":126,"y":478},"stoppin_busandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":397},"stoppin_commuterparking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":106},"stoppin_commuterparking_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":386},"stoppin_ferry_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":353},"stoppin_ferry_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":138},"stoppin_ferry_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_metro_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":587,"y":305},"stoppin_metro_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":170},"stoppin_metro_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_metroandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":618,"y":0},"stoppin_metroandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":649,"y":88},"stoppin_metroandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":616,"y":231},"stoppin_plane_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":411},"stoppin_plane_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_train_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":441},"stoppin_train_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":672,"y":367},"stoppin_train_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":444,"y":195},"stoppin_tram_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":624,"y":136},"stoppin_tram_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":304},"stoppin_tram_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_boat_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_boat_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":616,"y":275},"vehiclepin_bus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":64},"vehiclepin_bus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":128},"vehiclepin_bus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":628,"y":349},"vehiclepin_citybike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":192},"vehiclepin_citybike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_citybike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":678,"y":44},"vehiclepin_citybike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":444,"y":359},"vehiclepin_citybike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":256},"vehiclepin_citybike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":631,"y":305},"vehiclepin_citybike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":242},"vehiclepin_citybike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":320},"vehiclepin_ebike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":444,"y":260},"vehiclepin_ebike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":694,"y":0},"vehiclepin_ebike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":491,"y":308},"vehiclepin_ebike_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":520,"y":257},"vehiclepin_ebike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":384},"vehiclepin_ebike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":652,"y":275},"vehiclepin_ebike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":202},"vehiclepin_ebike_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":443},"vehiclepin_ebike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ferry_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":448},"vehiclepin_ferry_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ferry_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":212},"vehiclepin_loading_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_metro_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_metro_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_metro_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":242},"vehiclepin_otherbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_otherbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_otherbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":120},"vehiclepin_othertrain_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_othertrain_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_othertrain_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":701,"y":76},"vehiclepin_regionalbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_regionalbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_regionalbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":722,"y":32},"vehiclepin_scooter_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_scooter_cluster_generic_dark":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":161},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":44,"x":624,"y":180},"vehiclepin_scooter_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":407},"vehiclepin_scooter_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":492,"y":356},"vehiclepin_scooter_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":539,"y":305},"vehiclepin_scooter_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":568,"y":257},"vehiclepin_scooter_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_scooter_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":738,"y":0},"vehiclepin_scooter_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":475},"vehiclepin_scooter_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":106},"vehiclepin_scooter_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":737,"y":62},"vehiclepin_scooter_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":758,"y":30},"vehiclepin_scooter_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_scooter_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_scooter_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_sharedcar_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_sharedcar_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":209},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":596,"y":397},"vehiclepin_sharedcar_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":455},"vehiclepin_sharedcar_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_sharedcar_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":150},"vehiclepin_sharedcar_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":138},"vehiclepin_sharedcar_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_shuttlebus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_shuttlebus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_shuttlebus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":180},"vehiclepin_train_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_train_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_train_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":429},"vehiclepin_tram_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_tram_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_tram_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":459}}
\ No newline at end of file
+{"geofencingzone_allowed_dark":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":288},"geofencingzone_noentry_dark":{"height":44,"pixelRatio":1,"width":44,"x":603,"y":332},"geofencingzone_noparking_dark":{"height":44,"pixelRatio":1,"width":44,"x":628,"y":288},"geofencingzone_parking_dark":{"height":28,"pixelRatio":1,"width":28,"x":756,"y":426},"geofencingzone_slow_dark":{"height":44,"pixelRatio":1,"width":44,"x":604,"y":376},"interactivepin_default_dark":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_dark":{"height":51,"pixelRatio":1,"width":47,"x":192,"y":453},"interactivepin_valid_dark":{"height":51,"pixelRatio":1,"width":47,"x":508,"y":345},"stationpin_citybike_bikes_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":454},"stationpin_citybike_bikes_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":455},"stationpin_citybike_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":752,"y":454},"stationpin_citybike_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":460,"y":455},"stationpin_sharedcar_cars_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":106},"stationpin_sharedcar_cars_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_parking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":32},"stationpin_sharedcar_parking_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":647,"y":332},"stoppin_boat_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":706,"y":0},"stoppin_boat_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_bus_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":420},"stoppin_bus_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":64},"stoppin_bus_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_busandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":257},"stoppin_busandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":606,"y":92},"stoppin_busandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":648,"y":376},"stoppin_commuterparking_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":138},"stoppin_commuterparking_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_ferry_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":464},"stoppin_ferry_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":170},"stoppin_ferry_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":195},"stoppin_metro_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":420},"stoppin_metro_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":202},"stoppin_metro_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":260},"stoppin_metroandtram_default_dark":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":301},"stoppin_metroandtram_minimized_dark":{"height":32,"pixelRatio":1,"width":52,"x":650,"y":44},"stoppin_metroandtram_selected_dark":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":464},"stoppin_plane_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":234},"stoppin_plane_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":325},"stoppin_train_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":606,"y":48},"stoppin_train_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":708,"y":266},"stoppin_train_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":390},"stoppin_tram_default_dark":{"height":44,"pixelRatio":1,"width":44,"x":618,"y":0},"stoppin_tram_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":298},"stoppin_tram_selected_dark":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":69},"vehiclepin_boat_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":133},"vehiclepin_boat_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":220},"vehiclepin_bus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":197},"vehiclepin_bus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":261},"vehiclepin_bus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":250},"vehiclepin_citybike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":325},"vehiclepin_citybike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"vehiclepin_citybike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":662,"y":0},"vehiclepin_citybike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":508,"y":396},"vehiclepin_citybike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":389},"vehiclepin_citybike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":124},"vehiclepin_citybike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":330},"vehiclepin_citybike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ebike_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_ebike_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":124},"vehiclepin_ebike_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":555,"y":345},"vehiclepin_ebike_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":536,"y":444},"vehiclepin_ebike_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":556,"y":393},"vehiclepin_ebike_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":441},"vehiclepin_ebike_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_ebike_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":658,"y":76},"vehiclepin_ebike_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":362},"vehiclepin_ebike_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":756,"y":394},"vehiclepin_ebike_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":426},"vehiclepin_ebike_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":458},"vehiclepin_ebike_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ebike_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_ebike_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_ferry_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_ferry_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_ferry_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":154},"vehiclepin_loading_dark":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_metro_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_metro_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_metro_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":184},"vehiclepin_otherbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_otherbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_otherbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":214},"vehiclepin_othertrain_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_othertrain_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_othertrain_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":244},"vehiclepin_regionalbus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_regionalbus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_regionalbus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":672,"y":274},"vehiclepin_scooter_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_scooter_cluster_generic_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":161},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":156},"vehiclepin_scooter_default_dott_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":48},"vehiclepin_scooter_default_generic_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":96},"vehiclepin_scooter_default_ryde_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":144},"vehiclepin_scooter_default_voi_dark":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":192},"vehiclepin_scooter_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_scooter_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":304},"vehiclepin_scooter_minimized_dott_dark":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":96},"vehiclepin_scooter_minimized_generic_dark":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":32},"vehiclepin_scooter_minimized_ryde_dark":{"height":32,"pixelRatio":1,"width":32,"x":738,"y":0},"vehiclepin_scooter_minimized_voi_dark":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":64},"vehiclepin_scooter_selected_dott_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_generic_dark":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_scooter_selected_ryde_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_scooter_selected_voi_dark":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_sharedcar_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_sharedcar_cluster_dark":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":209},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":188},"vehiclepin_sharedcar_default_dark":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":240},"vehiclepin_sharedcar_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_sharedcar_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":334},"vehiclepin_sharedcar_minimized_dark":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":128},"vehiclepin_sharedcar_selected_dark":{"height":69,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_shuttlebus_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_shuttlebus_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_shuttlebus_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":692,"y":364},"vehiclepin_train_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_train_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":256},"vehiclepin_train_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":394},"vehiclepin_tram_active_dark":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":320},"vehiclepin_tram_error_dark":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":384},"vehiclepin_tram_indicator_dark":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":424}}
\ No newline at end of file
diff --git a/generated_sprites/Troms/dark.png b/generated_sprites/Troms/dark.png
index 511e5a09..d6f3895c 100644
Binary files a/generated_sprites/Troms/dark.png and b/generated_sprites/Troms/dark.png differ
diff --git a/generated_sprites/Troms/dark@2x.json b/generated_sprites/Troms/dark@2x.json
index 1398c11d..b1c044cf 100644
--- a/generated_sprites/Troms/dark@2x.json
+++ b/generated_sprites/Troms/dark@2x.json
@@ -1 +1 @@
-{"geofencingzone_allowed_dark":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":286},"geofencingzone_noentry_dark":{"height":88,"pixelRatio":2,"width":88,"x":1210,"y":184},"geofencingzone_noparking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1268,"y":88},"geofencingzone_parking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":374},"geofencingzone_slow_dark":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":808},"interactivepin_default_dark":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_dark":{"height":102,"pixelRatio":2,"width":94,"x":1116,"y":184},"interactivepin_valid_dark":{"height":102,"pixelRatio":2,"width":94,"x":888,"y":616},"stationpin_citybike_bikes_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":858},"stationpin_citybike_bikes_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":902},"stationpin_citybike_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1280,"y":758},"stationpin_citybike_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_cars_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":670},"stationpin_sharedcar_cars_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"stationpin_sharedcar_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":922},"stationpin_sharedcar_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1080,"y":706},"stoppin_boat_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1376,"y":544},"stoppin_boat_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":512},"stoppin_bus_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":896},"stoppin_bus_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":420},"stoppin_bus_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":642},"stoppin_busandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1116,"y":96},"stoppin_busandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":252,"y":956},"stoppin_busandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":794},"stoppin_commuterparking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":212},"stoppin_commuterparking_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":772},"stoppin_ferry_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":706},"stoppin_ferry_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":276},"stoppin_ferry_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_metro_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1174,"y":610},"stoppin_metro_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":340},"stoppin_metro_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_metroandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1236,"y":0},"stoppin_metroandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1298,"y":176},"stoppin_metroandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1232,"y":462},"stoppin_plane_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":822},"stoppin_plane_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_train_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":882},"stoppin_train_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1344,"y":734},"stoppin_train_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":888,"y":390},"stoppin_tram_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1248,"y":272},"stoppin_tram_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":608},"stoppin_tram_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_boat_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_boat_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1232,"y":550},"vehiclepin_bus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":128},"vehiclepin_bus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":256},"vehiclepin_bus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1256,"y":698},"vehiclepin_citybike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":384},"vehiclepin_citybike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_citybike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1356,"y":88},"vehiclepin_citybike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":888,"y":718},"vehiclepin_citybike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":512},"vehiclepin_citybike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1262,"y":610},"vehiclepin_citybike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":484},"vehiclepin_citybike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":640},"vehiclepin_ebike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":888,"y":520},"vehiclepin_ebike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1388,"y":0},"vehiclepin_ebike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":982,"y":616},"vehiclepin_ebike_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1040,"y":514},"vehiclepin_ebike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":768},"vehiclepin_ebike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1304,"y":550},"vehiclepin_ebike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":404},"vehiclepin_ebike_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":886},"vehiclepin_ebike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ferry_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":896},"vehiclepin_ferry_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ferry_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":424},"vehiclepin_loading_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_metro_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_metro_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_metro_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":484},"vehiclepin_otherbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_otherbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_otherbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":240},"vehiclepin_othertrain_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_othertrain_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_othertrain_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1402,"y":152},"vehiclepin_regionalbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_regionalbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_regionalbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1444,"y":64},"vehiclepin_scooter_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_scooter_cluster_generic_dark":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":322},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":88,"x":1248,"y":360},"vehiclepin_scooter_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":814},"vehiclepin_scooter_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":984,"y":712},"vehiclepin_scooter_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1078,"y":610},"vehiclepin_scooter_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1136,"y":514},"vehiclepin_scooter_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_scooter_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1476,"y":0},"vehiclepin_scooter_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":950},"vehiclepin_scooter_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":212},"vehiclepin_scooter_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1474,"y":124},"vehiclepin_scooter_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1516,"y":60},"vehiclepin_scooter_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_scooter_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_scooter_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_sharedcar_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_sharedcar_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":418},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1192,"y":794},"vehiclepin_sharedcar_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":910},"vehiclepin_sharedcar_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_sharedcar_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":300},"vehiclepin_sharedcar_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":276},"vehiclepin_sharedcar_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_shuttlebus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_shuttlebus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_shuttlebus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":360},"vehiclepin_train_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_train_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_train_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":858},"vehiclepin_tram_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_tram_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_tram_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":918}}
\ No newline at end of file
+{"geofencingzone_allowed_dark":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":576},"geofencingzone_noentry_dark":{"height":88,"pixelRatio":2,"width":88,"x":1206,"y":664},"geofencingzone_noparking_dark":{"height":88,"pixelRatio":2,"width":88,"x":1256,"y":576},"geofencingzone_parking_dark":{"height":56,"pixelRatio":2,"width":56,"x":1512,"y":852},"geofencingzone_slow_dark":{"height":88,"pixelRatio":2,"width":88,"x":1208,"y":752},"interactivepin_default_dark":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_dark":{"height":102,"pixelRatio":2,"width":94,"x":384,"y":906},"interactivepin_valid_dark":{"height":102,"pixelRatio":2,"width":94,"x":1016,"y":690},"stationpin_citybike_bikes_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":908},"stationpin_citybike_bikes_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":910},"stationpin_citybike_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1504,"y":908},"stationpin_citybike_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":920,"y":910},"stationpin_sharedcar_cars_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":212},"stationpin_sharedcar_cars_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_parking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":64},"stationpin_sharedcar_parking_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1294,"y":664},"stoppin_boat_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1412,"y":0},"stoppin_boat_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_bus_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":840},"stoppin_bus_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":128},"stoppin_bus_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_busandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":514},"stoppin_busandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1212,"y":184},"stoppin_busandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1296,"y":752},"stoppin_commuterparking_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":276},"stoppin_commuterparking_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_ferry_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":928},"stoppin_ferry_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":340},"stoppin_ferry_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":390},"stoppin_metro_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":840},"stoppin_metro_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":404},"stoppin_metro_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":520},"stoppin_metroandtram_default_dark":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":602},"stoppin_metroandtram_minimized_dark":{"height":64,"pixelRatio":2,"width":104,"x":1300,"y":88},"stoppin_metroandtram_selected_dark":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":928},"stoppin_plane_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":468},"stoppin_plane_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":650},"stoppin_train_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1212,"y":96},"stoppin_train_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1416,"y":532},"stoppin_train_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":780},"stoppin_tram_default_dark":{"height":88,"pixelRatio":2,"width":88,"x":1236,"y":0},"stoppin_tram_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":596},"stoppin_tram_selected_dark":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":138},"vehiclepin_boat_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":266},"vehiclepin_boat_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":440},"vehiclepin_bus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":394},"vehiclepin_bus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":522},"vehiclepin_bus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":500},"vehiclepin_citybike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":650},"vehiclepin_citybike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"vehiclepin_citybike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1324,"y":0},"vehiclepin_citybike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1016,"y":792},"vehiclepin_citybike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":778},"vehiclepin_citybike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":248},"vehiclepin_citybike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":660},"vehiclepin_citybike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ebike_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_ebike_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":248},"vehiclepin_ebike_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1110,"y":690},"vehiclepin_ebike_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":1072,"y":888},"vehiclepin_ebike_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1112,"y":786},"vehiclepin_ebike_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":882},"vehiclepin_ebike_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_ebike_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1316,"y":152},"vehiclepin_ebike_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":724},"vehiclepin_ebike_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1512,"y":788},"vehiclepin_ebike_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":852},"vehiclepin_ebike_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":916},"vehiclepin_ebike_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ebike_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_ebike_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_ferry_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_ferry_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_ferry_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":308},"vehiclepin_loading_dark":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_metro_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_metro_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_metro_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":368},"vehiclepin_otherbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_otherbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_otherbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":428},"vehiclepin_othertrain_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_othertrain_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_othertrain_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":488},"vehiclepin_regionalbus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_regionalbus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_regionalbus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1344,"y":548},"vehiclepin_scooter_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_scooter_cluster_generic_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":322},"vehiclepin_scooter_cluster_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":312},"vehiclepin_scooter_default_dott_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":96},"vehiclepin_scooter_default_generic_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":192},"vehiclepin_scooter_default_ryde_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":288},"vehiclepin_scooter_default_voi_dark":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":384},"vehiclepin_scooter_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_scooter_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":608},"vehiclepin_scooter_minimized_dott_dark":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":192},"vehiclepin_scooter_minimized_generic_dark":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":64},"vehiclepin_scooter_minimized_ryde_dark":{"height":64,"pixelRatio":2,"width":64,"x":1476,"y":0},"vehiclepin_scooter_minimized_voi_dark":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":128},"vehiclepin_scooter_selected_dott_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_generic_dark":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_scooter_selected_ryde_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_scooter_selected_voi_dark":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_sharedcar_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_sharedcar_cluster_dark":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":418},"vehiclepin_sharedcar_cluster_minimized_dark":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":376},"vehiclepin_sharedcar_default_dark":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":480},"vehiclepin_sharedcar_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_sharedcar_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":668},"vehiclepin_sharedcar_minimized_dark":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":256},"vehiclepin_sharedcar_selected_dark":{"height":138,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_shuttlebus_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_shuttlebus_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_shuttlebus_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1384,"y":728},"vehiclepin_train_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_train_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":512},"vehiclepin_train_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":788},"vehiclepin_tram_active_dark":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":640},"vehiclepin_tram_error_dark":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":768},"vehiclepin_tram_indicator_dark":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":848}}
\ No newline at end of file
diff --git a/generated_sprites/Troms/dark@2x.png b/generated_sprites/Troms/dark@2x.png
index c7fc3860..46361765 100644
Binary files a/generated_sprites/Troms/dark@2x.png and b/generated_sprites/Troms/dark@2x.png differ
diff --git a/generated_sprites/Troms/light.json b/generated_sprites/Troms/light.json
index ec63551a..c9d0ab07 100644
--- a/generated_sprites/Troms/light.json
+++ b/generated_sprites/Troms/light.json
@@ -1 +1 @@
-{"geofencingzone_allowed_light":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":143},"geofencingzone_noentry_light":{"height":44,"pixelRatio":1,"width":44,"x":605,"y":92},"geofencingzone_noparking_light":{"height":44,"pixelRatio":1,"width":44,"x":634,"y":44},"geofencingzone_parking_light":{"height":44,"pixelRatio":1,"width":44,"x":580,"y":187},"geofencingzone_slow_light":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":404},"interactivepin_default_light":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_light":{"height":51,"pixelRatio":1,"width":47,"x":558,"y":92},"interactivepin_valid_light":{"height":51,"pixelRatio":1,"width":47,"x":444,"y":308},"stationpin_citybike_bikes_default_light":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":429},"stationpin_citybike_bikes_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":451},"stationpin_citybike_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":640,"y":379},"stationpin_citybike_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_cars_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":335},"stationpin_sharedcar_cars_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"stationpin_sharedcar_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":632,"y":461},"stationpin_sharedcar_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_light":{"height":44,"pixelRatio":1,"width":44,"x":540,"y":353},"stoppin_boat_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":688,"y":272},"stoppin_boat_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":256},"stoppin_bus_default_light":{"height":44,"pixelRatio":1,"width":44,"x":508,"y":448},"stoppin_bus_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":210},"stoppin_bus_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":321},"stoppin_busandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":558,"y":48},"stoppin_busandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":126,"y":478},"stoppin_busandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_light":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":397},"stoppin_commuterparking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":106},"stoppin_commuterparking_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":384,"y":386},"stoppin_ferry_default_light":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":353},"stoppin_ferry_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":138},"stoppin_ferry_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_metro_default_light":{"height":44,"pixelRatio":1,"width":44,"x":587,"y":305},"stoppin_metro_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":170},"stoppin_metro_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_metroandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":618,"y":0},"stoppin_metroandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":649,"y":88},"stoppin_metroandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_light":{"height":44,"pixelRatio":1,"width":44,"x":616,"y":231},"stoppin_plane_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":411},"stoppin_plane_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_train_default_light":{"height":44,"pixelRatio":1,"width":44,"x":552,"y":441},"stoppin_train_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":672,"y":367},"stoppin_train_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":444,"y":195},"stoppin_tram_default_light":{"height":44,"pixelRatio":1,"width":44,"x":624,"y":136},"stoppin_tram_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":696,"y":304},"stoppin_tram_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_light":{"height":64,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_boat_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_boat_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":616,"y":275},"vehiclepin_bus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":64},"vehiclepin_bus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":128},"vehiclepin_bus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":628,"y":349},"vehiclepin_citybike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":192},"vehiclepin_citybike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_citybike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":678,"y":44},"vehiclepin_citybike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":444,"y":359},"vehiclepin_citybike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":256},"vehiclepin_citybike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":631,"y":305},"vehiclepin_citybike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":242},"vehiclepin_citybike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":320},"vehiclepin_ebike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":444,"y":260},"vehiclepin_ebike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":694,"y":0},"vehiclepin_ebike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":491,"y":308},"vehiclepin_ebike_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":520,"y":257},"vehiclepin_ebike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":384},"vehiclepin_ebike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":652,"y":275},"vehiclepin_ebike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":202},"vehiclepin_ebike_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":443},"vehiclepin_ebike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ferry_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":448},"vehiclepin_ferry_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ferry_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":212},"vehiclepin_loading_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_metro_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_metro_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_metro_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":660,"y":242},"vehiclepin_otherbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_otherbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_otherbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":120},"vehiclepin_othertrain_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_othertrain_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_othertrain_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":701,"y":76},"vehiclepin_regionalbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_regionalbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_regionalbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":722,"y":32},"vehiclepin_scooter_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_scooter_cluster_generic_light":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":161},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":32,"pixelRatio":1,"width":44,"x":624,"y":180},"vehiclepin_scooter_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":407},"vehiclepin_scooter_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":492,"y":356},"vehiclepin_scooter_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":539,"y":305},"vehiclepin_scooter_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":568,"y":257},"vehiclepin_scooter_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_scooter_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":738,"y":0},"vehiclepin_scooter_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":664,"y":475},"vehiclepin_scooter_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":106},"vehiclepin_scooter_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":737,"y":62},"vehiclepin_scooter_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":758,"y":30},"vehiclepin_scooter_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_scooter_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_scooter_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_sharedcar_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_sharedcar_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":504,"y":209},"vehiclepin_sharedcar_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":596,"y":397},"vehiclepin_sharedcar_default_light":{"height":48,"pixelRatio":1,"width":48,"x":460,"y":455},"vehiclepin_sharedcar_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_sharedcar_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":150},"vehiclepin_sharedcar_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":736,"y":138},"vehiclepin_sharedcar_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_shuttlebus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_shuttlebus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_shuttlebus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":180},"vehiclepin_train_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_train_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_train_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":429},"vehiclepin_tram_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_tram_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_tram_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":596,"y":459}}
\ No newline at end of file
+{"geofencingzone_allowed_light":{"height":44,"pixelRatio":1,"width":44,"x":584,"y":288},"geofencingzone_noentry_light":{"height":44,"pixelRatio":1,"width":44,"x":603,"y":332},"geofencingzone_noparking_light":{"height":44,"pixelRatio":1,"width":44,"x":628,"y":288},"geofencingzone_parking_light":{"height":28,"pixelRatio":1,"width":28,"x":756,"y":426},"geofencingzone_slow_light":{"height":44,"pixelRatio":1,"width":44,"x":604,"y":376},"interactivepin_default_light":{"height":53,"pixelRatio":1,"width":50,"x":76,"y":459},"interactivepin_invalid_light":{"height":51,"pixelRatio":1,"width":47,"x":192,"y":453},"interactivepin_valid_light":{"height":51,"pixelRatio":1,"width":47,"x":508,"y":345},"stationpin_citybike_bikes_default_light":{"height":48,"pixelRatio":1,"width":76,"x":0,"y":459},"stationpin_citybike_bikes_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":720,"y":454},"stationpin_citybike_bikes_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":384,"y":455},"stationpin_citybike_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":752,"y":454},"stationpin_citybike_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":65},"stationpin_sharedcar_cars_default_light":{"height":48,"pixelRatio":1,"width":76,"x":460,"y":455},"stationpin_sharedcar_cars_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":106},"stationpin_sharedcar_cars_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":130},"stationpin_sharedcar_parking_default_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":65},"stationpin_sharedcar_parking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":32},"stationpin_sharedcar_parking_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":195},"stoppin_boat_default_light":{"height":44,"pixelRatio":1,"width":44,"x":647,"y":332},"stoppin_boat_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":706,"y":0},"stoppin_boat_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":0},"stoppin_bus_default_light":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":420},"stoppin_bus_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":702,"y":64},"stoppin_bus_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":65},"stoppin_busandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":257},"stoppin_busandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":606,"y":92},"stoppin_busandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":260},"stoppin_commuterparking_default_light":{"height":44,"pixelRatio":1,"width":44,"x":648,"y":376},"stoppin_commuterparking_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":138},"stoppin_commuterparking_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":130},"stoppin_ferry_default_light":{"height":44,"pixelRatio":1,"width":44,"x":632,"y":464},"stoppin_ferry_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":686,"y":170},"stoppin_ferry_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":422,"y":195},"stoppin_metro_default_light":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":420},"stoppin_metro_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":202},"stoppin_metro_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":260},"stoppin_metroandtram_default_light":{"height":44,"pixelRatio":1,"width":76,"x":508,"y":301},"stoppin_metroandtram_minimized_light":{"height":32,"pixelRatio":1,"width":52,"x":650,"y":44},"stoppin_metroandtram_selected_light":{"height":65,"pixelRatio":1,"width":102,"x":0,"y":325},"stoppin_plane_default_light":{"height":44,"pixelRatio":1,"width":44,"x":676,"y":464},"stoppin_plane_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":704,"y":234},"stoppin_plane_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":325},"stoppin_train_default_light":{"height":44,"pixelRatio":1,"width":44,"x":606,"y":48},"stoppin_train_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":708,"y":266},"stoppin_train_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":448,"y":390},"stoppin_tram_default_light":{"height":44,"pixelRatio":1,"width":44,"x":618,"y":0},"stoppin_tram_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":298},"stoppin_tram_selected_light":{"height":65,"pixelRatio":1,"width":60,"x":482,"y":0},"vehiclepin_boat_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":69},"vehiclepin_boat_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":133},"vehiclepin_boat_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":220},"vehiclepin_bus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":197},"vehiclepin_bus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":166,"y":261},"vehiclepin_bus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":632,"y":250},"vehiclepin_citybike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":325},"vehiclepin_citybike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":542,"y":0},"vehiclepin_citybike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":662,"y":0},"vehiclepin_citybike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":508,"y":396},"vehiclepin_citybike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":192,"y":389},"vehiclepin_citybike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":124},"vehiclepin_citybike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":727,"y":330},"vehiclepin_citybike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":0,"y":390},"vehiclepin_ebike_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":0},"vehiclepin_ebike_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":113},"vehiclepin_ebike_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":124},"vehiclepin_ebike_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":555,"y":345},"vehiclepin_ebike_default_light":{"height":48,"pixelRatio":1,"width":48,"x":536,"y":444},"vehiclepin_ebike_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":556,"y":393},"vehiclepin_ebike_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":441},"vehiclepin_ebike_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":64},"vehiclepin_ebike_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":658,"y":76},"vehiclepin_ebike_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":728,"y":362},"vehiclepin_ebike_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":756,"y":394},"vehiclepin_ebike_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":426},"vehiclepin_ebike_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":784,"y":458},"vehiclepin_ebike_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":64,"y":390},"vehiclepin_ebike_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":0},"vehiclepin_ebike_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":69},"vehiclepin_ebike_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":138},"vehiclepin_ferry_active_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":128},"vehiclepin_ferry_error_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":192},"vehiclepin_ferry_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":154},"vehiclepin_loading_light":{"height":64,"pixelRatio":1,"width":64,"x":230,"y":256},"vehiclepin_metro_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":320},"vehiclepin_metro_error_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":384},"vehiclepin_metro_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":650,"y":184},"vehiclepin_otherbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":256,"y":448},"vehiclepin_otherbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":0},"vehiclepin_otherbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":214},"vehiclepin_othertrain_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":64},"vehiclepin_othertrain_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":128},"vehiclepin_othertrain_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":668,"y":244},"vehiclepin_regionalbus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":192},"vehiclepin_regionalbus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":294,"y":256},"vehiclepin_regionalbus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":672,"y":274},"vehiclepin_scooter_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":320},"vehiclepin_scooter_cluster_generic_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":161},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":156},"vehiclepin_scooter_default_dott_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":48},"vehiclepin_scooter_default_generic_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":96},"vehiclepin_scooter_default_ryde_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":144},"vehiclepin_scooter_default_voi_light":{"height":48,"pixelRatio":1,"width":48,"x":558,"y":192},"vehiclepin_scooter_error_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":384},"vehiclepin_scooter_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":304},"vehiclepin_scooter_minimized_dott_light":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":96},"vehiclepin_scooter_minimized_generic_light":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":32},"vehiclepin_scooter_minimized_ryde_light":{"height":32,"pixelRatio":1,"width":32,"x":738,"y":0},"vehiclepin_scooter_minimized_voi_light":{"height":32,"pixelRatio":1,"width":32,"x":734,"y":64},"vehiclepin_scooter_selected_dott_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":207},"vehiclepin_scooter_selected_generic_light":{"height":69,"pixelRatio":1,"width":64,"x":102,"y":276},"vehiclepin_scooter_selected_ryde_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":345},"vehiclepin_scooter_selected_voi_light":{"height":69,"pixelRatio":1,"width":64,"x":128,"y":414},"vehiclepin_sharedcar_active_light":{"height":64,"pixelRatio":1,"width":64,"x":320,"y":448},"vehiclepin_sharedcar_cluster_light":{"height":48,"pixelRatio":1,"width":76,"x":482,"y":209},"vehiclepin_sharedcar_cluster_minimized_light":{"height":32,"pixelRatio":1,"width":44,"x":606,"y":188},"vehiclepin_sharedcar_default_light":{"height":48,"pixelRatio":1,"width":48,"x":584,"y":240},"vehiclepin_sharedcar_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":0},"vehiclepin_sharedcar_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":691,"y":334},"vehiclepin_sharedcar_minimized_light":{"height":32,"pixelRatio":1,"width":32,"x":718,"y":128},"vehiclepin_sharedcar_selected_light":{"height":69,"pixelRatio":1,"width":64,"x":166,"y":0},"vehiclepin_shuttlebus_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":64},"vehiclepin_shuttlebus_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":128},"vehiclepin_shuttlebus_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":692,"y":364},"vehiclepin_train_active_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":192},"vehiclepin_train_error_light":{"height":64,"pixelRatio":1,"width":64,"x":358,"y":256},"vehiclepin_train_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":394},"vehiclepin_tram_active_light":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":320},"vehiclepin_tram_error_light":{"height":64,"pixelRatio":1,"width":64,"x":384,"y":384},"vehiclepin_tram_indicator_light":{"height":30,"pixelRatio":1,"width":36,"x":720,"y":424}}
\ No newline at end of file
diff --git a/generated_sprites/Troms/light.png b/generated_sprites/Troms/light.png
index 61e6013c..adb976fd 100644
Binary files a/generated_sprites/Troms/light.png and b/generated_sprites/Troms/light.png differ
diff --git a/generated_sprites/Troms/light@2x.json b/generated_sprites/Troms/light@2x.json
index 2d2fee41..55a7765e 100644
--- a/generated_sprites/Troms/light@2x.json
+++ b/generated_sprites/Troms/light@2x.json
@@ -1 +1 @@
-{"geofencingzone_allowed_light":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":286},"geofencingzone_noentry_light":{"height":88,"pixelRatio":2,"width":88,"x":1210,"y":184},"geofencingzone_noparking_light":{"height":88,"pixelRatio":2,"width":88,"x":1268,"y":88},"geofencingzone_parking_light":{"height":88,"pixelRatio":2,"width":88,"x":1160,"y":374},"geofencingzone_slow_light":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":808},"interactivepin_default_light":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_light":{"height":102,"pixelRatio":2,"width":94,"x":1116,"y":184},"interactivepin_valid_light":{"height":102,"pixelRatio":2,"width":94,"x":888,"y":616},"stationpin_citybike_bikes_default_light":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":858},"stationpin_citybike_bikes_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":902},"stationpin_citybike_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1280,"y":758},"stationpin_citybike_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_cars_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":670},"stationpin_sharedcar_cars_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"stationpin_sharedcar_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1264,"y":922},"stationpin_sharedcar_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1080,"y":706},"stoppin_boat_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1376,"y":544},"stoppin_boat_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":512},"stoppin_bus_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1016,"y":896},"stoppin_bus_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":420},"stoppin_bus_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":642},"stoppin_busandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1116,"y":96},"stoppin_busandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":252,"y":956},"stoppin_busandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":794},"stoppin_commuterparking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":212},"stoppin_commuterparking_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":768,"y":772},"stoppin_ferry_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":706},"stoppin_ferry_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":276},"stoppin_ferry_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_metro_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1174,"y":610},"stoppin_metro_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":340},"stoppin_metro_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_metroandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1236,"y":0},"stoppin_metroandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1298,"y":176},"stoppin_metroandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1232,"y":462},"stoppin_plane_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":822},"stoppin_plane_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_train_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1104,"y":882},"stoppin_train_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1344,"y":734},"stoppin_train_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":888,"y":390},"stoppin_tram_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1248,"y":272},"stoppin_tram_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1392,"y":608},"stoppin_tram_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_light":{"height":128,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_boat_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_boat_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1232,"y":550},"vehiclepin_bus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":128},"vehiclepin_bus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":256},"vehiclepin_bus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1256,"y":698},"vehiclepin_citybike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":384},"vehiclepin_citybike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_citybike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1356,"y":88},"vehiclepin_citybike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":888,"y":718},"vehiclepin_citybike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":512},"vehiclepin_citybike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1262,"y":610},"vehiclepin_citybike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":484},"vehiclepin_citybike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":640},"vehiclepin_ebike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":888,"y":520},"vehiclepin_ebike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1388,"y":0},"vehiclepin_ebike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":982,"y":616},"vehiclepin_ebike_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1040,"y":514},"vehiclepin_ebike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":768},"vehiclepin_ebike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1304,"y":550},"vehiclepin_ebike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":404},"vehiclepin_ebike_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":886},"vehiclepin_ebike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ferry_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":896},"vehiclepin_ferry_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ferry_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":424},"vehiclepin_loading_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_metro_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_metro_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_metro_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1320,"y":484},"vehiclepin_otherbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_otherbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_otherbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":240},"vehiclepin_othertrain_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_othertrain_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_othertrain_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1402,"y":152},"vehiclepin_regionalbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_regionalbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_regionalbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1444,"y":64},"vehiclepin_scooter_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_scooter_cluster_generic_light":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":322},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":64,"pixelRatio":2,"width":88,"x":1248,"y":360},"vehiclepin_scooter_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":814},"vehiclepin_scooter_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":984,"y":712},"vehiclepin_scooter_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1078,"y":610},"vehiclepin_scooter_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1136,"y":514},"vehiclepin_scooter_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_scooter_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1476,"y":0},"vehiclepin_scooter_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1328,"y":950},"vehiclepin_scooter_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":212},"vehiclepin_scooter_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1474,"y":124},"vehiclepin_scooter_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1516,"y":60},"vehiclepin_scooter_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_scooter_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_scooter_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_sharedcar_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_sharedcar_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":1008,"y":418},"vehiclepin_sharedcar_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1192,"y":794},"vehiclepin_sharedcar_default_light":{"height":96,"pixelRatio":2,"width":96,"x":920,"y":910},"vehiclepin_sharedcar_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_sharedcar_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":300},"vehiclepin_sharedcar_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1472,"y":276},"vehiclepin_sharedcar_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_shuttlebus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_shuttlebus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_shuttlebus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":360},"vehiclepin_train_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_train_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_train_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":858},"vehiclepin_tram_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_tram_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_tram_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1192,"y":918}}
\ No newline at end of file
+{"geofencingzone_allowed_light":{"height":88,"pixelRatio":2,"width":88,"x":1168,"y":576},"geofencingzone_noentry_light":{"height":88,"pixelRatio":2,"width":88,"x":1206,"y":664},"geofencingzone_noparking_light":{"height":88,"pixelRatio":2,"width":88,"x":1256,"y":576},"geofencingzone_parking_light":{"height":56,"pixelRatio":2,"width":56,"x":1512,"y":852},"geofencingzone_slow_light":{"height":88,"pixelRatio":2,"width":88,"x":1208,"y":752},"interactivepin_default_light":{"height":106,"pixelRatio":2,"width":100,"x":152,"y":918},"interactivepin_invalid_light":{"height":102,"pixelRatio":2,"width":94,"x":384,"y":906},"interactivepin_valid_light":{"height":102,"pixelRatio":2,"width":94,"x":1016,"y":690},"stationpin_citybike_bikes_default_light":{"height":96,"pixelRatio":2,"width":152,"x":0,"y":918},"stationpin_citybike_bikes_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1440,"y":908},"stationpin_citybike_bikes_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":0},"stationpin_citybike_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":768,"y":910},"stationpin_citybike_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1504,"y":908},"stationpin_citybike_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":130},"stationpin_sharedcar_cars_default_light":{"height":96,"pixelRatio":2,"width":152,"x":920,"y":910},"stationpin_sharedcar_cars_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":212},"stationpin_sharedcar_cars_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":260},"stationpin_sharedcar_parking_default_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":130},"stationpin_sharedcar_parking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":64},"stationpin_sharedcar_parking_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":390},"stoppin_boat_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1294,"y":664},"stoppin_boat_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1412,"y":0},"stoppin_boat_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":0},"stoppin_bus_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":840},"stoppin_bus_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1404,"y":128},"stoppin_bus_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":130},"stoppin_busandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":514},"stoppin_busandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1212,"y":184},"stoppin_busandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":520},"stoppin_commuterparking_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1296,"y":752},"stoppin_commuterparking_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":276},"stoppin_commuterparking_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":260},"stoppin_ferry_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1264,"y":928},"stoppin_ferry_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1372,"y":340},"stoppin_ferry_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":844,"y":390},"stoppin_metro_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":840},"stoppin_metro_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":404},"stoppin_metro_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":520},"stoppin_metroandtram_default_light":{"height":88,"pixelRatio":2,"width":152,"x":1016,"y":602},"stoppin_metroandtram_minimized_light":{"height":64,"pixelRatio":2,"width":104,"x":1300,"y":88},"stoppin_metroandtram_selected_light":{"height":130,"pixelRatio":2,"width":204,"x":0,"y":650},"stoppin_plane_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1352,"y":928},"stoppin_plane_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1408,"y":468},"stoppin_plane_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":650},"stoppin_train_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1212,"y":96},"stoppin_train_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1416,"y":532},"stoppin_train_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":896,"y":780},"stoppin_tram_default_light":{"height":88,"pixelRatio":2,"width":88,"x":1236,"y":0},"stoppin_tram_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":596},"stoppin_tram_selected_light":{"height":130,"pixelRatio":2,"width":120,"x":964,"y":0},"vehiclepin_boat_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":138},"vehiclepin_boat_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":266},"vehiclepin_boat_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":440},"vehiclepin_bus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":394},"vehiclepin_bus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":332,"y":522},"vehiclepin_bus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1264,"y":500},"vehiclepin_citybike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":650},"vehiclepin_citybike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":1084,"y":0},"vehiclepin_citybike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1324,"y":0},"vehiclepin_citybike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1016,"y":792},"vehiclepin_citybike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":384,"y":778},"vehiclepin_citybike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":248},"vehiclepin_citybike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1454,"y":660},"vehiclepin_citybike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":0,"y":780},"vehiclepin_ebike_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":0},"vehiclepin_ebike_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":226},"vehiclepin_ebike_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":248},"vehiclepin_ebike_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":1110,"y":690},"vehiclepin_ebike_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1072,"y":888},"vehiclepin_ebike_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1112,"y":786},"vehiclepin_ebike_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":882},"vehiclepin_ebike_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":128},"vehiclepin_ebike_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1316,"y":152},"vehiclepin_ebike_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1456,"y":724},"vehiclepin_ebike_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1512,"y":788},"vehiclepin_ebike_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":852},"vehiclepin_ebike_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1568,"y":916},"vehiclepin_ebike_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":128,"y":780},"vehiclepin_ebike_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":0},"vehiclepin_ebike_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":138},"vehiclepin_ebike_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":276},"vehiclepin_ferry_active_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":256},"vehiclepin_ferry_error_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":384},"vehiclepin_ferry_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":308},"vehiclepin_loading_light":{"height":128,"pixelRatio":2,"width":128,"x":460,"y":512},"vehiclepin_metro_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":640},"vehiclepin_metro_error_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":768},"vehiclepin_metro_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1300,"y":368},"vehiclepin_otherbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":512,"y":896},"vehiclepin_otherbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":0},"vehiclepin_otherbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":428},"vehiclepin_othertrain_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":128},"vehiclepin_othertrain_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":256},"vehiclepin_othertrain_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1336,"y":488},"vehiclepin_regionalbus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":384},"vehiclepin_regionalbus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":588,"y":512},"vehiclepin_regionalbus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1344,"y":548},"vehiclepin_scooter_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":640},"vehiclepin_scooter_cluster_generic_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":322},"vehiclepin_scooter_cluster_minimized_generic_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":312},"vehiclepin_scooter_default_dott_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":96},"vehiclepin_scooter_default_generic_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":192},"vehiclepin_scooter_default_ryde_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":288},"vehiclepin_scooter_default_voi_light":{"height":96,"pixelRatio":2,"width":96,"x":1116,"y":384},"vehiclepin_scooter_error_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":768},"vehiclepin_scooter_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":608},"vehiclepin_scooter_minimized_dott_light":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":192},"vehiclepin_scooter_minimized_generic_light":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":64},"vehiclepin_scooter_minimized_ryde_light":{"height":64,"pixelRatio":2,"width":64,"x":1476,"y":0},"vehiclepin_scooter_minimized_voi_light":{"height":64,"pixelRatio":2,"width":64,"x":1468,"y":128},"vehiclepin_scooter_selected_dott_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":414},"vehiclepin_scooter_selected_generic_light":{"height":138,"pixelRatio":2,"width":128,"x":204,"y":552},"vehiclepin_scooter_selected_ryde_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":690},"vehiclepin_scooter_selected_voi_light":{"height":138,"pixelRatio":2,"width":128,"x":256,"y":828},"vehiclepin_sharedcar_active_light":{"height":128,"pixelRatio":2,"width":128,"x":640,"y":896},"vehiclepin_sharedcar_cluster_light":{"height":96,"pixelRatio":2,"width":152,"x":964,"y":418},"vehiclepin_sharedcar_cluster_minimized_light":{"height":64,"pixelRatio":2,"width":88,"x":1212,"y":376},"vehiclepin_sharedcar_default_light":{"height":96,"pixelRatio":2,"width":96,"x":1168,"y":480},"vehiclepin_sharedcar_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":0},"vehiclepin_sharedcar_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1382,"y":668},"vehiclepin_sharedcar_minimized_light":{"height":64,"pixelRatio":2,"width":64,"x":1436,"y":256},"vehiclepin_sharedcar_selected_light":{"height":138,"pixelRatio":2,"width":128,"x":332,"y":0},"vehiclepin_shuttlebus_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":128},"vehiclepin_shuttlebus_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":256},"vehiclepin_shuttlebus_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1384,"y":728},"vehiclepin_train_active_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":384},"vehiclepin_train_error_light":{"height":128,"pixelRatio":2,"width":128,"x":716,"y":512},"vehiclepin_train_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":788},"vehiclepin_tram_active_light":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":640},"vehiclepin_tram_error_light":{"height":128,"pixelRatio":2,"width":128,"x":768,"y":768},"vehiclepin_tram_indicator_light":{"height":60,"pixelRatio":2,"width":72,"x":1440,"y":848}}
\ No newline at end of file
diff --git a/generated_sprites/Troms/light@2x.png b/generated_sprites/Troms/light@2x.png
index 0d0214e7..15909f3f 100644
Binary files a/generated_sprites/Troms/light@2x.png and b/generated_sprites/Troms/light@2x.png differ
diff --git a/sprite_assets/AtB/dark/geofencingzone_parking_dark.svg b/sprite_assets/AtB/dark/geofencingzone_parking_dark.svg
index 2a52ddca..a77e58bc 100644
--- a/sprite_assets/AtB/dark/geofencingzone_parking_dark.svg
+++ b/sprite_assets/AtB/dark/geofencingzone_parking_dark.svg
@@ -1,17 +1,4 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10043_6338)">
-<path d="M8 12C8 9.79086 9.79086 8 12 8H32C34.2091 8 36 9.79086 36 12V32C36 34.2091 34.2091 36 32 36H12C9.79086 36 8 34.2091 8 32V12Z" fill="#0959AA"/>
-<path d="M18 22.9999V15.9999H22.6667C24.5997 15.9999 26.1667 17.5669 26.1667 19.4999C26.1667 21.4329 24.5997 22.9999 22.6667 22.9999H18ZM18 22.9999V28.8332" stroke="white" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_d_10043_6338" x="0" y="0" width="44" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10043_6338"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10043_6338" result="shape"/>
-</filter>
-</defs>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H24C26.2091 0 28 1.79086 28 4V24C28 26.2091 26.2091 28 24 28H4C1.79086 28 0 26.2091 0 24V4Z" fill="#0959AA"/>
+<path d="M10.7051 21.4166C10.2221 21.4166 9.12695 21.1867 9.12695 20.7037V8.29163C9.12695 7.80863 9.51895 7.41663 10.002 7.41663H14.6641C17.0791 7.41663 19.0391 9.37663 19.0391 11.7916C19.0391 14.2066 17.0791 16.2037 14.6641 16.2037H12.2177V20.7037C12.2177 21.1867 11.1881 21.4166 10.7051 21.4166ZM12.2177 13.2037H13.7177C15.1667 13.2037 16.2177 13.1527 16.2177 11.7037C16.2177 10.3054 15.1667 10.2037 13.7177 10.2037H12.2177V13.2037Z" fill="white"/>
 </svg>
diff --git a/sprite_assets/AtB/dark/stationpin_citybike_parking_default_dark.svg b/sprite_assets/AtB/dark/stationpin_citybike_parking_default_dark.svg
index d0309a48..db3ee320 100644
--- a/sprite_assets/AtB/dark/stationpin_citybike_parking_default_dark.svg
+++ b/sprite_assets/AtB/dark/stationpin_citybike_parking_default_dark.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_8247)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="black"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="black" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#D7425B"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="black"/>
-<path d="M21.085 29.2099C20.74 29.2099 20.46 28.9299 20.46 28.5849V19.4199C20.46 19.0749 20.74 18.7949 21.085 18.7949H24.415C26.14 18.7949 27.54 20.1949 27.54 21.9199C27.54 23.6449 26.14 25.0449 24.415 25.0449H21.71V28.5849C21.71 28.9299 21.43 29.2099 21.085 29.2099ZM21.71 23.7899H24.415C25.45 23.7899 26.29 22.9499 26.29 21.9149C26.29 20.8799 25.45 20.0399 24.415 20.0399H21.71V23.7899Z" fill="black"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0959AA"/>
+<path d="M20.7051 31.4166C20.2221 31.4166 19.127 31.1867 19.127 30.7037V18.2916C19.127 17.8086 19.519 17.4166 20.002 17.4166H24.6641C27.0791 17.4166 29.0391 19.3766 29.0391 21.7916C29.0391 24.2066 27.0791 26.2037 24.6641 26.2037H22.2177V30.7037C22.2177 31.1867 21.1881 31.4166 20.7051 31.4166ZM22.2177 23.2037H23.7177C25.1667 23.2037 26.2177 23.1527 26.2177 21.7037C26.2177 20.3054 25.1667 20.2037 23.7177 20.2037H22.2177V23.2037Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8247" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/dark/stationpin_citybike_parking_minimized_dark.svg b/sprite_assets/AtB/dark/stationpin_citybike_parking_minimized_dark.svg
index 946c82d5..09a8d7ca 100644
--- a/sprite_assets/AtB/dark/stationpin_citybike_parking_minimized_dark.svg
+++ b/sprite_assets/AtB/dark/stationpin_citybike_parking_minimized_dark.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_8284)">
 <g clip-path="url(#clip0_8318_8284)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#D7425B"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0959AA"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="black" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/AtB/dark/stationpin_citybike_parking_selected_dark.svg b/sprite_assets/AtB/dark/stationpin_citybike_parking_selected_dark.svg
index e9484f7b..396a3d8f 100644
--- a/sprite_assets/AtB/dark/stationpin_citybike_parking_selected_dark.svg
+++ b/sprite_assets/AtB/dark/stationpin_citybike_parking_selected_dark.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8263)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#D7425B"/>
-<path d="M38.75 41.9559H21.25C19.479 41.9559 18.0439 40.5139 18.0439 38.7499V21.2499C18.0439 19.4789 19.479 18.0439 21.25 18.0439H38.75C40.521 18.0439 41.9561 19.4859 41.9561 21.2499V38.7499C41.9561 40.5209 40.521 41.9559 38.75 41.9559ZM21.25 19.7939C20.445 19.7939 19.7939 20.4449 19.7939 21.2499V38.7499C19.7939 39.5549 20.445 40.2059 21.25 40.2059H38.75C39.555 40.2059 40.2061 39.5549 40.2061 38.7499V21.2499C40.2061 20.4449 39.555 19.7939 38.75 19.7939H21.25Z" fill="black"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.9019 25.0439 36.4189V23.5879C25.0439 23.1049 25.4359 22.7129 25.9189 22.7129H30.5811C32.9961 22.7129 34.9561 24.6729 34.9561 27.0879C34.9561 29.5029 32.9961 31.4629 30.5811 31.4629H26.7939V36.4189C26.7939 36.9019 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.7059H30.5811C32.0301 29.7059 33.2061 28.5299 33.2061 27.0809C33.2061 25.6319 32.0301 24.4559 30.5811 24.4559H26.7939V29.7059Z" fill="black"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0959AA"/>
+<path d="M25.0074 40.3094C24.3174 40.3094 22.7529 39.981 22.7529 39.291V21.5594C22.7529 20.8694 23.3129 20.3094 24.0029 20.3094H30.6631C34.1131 20.3094 36.9131 23.1094 36.9131 26.5594C36.9131 30.0094 34.1131 32.8625 30.6631 32.8625H27.1683V39.291C27.1683 39.981 25.6974 40.3094 25.0074 40.3094ZM27.1683 28.5767H29.3112C31.3812 28.5767 32.8826 28.5039 32.8826 26.4339C32.8826 24.4363 31.3812 24.291 29.3112 24.291H27.1683V28.5767Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8263" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/dark/stationpin_sharedcar_parking_default_dark.svg b/sprite_assets/AtB/dark/stationpin_sharedcar_parking_default_dark.svg
index 4bd2ed5b..e458d155 100644
--- a/sprite_assets/AtB/dark/stationpin_sharedcar_parking_default_dark.svg
+++ b/sprite_assets/AtB/dark/stationpin_sharedcar_parking_default_dark.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_8253)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="black"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="black" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#AC53AC"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="black"/>
-<path d="M21.085 29.2099C20.74 29.2099 20.46 28.9299 20.46 28.5849V19.4199C20.46 19.0749 20.74 18.7949 21.085 18.7949H24.415C26.14 18.7949 27.54 20.1949 27.54 21.9199C27.54 23.6449 26.14 25.0449 24.415 25.0449H21.71V28.5849C21.71 28.9299 21.43 29.2099 21.085 29.2099ZM21.71 23.7899H24.415C25.45 23.7899 26.29 22.9499 26.29 21.9149C26.29 20.8799 25.45 20.0399 24.415 20.0399H21.71V23.7899Z" fill="black"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0959AA"/>
+<path d="M20.7051 31.4166C20.2221 31.4166 19.127 31.1867 19.127 30.7037V18.2916C19.127 17.8086 19.519 17.4166 20.002 17.4166H24.6641C27.0791 17.4166 29.0391 19.3766 29.0391 21.7916C29.0391 24.2066 27.0791 26.2037 24.6641 26.2037H22.2177V30.7037C22.2177 31.1867 21.1881 31.4166 20.7051 31.4166ZM22.2177 23.2037H23.7177C25.1667 23.2037 26.2177 23.1527 26.2177 21.7037C26.2177 20.3054 25.1667 20.2037 23.7177 20.2037H22.2177V23.2037Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8253" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/dark/stationpin_sharedcar_parking_minimized_dark.svg b/sprite_assets/AtB/dark/stationpin_sharedcar_parking_minimized_dark.svg
index d6c4edf0..99d1d2f7 100644
--- a/sprite_assets/AtB/dark/stationpin_sharedcar_parking_minimized_dark.svg
+++ b/sprite_assets/AtB/dark/stationpin_sharedcar_parking_minimized_dark.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_8286)">
 <g clip-path="url(#clip0_8318_8286)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#AC53AC"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0959AA"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="black" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/AtB/dark/stationpin_sharedcar_parking_selected_dark.svg b/sprite_assets/AtB/dark/stationpin_sharedcar_parking_selected_dark.svg
index 786f567f..dce66d00 100644
--- a/sprite_assets/AtB/dark/stationpin_sharedcar_parking_selected_dark.svg
+++ b/sprite_assets/AtB/dark/stationpin_sharedcar_parking_selected_dark.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8277)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#AC53AC"/>
-<path d="M38.75 41.9559H21.25C19.479 41.9559 18.0439 40.5139 18.0439 38.7499V21.2499C18.0439 19.4789 19.479 18.0439 21.25 18.0439H38.75C40.521 18.0439 41.9561 19.4859 41.9561 21.2499V38.7499C41.9561 40.5209 40.521 41.9559 38.75 41.9559ZM21.25 19.7939C20.445 19.7939 19.7939 20.4449 19.7939 21.2499V38.7499C19.7939 39.5549 20.445 40.2059 21.25 40.2059H38.75C39.555 40.2059 40.2061 39.5549 40.2061 38.7499V21.2499C40.2061 20.4449 39.555 19.7939 38.75 19.7939H21.25Z" fill="black"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.9019 25.0439 36.4189V23.5879C25.0439 23.1049 25.4359 22.7129 25.9189 22.7129H30.5811C32.9961 22.7129 34.9561 24.6729 34.9561 27.0879C34.9561 29.5029 32.9961 31.4629 30.5811 31.4629H26.7939V36.4189C26.7939 36.9019 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.7059H30.5811C32.0301 29.7059 33.2061 28.5299 33.2061 27.0809C33.2061 25.6319 32.0301 24.4559 30.5811 24.4559H26.7939V29.7059Z" fill="black"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0959AA"/>
+<path d="M25.0074 40.3094C24.3174 40.3094 22.7529 39.981 22.7529 39.291V21.5594C22.7529 20.8694 23.3129 20.3094 24.0029 20.3094H30.6631C34.1131 20.3094 36.9131 23.1094 36.9131 26.5594C36.9131 30.0094 34.1131 32.8625 30.6631 32.8625H27.1683V39.291C27.1683 39.981 25.6974 40.3094 25.0074 40.3094ZM27.1683 28.5767H29.3112C31.3812 28.5767 32.8826 28.5039 32.8826 26.4339C32.8826 24.4363 31.3812 24.291 29.3112 24.291H27.1683V28.5767Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8277" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/dark/stoppin_busandtram_selected_dark.svg b/sprite_assets/AtB/dark/stoppin_busandtram_selected_dark.svg
index 068cb8b3..fe403d6a 100644
--- a/sprite_assets/AtB/dark/stoppin_busandtram_selected_dark.svg
+++ b/sprite_assets/AtB/dark/stoppin_busandtram_selected_dark.svg
@@ -11,7 +11,7 @@
 <path d="M39.8004 36.65C39.8004 38.1964 38.5468 39.45 37.0004 39.45C35.454 39.45 34.2004 38.1964 34.2004 36.65C34.2004 35.1036 35.454 33.85 37.0004 33.85C38.5468 33.85 39.8004 35.1036 39.8004 36.65Z" fill="black"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#A9D22D"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6384 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6384 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6384 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6384 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6384 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6384 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2982 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6384 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05H83.9004C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8H60.8004C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9417 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7533 75.5997 21.069C75.7403 21.3847 75.6819 21.7535 75.4508 22.0103L72.3008 25.5103C71.9775 25.8695 71.4242 25.8986 71.065 25.5754C70.7058 25.2521 70.6767 24.6988 71 24.3396L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9082 68.3254 21.425Z" fill="black"/>
 </g>
 <defs>
diff --git a/sprite_assets/AtB/dark/stoppin_metroandtram_selected_dark.svg b/sprite_assets/AtB/dark/stoppin_metroandtram_selected_dark.svg
index 254e48f8..9aed8054 100644
--- a/sprite_assets/AtB/dark/stoppin_metroandtram_selected_dark.svg
+++ b/sprite_assets/AtB/dark/stoppin_metroandtram_selected_dark.svg
@@ -10,7 +10,7 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M21.1986 22.972C21.6676 20.158 24.1041 18.1 26.9531 18.1H33.0426C35.8986 18.1 38.3281 20.158 38.7971 22.972L40.3365 32.212C40.8475 35.25 38.881 38.246 35.71 38.673C33.995 38.904 31.9579 39.1 29.9979 39.1C28.0379 39.1 26.0077 38.904 24.2857 38.673C21.1217 38.246 19.1552 35.25 19.6592 32.212L21.1986 22.972ZM26.9531 20.431C25.2451 20.431 23.7817 21.67 23.5017 23.357L23.0751 25.919C24.0201 26.927 25.2587 27.585 26.5047 28.005C27.8977 28.467 29.2279 28.6 29.9979 28.6C30.7679 28.6 32.098 28.467 33.491 28.005C34.737 27.592 35.9761 26.927 36.9281 25.919L36.5009 23.357C36.2139 21.67 34.7576 20.431 33.0426 20.431H26.9531ZM26.4979 32.093C25.8539 32.093 25.3289 32.618 25.3289 33.262C25.3289 33.906 25.8539 34.431 26.4979 34.431C27.1489 34.431 27.6668 33.906 27.6668 33.262C27.6668 32.618 27.1489 32.093 26.4979 32.093ZM33.4842 32.093C32.8402 32.093 32.3221 32.618 32.3221 33.262C32.3221 33.906 32.8402 34.431 33.4842 34.431H33.4979C34.1419 34.431 34.6668 33.906 34.6668 33.262C34.6668 32.618 34.1419 32.093 33.4979 32.093H33.4842Z" fill="black"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#A9D22D"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6384 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6384 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6384 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6384 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6384 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6384 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2982 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6384 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05H83.9004C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8H60.8004C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9417 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7533 75.5997 21.069C75.7403 21.3847 75.6819 21.7535 75.4508 22.0103L72.3008 25.5103C71.9775 25.8695 71.4242 25.8986 71.065 25.5754C70.7058 25.2521 70.6767 24.6988 71 24.3396L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9082 68.3254 21.425Z" fill="black"/>
 </g>
 <defs>
diff --git a/sprite_assets/AtB/dark/stoppin_tram_selected_dark.svg b/sprite_assets/AtB/dark/stoppin_tram_selected_dark.svg
index 4d55892b..c96865bc 100644
--- a/sprite_assets/AtB/dark/stoppin_tram_selected_dark.svg
+++ b/sprite_assets/AtB/dark/stoppin_tram_selected_dark.svg
@@ -6,7 +6,7 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#A9D22D"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8342)"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.825 41.2051 36.825C34.3616 36.825 21.3834 36.825 19.5004 36.825C18.3406 36.825 17.4004 35.8848 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6384 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6384 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6384 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6384 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6384 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6384 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2982 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6384 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4417 18.3171 38.05 18.8004 38.05L41.9004 38.05C42.3836 38.05 42.7754 38.4417 42.7754 38.925C42.7754 39.4082 42.3836 39.8 41.9004 39.8L18.8004 39.8C18.3171 39.8 17.9254 39.4082 17.9254 38.925Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4417 18.3171 38.05 18.8004 38.05H41.9004C42.3836 38.05 42.7754 38.4417 42.7754 38.925C42.7754 39.4082 42.3836 39.8 41.9004 39.8H18.8004C18.3171 39.8 17.9254 39.4082 17.9254 38.925Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9417 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7533 33.5997 21.069C33.7403 21.3847 33.6819 21.7535 33.4508 22.0103L30.3008 25.5103C29.9775 25.8695 29.4242 25.8986 29.065 25.5754C28.7058 25.2521 28.6767 24.6988 29 24.3396L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9082 26.3254 21.425Z" fill="black"/>
 </g>
 <defs>
diff --git a/sprite_assets/AtB/dark/vehiclepin_citybike_active_dark.svg b/sprite_assets/AtB/dark/vehiclepin_citybike_active_dark.svg
index 3adb843a..690ea662 100644
--- a/sprite_assets/AtB/dark/vehiclepin_citybike_active_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_citybike_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46828)">
 <g clip-path="url(#clip0_10646_46828)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#D7425B"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#D7425B"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="black"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46828" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46828">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_citybike_cluster_dark.svg b/sprite_assets/AtB/dark/vehiclepin_citybike_cluster_dark.svg
index 3895bd3d..53ad870a 100644
--- a/sprite_assets/AtB/dark/vehiclepin_citybike_cluster_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_citybike_cluster_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5179)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#D7425B"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#D7425B"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M29.2051 24.833C27.8251 24.833 26.7051 25.953 26.7051 27.333C26.7051 28.713 27.8251 29.833 29.2051 29.833C30.5851 29.833 31.7051 28.713 31.7051 27.333C31.7051 25.953 30.5901 24.833 29.2051 24.833ZM25.04 27.333C25.04 25.033 26.9051 23.168 29.2051 23.168C31.5051 23.168 33.375 25.033 33.375 27.333C33.375 29.633 31.5051 31.498 29.2051 31.498C26.9051 31.498 25.04 29.633 25.04 27.333Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M27.5649 19.9629C27.9549 20.2079 28.0751 20.7229 27.8301 21.1129L23.665 27.7779C23.51 28.0229 23.2451 28.1679 22.9551 28.1679H18.79C18.33 28.1679 17.9551 27.7929 17.9551 27.3329C17.9551 26.8729 18.33 26.4979 18.79 26.4979H22.4951L26.415 20.2279C26.66 19.8379 27.1749 19.7179 27.5649 19.9629Z" fill="black"/>
diff --git a/sprite_assets/AtB/dark/vehiclepin_citybike_default_dark.svg b/sprite_assets/AtB/dark/vehiclepin_citybike_default_dark.svg
index 34b5d2c5..fc08a729 100644
--- a/sprite_assets/AtB/dark/vehiclepin_citybike_default_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_citybike_default_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5144)">
 <g clip-path="url(#clip0_10646_5144)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#D7425B"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="black"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5144" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5144">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_citybike_selected_dark.svg b/sprite_assets/AtB/dark/vehiclepin_citybike_selected_dark.svg
index b02f403a..9af6dc1f 100644
--- a/sprite_assets/AtB/dark/vehiclepin_citybike_selected_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_citybike_selected_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5158)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#D7425B" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#D7425B" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="black"/>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_active_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_active_dark.svg
index ec87e9ab..de9b6cda 100644
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_active_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46830)">
 <g clip-path="url(#clip0_10646_46830)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#D7425B"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#D7425B"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.4549C34.8063 19.5824 35.0335 19.9094 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7223 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.4569 29.5304 44.5559 29.1877 44.4283C28.8451 44.3009 28.6178 43.9739 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.161 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.4549Z" fill="black"/>
 </g>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="black" stroke-width="2"/>
@@ -17,7 +17,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46830" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46830">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_cluster__dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_cluster__dark.svg
new file mode 100644
index 00000000..731dd36e
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_cluster__dark.svg
@@ -0,0 +1,19 @@
+<svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10646_5508)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
+<path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#D7425B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10646_5508" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5508"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5508" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_cluster_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_cluster_dark.svg
deleted file mode 100644
index 90963473..00000000
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_cluster_dark.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5508)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6H52C60.8366 6 68 13.1634 68 22V22C68 30.8366 60.8366 38 52 38H24C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7H52C60.2843 7 67 13.7157 67 22C67 30.2843 60.2843 37 52 37H24C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#D7425B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
-</g>
-<defs>
-<filter id="filter0_d_10646_5508" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5508"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5508" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_cluster_minimized_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_cluster_minimized__dark.svg
similarity index 77%
rename from sprite_assets/AtB/dark/vehiclepin_ebike_cluster_minimized_dark.svg
rename to sprite_assets/AtB/dark/vehiclepin_ebike_cluster_minimized__dark.svg
index 5af7ebf9..d15f142b 100644
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_cluster_minimized_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_cluster_minimized__dark.svg
@@ -1,16 +1,16 @@
 <svg width="44" height="32" viewBox="0 0 44 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5522)">
-<rect x="10" y="8" width="24" height="12" rx="6" fill="black"/>
-<rect x="9" y="7" width="26" height="14" rx="7" stroke="black" stroke-width="2"/>
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#D7425B"/>
+<rect x="10" y="10" width="24" height="12" rx="6" fill="black"/>
+<rect x="9" y="9" width="26" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#D7425B"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5522" x="0" y="0" width="44" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5522"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5522" result="shape"/>
 </filter>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_default_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_default_dark.svg
deleted file mode 100644
index 16dcc0a2..00000000
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_default_dark.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5473)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#D7425B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
-</g>
-<defs>
-<filter id="filter0_d_10646_5473" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5473"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5473" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_default_dott_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_default_dott_dark.svg
new file mode 100644
index 00000000..eadf4361
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_default_dott_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6633)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="#009DDB"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#009DDB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6633" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6633"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6633" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_default_generic_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_default_generic_dark.svg
new file mode 100644
index 00000000..6ef09775
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_default_generic_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10646_5473)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#D7425B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10646_5473" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5473"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5473" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_default_ryde_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_default_ryde_dark.svg
new file mode 100644
index 00000000..026c7449
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_default_ryde_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6652)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#4BCD1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6652" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6652"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6652" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_default_voi_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_default_voi_dark.svg
index 61357462..805c6a27 100644
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_default_voi_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_default_voi_dark.svg
@@ -1,19 +1,19 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47386)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#F36960"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6645)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#F36960"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47386" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6645" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47386"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47386" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6645"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6645" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_dott_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_dott_dark.svg
new file mode 100644
index 00000000..c920c7d4
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_dott_dark.svg
@@ -0,0 +1,22 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6629)">
+<g clip-path="url(#clip0_10957_6629)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6629" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6629"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6629" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6629">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_generic_dark.svg
similarity index 78%
rename from sprite_assets/AtB/dark/vehiclepin_ebike_minimized_dark.svg
rename to sprite_assets/AtB/dark/vehiclepin_ebike_minimized_generic_dark.svg
index 1baef8a1..32312658 100644
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_generic_dark.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5459)">
 <g clip-path="url(#clip0_10646_5459)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#D7425B"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#D7425B"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5459" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5459"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5459" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5459">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_ryde_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_ryde_dark.svg
new file mode 100644
index 00000000..4f5ff3df
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_ryde_dark.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6650)">
+<g clip-path="url(#clip0_10957_6650)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
+<rect width="12" height="12" transform="translate(10 10)" fill="#4BCD1F"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6650" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6650"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6650" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6650">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_voi_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_voi_dark.svg
index e3f51fa0..e8db6e48 100644
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_voi_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_minimized_voi_dark.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47384)">
-<g clip-path="url(#clip0_10647_47384)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#F36960"/>
+<g filter="url(#filter0_d_10957_6643)">
+<g clip-path="url(#clip0_10957_6643)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47384" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6643" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47384"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47384" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6643"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6643" result="shape"/>
 </filter>
-<clipPath id="clip0_10647_47384">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<clipPath id="clip0_10957_6643">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_selected_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_dark.svg
deleted file mode 100644
index e96bc364..00000000
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_selected_dark.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5487)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#D7425B" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5824 35.0335 17.9095 35.0335 18.275V27.9002H40.5761C40.9184 27.9002 41.2294 28.0998 41.3718 28.4111C41.5143 28.7224 41.4621 29.0881 41.2383 29.3471L30.155 42.1802C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6083V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4723C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4264 34.121 17.3275 34.4636 17.455Z" fill="black"/>
-</g>
-<defs>
-<filter id="filter0_d_10646_5487" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5487"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5487" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_selected_dott_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_dott_dark.svg
new file mode 100644
index 00000000..ca522d4c
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_dott_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6637)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6637" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6637"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6637" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_selected_generic_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_generic_dark.svg
new file mode 100644
index 00000000..79689f0f
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_generic_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10646_5487)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#D7425B" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10646_5487" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5487"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5487" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_selected_ryde_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_ryde_dark.svg
new file mode 100644
index 00000000..be4a6218
--- /dev/null
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_ryde_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6654)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6654" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6654"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6654" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_ebike_selected_voi_dark.svg b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_voi_dark.svg
index 18dfb5ad..e8adfbf2 100644
--- a/sprite_assets/AtB/dark/vehiclepin_ebike_selected_voi_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_ebike_selected_voi_dark.svg
@@ -1,17 +1,17 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47388)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5824 35.0335 17.9095 35.0335 18.275V27.9002H40.5761C40.9184 27.9002 41.2294 28.0998 41.3718 28.4111C41.5143 28.7224 41.4621 29.0881 41.2383 29.3471L30.155 42.1802C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6083V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4723C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4264 34.121 17.3275 34.4636 17.455Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6647)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47388" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6647" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47388"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47388" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6647"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6647" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_loading_dark.svg b/sprite_assets/AtB/dark/vehiclepin_loading_dark.svg
index c19365c1..fcddf511 100644
--- a/sprite_assets/AtB/dark/vehiclepin_loading_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_loading_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46846)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#73848C"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#73848C"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 20.331C32.6441 20.331 33.1691 20.856 33.1691 21.5V25C33.1691 25.644 32.6441 26.169 32.0001 26.169C31.3561 26.169 30.8311 25.644 30.8311 25V21.5C30.8311 20.856 31.3561 20.331 32.0001 20.331Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 37.831C32.6441 37.831 33.1691 38.356 33.1691 39V42.5C33.1691 43.144 32.6441 43.669 32.0001 43.669C31.3561 43.669 30.8311 43.144 30.8311 42.5V39C30.8311 38.356 31.3561 37.831 32.0001 37.831Z" fill="black"/>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_active_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_active_dark.svg
index 41982e3f..6dcf0c81 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_active_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46840)">
 <g clip-path="url(#clip0_10646_46840)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#5C99D6"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#5C99D6"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
@@ -19,7 +19,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46840" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46840">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_cluster_generic_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_cluster_generic_dark.svg
index 05bc619a..fa7097da 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_cluster_generic_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_cluster_generic_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5417)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#5C99D6"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#5C99D6"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M30.665 28.165C30.205 28.165 29.835 28.54 29.835 29C29.835 29.46 30.205 29.835 30.665 29.835C31.125 29.835 31.5 29.46 31.5 29C31.5 28.54 31.125 28.165 30.665 28.165ZM28.165 29C28.165 27.62 29.285 26.5 30.665 26.5C32.045 26.5 33.165 27.62 33.165 29C33.165 30.38 32.045 31.5 30.665 31.5C29.285 31.5 28.165 30.38 28.165 29Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M25.6649 17.335C25.6649 16.875 26.0399 16.5 26.4999 16.5H27.3148C28.4398 16.5 29.425 17.25 29.725 18.33L31.4701 24.61C31.5401 24.86 31.4899 25.13 31.3299 25.335C31.1749 25.54 30.9249 25.665 30.6649 25.665C29.5749 25.665 28.6099 26.185 27.9999 27C27.5799 27.555 27.3348 28.25 27.3348 29C27.3348 29.46 26.9599 29.835 26.4999 29.835H18.9999C18.7799 29.835 18.565 29.75 18.41 29.59C18.255 29.435 18.165 29.22 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165C16.875 28.165 16.5199 27.815 16.4999 27.365C16.4799 26.92 16.82 26.535 17.265 26.5L26.91 25.695C27.605 24.91 28.54 24.34 29.6 24.11L28.12 18.775C28.02 18.415 27.6898 18.165 27.3148 18.165H26.4999C26.0399 18.165 25.6649 17.79 25.6649 17.33V17.335Z" fill="black"/>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_default_dott_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_default_dott_dark.svg
index 28eefdc9..7fc68a19 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_default_dott_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_default_dott_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5319)">
-<g clip-path="url(#clip0_10646_5319)">
+<g filter="url(#filter0_d_10957_6621)">
+<g clip-path="url(#clip0_10957_6621)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#009DDB"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5319" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6621" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5319"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5319" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6621"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6621" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5319">
+<clipPath id="clip0_10957_6621">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_default_generic_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_default_generic_dark.svg
index 3a5743b6..6e034ee7 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_default_generic_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_default_generic_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5277)">
 <g clip-path="url(#clip0_10646_5277)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#5C99D6"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="black"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5277" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5277">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_default_ryde_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_default_ryde_dark.svg
index fefb75ae..57dd5055 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_default_ryde_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_default_ryde_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5291)">
-<g clip-path="url(#clip0_10646_5291)">
+<g filter="url(#filter0_d_10957_6619)">
+<g clip-path="url(#clip0_10957_6619)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#4BCD1F"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5291" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6619" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5291"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5291" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6619"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6619" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5291">
+<clipPath id="clip0_10957_6619">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_default_voi_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_default_voi_dark.svg
index 53e0f20d..5fd362a7 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_default_voi_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_default_voi_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5305)">
-<g clip-path="url(#clip0_10646_5305)">
+<g filter="url(#filter0_d_10957_6635)">
+<g clip-path="url(#clip0_10957_6635)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#F36960"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5305" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6635" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5305"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5305" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6635"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6635" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5305">
+<clipPath id="clip0_10957_6635">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_dott_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_dott_dark.svg
index db29fae4..e4a5b36d 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_dott_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_dott_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5263)">
-<g clip-path="url(#clip0_10646_5263)">
+<g filter="url(#filter0_d_10957_6617)">
+<g clip-path="url(#clip0_10957_6617)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5263" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6617" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5263"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5263" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6617"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6617" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5263">
+<clipPath id="clip0_10957_6617">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_ryde_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_ryde_dark.svg
index f0b3e9ff..76c33fa6 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_ryde_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_ryde_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5235)">
-<g clip-path="url(#clip0_10646_5235)">
+<g filter="url(#filter0_d_10957_6615)">
+<g clip-path="url(#clip0_10957_6615)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#4BCD1F"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5235" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6615" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5235"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5235" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6615"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6615" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5235">
+<clipPath id="clip0_10957_6615">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_voi_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_voi_dark.svg
index 549c941e..2aeb598a 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_voi_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_minimized_voi_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5249)">
-<g clip-path="url(#clip0_10646_5249)">
+<g filter="url(#filter0_d_10957_6631)">
+<g clip-path="url(#clip0_10957_6631)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5249" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6631" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5249"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5249" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6631"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6631" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5249">
+<clipPath id="clip0_10957_6631">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_selected_dott_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_selected_dott_dark.svg
index 7e2db73e..60bc26d3 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_selected_dott_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_selected_dott_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5396)">
+<g filter="url(#filter0_d_10957_6626)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5396" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6626" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5396"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5396" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6626"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6626" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_selected_generic_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_selected_generic_dark.svg
index 3b32f4fe..a25071e5 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_selected_generic_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_selected_generic_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5333)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#5C99D6" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#5C99D6" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_selected_ryde_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_selected_ryde_dark.svg
index 0bd97e8f..9f2cfab5 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_selected_ryde_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_selected_ryde_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5354)">
+<g filter="url(#filter0_d_10957_6623)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5354" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6623" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5354"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5354" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6623"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6623" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_scooter_selected_voi_dark.svg b/sprite_assets/AtB/dark/vehiclepin_scooter_selected_voi_dark.svg
index df95828f..4259a3bc 100644
--- a/sprite_assets/AtB/dark/vehiclepin_scooter_selected_voi_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_scooter_selected_voi_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5375)">
+<g filter="url(#filter0_d_10957_6640)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5375" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6640" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5375"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5375" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6640"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6640" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_sharedcar_cluster_dark.svg b/sprite_assets/AtB/dark/vehiclepin_sharedcar_cluster_dark.svg
index f319ff21..2b1848bb 100644
--- a/sprite_assets/AtB/dark/vehiclepin_sharedcar_cluster_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_sharedcar_cluster_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5088)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#AC53AC"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#AC53AC"/>
 <path d="M19.835 30.355C20.985 30.355 21.915 29.42 21.915 28.27C21.915 27.12 20.985 26.185 19.835 26.185C18.685 26.185 17.75 27.12 17.75 28.27C17.75 29.42 18.685 30.355 19.835 30.355Z" fill="black"/>
 <path d="M28.165 30.355C29.315 30.355 30.25 29.42 30.25 28.27C30.25 27.12 29.315 26.185 28.165 26.185C27.015 26.185 26.085 27.12 26.085 28.27C26.085 29.42 27.015 30.355 28.165 30.355Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15.04 22.435C15.04 22.09 15.32 21.81 15.665 21.81H29C29.345 21.81 29.625 22.09 29.625 22.435C29.625 22.78 29.345 23.06 29 23.06H15.665C15.32 23.06 15.04 22.78 15.04 22.435Z" fill="black"/>
diff --git a/sprite_assets/AtB/dark/vehiclepin_sharedcar_default_dark.svg b/sprite_assets/AtB/dark/vehiclepin_sharedcar_default_dark.svg
index cb37a95e..94fef8ba 100644
--- a/sprite_assets/AtB/dark/vehiclepin_sharedcar_default_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_sharedcar_default_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5053)">
 <g clip-path="url(#clip0_10646_5053)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#AC53AC"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path d="M19.835 30.355C20.985 30.355 21.915 29.42 21.915 28.27C21.915 27.12 20.985 26.185 19.835 26.185C18.685 26.185 17.75 27.12 17.75 28.27C17.75 29.42 18.685 30.355 19.835 30.355Z" fill="black"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5053" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5053">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/dark/vehiclepin_sharedcar_selected_dark.svg b/sprite_assets/AtB/dark/vehiclepin_sharedcar_selected_dark.svg
index 91ce8ad4..0260609a 100644
--- a/sprite_assets/AtB/dark/vehiclepin_sharedcar_selected_dark.svg
+++ b/sprite_assets/AtB/dark/vehiclepin_sharedcar_selected_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5067)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#AC53AC" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#AC53AC" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path d="M26.1689 40.897C27.7789 40.897 29.0811 39.588 29.0811 37.978C29.0811 36.368 27.7789 35.059 26.1689 35.059C24.5589 35.059 23.25 36.368 23.25 37.978C23.25 39.588 24.5589 40.897 26.1689 40.897Z" fill="black"/>
 <path d="M37.8311 40.897C39.4411 40.897 40.75 39.588 40.75 37.978C40.75 36.368 39.4411 35.059 37.8311 35.059C36.2211 35.059 34.9189 36.368 34.9189 37.978C34.9189 39.588 36.2211 40.897 37.8311 40.897Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.4561 29.809C19.4561 29.326 19.8481 28.934 20.3311 28.934H39C39.483 28.934 39.875 29.326 39.875 29.809C39.875 30.292 39.483 30.684 39 30.684H20.3311C19.8481 30.684 19.4561 30.292 19.4561 29.809Z" fill="black"/>
diff --git a/sprite_assets/AtB/light/geofencingzone_parking_light.svg b/sprite_assets/AtB/light/geofencingzone_parking_light.svg
index cebea618..3d7a297b 100644
--- a/sprite_assets/AtB/light/geofencingzone_parking_light.svg
+++ b/sprite_assets/AtB/light/geofencingzone_parking_light.svg
@@ -1,17 +1,4 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10041_6197)">
-<path d="M8 12C8 9.79086 9.79086 8 12 8H32C34.2091 8 36 9.79086 36 12V32C36 34.2091 34.2091 36 32 36H12C9.79086 36 8 34.2091 8 32V12Z" fill="#0959AA"/>
-<path d="M18 22.9999V15.9999H22.6667C24.5997 15.9999 26.1667 17.5669 26.1667 19.4999C26.1667 21.433 24.5997 22.9999 22.6667 22.9999H18ZM18 22.9999V28.8332" stroke="white" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_d_10041_6197" x="0" y="0" width="44" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10041_6197"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10041_6197" result="shape"/>
-</filter>
-</defs>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H24C26.2091 0 28 1.79086 28 4V24C28 26.2091 26.2091 28 24 28H4C1.79086 28 0 26.2091 0 24V4Z" fill="#0959AA"/>
+<path d="M10.7051 21.4167C10.2221 21.4167 9.12695 21.1868 9.12695 20.7038V8.29169C9.12695 7.80869 9.51895 7.41669 10.002 7.41669H14.6641C17.0791 7.41669 19.0391 9.37669 19.0391 11.7917C19.0391 14.2067 17.0791 16.2038 14.6641 16.2038H12.2177V20.7038C12.2177 21.1868 11.1881 21.4167 10.7051 21.4167ZM12.2177 13.2038H13.7177C15.1667 13.2038 16.2177 13.1528 16.2177 11.7038C16.2177 10.3055 15.1667 10.2038 13.7177 10.2038H12.2177V13.2038Z" fill="white"/>
 </svg>
diff --git a/sprite_assets/AtB/light/stationpin_citybike_parking_default_light.svg b/sprite_assets/AtB/light/stationpin_citybike_parking_default_light.svg
index 8bbe41bc..47856261 100644
--- a/sprite_assets/AtB/light/stationpin_citybike_parking_default_light.svg
+++ b/sprite_assets/AtB/light/stationpin_citybike_parking_default_light.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_6959)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="white"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="white" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#C91D39"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="white"/>
-<path d="M21.085 29.21C20.74 29.21 20.46 28.93 20.46 28.585V19.42C20.46 19.075 20.74 18.795 21.085 18.795H24.415C26.14 18.795 27.54 20.195 27.54 21.92C27.54 23.645 26.14 25.045 24.415 25.045H21.71V28.585C21.71 28.93 21.43 29.21 21.085 29.21ZM21.71 23.79H24.415C25.45 23.79 26.29 22.95 26.29 21.915C26.29 20.88 25.45 20.04 24.415 20.04H21.71V23.79Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0959AA"/>
+<path d="M20.7051 31.4167C20.2221 31.4167 19.127 31.1868 19.127 30.7038V18.2917C19.127 17.8087 19.519 17.4167 20.002 17.4167H24.6641C27.0791 17.4167 29.0391 19.3767 29.0391 21.7917C29.0391 24.2067 27.0791 26.2038 24.6641 26.2038H22.2177V30.7038C22.2177 31.1868 21.1881 31.4167 20.7051 31.4167ZM22.2177 23.2038H23.7177C25.1667 23.2038 26.2177 23.1528 26.2177 21.7038C26.2177 20.3055 25.1667 20.2038 23.7177 20.2038H22.2177V23.2038Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_6959" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/light/stationpin_citybike_parking_minimized_light.svg b/sprite_assets/AtB/light/stationpin_citybike_parking_minimized_light.svg
index 5d4788d5..f778e7e9 100644
--- a/sprite_assets/AtB/light/stationpin_citybike_parking_minimized_light.svg
+++ b/sprite_assets/AtB/light/stationpin_citybike_parking_minimized_light.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_6996)">
 <g clip-path="url(#clip0_8318_6996)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#C91D39"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0959AA"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="white" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/AtB/light/stationpin_citybike_parking_selected_light.svg b/sprite_assets/AtB/light/stationpin_citybike_parking_selected_light.svg
index 6e5c23d1..c9905734 100644
--- a/sprite_assets/AtB/light/stationpin_citybike_parking_selected_light.svg
+++ b/sprite_assets/AtB/light/stationpin_citybike_parking_selected_light.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_6975)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#C91D39"/>
-<path d="M38.75 41.956H21.25C19.479 41.956 18.0439 40.514 18.0439 38.75V21.25C18.0439 19.479 19.479 18.044 21.25 18.044H38.75C40.521 18.044 41.9561 19.486 41.9561 21.25V38.75C41.9561 40.521 40.521 41.956 38.75 41.956ZM21.25 19.794C20.445 19.794 19.7939 20.445 19.7939 21.25V38.75C19.7939 39.555 20.445 40.206 21.25 40.206H38.75C39.555 40.206 40.2061 39.555 40.2061 38.75V21.25C40.2061 20.445 39.555 19.794 38.75 19.794H21.25Z" fill="white"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.902 25.0439 36.4189V23.588C25.0439 23.105 25.4359 22.713 25.9189 22.713H30.5811C32.9961 22.713 34.9561 24.673 34.9561 27.088C34.9561 29.503 32.9961 31.463 30.5811 31.463H26.7939V36.4189C26.7939 36.902 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.706H30.5811C32.0301 29.706 33.2061 28.53 33.2061 27.081C33.2061 25.632 32.0301 24.456 30.5811 24.456H26.7939V29.706Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0959AA"/>
+<path d="M25.0074 40.3096C24.3174 40.3096 22.7529 39.9812 22.7529 39.2912V21.5596C22.7529 20.8696 23.3129 20.3096 24.0029 20.3096H30.6631C34.1131 20.3096 36.9131 23.1096 36.9131 26.5596C36.9131 30.0096 34.1131 32.8626 30.6631 32.8626H27.1683V39.2912C27.1683 39.9812 25.6974 40.3096 25.0074 40.3096ZM27.1683 28.5769H29.3112C31.3812 28.5769 32.8826 28.504 32.8826 26.434C32.8826 24.4364 31.3812 24.2912 29.3112 24.2912H27.1683V28.5769Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_6975" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/light/stationpin_sharedcar_parking_default_light.svg b/sprite_assets/AtB/light/stationpin_sharedcar_parking_default_light.svg
index 1f35117f..aba53fe4 100644
--- a/sprite_assets/AtB/light/stationpin_sharedcar_parking_default_light.svg
+++ b/sprite_assets/AtB/light/stationpin_sharedcar_parking_default_light.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_6965)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="white"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="white" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#4C1A4C"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="white"/>
-<path d="M21.085 29.21C20.74 29.21 20.46 28.93 20.46 28.585V19.42C20.46 19.075 20.74 18.795 21.085 18.795H24.415C26.14 18.795 27.54 20.195 27.54 21.92C27.54 23.645 26.14 25.045 24.415 25.045H21.71V28.585C21.71 28.93 21.43 29.21 21.085 29.21ZM21.71 23.79H24.415C25.45 23.79 26.29 22.95 26.29 21.915C26.29 20.88 25.45 20.04 24.415 20.04H21.71V23.79Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0959AA"/>
+<path d="M20.7051 31.4167C20.2221 31.4167 19.127 31.1868 19.127 30.7038V18.2917C19.127 17.8087 19.519 17.4167 20.002 17.4167H24.6641C27.0791 17.4167 29.0391 19.3767 29.0391 21.7917C29.0391 24.2067 27.0791 26.2038 24.6641 26.2038H22.2177V30.7038C22.2177 31.1868 21.1881 31.4167 20.7051 31.4167ZM22.2177 23.2038H23.7177C25.1667 23.2038 26.2177 23.1528 26.2177 21.7038C26.2177 20.3055 25.1667 20.2038 23.7177 20.2038H22.2177V23.2038Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_6965" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/light/stationpin_sharedcar_parking_minimized_light.svg b/sprite_assets/AtB/light/stationpin_sharedcar_parking_minimized_light.svg
index 0995b8c6..0ec544b8 100644
--- a/sprite_assets/AtB/light/stationpin_sharedcar_parking_minimized_light.svg
+++ b/sprite_assets/AtB/light/stationpin_sharedcar_parking_minimized_light.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_6998)">
 <g clip-path="url(#clip0_8318_6998)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#4C1A4C"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0959AA"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="white" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/AtB/light/stationpin_sharedcar_parking_selected_light.svg b/sprite_assets/AtB/light/stationpin_sharedcar_parking_selected_light.svg
index 5845b03b..7cee0d60 100644
--- a/sprite_assets/AtB/light/stationpin_sharedcar_parking_selected_light.svg
+++ b/sprite_assets/AtB/light/stationpin_sharedcar_parking_selected_light.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_6989)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#4C1A4C"/>
-<path d="M38.75 41.956H21.25C19.479 41.956 18.0439 40.514 18.0439 38.75V21.25C18.0439 19.479 19.479 18.044 21.25 18.044H38.75C40.521 18.044 41.9561 19.486 41.9561 21.25V38.75C41.9561 40.521 40.521 41.956 38.75 41.956ZM21.25 19.794C20.445 19.794 19.7939 20.445 19.7939 21.25V38.75C19.7939 39.555 20.445 40.206 21.25 40.206H38.75C39.555 40.206 40.2061 39.555 40.2061 38.75V21.25C40.2061 20.445 39.555 19.794 38.75 19.794H21.25Z" fill="white"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.902 25.0439 36.4189V23.588C25.0439 23.105 25.4359 22.713 25.9189 22.713H30.5811C32.9961 22.713 34.9561 24.673 34.9561 27.088C34.9561 29.503 32.9961 31.463 30.5811 31.463H26.7939V36.4189C26.7939 36.902 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.706H30.5811C32.0301 29.706 33.2061 28.53 33.2061 27.081C33.2061 25.632 32.0301 24.456 30.5811 24.456H26.7939V29.706Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0959AA"/>
+<path d="M25.0074 40.3096C24.3174 40.3096 22.7529 39.9812 22.7529 39.2912V21.5596C22.7529 20.8696 23.3129 20.3096 24.0029 20.3096H30.6631C34.1131 20.3096 36.9131 23.1096 36.9131 26.5596C36.9131 30.0096 34.1131 32.8626 30.6631 32.8626H27.1683V39.2912C27.1683 39.9812 25.6974 40.3096 25.0074 40.3096ZM27.1683 28.5769H29.3112C31.3812 28.5769 32.8826 28.504 32.8826 26.434C32.8826 24.4364 31.3812 24.2912 29.3112 24.2912H27.1683V28.5769Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_6989" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/light/stoppin_busandtram_selected_light.svg b/sprite_assets/AtB/light/stoppin_busandtram_selected_light.svg
index 02e3485d..04f999d8 100644
--- a/sprite_assets/AtB/light/stoppin_busandtram_selected_light.svg
+++ b/sprite_assets/AtB/light/stoppin_busandtram_selected_light.svg
@@ -10,9 +10,9 @@
 <path d="M26.5004 36.65C26.5004 38.1964 25.2468 39.45 23.7004 39.45C22.154 39.45 20.9004 38.1964 20.9004 36.65C20.9004 35.1036 22.154 33.85 23.7004 33.85C25.2468 33.85 26.5004 35.1036 26.5004 36.65Z" fill="white"/>
 <path d="M39.8004 36.65C39.8004 38.1964 38.5468 39.45 37.0004 39.45C35.454 39.45 34.2004 38.1964 34.2004 36.65C34.2004 35.1036 35.454 33.85 37.0004 33.85C38.5468 33.85 39.8004 35.1036 39.8004 36.65Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#608000"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4418 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4418 84.7754 38.925C84.7754 39.4083 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4083 59.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7535 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.8251 83.2051 36.8251C76.3616 36.8251 63.3834 36.8251 61.5004 36.8251C60.3406 36.8251 59.4004 35.8849 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.9251C59.9254 38.4418 60.3171 38.0501 60.8004 38.0501H83.9004C84.3836 38.0501 84.7754 38.4418 84.7754 38.9251C84.7754 39.4083 84.3836 39.8001 83.9004 39.8001H60.8004C60.3171 39.8001 59.9254 39.4083 59.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7536 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7111" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/light/stoppin_metroandtram_selected_light.svg b/sprite_assets/AtB/light/stoppin_metroandtram_selected_light.svg
index 865d97a2..0c179c29 100644
--- a/sprite_assets/AtB/light/stoppin_metroandtram_selected_light.svg
+++ b/sprite_assets/AtB/light/stoppin_metroandtram_selected_light.svg
@@ -9,9 +9,9 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.4049 36.5172C24.8599 36.9722 24.8599 37.7142 24.4049 38.1692L21.4928 41.0882C21.0308 41.5432 20.2962 41.5432 19.8412 41.0882C19.3863 40.6332 19.3863 39.8912 19.8412 39.4362L22.7534 36.5172C23.2154 36.0622 23.9499 36.0622 24.4049 36.5172ZM35.5912 36.5172C36.0462 36.0622 36.7808 36.0622 37.2428 36.5172L40.1549 39.4362C40.6099 39.8912 40.6099 40.6332 40.1549 41.0882C39.6999 41.5432 38.9654 41.5432 38.5034 41.0882L35.5912 38.1692C35.1362 37.7142 35.1362 36.9722 35.5912 36.5172Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M21.1986 22.972C21.6676 20.158 24.1041 18.1 26.9531 18.1H33.0426C35.8986 18.1 38.3281 20.158 38.7971 22.972L40.3365 32.212C40.8475 35.25 38.881 38.246 35.71 38.673C33.995 38.904 31.9579 39.1 29.9979 39.1C28.0379 39.1 26.0077 38.904 24.2857 38.673C21.1217 38.246 19.1552 35.25 19.6592 32.212L21.1986 22.972ZM26.9531 20.431C25.2451 20.431 23.7817 21.67 23.5017 23.357L23.0751 25.919C24.0201 26.927 25.2587 27.585 26.5047 28.005C27.8977 28.467 29.2279 28.6 29.9979 28.6C30.7679 28.6 32.098 28.467 33.491 28.005C34.737 27.592 35.9761 26.927 36.9281 25.919L36.5009 23.357C36.2139 21.67 34.7576 20.431 33.0426 20.431H26.9531ZM26.4979 32.093C25.8539 32.093 25.3289 32.618 25.3289 33.262C25.3289 33.906 25.8539 34.431 26.4979 34.431C27.1489 34.431 27.6668 33.906 27.6668 33.262C27.6668 32.618 27.1489 32.093 26.4979 32.093ZM33.4842 32.093C32.8402 32.093 32.3221 32.618 32.3221 33.262C32.3221 33.906 32.8402 34.431 33.4842 34.431H33.4979C34.1419 34.431 34.6668 33.906 34.6668 33.262C34.6668 32.618 34.1419 32.093 33.4979 32.093H33.4842Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#608000"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4418 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4418 84.7754 38.925C84.7754 39.4083 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4083 59.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7535 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.8251 83.2051 36.8251C76.3616 36.8251 63.3834 36.8251 61.5004 36.8251C60.3406 36.8251 59.4004 35.8849 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.9251C59.9254 38.4418 60.3171 38.0501 60.8004 38.0501H83.9004C84.3836 38.0501 84.7754 38.4418 84.7754 38.9251C84.7754 39.4083 84.3836 39.8001 83.9004 39.8001H60.8004C60.3171 39.8001 59.9254 39.4083 59.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7536 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7117" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/light/stoppin_plane_selected_light.svg b/sprite_assets/AtB/light/stoppin_plane_selected_light.svg
index bc1b2f17..0a161ca8 100644
--- a/sprite_assets/AtB/light/stoppin_plane_selected_light.svg
+++ b/sprite_assets/AtB/light/stoppin_plane_selected_light.svg
@@ -5,7 +5,7 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#576B75"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7079)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3305 20.9388C34.2023 18.3187 38.0159 17.7875 40.4533 19.2497C40.5765 19.3236 40.6795 19.4266 40.7534 19.5498C42.2335 22.016 41.5819 25.2983 39.3819 27.1595L37.671 28.607L39.2616 34.6503C39.5533 35.7584 39.2343 36.938 38.4241 37.7481L36.888 39.2838C36.7011 39.4706 36.4399 39.563 36.1772 39.5351C35.9145 39.5074 35.6783 39.3622 35.5348 39.1404L31.5593 32.9977L29.3031 35.2535L29.6715 38.5684C29.7008 38.8326 29.6085 39.0959 29.4204 39.2838L27.761 40.9429C27.5621 41.1417 27.2798 41.2328 27.0022 41.1878C26.7246 41.1428 26.4856 40.9671 26.3598 40.7156L24.001 35.9991L19.2836 33.6408C19.032 33.515 18.8562 33.276 18.8111 32.9983C18.7661 32.7206 18.8572 32.4382 19.0562 32.2394L20.7156 30.5802C20.9036 30.3923 21.1667 30.3 21.4309 30.3294L24.7467 30.6977L27.0027 28.4422L20.859 24.4677C20.6371 24.3241 20.492 24.088 20.4641 23.8252C20.4363 23.5624 20.5287 23.3011 20.7156 23.1142L22.2516 21.5785C23.0619 20.7684 24.2416 20.4496 25.3496 20.7411L31.3447 22.3185L32.3305 20.9388Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3305 20.9388C34.2023 18.3187 38.0159 17.7875 40.4533 19.2497C40.5765 19.3236 40.6795 19.4266 40.7534 19.5498C42.2335 22.016 41.5819 25.2983 39.3819 27.1595L37.671 28.607L39.2616 34.6503C39.5533 35.7584 39.2343 36.938 38.4241 37.7481L36.888 39.2838C36.7011 39.4706 36.4399 39.563 36.1772 39.5351C35.9145 39.5074 35.6783 39.3622 35.5348 39.1404L31.5593 32.9977L29.3031 35.2535L29.6715 38.5684C29.7008 38.8326 29.6085 39.0959 29.4204 39.2838L27.761 40.9429C27.5621 41.1417 27.2798 41.2329 27.0022 41.1878C26.7246 41.1428 26.4856 40.9671 26.3598 40.7156L24.001 35.9991L19.2836 33.6408C19.032 33.515 18.8562 33.276 18.8111 32.9983C18.7661 32.7206 18.8572 32.4382 19.0562 32.2394L20.7156 30.5803C20.9036 30.3923 21.1667 30.3 21.4309 30.3294L24.7467 30.6977L27.0027 28.4422L20.859 24.4677C20.6371 24.3241 20.492 24.088 20.4641 23.8252C20.4363 23.5624 20.5287 23.3011 20.7156 23.1142L22.2516 21.5785C23.0619 20.7684 24.2416 20.4496 25.3496 20.7411L31.3447 22.3185L32.3305 20.9388Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7079" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/light/stoppin_tram_selected_light.svg b/sprite_assets/AtB/light/stoppin_tram_selected_light.svg
index 64443a3a..0a3c5f01 100644
--- a/sprite_assets/AtB/light/stoppin_tram_selected_light.svg
+++ b/sprite_assets/AtB/light/stoppin_tram_selected_light.svg
@@ -5,9 +5,9 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#608000"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7054)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.825 41.2051 36.825C34.3616 36.825 21.3834 36.825 19.5004 36.825C18.3406 36.825 17.4004 35.8848 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6385 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6385 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6385 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6385 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6385 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6385 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2983 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6385 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4418 18.3171 38.05 18.8004 38.05L41.9004 38.05C42.3836 38.05 42.7754 38.4418 42.7754 38.925C42.7754 39.4083 42.3836 39.8 41.9004 39.8L18.8004 39.8C18.3171 39.8 17.9254 39.4083 17.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9418 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7534 33.5997 21.0691C33.7403 21.3847 33.6819 21.7535 33.4508 22.0104L30.3008 25.5104C29.9775 25.8696 29.4242 25.8987 29.065 25.5754C28.7058 25.2522 28.6767 24.6989 29 24.3397L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9083 26.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.8251 41.2051 36.8251C34.3616 36.8251 21.3834 36.8251 19.5004 36.8251C18.3406 36.8251 17.4004 35.8849 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6385 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6385 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6385 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6385 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6385 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6385 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2983 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6385 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.9251C17.9254 38.4418 18.3171 38.0501 18.8004 38.0501H41.9004C42.3836 38.0501 42.7754 38.4418 42.7754 38.9251C42.7754 39.4083 42.3836 39.8001 41.9004 39.8001H18.8004C18.3171 39.8001 17.9254 39.4083 17.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9418 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7534 33.5997 21.0691C33.7403 21.3847 33.6819 21.7536 33.4508 22.0104L30.3008 25.5104C29.9775 25.8696 29.4242 25.8987 29.065 25.5754C28.7058 25.2522 28.6767 24.6989 29 24.3397L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9083 26.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7054" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_active_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_active_light.svg
index 04be6a4f..a870682b 100644
--- a/sprite_assets/AtB/light/vehiclepin_ebike_active_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5921)">
 <g clip-path="url(#clip0_10646_5921)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#C91D39"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#C91D39"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="white"/>
 </g>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
@@ -17,7 +17,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5921" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5921">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_cluster__light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_cluster__light.svg
new file mode 100644
index 00000000..707a724e
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_cluster__light.svg
@@ -0,0 +1,19 @@
+<svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10646_3797)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#C91D39"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_10646_3797" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_3797"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_3797" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_cluster_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_cluster_light.svg
deleted file mode 100644
index 4bea7c35..00000000
--- a/sprite_assets/AtB/light/vehiclepin_ebike_cluster_light.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_3797)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6H52C60.8366 6 68 13.1634 68 22V22C68 30.8366 60.8366 38 52 38H24C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7H52C60.2843 7 67 13.7157 67 22C67 30.2843 60.2843 37 52 37H24C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#C91D39"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
-</g>
-<defs>
-<filter id="filter0_d_10646_3797" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_3797"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_3797" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_cluster_minimized_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_cluster_minimized__light.svg
similarity index 77%
rename from sprite_assets/AtB/light/vehiclepin_ebike_cluster_minimized_light.svg
rename to sprite_assets/AtB/light/vehiclepin_ebike_cluster_minimized__light.svg
index de1ec5d6..b9cc21f7 100644
--- a/sprite_assets/AtB/light/vehiclepin_ebike_cluster_minimized_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_cluster_minimized__light.svg
@@ -1,16 +1,16 @@
 <svg width="44" height="32" viewBox="0 0 44 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_3791)">
-<rect x="10" y="8" width="24" height="12" rx="6" fill="white"/>
-<rect x="9" y="7" width="26" height="14" rx="7" stroke="white" stroke-width="2"/>
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#C91D39"/>
+<rect x="10" y="10" width="24" height="12" rx="6" fill="white"/>
+<rect x="9" y="9" width="26" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#C91D39"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_3791" x="0" y="0" width="44" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_3791"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_3791" result="shape"/>
 </filter>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_default_dott_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_default_dott_light.svg
new file mode 100644
index 00000000..ed071ffc
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_default_dott_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10647_47322)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="#009DDB"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#009DDB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10647_47322" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47322"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47322" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_default_generic_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_default_generic_light.svg
new file mode 100644
index 00000000..539e7d27
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_default_generic_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10646_3786)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#C91D39"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_10646_3786" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_3786"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_3786" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_default_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_default_light.svg
deleted file mode 100644
index d12ea2a8..00000000
--- a/sprite_assets/AtB/light/vehiclepin_ebike_default_light.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_3786)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#C91D39"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
-</g>
-<defs>
-<filter id="filter0_d_10646_3786" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_3786"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_3786" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_default_ryde_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_default_ryde_light.svg
new file mode 100644
index 00000000..856444c4
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_default_ryde_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6360)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#4BCD1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6360" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6360"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6360" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_default_voi_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_default_voi_light.svg
index ee9d4ac9..1246df97 100644
--- a/sprite_assets/AtB/light/vehiclepin_ebike_default_voi_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_default_voi_light.svg
@@ -1,19 +1,19 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47322)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#F36960"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6346)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#F36960"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47322" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6346" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47322"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47322" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6346"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6346" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_minimized_dott_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_minimized_dott_light.svg
new file mode 100644
index 00000000..2d65df57
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_minimized_dott_light.svg
@@ -0,0 +1,22 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10647_47320)">
+<g clip-path="url(#clip0_10647_47320)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10647_47320" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47320"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47320" result="shape"/>
+</filter>
+<clipPath id="clip0_10647_47320">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_minimized_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_minimized_generic_light.svg
similarity index 78%
rename from sprite_assets/AtB/light/vehiclepin_ebike_minimized_light.svg
rename to sprite_assets/AtB/light/vehiclepin_ebike_minimized_generic_light.svg
index dfaf37b1..a4a7ca2d 100644
--- a/sprite_assets/AtB/light/vehiclepin_ebike_minimized_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_minimized_generic_light.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_3784)">
 <g clip-path="url(#clip0_10646_3784)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#C91D39"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#C91D39"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_3784" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_3784"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_3784" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_3784">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_minimized_ryde_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_minimized_ryde_light.svg
new file mode 100644
index 00000000..b8134b6a
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_minimized_ryde_light.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6358)">
+<g clip-path="url(#clip0_10957_6358)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
+<rect width="12" height="12" transform="translate(10 10)" fill="#4BCD1F"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6358" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6358"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6358" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6358">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_minimized_voi_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_minimized_voi_light.svg
index c5df4238..8d5fde29 100644
--- a/sprite_assets/AtB/light/vehiclepin_ebike_minimized_voi_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_minimized_voi_light.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47320)">
-<g clip-path="url(#clip0_10647_47320)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#F36960"/>
+<g filter="url(#filter0_d_10957_6344)">
+<g clip-path="url(#clip0_10957_6344)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47320" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6344" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47320"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47320" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6344"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6344" result="shape"/>
 </filter>
-<clipPath id="clip0_10647_47320">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<clipPath id="clip0_10957_6344">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_selected_dott_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_selected_dott_light.svg
new file mode 100644
index 00000000..3295490e
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_selected_dott_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10647_47324)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10647_47324" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47324"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47324" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_selected_generic_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_selected_generic_light.svg
new file mode 100644
index 00000000..6138a5ae
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_selected_generic_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10646_3794)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#C91D39" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_10646_3794" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_3794"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_3794" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_selected_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_selected_light.svg
deleted file mode 100644
index 982a4fb0..00000000
--- a/sprite_assets/AtB/light/vehiclepin_ebike_selected_light.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_3794)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#C91D39" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5825 35.0335 17.9095 35.0335 18.2751V27.9003H40.5761C40.9184 27.9003 41.2294 28.0999 41.3718 28.4111C41.5143 28.7224 41.4621 29.0882 41.2383 29.3472L30.155 42.1803C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6084V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4724C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4265 34.121 17.3275 34.4636 17.455Z" fill="white"/>
-</g>
-<defs>
-<filter id="filter0_d_10646_3794" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_3794"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_3794" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_selected_ryde_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_selected_ryde_light.svg
new file mode 100644
index 00000000..7c1a9c33
--- /dev/null
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_selected_ryde_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6362)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6362" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6362"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6362" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_ebike_selected_voi_light.svg b/sprite_assets/AtB/light/vehiclepin_ebike_selected_voi_light.svg
index b508a67b..e37a655f 100644
--- a/sprite_assets/AtB/light/vehiclepin_ebike_selected_voi_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_ebike_selected_voi_light.svg
@@ -1,17 +1,17 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47324)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5825 35.0335 17.9095 35.0335 18.2751V27.9003H40.5761C40.9184 27.9003 41.2294 28.0999 41.3718 28.4111C41.5143 28.7224 41.4621 29.0882 41.2383 29.3472L30.155 42.1803C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6084V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4724C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4265 34.121 17.3275 34.4636 17.455Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6348)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47324" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6348" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47324"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47324" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6348"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6348" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_scooter_default_voi_light.svg b/sprite_assets/AtB/light/vehiclepin_scooter_default_voi_light.svg
index d6d45b76..22293865 100644
--- a/sprite_assets/AtB/light/vehiclepin_scooter_default_voi_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_scooter_default_voi_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_8318_6858)">
-<g clip-path="url(#clip0_8318_6858)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<g filter="url(#filter0_d_10957_6516)">
+<g clip-path="url(#clip0_10957_6516)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#F36960"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="black"/>
@@ -11,17 +11,17 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_8318_6858" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6516" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_8318_6858"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_8318_6858" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6516"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6516" result="shape"/>
 </filter>
-<clipPath id="clip0_8318_6858">
-<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<clipPath id="clip0_10957_6516">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/AtB/light/vehiclepin_scooter_minimized_voi_light.svg b/sprite_assets/AtB/light/vehiclepin_scooter_minimized_voi_light.svg
index 3303958f..1524a6d0 100644
--- a/sprite_assets/AtB/light/vehiclepin_scooter_minimized_voi_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_scooter_minimized_voi_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_8318_6850)">
-<g clip-path="url(#clip0_8318_6850)">
+<g filter="url(#filter0_d_10957_6552)">
+<g clip-path="url(#clip0_10957_6552)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_8318_6850" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6552" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_8318_6850"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_8318_6850" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6552"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6552" result="shape"/>
 </filter>
-<clipPath id="clip0_8318_6850">
+<clipPath id="clip0_10957_6552">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/AtB/light/vehiclepin_scooter_selected_voi_light.svg b/sprite_assets/AtB/light/vehiclepin_scooter_selected_voi_light.svg
index e5b10365..c7083182 100644
--- a/sprite_assets/AtB/light/vehiclepin_scooter_selected_voi_light.svg
+++ b/sprite_assets/AtB/light/vehiclepin_scooter_selected_voi_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_8318_6868)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<g filter="url(#filter0_d_10957_6479)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_8318_6868" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6479" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_8318_6868"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_8318_6868" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6479"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6479" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/geofencingzone_parking_dark.svg b/sprite_assets/FRAM/dark/geofencingzone_parking_dark.svg
index c4778f01..7a71a9da 100644
--- a/sprite_assets/FRAM/dark/geofencingzone_parking_dark.svg
+++ b/sprite_assets/FRAM/dark/geofencingzone_parking_dark.svg
@@ -1,17 +1,4 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10043_6335)">
-<path d="M8 12C8 9.79086 9.79086 8 12 8H32C34.2091 8 36 9.79086 36 12V32C36 34.2091 34.2091 36 32 36H12C9.79086 36 8 34.2091 8 32V12Z" fill="#007AB5"/>
-<path d="M18 22.9999V15.9999H22.6667C24.5997 15.9999 26.1667 17.5669 26.1667 19.4999C26.1667 21.4329 24.5997 22.9999 22.6667 22.9999H18ZM18 22.9999V28.8332" stroke="white" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_d_10043_6335" x="0" y="0" width="44" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10043_6335"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10043_6335" result="shape"/>
-</filter>
-</defs>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H24C26.2091 0 28 1.79086 28 4V24C28 26.2091 26.2091 28 24 28H4C1.79086 28 0 26.2091 0 24V4Z" fill="#007AB5"/>
+<path d="M10.7051 21.4166C10.2221 21.4166 9.12695 21.1867 9.12695 20.7037V8.29163C9.12695 7.80863 9.51895 7.41663 10.002 7.41663H14.6641C17.0791 7.41663 19.0391 9.37663 19.0391 11.7916C19.0391 14.2066 17.0791 16.2037 14.6641 16.2037H12.2177V20.7037C12.2177 21.1867 11.1881 21.4166 10.7051 21.4166ZM12.2177 13.2037H13.7177C15.1667 13.2037 16.2177 13.1527 16.2177 11.7037C16.2177 10.3054 15.1667 10.2037 13.7177 10.2037H12.2177V13.2037Z" fill="white"/>
 </svg>
diff --git a/sprite_assets/FRAM/dark/stationpin_citybike_parking_default_dark.svg b/sprite_assets/FRAM/dark/stationpin_citybike_parking_default_dark.svg
index a92a4c62..c2eeb430 100644
--- a/sprite_assets/FRAM/dark/stationpin_citybike_parking_default_dark.svg
+++ b/sprite_assets/FRAM/dark/stationpin_citybike_parking_default_dark.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_8574)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="black"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="black" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#5B0C0E"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="white"/>
-<path d="M21.085 29.2099C20.74 29.2099 20.46 28.9299 20.46 28.5849V19.4199C20.46 19.0749 20.74 18.7949 21.085 18.7949H24.415C26.14 18.7949 27.54 20.1949 27.54 21.9199C27.54 23.6449 26.14 25.0449 24.415 25.0449H21.71V28.5849C21.71 28.9299 21.43 29.2099 21.085 29.2099ZM21.71 23.7899H24.415C25.45 23.7899 26.29 22.9499 26.29 21.9149C26.29 20.8799 25.45 20.0399 24.415 20.0399H21.71V23.7899Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#007AB5"/>
+<path d="M20.7051 31.4166C20.2221 31.4166 19.127 31.1867 19.127 30.7037V18.2916C19.127 17.8086 19.519 17.4166 20.002 17.4166H24.6641C27.0791 17.4166 29.0391 19.3766 29.0391 21.7916C29.0391 24.2066 27.0791 26.2037 24.6641 26.2037H22.2177V30.7037C22.2177 31.1867 21.1881 31.4166 20.7051 31.4166ZM22.2177 23.2037H23.7177C25.1667 23.2037 26.2177 23.1527 26.2177 21.7037C26.2177 20.3054 25.1667 20.2037 23.7177 20.2037H22.2177V23.2037Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8574" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/dark/stationpin_citybike_parking_minimized_dark.svg b/sprite_assets/FRAM/dark/stationpin_citybike_parking_minimized_dark.svg
index 5e22cddb..92bd8afc 100644
--- a/sprite_assets/FRAM/dark/stationpin_citybike_parking_minimized_dark.svg
+++ b/sprite_assets/FRAM/dark/stationpin_citybike_parking_minimized_dark.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_8611)">
 <g clip-path="url(#clip0_8318_8611)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#5B0C0E"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#007AB5"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="black" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/FRAM/dark/stationpin_citybike_parking_selected_dark.svg b/sprite_assets/FRAM/dark/stationpin_citybike_parking_selected_dark.svg
index 45c2c96c..aa9472c7 100644
--- a/sprite_assets/FRAM/dark/stationpin_citybike_parking_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/stationpin_citybike_parking_selected_dark.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8590)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#5B0C0E"/>
-<path d="M38.75 41.9559H21.25C19.479 41.9559 18.0439 40.5139 18.0439 38.7499V21.2499C18.0439 19.4789 19.479 18.0439 21.25 18.0439H38.75C40.521 18.0439 41.9561 19.4859 41.9561 21.2499V38.7499C41.9561 40.5209 40.521 41.9559 38.75 41.9559ZM21.25 19.7939C20.445 19.7939 19.7939 20.4449 19.7939 21.2499V38.7499C19.7939 39.5549 20.445 40.2059 21.25 40.2059H38.75C39.555 40.2059 40.2061 39.5549 40.2061 38.7499V21.2499C40.2061 20.4449 39.555 19.7939 38.75 19.7939H21.25Z" fill="white"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.9019 25.0439 36.4189V23.5879C25.0439 23.1049 25.4359 22.7129 25.9189 22.7129H30.5811C32.9961 22.7129 34.9561 24.6729 34.9561 27.0879C34.9561 29.5029 32.9961 31.4629 30.5811 31.4629H26.7939V36.4189C26.7939 36.9019 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.7059H30.5811C32.0301 29.7059 33.2061 28.5299 33.2061 27.0809C33.2061 25.6319 32.0301 24.4559 30.5811 24.4559H26.7939V29.7059Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#007AB5"/>
+<path d="M25.0074 40.3094C24.3174 40.3094 22.7529 39.981 22.7529 39.291V21.5594C22.7529 20.8694 23.3129 20.3094 24.0029 20.3094H30.6631C34.1131 20.3094 36.9131 23.1094 36.9131 26.5594C36.9131 30.0094 34.1131 32.8625 30.6631 32.8625H27.1683V39.291C27.1683 39.981 25.6974 40.3094 25.0074 40.3094ZM27.1683 28.5767H29.3112C31.3812 28.5767 32.8826 28.5039 32.8826 26.4339C32.8826 24.4363 31.3812 24.291 29.3112 24.291H27.1683V28.5767Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8590" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_default_dark.svg b/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_default_dark.svg
index 77e7906c..cd59ab92 100644
--- a/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_default_dark.svg
+++ b/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_default_dark.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_8580)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="black"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="black" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#AA8892"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="black"/>
-<path d="M21.085 29.2099C20.74 29.2099 20.46 28.9299 20.46 28.5849V19.4199C20.46 19.0749 20.74 18.7949 21.085 18.7949H24.415C26.14 18.7949 27.54 20.1949 27.54 21.9199C27.54 23.6449 26.14 25.0449 24.415 25.0449H21.71V28.5849C21.71 28.9299 21.43 29.2099 21.085 29.2099ZM21.71 23.7899H24.415C25.45 23.7899 26.29 22.9499 26.29 21.9149C26.29 20.8799 25.45 20.0399 24.415 20.0399H21.71V23.7899Z" fill="black"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#007AB5"/>
+<path d="M20.7051 31.4166C20.2221 31.4166 19.127 31.1867 19.127 30.7037V18.2916C19.127 17.8086 19.519 17.4166 20.002 17.4166H24.6641C27.0791 17.4166 29.0391 19.3766 29.0391 21.7916C29.0391 24.2066 27.0791 26.2037 24.6641 26.2037H22.2177V30.7037C22.2177 31.1867 21.1881 31.4166 20.7051 31.4166ZM22.2177 23.2037H23.7177C25.1667 23.2037 26.2177 23.1527 26.2177 21.7037C26.2177 20.3054 25.1667 20.2037 23.7177 20.2037H22.2177V23.2037Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8580" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_minimized_dark.svg b/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_minimized_dark.svg
index 7521ac15..c590e555 100644
--- a/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_minimized_dark.svg
+++ b/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_minimized_dark.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_8613)">
 <g clip-path="url(#clip0_8318_8613)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#AA8892"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#007AB5"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="black" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_selected_dark.svg b/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_selected_dark.svg
index a6937d52..84fd0774 100644
--- a/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/stationpin_sharedcar_parking_selected_dark.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8604)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#AA8892"/>
-<path d="M38.75 41.9559H21.25C19.479 41.9559 18.0439 40.5139 18.0439 38.7499V21.2499C18.0439 19.4789 19.479 18.0439 21.25 18.0439H38.75C40.521 18.0439 41.9561 19.4859 41.9561 21.2499V38.7499C41.9561 40.5209 40.521 41.9559 38.75 41.9559ZM21.25 19.7939C20.445 19.7939 19.7939 20.4449 19.7939 21.2499V38.7499C19.7939 39.5549 20.445 40.2059 21.25 40.2059H38.75C39.555 40.2059 40.2061 39.5549 40.2061 38.7499V21.2499C40.2061 20.4449 39.555 19.7939 38.75 19.7939H21.25Z" fill="black"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.9019 25.0439 36.4189V23.5879C25.0439 23.1049 25.4359 22.7129 25.9189 22.7129H30.5811C32.9961 22.7129 34.9561 24.6729 34.9561 27.0879C34.9561 29.5029 32.9961 31.4629 30.5811 31.4629H26.7939V36.4189C26.7939 36.9019 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.7059H30.5811C32.0301 29.7059 33.2061 28.5299 33.2061 27.0809C33.2061 25.6319 32.0301 24.4559 30.5811 24.4559H26.7939V29.7059Z" fill="black"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#007AB5"/>
+<path d="M25.0074 40.3094C24.3174 40.3094 22.7529 39.981 22.7529 39.291V21.5594C22.7529 20.8694 23.3129 20.3094 24.0029 20.3094H30.6631C34.1131 20.3094 36.9131 23.1094 36.9131 26.5594C36.9131 30.0094 34.1131 32.8625 30.6631 32.8625H27.1683V39.291C27.1683 39.981 25.6974 40.3094 25.0074 40.3094ZM27.1683 28.5767H29.3112C31.3812 28.5767 32.8826 28.5039 32.8826 26.4339C32.8826 24.4363 31.3812 24.291 29.3112 24.291H27.1683V28.5767Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8604" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/dark/stoppin_boat_selected_dark.svg b/sprite_assets/FRAM/dark/stoppin_boat_selected_dark.svg
index 0acc7dd3..373ad53a 100644
--- a/sprite_assets/FRAM/dark/stoppin_boat_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/stoppin_boat_selected_dark.svg
@@ -5,7 +5,7 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#007AB5"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8677)"/>
-<path d="M41.1851 33.6382C40.7907 33.2797 40.3606 32.8853 39.536 32.8853C38.7115 32.8853 38.2813 33.2797 37.887 33.6382C37.5285 33.9608 37.2058 34.2476 36.5606 34.2476C35.9153 34.2476 35.5926 33.9608 35.2341 33.6382C34.8398 33.2797 34.4096 32.8853 33.5851 32.8853C32.7606 32.8853 32.3304 33.2797 31.936 33.6382C31.5775 33.9608 31.2549 34.2476 30.6096 34.2476C29.9643 34.2476 29.6417 33.9608 29.2832 33.6382C29.104 33.4589 28.8889 33.2797 28.6379 33.1363C28.6379 33.1363 28.5662 33.1363 28.5304 33.1363C28.2794 33.0287 28.0285 32.957 27.67 32.957C26.8455 32.957 26.4153 33.3514 26.0568 33.7098C25.6983 34.0325 25.4115 34.3193 24.7662 34.3193C24.1209 34.3193 23.7983 34.0325 23.4757 33.7098C23.0813 33.3514 22.687 32.957 21.8625 32.957C21.0379 32.957 20.6077 33.3514 20.2493 33.7098C19.8908 34.0325 19.604 34.3193 18.9228 34.3193C18.2417 34.3193 17.9549 34.0325 17.6323 33.7098C17.4172 33.5306 17.2021 33.3155 16.8794 33.1363L16.7002 34.3193C16.9511 34.4268 17.1304 34.6061 17.3096 34.7853C17.704 35.1438 18.1342 35.5382 18.9228 35.5382C19.7115 35.5382 20.1776 35.1438 20.536 34.7853C20.8945 34.4627 21.1813 34.1759 21.8266 34.1759C22.4719 34.1759 22.7945 34.4627 23.153 34.7853C23.5474 35.1438 23.9417 35.5382 24.7662 35.5382C25.5908 35.5382 26.0209 35.1438 26.3794 34.7853C26.7379 34.4627 27.0247 34.1759 27.7058 34.1759C28.387 34.1759 28.2436 34.2476 28.4587 34.3551C28.6379 34.4627 28.8172 34.6061 28.9606 34.7495C29.3191 35.0721 29.7492 35.4665 30.5738 35.4665C31.3983 35.4665 31.8285 35.0721 32.2228 34.7136C32.5813 34.391 32.8681 34.1042 33.5492 34.1042C34.2304 34.1042 34.5172 34.391 34.8757 34.7136C35.27 35.0721 35.7002 35.4665 36.5247 35.4665C37.3492 35.4665 37.7794 35.0721 38.1738 34.7136C38.5323 34.391 38.8549 34.1042 39.5002 34.1042C40.1455 34.1042 40.4681 34.391 40.8266 34.7136L41.2209 33.7098C41.2209 33.7098 41.1492 33.6382 41.0775 33.6023V33.674L41.1851 33.6382Z" fill="white"/>
+<path d="M41.1851 33.6382C40.7908 33.2797 40.3606 32.8853 39.536 32.8853C38.7115 32.8853 38.2813 33.2797 37.887 33.6382C37.5285 33.9608 37.2058 34.2476 36.5606 34.2476C35.9153 34.2476 35.5926 33.9608 35.2341 33.6382C34.8398 33.2797 34.4096 32.8853 33.5851 32.8853C32.7606 32.8853 32.3304 33.2797 31.936 33.6382C31.5775 33.9608 31.2549 34.2476 30.6096 34.2476C29.9643 34.2476 29.6417 33.9608 29.2832 33.6382C29.104 33.4589 28.8889 33.2797 28.6379 33.1363C28.6379 33.1363 28.5662 33.1363 28.5304 33.1363C28.2794 33.0287 28.0285 32.957 27.67 32.957C26.8455 32.957 26.4153 33.3514 26.0568 33.7099C25.6983 34.0325 25.4115 34.3193 24.7662 34.3193C24.1209 34.3193 23.7983 34.0325 23.4757 33.7099C23.0813 33.3514 22.687 32.957 21.8625 32.957C21.0379 32.957 20.6077 33.3514 20.2493 33.7099C19.8908 34.0325 19.604 34.3193 18.9228 34.3193C18.2417 34.3193 17.9549 34.0325 17.6323 33.7099C17.4172 33.5306 17.2021 33.3155 16.8794 33.1363L16.7002 34.3193C16.9511 34.4268 17.1304 34.6061 17.3096 34.7853C17.704 35.1438 18.1342 35.5382 18.9228 35.5382C19.7115 35.5382 20.1776 35.1438 20.536 34.7853C20.8945 34.4627 21.1813 34.1759 21.8266 34.1759C22.4719 34.1759 22.7945 34.4627 23.153 34.7853C23.5474 35.1438 23.9417 35.5382 24.7662 35.5382C25.5908 35.5382 26.0209 35.1438 26.3794 34.7853C26.7379 34.4627 27.0247 34.1759 27.7059 34.1759C28.387 34.1759 28.2436 34.2476 28.4587 34.3551C28.6379 34.4627 28.8172 34.6061 28.9606 34.7495C29.3191 35.0721 29.7492 35.4665 30.5738 35.4665C31.3983 35.4665 31.8285 35.0721 32.2228 34.7136C32.5813 34.391 32.8681 34.1042 33.5492 34.1042C34.2304 34.1042 34.5172 34.391 34.8757 34.7136C35.27 35.0721 35.7002 35.4665 36.5247 35.4665C37.3492 35.4665 37.7794 35.0721 38.1738 34.7136C38.5323 34.391 38.8549 34.1042 39.5002 34.1042C40.1455 34.1042 40.4681 34.391 40.8266 34.7136L41.2209 33.7099C41.2209 33.7099 41.1492 33.6382 41.0775 33.6023V33.674L41.1851 33.6382Z" fill="white"/>
 <path d="M28.4945 33.1004C28.2794 32.9929 28.0643 32.9212 27.7417 32.9212C27.4191 32.9212 27.1681 32.9929 26.953 33.1363L28.5304 33.1363L28.4945 33.1363V33.1004Z" fill="white"/>
 <path d="M21.0021 33.1721H22.687C22.4719 33.0287 22.2209 32.9212 21.8625 32.9212C21.504 32.9212 21.2172 33.0287 21.0021 33.1721Z" fill="white"/>
 <path d="M43.1926 28.1891H39.8587L34.7323 24.3891H21.2889C21.0738 24.3891 20.8945 24.5683 20.8587 24.7834L20.07 28.1891H18.8153C18.6002 28.1891 18.4209 28.3325 18.3851 28.5117L17.4172 31.9891L17.3096 32.0966C17.453 32.2042 17.5606 32.3117 17.704 32.4193C18.0625 32.7419 18.3493 33.0287 18.9945 33.0287C19.6398 33.0287 19.9625 32.7419 20.3209 32.4193C20.7153 32.0608 21.1096 31.6665 21.9342 31.6665C22.7587 31.6665 23.1889 32.0608 23.5474 32.4193C23.9059 32.7419 24.1926 33.0287 24.8379 33.0287C25.4832 33.0287 25.8059 32.7419 26.1285 32.4193C26.5228 32.0608 26.9172 31.6665 27.7417 31.6665C28.5662 31.6665 28.387 31.7382 28.6021 31.8457C28.9247 31.9891 29.1398 32.2042 29.3908 32.3834C29.7492 32.7061 30.0719 32.9929 30.7172 32.9929C31.3625 32.9929 31.6851 32.7061 32.0436 32.3834C32.4379 32.0249 32.8681 31.6306 33.6926 31.6306C34.5172 31.6306 34.9474 32.0249 35.3417 32.3834C35.7002 32.7061 36.0228 32.9929 36.6681 32.9929C37.3134 32.9929 37.636 32.7061 37.9945 32.3834C38.3889 32.0249 38.819 31.6306 39.6436 31.6306C40.4681 31.6306 40.5398 31.774 40.8266 31.9891L43.3002 28.5476C43.3002 28.5476 43.3002 28.4759 43.3002 28.4042C43.3002 28.2608 43.1926 28.1532 43.0492 28.1532H43.1568L43.1926 28.1891ZM25.5908 28.1891H21.0738L21.504 26.3249H25.5191V26.3966H25.5908V28.2249V28.1891ZM30.0719 28.1891H26.0926V26.3249H30.0719V28.1891ZM30.7172 28.1891V26.3249H35.3775L37.9228 28.1891H30.7172Z" fill="white"/>
diff --git a/sprite_assets/FRAM/dark/stoppin_bus_selected_dark.svg b/sprite_assets/FRAM/dark/stoppin_bus_selected_dark.svg
index b2ad93ca..e1c6d531 100644
--- a/sprite_assets/FRAM/dark/stoppin_bus_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/stoppin_bus_selected_dark.svg
@@ -5,7 +5,7 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#82B962"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8657)"/>
-<path d="M43.3002 34.7389C43.3002 35.0889 43.1072 35.2833 42.7597 35.2833H38.7446V34.9333C38.7446 34.1555 38.4744 33.4555 37.8953 32.9111C37.3548 32.3666 36.6598 32.0555 35.8877 32.0555C35.1156 32.0555 34.3821 32.3278 33.8416 32.9111C33.3011 33.4555 32.9922 34.1555 32.9922 34.9333C32.9922 35.7111 32.9922 35.05 32.9922 35.0889V35.2444H26.931V34.8944C26.931 34.1166 26.6607 33.4166 26.1202 32.8722C25.5797 32.3278 24.8848 32.0166 24.0741 32.0166C23.2633 32.0166 22.5684 32.2889 22.0279 32.8722C21.4874 33.4166 21.2172 34.1166 21.2172 34.8944V35.2444H17.2407C17.0863 35.2444 16.9704 35.2444 16.8546 35.0889C16.7388 34.9722 16.7002 34.8555 16.7002 34.7V24.3944C16.7002 24.2389 16.7388 24.1222 16.8546 24.0055C16.9704 23.8889 17.0863 23.85 17.2407 23.85H42.6825C42.8369 23.85 42.9527 23.85 43.0686 24.0055C43.1844 24.1222 43.223 24.2389 43.223 24.3944H43.3002V34.7389ZM17.9742 30.5778H23.2633V26.1833H17.9742V30.5778ZM26.3519 34.9333C26.3519 35.5555 26.1202 36.0611 25.6955 36.4889C25.2709 36.9166 24.7304 37.15 24.1513 37.15C23.5722 37.15 23.0317 36.9166 22.607 36.4889C22.1823 36.0611 21.9507 35.5166 21.9507 34.9333C21.9507 34.35 22.1823 33.8055 22.607 33.3778C23.0317 32.95 23.5722 32.7555 24.1513 32.7555C24.7304 32.7555 25.2709 32.95 25.6955 33.3778C26.1202 33.8055 26.3519 34.3111 26.3519 34.9333ZM24.2285 30.5778H29.5176V26.1833H24.2285V30.5778ZM30.5214 30.5778H35.8491V26.1833H30.5214V30.5778ZM38.1269 34.9333C38.1269 35.5555 37.8953 36.0611 37.4706 36.4889C37.0459 36.9166 36.5054 37.15 35.9263 37.15C35.3472 37.15 34.8067 36.9166 34.3821 36.4889C33.9574 36.0611 33.7257 35.5166 33.7257 34.9333C33.7257 34.35 33.9574 33.8055 34.3821 33.3778C34.8067 32.95 35.3472 32.7555 35.9263 32.7555C36.5054 32.7555 37.0459 32.95 37.4706 33.3778C37.8953 33.8055 38.1269 34.3111 38.1269 34.9333ZM36.8143 30.5778H42.1034V26.1833H36.8143V30.5778Z" fill="black"/>
+<path d="M43.3002 34.7389C43.3002 35.0889 43.1072 35.2833 42.7597 35.2833H38.7446V34.9333C38.7446 34.1555 38.4744 33.4555 37.8953 32.9111C37.3548 32.3666 36.6598 32.0555 35.8877 32.0555C35.1156 32.0555 34.3821 32.3278 33.8416 32.9111C33.3011 33.4555 32.9922 34.1555 32.9922 34.9333C32.9922 35.7111 32.9922 35.05 32.9922 35.0889V35.2444H26.931V34.8944C26.931 34.1166 26.6607 33.4166 26.1202 32.8722C25.5797 32.3278 24.8848 32.0166 24.0741 32.0166C23.2633 32.0166 22.5684 32.2889 22.0279 32.8722C21.4874 33.4166 21.2172 34.1166 21.2172 34.8944V35.2444H17.2407C17.0863 35.2444 16.9704 35.2444 16.8546 35.0889C16.7388 34.9722 16.7002 34.8555 16.7002 34.7V24.3944C16.7002 24.2389 16.7388 24.1222 16.8546 24.0055C16.9704 23.8889 17.0863 23.85 17.2407 23.85H42.6825C42.8369 23.85 42.9527 23.85 43.0686 24.0055C43.1844 24.1222 43.223 24.2389 43.223 24.3944H43.3002V34.7389ZM17.9742 30.5778H23.2633V26.1833H17.9742V30.5778ZM26.3519 34.9333C26.3519 35.5555 26.1202 36.0611 25.6956 36.4889C25.2709 36.9166 24.7304 37.15 24.1513 37.15C23.5722 37.15 23.0317 36.9166 22.607 36.4889C22.1823 36.0611 21.9507 35.5166 21.9507 34.9333C21.9507 34.35 22.1823 33.8055 22.607 33.3778C23.0317 32.95 23.5722 32.7555 24.1513 32.7555C24.7304 32.7555 25.2709 32.95 25.6956 33.3778C26.1202 33.8055 26.3519 34.3111 26.3519 34.9333ZM24.2285 30.5778H29.5176V26.1833H24.2285V30.5778ZM30.5214 30.5778H35.8491V26.1833H30.5214V30.5778ZM38.1269 34.9333C38.1269 35.5555 37.8953 36.0611 37.4706 36.4889C37.0459 36.9166 36.5054 37.15 35.9263 37.15C35.3472 37.15 34.8067 36.9166 34.3821 36.4889C33.9574 36.0611 33.7257 35.5166 33.7257 34.9333C33.7257 34.35 33.9574 33.8055 34.3821 33.3778C34.8067 32.95 35.3472 32.7555 35.9263 32.7555C36.5054 32.7555 37.0459 32.95 37.4706 33.3778C37.8953 33.8055 38.1269 34.3111 38.1269 34.9333ZM36.8143 30.5778H42.1034V26.1833H36.8143V30.5778Z" fill="black"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8657" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/dark/stoppin_busandtram_selected_dark.svg b/sprite_assets/FRAM/dark/stoppin_busandtram_selected_dark.svg
index f1b45e33..9db8e5ec 100644
--- a/sprite_assets/FRAM/dark/stoppin_busandtram_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/stoppin_busandtram_selected_dark.svg
@@ -6,10 +6,10 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8719)"/>
 <rect x="10" y="10" width="40" height="40" rx="6" fill="#82B962"/>
-<path d="M43.3002 34.7389C43.3002 35.0889 43.1072 35.2833 42.7597 35.2833H38.7446V34.9333C38.7446 34.1555 38.4744 33.4555 37.8953 32.9111C37.3548 32.3666 36.6598 32.0555 35.8877 32.0555C35.1156 32.0555 34.3821 32.3278 33.8416 32.9111C33.3011 33.4555 32.9922 34.1555 32.9922 34.9333C32.9922 35.7111 32.9922 35.05 32.9922 35.0889V35.2444H26.931V34.8944C26.931 34.1166 26.6607 33.4166 26.1202 32.8722C25.5797 32.3278 24.8848 32.0166 24.0741 32.0166C23.2633 32.0166 22.5684 32.2889 22.0279 32.8722C21.4874 33.4166 21.2172 34.1166 21.2172 34.8944V35.2444H17.2407C17.0863 35.2444 16.9704 35.2444 16.8546 35.0889C16.7388 34.9722 16.7002 34.8555 16.7002 34.7V24.3944C16.7002 24.2389 16.7388 24.1222 16.8546 24.0055C16.9704 23.8889 17.0863 23.85 17.2407 23.85H42.6825C42.8369 23.85 42.9527 23.85 43.0686 24.0055C43.1844 24.1222 43.223 24.2389 43.223 24.3944H43.3002V34.7389ZM17.9742 30.5778H23.2633V26.1833H17.9742V30.5778ZM26.3519 34.9333C26.3519 35.5555 26.1202 36.0611 25.6955 36.4889C25.2709 36.9166 24.7304 37.15 24.1513 37.15C23.5722 37.15 23.0317 36.9166 22.607 36.4889C22.1823 36.0611 21.9507 35.5166 21.9507 34.9333C21.9507 34.35 22.1823 33.8055 22.607 33.3778C23.0317 32.95 23.5722 32.7555 24.1513 32.7555C24.7304 32.7555 25.2709 32.95 25.6955 33.3778C26.1202 33.8055 26.3519 34.3111 26.3519 34.9333ZM24.2285 30.5778H29.5176V26.1833H24.2285V30.5778ZM30.5214 30.5778H35.8491V26.1833H30.5214V30.5778ZM38.1269 34.9333C38.1269 35.5555 37.8953 36.0611 37.4706 36.4889C37.0459 36.9166 36.5054 37.15 35.9263 37.15C35.3472 37.15 34.8067 36.9166 34.3821 36.4889C33.9574 36.0611 33.7257 35.5166 33.7257 34.9333C33.7257 34.35 33.9574 33.8055 34.3821 33.3778C34.8067 32.95 35.3472 32.7555 35.9263 32.7555C36.5054 32.7555 37.0459 32.95 37.4706 33.3778C37.8953 33.8055 38.1269 34.3111 38.1269 34.9333ZM36.8143 30.5778H42.1034V26.1833H36.8143V30.5778Z" fill="black"/>
+<path d="M43.3002 34.7389C43.3002 35.0889 43.1072 35.2833 42.7597 35.2833H38.7446V34.9333C38.7446 34.1555 38.4744 33.4555 37.8953 32.9111C37.3548 32.3666 36.6598 32.0555 35.8877 32.0555C35.1156 32.0555 34.3821 32.3278 33.8416 32.9111C33.3011 33.4555 32.9922 34.1555 32.9922 34.9333C32.9922 35.7111 32.9922 35.05 32.9922 35.0889V35.2444H26.931V34.8944C26.931 34.1166 26.6607 33.4166 26.1202 32.8722C25.5797 32.3278 24.8848 32.0166 24.0741 32.0166C23.2633 32.0166 22.5684 32.2889 22.0279 32.8722C21.4874 33.4166 21.2172 34.1166 21.2172 34.8944V35.2444H17.2407C17.0863 35.2444 16.9704 35.2444 16.8546 35.0889C16.7388 34.9722 16.7002 34.8555 16.7002 34.7V24.3944C16.7002 24.2389 16.7388 24.1222 16.8546 24.0055C16.9704 23.8889 17.0863 23.85 17.2407 23.85H42.6825C42.8369 23.85 42.9527 23.85 43.0686 24.0055C43.1844 24.1222 43.223 24.2389 43.223 24.3944H43.3002V34.7389ZM17.9742 30.5778H23.2633V26.1833H17.9742V30.5778ZM26.3519 34.9333C26.3519 35.5555 26.1202 36.0611 25.6956 36.4889C25.2709 36.9166 24.7304 37.15 24.1513 37.15C23.5722 37.15 23.0317 36.9166 22.607 36.4889C22.1823 36.0611 21.9507 35.5166 21.9507 34.9333C21.9507 34.35 22.1823 33.8055 22.607 33.3778C23.0317 32.95 23.5722 32.7555 24.1513 32.7555C24.7304 32.7555 25.2709 32.95 25.6956 33.3778C26.1202 33.8055 26.3519 34.3111 26.3519 34.9333ZM24.2285 30.5778H29.5176V26.1833H24.2285V30.5778ZM30.5214 30.5778H35.8491V26.1833H30.5214V30.5778ZM38.1269 34.9333C38.1269 35.5555 37.8953 36.0611 37.4706 36.4889C37.0459 36.9166 36.5054 37.15 35.9263 37.15C35.3472 37.15 34.8067 36.9166 34.3821 36.4889C33.9574 36.0611 33.7257 35.5166 33.7257 34.9333C33.7257 34.35 33.9574 33.8055 34.3821 33.3778C34.8067 32.95 35.3472 32.7555 35.9263 32.7555C36.5054 32.7555 37.0459 32.95 37.4706 33.3778C37.8953 33.8055 38.1269 34.3111 38.1269 34.9333ZM36.8143 30.5778H42.1034V26.1833H36.8143V30.5778Z" fill="black"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#82B962"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6384 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6384 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6384 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6384 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6384 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6384 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2982 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6384 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05H83.9004C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8H60.8004C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9417 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7533 75.5997 21.069C75.7403 21.3847 75.6819 21.7535 75.4508 22.0103L72.3008 25.5103C71.9775 25.8695 71.4242 25.8986 71.065 25.5754C70.7058 25.2521 70.6767 24.6988 71 24.3396L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9082 68.3254 21.425Z" fill="black"/>
 </g>
 <defs>
diff --git a/sprite_assets/FRAM/dark/stoppin_metroandtram_selected_dark.svg b/sprite_assets/FRAM/dark/stoppin_metroandtram_selected_dark.svg
index dcb83144..150b65fd 100644
--- a/sprite_assets/FRAM/dark/stoppin_metroandtram_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/stoppin_metroandtram_selected_dark.svg
@@ -10,7 +10,7 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M21.1986 22.972C21.6676 20.158 24.1041 18.1 26.9531 18.1H33.0426C35.8986 18.1 38.3281 20.158 38.7971 22.972L40.3365 32.212C40.8475 35.25 38.881 38.246 35.71 38.673C33.995 38.904 31.9579 39.1 29.9979 39.1C28.0379 39.1 26.0077 38.904 24.2857 38.673C21.1217 38.246 19.1552 35.25 19.6592 32.212L21.1986 22.972ZM26.9531 20.431C25.2451 20.431 23.7817 21.67 23.5017 23.357L23.0751 25.919C24.0201 26.927 25.2587 27.585 26.5047 28.005C27.8977 28.467 29.2279 28.6 29.9979 28.6C30.7679 28.6 32.098 28.467 33.491 28.005C34.737 27.592 35.9761 26.927 36.9281 25.919L36.5009 23.357C36.2139 21.67 34.7576 20.431 33.0426 20.431H26.9531ZM26.4979 32.093C25.8539 32.093 25.3289 32.618 25.3289 33.262C25.3289 33.906 25.8539 34.431 26.4979 34.431C27.1489 34.431 27.6668 33.906 27.6668 33.262C27.6668 32.618 27.1489 32.093 26.4979 32.093ZM33.4842 32.093C32.8402 32.093 32.3221 32.618 32.3221 33.262C32.3221 33.906 32.8402 34.431 33.4842 34.431H33.4979C34.1419 34.431 34.6668 33.906 34.6668 33.262C34.6668 32.618 34.1419 32.093 33.4979 32.093H33.4842Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#82B962"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6384 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6384 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6384 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6384 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6384 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6384 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2982 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6384 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05H83.9004C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8H60.8004C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9417 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7533 75.5997 21.069C75.7403 21.3847 75.6819 21.7535 75.4508 22.0103L72.3008 25.5103C71.9775 25.8695 71.4242 25.8986 71.065 25.5754C70.7058 25.2521 70.6767 24.6988 71 24.3396L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9082 68.3254 21.425Z" fill="black"/>
 </g>
 <defs>
diff --git a/sprite_assets/FRAM/dark/stoppin_tram_selected_dark.svg b/sprite_assets/FRAM/dark/stoppin_tram_selected_dark.svg
index ecc814a8..52c5f536 100644
--- a/sprite_assets/FRAM/dark/stoppin_tram_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/stoppin_tram_selected_dark.svg
@@ -6,7 +6,7 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#82B962"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8662)"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.825 41.2051 36.825C34.3616 36.825 21.3834 36.825 19.5004 36.825C18.3406 36.825 17.4004 35.8848 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6384 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6384 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6384 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6384 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6384 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6384 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2982 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6384 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4417 18.3171 38.05 18.8004 38.05L41.9004 38.05C42.3836 38.05 42.7754 38.4417 42.7754 38.925C42.7754 39.4082 42.3836 39.8 41.9004 39.8L18.8004 39.8C18.3171 39.8 17.9254 39.4082 17.9254 38.925Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4417 18.3171 38.05 18.8004 38.05H41.9004C42.3836 38.05 42.7754 38.4417 42.7754 38.925C42.7754 39.4082 42.3836 39.8 41.9004 39.8H18.8004C18.3171 39.8 17.9254 39.4082 17.9254 38.925Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9417 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7533 33.5997 21.069C33.7403 21.3847 33.6819 21.7535 33.4508 22.0103L30.3008 25.5103C29.9775 25.8695 29.4242 25.8986 29.065 25.5754C28.7058 25.2521 28.6767 24.6988 29 24.3396L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9082 26.3254 21.425Z" fill="black"/>
 </g>
 <defs>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_citybike_active_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_citybike_active_dark.svg
index f7e5cfdb..46ec784f 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_citybike_active_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_citybike_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46876)">
 <g clip-path="url(#clip0_10646_46876)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#5B0C0E"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#5B0C0E"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46876" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46876">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_citybike_cluster_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_citybike_cluster_dark.svg
index 43c5205b..9cd44417 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_citybike_cluster_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_citybike_cluster_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5183)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#5B0C0E"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#5B0C0E"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M29.2051 24.833C27.8251 24.833 26.7051 25.953 26.7051 27.333C26.7051 28.713 27.8251 29.833 29.2051 29.833C30.5851 29.833 31.7051 28.713 31.7051 27.333C31.7051 25.953 30.5901 24.833 29.2051 24.833ZM25.04 27.333C25.04 25.033 26.9051 23.168 29.2051 23.168C31.5051 23.168 33.375 25.033 33.375 27.333C33.375 29.633 31.5051 31.498 29.2051 31.498C26.9051 31.498 25.04 29.633 25.04 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M27.5649 19.9629C27.9549 20.2079 28.0751 20.7229 27.8301 21.1129L23.665 27.7779C23.51 28.0229 23.2451 28.1679 22.9551 28.1679H18.79C18.33 28.1679 17.9551 27.7929 17.9551 27.3329C17.9551 26.8729 18.33 26.4979 18.79 26.4979H22.4951L26.415 20.2279C26.66 19.8379 27.1749 19.7179 27.5649 19.9629Z" fill="white"/>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_citybike_default_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_citybike_default_dark.svg
index e4a6ccd7..42959b1e 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_citybike_default_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_citybike_default_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5146)">
 <g clip-path="url(#clip0_10646_5146)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#5B0C0E"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5146" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5146">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_citybike_selected_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_citybike_selected_dark.svg
index ceadde46..61799e6b 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_citybike_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_citybike_selected_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5161)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#5B0C0E" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#5B0C0E" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_active_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_active_dark.svg
index e1d47c89..2860ee7e 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_active_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46878)">
 <g clip-path="url(#clip0_10646_46878)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#5B0C0E"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#5B0C0E"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.4549C34.8063 19.5824 35.0335 19.9094 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7223 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.4569 29.5304 44.5559 29.1877 44.4283C28.8451 44.3009 28.6178 43.9739 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.161 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.4549Z" fill="white"/>
 </g>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="black" stroke-width="2"/>
@@ -17,7 +17,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46878" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46878">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_cluster_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_cluster_dark.svg
index 344c996b..8582ac5f 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_cluster_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_cluster_dark.svg
@@ -1,17 +1,17 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5510)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6H52C60.8366 6 68 13.1634 68 22V22C68 30.8366 60.8366 38 52 38H24C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7H52C60.2843 7 67 13.7157 67 22C67 30.2843 60.2843 37 52 37H24C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#5B0C0E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
+<path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#5B0C0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5510" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5510"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5510" result="shape"/>
 </filter>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_cluster_minimized_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_cluster_minimized_dark.svg
index 7f7bd292..ea28b7e8 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_cluster_minimized_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_cluster_minimized_dark.svg
@@ -1,16 +1,16 @@
 <svg width="44" height="32" viewBox="0 0 44 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5524)">
-<rect x="10" y="8" width="24" height="12" rx="6" fill="black"/>
-<rect x="9" y="7" width="26" height="14" rx="7" stroke="black" stroke-width="2"/>
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#5B0C0E"/>
+<rect x="10" y="10" width="24" height="12" rx="6" fill="black"/>
+<rect x="9" y="9" width="26" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#5B0C0E"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5524" x="0" y="0" width="44" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5524"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5524" result="shape"/>
 </filter>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_default_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_default_dark.svg
index 1b7c52eb..c537ba76 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_default_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_default_dark.svg
@@ -1,17 +1,17 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5475)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#5B0C0E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#5B0C0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5475" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5475"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5475" result="shape"/>
 </filter>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_default_dott_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_default_dott_dark.svg
new file mode 100644
index 00000000..198c287d
--- /dev/null
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_default_dott_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6712)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="#009DDB"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#009DDB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6712" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6712"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6712" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_default_ryde_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_default_ryde_dark.svg
new file mode 100644
index 00000000..dfc38943
--- /dev/null
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_default_ryde_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6731)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#4BCD1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6731" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6731"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6731" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_default_voi_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_default_voi_dark.svg
index d63e7b79..65cc55a0 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_default_voi_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_default_voi_dark.svg
@@ -1,19 +1,19 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47416)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#F36960"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6724)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#F36960"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47416" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6724" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47416"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47416" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6724"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6724" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_dark.svg
index e23071f9..c8d4a359 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_dark.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5461)">
 <g clip-path="url(#clip0_10646_5461)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#5B0C0E"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#5B0C0E"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5461" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5461"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5461" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5461">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_dott_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_dott_dark.svg
new file mode 100644
index 00000000..ce030d66
--- /dev/null
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_dott_dark.svg
@@ -0,0 +1,22 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6708)">
+<g clip-path="url(#clip0_10957_6708)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6708" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6708"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6708" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6708">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_ryde_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_ryde_dark.svg
new file mode 100644
index 00000000..0f801dab
--- /dev/null
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_ryde_dark.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6729)">
+<g clip-path="url(#clip0_10957_6729)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
+<rect width="12" height="12" transform="translate(10 10)" fill="#4BCD1F"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6729" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6729"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6729" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6729">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_voi_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_voi_dark.svg
index 2d2b4c76..96566ef6 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_voi_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_minimized_voi_dark.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47404)">
-<g clip-path="url(#clip0_10647_47404)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#F36960"/>
+<g filter="url(#filter0_d_10957_6722)">
+<g clip-path="url(#clip0_10957_6722)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47404" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6722" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47404"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47404" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6722"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6722" result="shape"/>
 </filter>
-<clipPath id="clip0_10647_47404">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<clipPath id="clip0_10957_6722">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_dark.svg
index 3b510300..b8b8d23e 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_dark.svg
@@ -1,15 +1,15 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5490)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#5B0C0E" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5824 35.0335 17.9095 35.0335 18.275V27.9002H40.5761C40.9184 27.9002 41.2294 28.0998 41.3718 28.4111C41.5143 28.7224 41.4621 29.0881 41.2383 29.3471L30.155 42.1802C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6083V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4723C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4264 34.121 17.3275 34.4636 17.455Z" fill="white"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#5B0C0E" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5490" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5490"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5490" result="shape"/>
 </filter>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_dott_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_dott_dark.svg
new file mode 100644
index 00000000..8acafbb9
--- /dev/null
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_dott_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6716)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6716" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6716"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6716" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_ryde_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_ryde_dark.svg
new file mode 100644
index 00000000..a7c0ab4e
--- /dev/null
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_ryde_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6733)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6733" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6733"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6733" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_voi_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_voi_dark.svg
index 09faf7f6..f4f1885d 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_voi_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_ebike_selected_voi_dark.svg
@@ -1,17 +1,17 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47431)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5824 35.0335 17.9095 35.0335 18.275V27.9002H40.5761C40.9184 27.9002 41.2294 28.0998 41.3718 28.4111C41.5143 28.7224 41.4621 29.0881 41.2383 29.3471L30.155 42.1802C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6083V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4723C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4264 34.121 17.3275 34.4636 17.455Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6726)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47431" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6726" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47431"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47431" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6726"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6726" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_loading_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_loading_dark.svg
index 4c3d8ab1..097bcc02 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_loading_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_loading_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46894)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#B3B3B3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#B3B3B3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 20.331C32.6441 20.331 33.1691 20.856 33.1691 21.5V25C33.1691 25.644 32.6441 26.169 32.0001 26.169C31.3561 26.169 30.8311 25.644 30.8311 25V21.5C30.8311 20.856 31.3561 20.331 32.0001 20.331Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 37.831C32.6441 37.831 33.1691 38.356 33.1691 39V42.5C33.1691 43.144 32.6441 43.669 32.0001 43.669C31.3561 43.669 30.8311 43.144 30.8311 42.5V39C30.8311 38.356 31.3561 37.831 32.0001 37.831Z" fill="black"/>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_active_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_active_dark.svg
index 905759cc..1685c71a 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_active_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46888)">
 <g clip-path="url(#clip0_10646_46888)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#284320"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#284320"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="white"/>
@@ -19,7 +19,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46888" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46888">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_cluster_generic_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_cluster_generic_dark.svg
index 201fb955..eae4a2ff 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_cluster_generic_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_cluster_generic_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5421)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#284320"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#284320"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M30.665 28.165C30.205 28.165 29.835 28.54 29.835 29C29.835 29.46 30.205 29.835 30.665 29.835C31.125 29.835 31.5 29.46 31.5 29C31.5 28.54 31.125 28.165 30.665 28.165ZM28.165 29C28.165 27.62 29.285 26.5 30.665 26.5C32.045 26.5 33.165 27.62 33.165 29C33.165 30.38 32.045 31.5 30.665 31.5C29.285 31.5 28.165 30.38 28.165 29Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M25.6649 17.335C25.6649 16.875 26.0399 16.5 26.4999 16.5H27.3148C28.4398 16.5 29.425 17.25 29.725 18.33L31.4701 24.61C31.5401 24.86 31.4899 25.13 31.3299 25.335C31.1749 25.54 30.9249 25.665 30.6649 25.665C29.5749 25.665 28.6099 26.185 27.9999 27C27.5799 27.555 27.3348 28.25 27.3348 29C27.3348 29.46 26.9599 29.835 26.4999 29.835H18.9999C18.7799 29.835 18.565 29.75 18.41 29.59C18.255 29.435 18.165 29.22 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165C16.875 28.165 16.5199 27.815 16.4999 27.365C16.4799 26.92 16.82 26.535 17.265 26.5L26.91 25.695C27.605 24.91 28.54 24.34 29.6 24.11L28.12 18.775C28.02 18.415 27.6898 18.165 27.3148 18.165H26.4999C26.0399 18.165 25.6649 17.79 25.6649 17.33V17.335Z" fill="white"/>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_default_dott_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_default_dott_dark.svg
index 1c17a3cf..08764569 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_default_dott_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_default_dott_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5321)">
-<g clip-path="url(#clip0_10646_5321)">
+<g filter="url(#filter0_d_10957_6700)">
+<g clip-path="url(#clip0_10957_6700)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#009DDB"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5321" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6700" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5321"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5321" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6700"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6700" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5321">
+<clipPath id="clip0_10957_6700">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_default_generic_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_default_generic_dark.svg
index 9e41606c..6ee6ad00 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_default_generic_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_default_generic_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5279)">
 <g clip-path="url(#clip0_10646_5279)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#284320"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5279" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5279">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_default_ryde_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_default_ryde_dark.svg
index b68aae07..06802f55 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_default_ryde_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_default_ryde_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5293)">
-<g clip-path="url(#clip0_10646_5293)">
+<g filter="url(#filter0_d_10957_6698)">
+<g clip-path="url(#clip0_10957_6698)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#4BCD1F"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5293" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6698" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5293"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5293" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6698"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6698" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5293">
+<clipPath id="clip0_10957_6698">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_default_voi_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_default_voi_dark.svg
index f46e70d7..20a87dcd 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_default_voi_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_default_voi_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5307)">
-<g clip-path="url(#clip0_10646_5307)">
+<g filter="url(#filter0_d_10957_6714)">
+<g clip-path="url(#clip0_10957_6714)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#F36960"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5307" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6714" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5307"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5307" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6714"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6714" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5307">
+<clipPath id="clip0_10957_6714">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_dott_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_dott_dark.svg
index 7eaf6c0b..90ca0c68 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_dott_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_dott_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5265)">
-<g clip-path="url(#clip0_10646_5265)">
+<g filter="url(#filter0_d_10957_6696)">
+<g clip-path="url(#clip0_10957_6696)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5265" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6696" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5265"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5265" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6696"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6696" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5265">
+<clipPath id="clip0_10957_6696">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_ryde_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_ryde_dark.svg
index b73a1740..0fd583c1 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_ryde_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_ryde_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5237)">
-<g clip-path="url(#clip0_10646_5237)">
+<g filter="url(#filter0_d_10957_6694)">
+<g clip-path="url(#clip0_10957_6694)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#4BCD1F"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5237" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6694" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5237"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5237" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6694"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6694" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5237">
+<clipPath id="clip0_10957_6694">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_voi_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_voi_dark.svg
index 4eb5a3f7..96cb76af 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_voi_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_minimized_voi_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5251)">
-<g clip-path="url(#clip0_10646_5251)">
+<g filter="url(#filter0_d_10957_6710)">
+<g clip-path="url(#clip0_10957_6710)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5251" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6710" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5251"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5251" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6710"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6710" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5251">
+<clipPath id="clip0_10957_6710">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_dott_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_dott_dark.svg
index 5ad767e1..c46e9757 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_dott_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_dott_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5399)">
+<g filter="url(#filter0_d_10957_6705)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5399" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6705" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5399"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5399" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6705"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6705" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_generic_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_generic_dark.svg
index c4d87fd2..f058d3a4 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_generic_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_generic_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5336)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#284320" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#284320" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="white"/>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_ryde_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_ryde_dark.svg
index 628ebbb7..95eb7f02 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_ryde_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_ryde_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5357)">
+<g filter="url(#filter0_d_10957_6702)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5357" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6702" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5357"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5357" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6702"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6702" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_voi_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_voi_dark.svg
index bf13ce9f..aa9f48b8 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_voi_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_scooter_selected_voi_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5378)">
+<g filter="url(#filter0_d_10957_6719)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5378" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6719" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5378"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5378" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6719"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6719" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_sharedcar_cluster_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_sharedcar_cluster_dark.svg
index ab921d39..4fcc4200 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_sharedcar_cluster_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_sharedcar_cluster_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5092)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#AA8892"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#AA8892"/>
 <path d="M19.835 30.355C20.985 30.355 21.915 29.42 21.915 28.27C21.915 27.12 20.985 26.185 19.835 26.185C18.685 26.185 17.75 27.12 17.75 28.27C17.75 29.42 18.685 30.355 19.835 30.355Z" fill="black"/>
 <path d="M28.165 30.355C29.315 30.355 30.25 29.42 30.25 28.27C30.25 27.12 29.315 26.185 28.165 26.185C27.015 26.185 26.085 27.12 26.085 28.27C26.085 29.42 27.015 30.355 28.165 30.355Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15.04 22.435C15.04 22.09 15.32 21.81 15.665 21.81H29C29.345 21.81 29.625 22.09 29.625 22.435C29.625 22.78 29.345 23.06 29 23.06H15.665C15.32 23.06 15.04 22.78 15.04 22.435Z" fill="black"/>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_sharedcar_default_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_sharedcar_default_dark.svg
index c946a477..797b8014 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_sharedcar_default_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_sharedcar_default_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5055)">
 <g clip-path="url(#clip0_10646_5055)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#AA8892"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path d="M19.835 30.355C20.985 30.355 21.915 29.42 21.915 28.27C21.915 27.12 20.985 26.185 19.835 26.185C18.685 26.185 17.75 27.12 17.75 28.27C17.75 29.42 18.685 30.355 19.835 30.355Z" fill="black"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5055" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5055">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/dark/vehiclepin_sharedcar_selected_dark.svg b/sprite_assets/FRAM/dark/vehiclepin_sharedcar_selected_dark.svg
index 87c520db..4f5a4dae 100644
--- a/sprite_assets/FRAM/dark/vehiclepin_sharedcar_selected_dark.svg
+++ b/sprite_assets/FRAM/dark/vehiclepin_sharedcar_selected_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5070)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#AA8892" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#AA8892" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path d="M26.1689 40.897C27.7789 40.897 29.0811 39.588 29.0811 37.978C29.0811 36.368 27.7789 35.059 26.1689 35.059C24.5589 35.059 23.25 36.368 23.25 37.978C23.25 39.588 24.5589 40.897 26.1689 40.897Z" fill="black"/>
 <path d="M37.8311 40.897C39.4411 40.897 40.75 39.588 40.75 37.978C40.75 36.368 39.4411 35.059 37.8311 35.059C36.2211 35.059 34.9189 36.368 34.9189 37.978C34.9189 39.588 36.2211 40.897 37.8311 40.897Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.4561 29.809C19.4561 29.326 19.8481 28.934 20.3311 28.934H39C39.483 28.934 39.875 29.326 39.875 29.809C39.875 30.292 39.483 30.684 39 30.684H20.3311C19.8481 30.684 19.4561 30.292 19.4561 29.809Z" fill="black"/>
diff --git a/sprite_assets/FRAM/light/geofencingzone_parking_light.svg b/sprite_assets/FRAM/light/geofencingzone_parking_light.svg
index e3d17f88..36b2780a 100644
--- a/sprite_assets/FRAM/light/geofencingzone_parking_light.svg
+++ b/sprite_assets/FRAM/light/geofencingzone_parking_light.svg
@@ -1,17 +1,4 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10043_6320)">
-<path d="M8 12C8 9.79086 9.79086 8 12 8H32C34.2091 8 36 9.79086 36 12V32C36 34.2091 34.2091 36 32 36H12C9.79086 36 8 34.2091 8 32V12Z" fill="#2B729A"/>
-<path d="M18 22.9999V15.9999H22.6667C24.5997 15.9999 26.1667 17.5669 26.1667 19.4999C26.1667 21.433 24.5997 22.9999 22.6667 22.9999H18ZM18 22.9999V28.8332" stroke="white" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_d_10043_6320" x="0" y="0" width="44" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10043_6320"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10043_6320" result="shape"/>
-</filter>
-</defs>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H24C26.2091 0 28 1.79086 28 4V24C28 26.2091 26.2091 28 24 28H4C1.79086 28 0 26.2091 0 24V4Z" fill="#2B729A"/>
+<path d="M10.7051 21.4167C10.2221 21.4167 9.12695 21.1868 9.12695 20.7038V8.29169C9.12695 7.80869 9.51895 7.41669 10.002 7.41669H14.6641C17.0791 7.41669 19.0391 9.37669 19.0391 11.7917C19.0391 14.2067 17.0791 16.2038 14.6641 16.2038H12.2177V20.7038C12.2177 21.1868 11.1881 21.4167 10.7051 21.4167ZM12.2177 13.2038H13.7177C15.1667 13.2038 16.2177 13.1528 16.2177 11.7038C16.2177 10.3055 15.1667 10.2038 13.7177 10.2038H12.2177V13.2038Z" fill="white"/>
 </svg>
diff --git a/sprite_assets/FRAM/light/stationpin_citybike_parking_default_light.svg b/sprite_assets/FRAM/light/stationpin_citybike_parking_default_light.svg
index 4bac97c7..5ea171e1 100644
--- a/sprite_assets/FRAM/light/stationpin_citybike_parking_default_light.svg
+++ b/sprite_assets/FRAM/light/stationpin_citybike_parking_default_light.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_7289)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="white"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="white" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#5B0C0E"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="white"/>
-<path d="M21.085 29.21C20.74 29.21 20.46 28.93 20.46 28.585V19.42C20.46 19.075 20.74 18.795 21.085 18.795H24.415C26.14 18.795 27.54 20.195 27.54 21.92C27.54 23.645 26.14 25.045 24.415 25.045H21.71V28.585C21.71 28.93 21.43 29.21 21.085 29.21ZM21.71 23.79H24.415C25.45 23.79 26.29 22.95 26.29 21.915C26.29 20.88 25.45 20.04 24.415 20.04H21.71V23.79Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#2B729A"/>
+<path d="M20.7051 31.4167C20.2221 31.4167 19.127 31.1868 19.127 30.7038V18.2917C19.127 17.8087 19.519 17.4167 20.002 17.4167H24.6641C27.0791 17.4167 29.0391 19.3767 29.0391 21.7917C29.0391 24.2067 27.0791 26.2038 24.6641 26.2038H22.2177V30.7038C22.2177 31.1868 21.1881 31.4167 20.7051 31.4167ZM22.2177 23.2038H23.7177C25.1667 23.2038 26.2177 23.1528 26.2177 21.7038C26.2177 20.3055 25.1667 20.2038 23.7177 20.2038H22.2177V23.2038Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7289" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/stationpin_citybike_parking_minimized_light.svg b/sprite_assets/FRAM/light/stationpin_citybike_parking_minimized_light.svg
index 92286385..dc02d43a 100644
--- a/sprite_assets/FRAM/light/stationpin_citybike_parking_minimized_light.svg
+++ b/sprite_assets/FRAM/light/stationpin_citybike_parking_minimized_light.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_7326)">
 <g clip-path="url(#clip0_8318_7326)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#5B0C0E"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#2B729A"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="white" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/FRAM/light/stationpin_citybike_parking_selected_light.svg b/sprite_assets/FRAM/light/stationpin_citybike_parking_selected_light.svg
index 17cb8967..4413e3f3 100644
--- a/sprite_assets/FRAM/light/stationpin_citybike_parking_selected_light.svg
+++ b/sprite_assets/FRAM/light/stationpin_citybike_parking_selected_light.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7305)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#5B0C0E"/>
-<path d="M38.75 41.956H21.25C19.479 41.956 18.0439 40.514 18.0439 38.75V21.25C18.0439 19.479 19.479 18.044 21.25 18.044H38.75C40.521 18.044 41.9561 19.486 41.9561 21.25V38.75C41.9561 40.521 40.521 41.956 38.75 41.956ZM21.25 19.794C20.445 19.794 19.7939 20.445 19.7939 21.25V38.75C19.7939 39.555 20.445 40.206 21.25 40.206H38.75C39.555 40.206 40.2061 39.555 40.2061 38.75V21.25C40.2061 20.445 39.555 19.794 38.75 19.794H21.25Z" fill="white"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.902 25.0439 36.4189V23.588C25.0439 23.105 25.4359 22.713 25.9189 22.713H30.5811C32.9961 22.713 34.9561 24.673 34.9561 27.088C34.9561 29.503 32.9961 31.463 30.5811 31.463H26.7939V36.4189C26.7939 36.902 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.706H30.5811C32.0301 29.706 33.2061 28.53 33.2061 27.081C33.2061 25.632 32.0301 24.456 30.5811 24.456H26.7939V29.706Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#2B729A"/>
+<path d="M25.0074 40.3096C24.3174 40.3096 22.7529 39.9812 22.7529 39.2912V21.5596C22.7529 20.8696 23.3129 20.3096 24.0029 20.3096H30.6631C34.1131 20.3096 36.9131 23.1096 36.9131 26.5596C36.9131 30.0096 34.1131 32.8626 30.6631 32.8626H27.1683V39.2912C27.1683 39.9812 25.6974 40.3096 25.0074 40.3096ZM27.1683 28.5769H29.3112C31.3812 28.5769 32.8826 28.504 32.8826 26.434C32.8826 24.4364 31.3812 24.2912 29.3112 24.2912H27.1683V28.5769Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7305" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/stationpin_sharedcar_parking_default_light.svg b/sprite_assets/FRAM/light/stationpin_sharedcar_parking_default_light.svg
index 90cba69f..98247db4 100644
--- a/sprite_assets/FRAM/light/stationpin_sharedcar_parking_default_light.svg
+++ b/sprite_assets/FRAM/light/stationpin_sharedcar_parking_default_light.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_7295)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="white"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="white" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#AA8892"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="black"/>
-<path d="M21.085 29.21C20.74 29.21 20.46 28.93 20.46 28.585V19.42C20.46 19.075 20.74 18.795 21.085 18.795H24.415C26.14 18.795 27.54 20.195 27.54 21.92C27.54 23.645 26.14 25.045 24.415 25.045H21.71V28.585C21.71 28.93 21.43 29.21 21.085 29.21ZM21.71 23.79H24.415C25.45 23.79 26.29 22.95 26.29 21.915C26.29 20.88 25.45 20.04 24.415 20.04H21.71V23.79Z" fill="black"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#2B729A"/>
+<path d="M20.7051 31.4167C20.2221 31.4167 19.127 31.1868 19.127 30.7038V18.2917C19.127 17.8087 19.519 17.4167 20.002 17.4167H24.6641C27.0791 17.4167 29.0391 19.3767 29.0391 21.7917C29.0391 24.2067 27.0791 26.2038 24.6641 26.2038H22.2177V30.7038C22.2177 31.1868 21.1881 31.4167 20.7051 31.4167ZM22.2177 23.2038H23.7177C25.1667 23.2038 26.2177 23.1528 26.2177 21.7038C26.2177 20.3055 25.1667 20.2038 23.7177 20.2038H22.2177V23.2038Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7295" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/stationpin_sharedcar_parking_minimized_light.svg b/sprite_assets/FRAM/light/stationpin_sharedcar_parking_minimized_light.svg
index a84db00b..69703a57 100644
--- a/sprite_assets/FRAM/light/stationpin_sharedcar_parking_minimized_light.svg
+++ b/sprite_assets/FRAM/light/stationpin_sharedcar_parking_minimized_light.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_7328)">
 <g clip-path="url(#clip0_8318_7328)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#AA8892"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#2B729A"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="white" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/FRAM/light/stationpin_sharedcar_parking_selected_light.svg b/sprite_assets/FRAM/light/stationpin_sharedcar_parking_selected_light.svg
index de51c37f..123bc337 100644
--- a/sprite_assets/FRAM/light/stationpin_sharedcar_parking_selected_light.svg
+++ b/sprite_assets/FRAM/light/stationpin_sharedcar_parking_selected_light.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7319)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#AA8892"/>
-<path d="M38.75 41.956H21.25C19.479 41.956 18.0439 40.514 18.0439 38.75V21.25C18.0439 19.479 19.479 18.044 21.25 18.044H38.75C40.521 18.044 41.9561 19.486 41.9561 21.25V38.75C41.9561 40.521 40.521 41.956 38.75 41.956ZM21.25 19.794C20.445 19.794 19.7939 20.445 19.7939 21.25V38.75C19.7939 39.555 20.445 40.206 21.25 40.206H38.75C39.555 40.206 40.2061 39.555 40.2061 38.75V21.25C40.2061 20.445 39.555 19.794 38.75 19.794H21.25Z" fill="black"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.902 25.0439 36.4189V23.588C25.0439 23.105 25.4359 22.713 25.9189 22.713H30.5811C32.9961 22.713 34.9561 24.673 34.9561 27.088C34.9561 29.503 32.9961 31.463 30.5811 31.463H26.7939V36.4189C26.7939 36.902 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.706H30.5811C32.0301 29.706 33.2061 28.53 33.2061 27.081C33.2061 25.632 32.0301 24.456 30.5811 24.456H26.7939V29.706Z" fill="black"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#2B729A"/>
+<path d="M25.0074 40.3096C24.3174 40.3096 22.7529 39.9812 22.7529 39.2912V21.5596C22.7529 20.8696 23.3129 20.3096 24.0029 20.3096H30.6631C34.1131 20.3096 36.9131 23.1096 36.9131 26.5596C36.9131 30.0096 34.1131 32.8626 30.6631 32.8626H27.1683V39.2912C27.1683 39.9812 25.6974 40.3096 25.0074 40.3096ZM27.1683 28.5769H29.3112C31.3812 28.5769 32.8826 28.504 32.8826 26.434C32.8826 24.4364 31.3812 24.2912 29.3112 24.2912H27.1683V28.5769Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7319" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/stoppin_boat_selected_light.svg b/sprite_assets/FRAM/light/stoppin_boat_selected_light.svg
index fdbd5093..6d89e392 100644
--- a/sprite_assets/FRAM/light/stoppin_boat_selected_light.svg
+++ b/sprite_assets/FRAM/light/stoppin_boat_selected_light.svg
@@ -5,7 +5,7 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#007AB5"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7390)"/>
-<path d="M41.1851 33.6382C40.7907 33.2797 40.3606 32.8854 39.536 32.8854C38.7115 32.8854 38.2813 33.2797 37.887 33.6382C37.5285 33.9609 37.2058 34.2476 36.5606 34.2476C35.9153 34.2476 35.5926 33.9609 35.2341 33.6382C34.8398 33.2797 34.4096 32.8854 33.5851 32.8854C32.7606 32.8854 32.3304 33.2797 31.936 33.6382C31.5775 33.9609 31.2549 34.2476 30.6096 34.2476C29.9643 34.2476 29.6417 33.9609 29.2832 33.6382C29.104 33.459 28.8889 33.2797 28.6379 33.1363C28.6379 33.1363 28.5662 33.1363 28.5304 33.1363C28.2794 33.0288 28.0285 32.9571 27.67 32.9571C26.8455 32.9571 26.4153 33.3514 26.0568 33.7099C25.6983 34.0326 25.4115 34.3193 24.7662 34.3193C24.1209 34.3193 23.7983 34.0326 23.4757 33.7099C23.0813 33.3514 22.687 32.9571 21.8625 32.9571C21.0379 32.9571 20.6077 33.3514 20.2493 33.7099C19.8908 34.0326 19.604 34.3193 18.9228 34.3193C18.2417 34.3193 17.9549 34.0326 17.6323 33.7099C17.4172 33.5307 17.2021 33.3156 16.8794 33.1363L16.7002 34.3193C16.9511 34.4269 17.1304 34.6061 17.3096 34.7854C17.704 35.1439 18.1342 35.5382 18.9228 35.5382C19.7115 35.5382 20.1776 35.1439 20.536 34.7854C20.8945 34.4627 21.1813 34.1759 21.8266 34.1759C22.4719 34.1759 22.7945 34.4627 23.153 34.7854C23.5474 35.1439 23.9417 35.5382 24.7662 35.5382C25.5908 35.5382 26.0209 35.1439 26.3794 34.7854C26.7379 34.4627 27.0247 34.1759 27.7058 34.1759C28.387 34.1759 28.2436 34.2476 28.4587 34.3552C28.6379 34.4627 28.8172 34.6061 28.9606 34.7495C29.3191 35.0722 29.7492 35.4665 30.5738 35.4665C31.3983 35.4665 31.8285 35.0722 32.2228 34.7137C32.5813 34.391 32.8681 34.1042 33.5492 34.1042C34.2304 34.1042 34.5172 34.391 34.8757 34.7137C35.27 35.0722 35.7002 35.4665 36.5247 35.4665C37.3492 35.4665 37.7794 35.0722 38.1738 34.7137C38.5323 34.391 38.8549 34.1042 39.5002 34.1042C40.1455 34.1042 40.4681 34.391 40.8266 34.7137L41.2209 33.7099C41.2209 33.7099 41.1492 33.6382 41.0775 33.6024V33.6741L41.1851 33.6382Z" fill="white"/>
+<path d="M41.1851 33.6382C40.7908 33.2797 40.3606 32.8854 39.536 32.8854C38.7115 32.8854 38.2813 33.2797 37.887 33.6382C37.5285 33.9609 37.2058 34.2476 36.5606 34.2476C35.9153 34.2476 35.5926 33.9609 35.2341 33.6382C34.8398 33.2797 34.4096 32.8854 33.5851 32.8854C32.7606 32.8854 32.3304 33.2797 31.936 33.6382C31.5775 33.9609 31.2549 34.2476 30.6096 34.2476C29.9643 34.2476 29.6417 33.9609 29.2832 33.6382C29.104 33.459 28.8889 33.2797 28.6379 33.1363C28.6379 33.1363 28.5662 33.1363 28.5304 33.1363C28.2794 33.0288 28.0285 32.9571 27.67 32.9571C26.8455 32.9571 26.4153 33.3514 26.0568 33.7099C25.6983 34.0326 25.4115 34.3193 24.7662 34.3193C24.1209 34.3193 23.7983 34.0326 23.4757 33.7099C23.0813 33.3514 22.687 32.9571 21.8625 32.9571C21.0379 32.9571 20.6077 33.3514 20.2493 33.7099C19.8908 34.0326 19.604 34.3193 18.9228 34.3193C18.2417 34.3193 17.9549 34.0326 17.6323 33.7099C17.4172 33.5307 17.2021 33.3156 16.8794 33.1363L16.7002 34.3193C16.9511 34.4269 17.1304 34.6061 17.3096 34.7854C17.704 35.1439 18.1342 35.5382 18.9228 35.5382C19.7115 35.5382 20.1776 35.1439 20.536 34.7854C20.8945 34.4627 21.1813 34.1759 21.8266 34.1759C22.4719 34.1759 22.7945 34.4627 23.153 34.7854C23.5474 35.1439 23.9417 35.5382 24.7662 35.5382C25.5908 35.5382 26.0209 35.1439 26.3794 34.7854C26.7379 34.4627 27.0247 34.1759 27.7059 34.1759C28.387 34.1759 28.2436 34.2476 28.4587 34.3552C28.6379 34.4627 28.8172 34.6061 28.9606 34.7495C29.3191 35.0722 29.7492 35.4665 30.5738 35.4665C31.3983 35.4665 31.8285 35.0722 32.2228 34.7137C32.5813 34.391 32.8681 34.1043 33.5492 34.1043C34.2304 34.1043 34.5172 34.391 34.8757 34.7137C35.27 35.0722 35.7002 35.4665 36.5247 35.4665C37.3492 35.4665 37.7794 35.0722 38.1738 34.7137C38.5323 34.391 38.8549 34.1043 39.5002 34.1043C40.1455 34.1043 40.4681 34.391 40.8266 34.7137L41.2209 33.7099C41.2209 33.7099 41.1492 33.6382 41.0775 33.6024V33.6741L41.1851 33.6382Z" fill="white"/>
 <path d="M28.4945 33.1005C28.2794 32.9929 28.0643 32.9212 27.7417 32.9212C27.4191 32.9212 27.1681 32.9929 26.953 33.1363L28.5304 33.1363L28.4945 33.1363V33.1005Z" fill="white"/>
 <path d="M21.0021 33.1722H22.687C22.4719 33.0288 22.2209 32.9212 21.8625 32.9212C21.504 32.9212 21.2172 33.0288 21.0021 33.1722Z" fill="white"/>
 <path d="M43.1926 28.1892H39.8587L34.7323 24.3892H21.2889C21.0738 24.3892 20.8945 24.5684 20.8587 24.7835L20.07 28.1892H18.8153C18.6002 28.1892 18.4209 28.3326 18.3851 28.5118L17.4172 31.9892L17.3096 32.0967C17.453 32.2043 17.5606 32.3118 17.704 32.4193C18.0625 32.742 18.3493 33.0288 18.9945 33.0288C19.6398 33.0288 19.9625 32.742 20.3209 32.4193C20.7153 32.0609 21.1096 31.6665 21.9342 31.6665C22.7587 31.6665 23.1889 32.0609 23.5474 32.4193C23.9059 32.742 24.1926 33.0288 24.8379 33.0288C25.4832 33.0288 25.8059 32.742 26.1285 32.4193C26.5228 32.0609 26.9172 31.6665 27.7417 31.6665C28.5662 31.6665 28.387 31.7382 28.6021 31.8458C28.9247 31.9892 29.1398 32.2043 29.3908 32.3835C29.7492 32.7061 30.0719 32.9929 30.7172 32.9929C31.3625 32.9929 31.6851 32.7061 32.0436 32.3835C32.4379 32.025 32.8681 31.6307 33.6926 31.6307C34.5172 31.6307 34.9474 32.025 35.3417 32.3835C35.7002 32.7061 36.0228 32.9929 36.6681 32.9929C37.3134 32.9929 37.636 32.7061 37.9945 32.3835C38.3889 32.025 38.819 31.6307 39.6436 31.6307C40.4681 31.6307 40.5398 31.7741 40.8266 31.9892L43.3002 28.5476C43.3002 28.5476 43.3002 28.476 43.3002 28.4043C43.3002 28.2609 43.1926 28.1533 43.0492 28.1533H43.1568L43.1926 28.1892ZM25.5908 28.1892H21.0738L21.504 26.325H25.5191V26.3967H25.5908V28.225V28.1892ZM30.0719 28.1892H26.0926V26.325H30.0719V28.1892ZM30.7172 28.1892V26.325H35.3775L37.9228 28.1892H30.7172Z" fill="white"/>
diff --git a/sprite_assets/FRAM/light/stoppin_bus_selected_light.svg b/sprite_assets/FRAM/light/stoppin_bus_selected_light.svg
index db558a38..ea66141a 100644
--- a/sprite_assets/FRAM/light/stoppin_bus_selected_light.svg
+++ b/sprite_assets/FRAM/light/stoppin_bus_selected_light.svg
@@ -5,7 +5,7 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#82B962"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7370)"/>
-<path d="M43.3002 34.7389C43.3002 35.0889 43.1072 35.2833 42.7597 35.2833H38.7446V34.9333C38.7446 34.1555 38.4744 33.4555 37.8953 32.9111C37.3548 32.3666 36.6598 32.0555 35.8877 32.0555C35.1156 32.0555 34.3821 32.3278 33.8416 32.9111C33.3011 33.4555 32.9922 34.1555 32.9922 34.9333C32.9922 35.7111 32.9922 35.05 32.9922 35.0889V35.2444H26.931V34.8944C26.931 34.1166 26.6607 33.4166 26.1202 32.8722C25.5797 32.3278 24.8848 32.0166 24.0741 32.0166C23.2633 32.0166 22.5684 32.2889 22.0279 32.8722C21.4874 33.4166 21.2172 34.1166 21.2172 34.8944V35.2444H17.2407C17.0863 35.2444 16.9704 35.2444 16.8546 35.0889C16.7388 34.9722 16.7002 34.8555 16.7002 34.7V24.3944C16.7002 24.2389 16.7388 24.1222 16.8546 24.0055C16.9704 23.8889 17.0863 23.85 17.2407 23.85H42.6825C42.8369 23.85 42.9527 23.85 43.0686 24.0055C43.1844 24.1222 43.223 24.2389 43.223 24.3944H43.3002V34.7389ZM17.9742 30.5778H23.2633V26.1833H17.9742V30.5778ZM26.3519 34.9333C26.3519 35.5555 26.1202 36.0611 25.6955 36.4889C25.2709 36.9166 24.7304 37.15 24.1513 37.15C23.5722 37.15 23.0317 36.9166 22.607 36.4889C22.1823 36.0611 21.9507 35.5166 21.9507 34.9333C21.9507 34.35 22.1823 33.8055 22.607 33.3778C23.0317 32.95 23.5722 32.7555 24.1513 32.7555C24.7304 32.7555 25.2709 32.95 25.6955 33.3778C26.1202 33.8055 26.3519 34.3111 26.3519 34.9333ZM24.2285 30.5778H29.5176V26.1833H24.2285V30.5778ZM30.5214 30.5778H35.8491V26.1833H30.5214V30.5778ZM38.1269 34.9333C38.1269 35.5555 37.8953 36.0611 37.4706 36.4889C37.0459 36.9166 36.5054 37.15 35.9263 37.15C35.3472 37.15 34.8067 36.9166 34.3821 36.4889C33.9574 36.0611 33.7257 35.5166 33.7257 34.9333C33.7257 34.35 33.9574 33.8055 34.3821 33.3778C34.8067 32.95 35.3472 32.7555 35.9263 32.7555C36.5054 32.7555 37.0459 32.95 37.4706 33.3778C37.8953 33.8055 38.1269 34.3111 38.1269 34.9333ZM36.8143 30.5778H42.1034V26.1833H36.8143V30.5778Z" fill="black"/>
+<path d="M43.3002 34.7389C43.3002 35.0889 43.1072 35.2833 42.7597 35.2833H38.7446V34.9333C38.7446 34.1555 38.4744 33.4555 37.8953 32.9111C37.3548 32.3666 36.6598 32.0555 35.8877 32.0555C35.1156 32.0555 34.3821 32.3278 33.8416 32.9111C33.3011 33.4555 32.9922 34.1555 32.9922 34.9333C32.9922 35.7111 32.9922 35.05 32.9922 35.0889V35.2444H26.931V34.8944C26.931 34.1166 26.6607 33.4166 26.1202 32.8722C25.5797 32.3278 24.8848 32.0166 24.0741 32.0166C23.2633 32.0166 22.5684 32.2889 22.0279 32.8722C21.4874 33.4166 21.2172 34.1166 21.2172 34.8944V35.2444H17.2407C17.0863 35.2444 16.9704 35.2444 16.8546 35.0889C16.7388 34.9722 16.7002 34.8555 16.7002 34.7V24.3944C16.7002 24.2389 16.7388 24.1222 16.8546 24.0055C16.9704 23.8889 17.0863 23.85 17.2407 23.85H42.6825C42.8369 23.85 42.9527 23.85 43.0686 24.0055C43.1844 24.1222 43.223 24.2389 43.223 24.3944H43.3002V34.7389ZM17.9742 30.5778H23.2633V26.1833H17.9742V30.5778ZM26.3519 34.9333C26.3519 35.5555 26.1202 36.0611 25.6956 36.4889C25.2709 36.9166 24.7304 37.15 24.1513 37.15C23.5722 37.15 23.0317 36.9166 22.607 36.4889C22.1823 36.0611 21.9507 35.5166 21.9507 34.9333C21.9507 34.35 22.1823 33.8055 22.607 33.3778C23.0317 32.95 23.5722 32.7555 24.1513 32.7555C24.7304 32.7555 25.2709 32.95 25.6956 33.3778C26.1202 33.8055 26.3519 34.3111 26.3519 34.9333ZM24.2285 30.5778H29.5176V26.1833H24.2285V30.5778ZM30.5214 30.5778H35.8491V26.1833H30.5214V30.5778ZM38.1269 34.9333C38.1269 35.5555 37.8953 36.0611 37.4706 36.4889C37.0459 36.9166 36.5054 37.15 35.9263 37.15C35.3472 37.15 34.8067 36.9166 34.3821 36.4889C33.9574 36.0611 33.7257 35.5166 33.7257 34.9333C33.7257 34.35 33.9574 33.8055 34.3821 33.3778C34.8067 32.95 35.3472 32.7555 35.9263 32.7555C36.5054 32.7555 37.0459 32.95 37.4706 33.3778C37.8953 33.8055 38.1269 34.3111 38.1269 34.9333ZM36.8143 30.5778H42.1034V26.1833H36.8143V30.5778Z" fill="black"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7370" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/stoppin_busandtram_selected_light.svg b/sprite_assets/FRAM/light/stoppin_busandtram_selected_light.svg
index c3aef466..12a1cdbb 100644
--- a/sprite_assets/FRAM/light/stoppin_busandtram_selected_light.svg
+++ b/sprite_assets/FRAM/light/stoppin_busandtram_selected_light.svg
@@ -6,11 +6,11 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7432)"/>
 <rect x="10" y="10" width="40" height="40" rx="6" fill="#82B962"/>
-<path d="M43.3002 34.7389C43.3002 35.0889 43.1072 35.2833 42.7597 35.2833H38.7446V34.9333C38.7446 34.1555 38.4744 33.4555 37.8953 32.9111C37.3548 32.3666 36.6598 32.0555 35.8877 32.0555C35.1156 32.0555 34.3821 32.3278 33.8416 32.9111C33.3011 33.4555 32.9922 34.1555 32.9922 34.9333C32.9922 35.7111 32.9922 35.05 32.9922 35.0889V35.2444H26.931V34.8944C26.931 34.1166 26.6607 33.4166 26.1202 32.8722C25.5797 32.3278 24.8848 32.0166 24.0741 32.0166C23.2633 32.0166 22.5684 32.2889 22.0279 32.8722C21.4874 33.4166 21.2172 34.1166 21.2172 34.8944V35.2444H17.2407C17.0863 35.2444 16.9704 35.2444 16.8546 35.0889C16.7388 34.9722 16.7002 34.8555 16.7002 34.7V24.3944C16.7002 24.2389 16.7388 24.1222 16.8546 24.0055C16.9704 23.8889 17.0863 23.85 17.2407 23.85H42.6825C42.8369 23.85 42.9527 23.85 43.0686 24.0055C43.1844 24.1222 43.223 24.2389 43.223 24.3944H43.3002V34.7389ZM17.9742 30.5778H23.2633V26.1833H17.9742V30.5778ZM26.3519 34.9333C26.3519 35.5555 26.1202 36.0611 25.6955 36.4889C25.2709 36.9166 24.7304 37.15 24.1513 37.15C23.5722 37.15 23.0317 36.9166 22.607 36.4889C22.1823 36.0611 21.9507 35.5166 21.9507 34.9333C21.9507 34.35 22.1823 33.8055 22.607 33.3778C23.0317 32.95 23.5722 32.7555 24.1513 32.7555C24.7304 32.7555 25.2709 32.95 25.6955 33.3778C26.1202 33.8055 26.3519 34.3111 26.3519 34.9333ZM24.2285 30.5778H29.5176V26.1833H24.2285V30.5778ZM30.5214 30.5778H35.8491V26.1833H30.5214V30.5778ZM38.1269 34.9333C38.1269 35.5555 37.8953 36.0611 37.4706 36.4889C37.0459 36.9166 36.5054 37.15 35.9263 37.15C35.3472 37.15 34.8067 36.9166 34.3821 36.4889C33.9574 36.0611 33.7257 35.5166 33.7257 34.9333C33.7257 34.35 33.9574 33.8055 34.3821 33.3778C34.8067 32.95 35.3472 32.7555 35.9263 32.7555C36.5054 32.7555 37.0459 32.95 37.4706 33.3778C37.8953 33.8055 38.1269 34.3111 38.1269 34.9333ZM36.8143 30.5778H42.1034V26.1833H36.8143V30.5778Z" fill="black"/>
+<path d="M43.3002 34.7389C43.3002 35.0889 43.1072 35.2833 42.7597 35.2833H38.7446V34.9333C38.7446 34.1555 38.4744 33.4555 37.8953 32.9111C37.3548 32.3666 36.6598 32.0555 35.8877 32.0555C35.1156 32.0555 34.3821 32.3278 33.8416 32.9111C33.3011 33.4555 32.9922 34.1555 32.9922 34.9333C32.9922 35.7111 32.9922 35.05 32.9922 35.0889V35.2444H26.931V34.8944C26.931 34.1166 26.6607 33.4166 26.1202 32.8722C25.5797 32.3278 24.8848 32.0166 24.0741 32.0166C23.2633 32.0166 22.5684 32.2889 22.0279 32.8722C21.4874 33.4166 21.2172 34.1166 21.2172 34.8944V35.2444H17.2407C17.0863 35.2444 16.9704 35.2444 16.8546 35.0889C16.7388 34.9722 16.7002 34.8555 16.7002 34.7V24.3944C16.7002 24.2389 16.7388 24.1222 16.8546 24.0055C16.9704 23.8889 17.0863 23.85 17.2407 23.85H42.6825C42.8369 23.85 42.9527 23.85 43.0686 24.0055C43.1844 24.1222 43.223 24.2389 43.223 24.3944H43.3002V34.7389ZM17.9742 30.5778H23.2633V26.1833H17.9742V30.5778ZM26.3519 34.9333C26.3519 35.5555 26.1202 36.0611 25.6956 36.4889C25.2709 36.9166 24.7304 37.15 24.1513 37.15C23.5722 37.15 23.0317 36.9166 22.607 36.4889C22.1823 36.0611 21.9507 35.5166 21.9507 34.9333C21.9507 34.35 22.1823 33.8055 22.607 33.3778C23.0317 32.95 23.5722 32.7555 24.1513 32.7555C24.7304 32.7555 25.2709 32.95 25.6956 33.3778C26.1202 33.8055 26.3519 34.3111 26.3519 34.9333ZM24.2285 30.5778H29.5176V26.1833H24.2285V30.5778ZM30.5214 30.5778H35.8491V26.1833H30.5214V30.5778ZM38.1269 34.9333C38.1269 35.5555 37.8953 36.0611 37.4706 36.4889C37.0459 36.9166 36.5054 37.15 35.9263 37.15C35.3472 37.15 34.8067 36.9166 34.3821 36.4889C33.9574 36.0611 33.7257 35.5166 33.7257 34.9333C33.7257 34.35 33.9574 33.8055 34.3821 33.3778C34.8067 32.95 35.3472 32.7555 35.9263 32.7555C36.5054 32.7555 37.0459 32.95 37.4706 33.3778C37.8953 33.8055 38.1269 34.3111 38.1269 34.9333ZM36.8143 30.5778H42.1034V26.1833H36.8143V30.5778Z" fill="black"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#82B962"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4418 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4418 84.7754 38.925C84.7754 39.4083 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4083 59.9254 38.925Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7535 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.8251 83.2051 36.8251C76.3616 36.8251 63.3834 36.8251 61.5004 36.8251C60.3406 36.8251 59.4004 35.8849 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.9251C59.9254 38.4418 60.3171 38.0501 60.8004 38.0501H83.9004C84.3836 38.0501 84.7754 38.4418 84.7754 38.9251C84.7754 39.4083 84.3836 39.8001 83.9004 39.8001H60.8004C60.3171 39.8001 59.9254 39.4083 59.9254 38.9251Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7536 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="black"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7432" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/stoppin_metroandtram_selected_light.svg b/sprite_assets/FRAM/light/stoppin_metroandtram_selected_light.svg
index 564a73ce..e9d1eb80 100644
--- a/sprite_assets/FRAM/light/stoppin_metroandtram_selected_light.svg
+++ b/sprite_assets/FRAM/light/stoppin_metroandtram_selected_light.svg
@@ -9,9 +9,9 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.4049 36.5172C24.8599 36.9722 24.8599 37.7142 24.4049 38.1692L21.4928 41.0882C21.0308 41.5432 20.2962 41.5432 19.8412 41.0882C19.3863 40.6332 19.3863 39.8912 19.8412 39.4362L22.7534 36.5172C23.2154 36.0622 23.9499 36.0622 24.4049 36.5172ZM35.5912 36.5172C36.0462 36.0622 36.7808 36.0622 37.2428 36.5172L40.1549 39.4362C40.6099 39.8912 40.6099 40.6332 40.1549 41.0882C39.6999 41.5432 38.9654 41.5432 38.5034 41.0882L35.5912 38.1692C35.1362 37.7142 35.1362 36.9722 35.5912 36.5172Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M21.1986 22.972C21.6676 20.158 24.1041 18.1 26.9531 18.1H33.0426C35.8986 18.1 38.3281 20.158 38.7971 22.972L40.3365 32.212C40.8475 35.25 38.881 38.246 35.71 38.673C33.995 38.904 31.9579 39.1 29.9979 39.1C28.0379 39.1 26.0077 38.904 24.2857 38.673C21.1217 38.246 19.1552 35.25 19.6592 32.212L21.1986 22.972ZM26.9531 20.431C25.2451 20.431 23.7817 21.67 23.5017 23.357L23.0751 25.919C24.0201 26.927 25.2587 27.585 26.5047 28.005C27.8977 28.467 29.2279 28.6 29.9979 28.6C30.7679 28.6 32.098 28.467 33.491 28.005C34.737 27.592 35.9761 26.927 36.9281 25.919L36.5009 23.357C36.2139 21.67 34.7576 20.431 33.0426 20.431H26.9531ZM26.4979 32.093C25.8539 32.093 25.3289 32.618 25.3289 33.262C25.3289 33.906 25.8539 34.431 26.4979 34.431C27.1489 34.431 27.6668 33.906 27.6668 33.262C27.6668 32.618 27.1489 32.093 26.4979 32.093ZM33.4842 32.093C32.8402 32.093 32.3221 32.618 32.3221 33.262C32.3221 33.906 32.8402 34.431 33.4842 34.431H33.4979C34.1419 34.431 34.6668 33.906 34.6668 33.262C34.6668 32.618 34.1419 32.093 33.4979 32.093H33.4842Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#82B962"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4418 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4418 84.7754 38.925C84.7754 39.4083 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4083 59.9254 38.925Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7535 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.8251 83.2051 36.8251C76.3616 36.8251 63.3834 36.8251 61.5004 36.8251C60.3406 36.8251 59.4004 35.8849 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.9251C59.9254 38.4418 60.3171 38.0501 60.8004 38.0501H83.9004C84.3836 38.0501 84.7754 38.4418 84.7754 38.9251C84.7754 39.4083 84.3836 39.8001 83.9004 39.8001H60.8004C60.3171 39.8001 59.9254 39.4083 59.9254 38.9251Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7536 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="black"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7438" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/stoppin_plane_selected_light.svg b/sprite_assets/FRAM/light/stoppin_plane_selected_light.svg
index a15d6531..9b1423cb 100644
--- a/sprite_assets/FRAM/light/stoppin_plane_selected_light.svg
+++ b/sprite_assets/FRAM/light/stoppin_plane_selected_light.svg
@@ -5,7 +5,7 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#676767"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7400)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3305 20.9388C34.2023 18.3187 38.0159 17.7875 40.4533 19.2497C40.5765 19.3236 40.6795 19.4266 40.7534 19.5498C42.2335 22.016 41.5819 25.2983 39.3819 27.1595L37.671 28.607L39.2616 34.6503C39.5533 35.7584 39.2343 36.938 38.4241 37.7481L36.888 39.2838C36.7011 39.4706 36.4399 39.563 36.1772 39.5351C35.9145 39.5074 35.6783 39.3622 35.5348 39.1404L31.5593 32.9977L29.3031 35.2535L29.6715 38.5684C29.7008 38.8326 29.6085 39.0959 29.4204 39.2838L27.761 40.9429C27.5621 41.1417 27.2798 41.2328 27.0022 41.1878C26.7246 41.1428 26.4856 40.9671 26.3598 40.7156L24.001 35.9991L19.2836 33.6408C19.032 33.515 18.8562 33.276 18.8111 32.9983C18.7661 32.7206 18.8572 32.4382 19.0562 32.2394L20.7156 30.5802C20.9036 30.3923 21.1667 30.3 21.4309 30.3294L24.7467 30.6977L27.0027 28.4422L20.859 24.4677C20.6371 24.3241 20.492 24.088 20.4641 23.8252C20.4363 23.5624 20.5287 23.3011 20.7156 23.1142L22.2516 21.5785C23.0619 20.7684 24.2416 20.4496 25.3496 20.7411L31.3447 22.3185L32.3305 20.9388Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3305 20.9388C34.2023 18.3187 38.0159 17.7875 40.4533 19.2497C40.5765 19.3236 40.6795 19.4266 40.7534 19.5498C42.2335 22.016 41.5819 25.2983 39.3819 27.1595L37.671 28.607L39.2616 34.6503C39.5533 35.7584 39.2343 36.938 38.4241 37.7481L36.888 39.2838C36.7011 39.4706 36.4399 39.563 36.1772 39.5351C35.9145 39.5074 35.6783 39.3622 35.5348 39.1404L31.5593 32.9977L29.3031 35.2535L29.6715 38.5684C29.7008 38.8326 29.6085 39.0959 29.4204 39.2838L27.761 40.9429C27.5621 41.1417 27.2798 41.2329 27.0022 41.1878C26.7246 41.1428 26.4856 40.9671 26.3598 40.7156L24.001 35.9991L19.2836 33.6408C19.032 33.515 18.8562 33.276 18.8111 32.9983C18.7661 32.7206 18.8572 32.4382 19.0562 32.2394L20.7156 30.5803C20.9036 30.3923 21.1667 30.3 21.4309 30.3294L24.7467 30.6977L27.0027 28.4422L20.859 24.4677C20.6371 24.3241 20.492 24.088 20.4641 23.8252C20.4363 23.5624 20.5287 23.3011 20.7156 23.1142L22.2516 21.5785C23.0619 20.7684 24.2416 20.4496 25.3496 20.7411L31.3447 22.3185L32.3305 20.9388Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7400" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/stoppin_tram_selected_light.svg b/sprite_assets/FRAM/light/stoppin_tram_selected_light.svg
index d727bb72..e72de313 100644
--- a/sprite_assets/FRAM/light/stoppin_tram_selected_light.svg
+++ b/sprite_assets/FRAM/light/stoppin_tram_selected_light.svg
@@ -5,9 +5,9 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#82B962"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7375)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.825 41.2051 36.825C34.3616 36.825 21.3834 36.825 19.5004 36.825C18.3406 36.825 17.4004 35.8848 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6385 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6385 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6385 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6385 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6385 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6385 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2983 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6385 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4418 18.3171 38.05 18.8004 38.05L41.9004 38.05C42.3836 38.05 42.7754 38.4418 42.7754 38.925C42.7754 39.4083 42.3836 39.8 41.9004 39.8L18.8004 39.8C18.3171 39.8 17.9254 39.4083 17.9254 38.925Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9418 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7534 33.5997 21.0691C33.7403 21.3847 33.6819 21.7535 33.4508 22.0104L30.3008 25.5104C29.9775 25.8696 29.4242 25.8987 29.065 25.5754C28.7058 25.2522 28.6767 24.6989 29 24.3397L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9083 26.3254 21.425Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.8251 41.2051 36.8251C34.3616 36.8251 21.3834 36.8251 19.5004 36.8251C18.3406 36.8251 17.4004 35.8849 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6385 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6385 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6385 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6385 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6385 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6385 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2983 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6385 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.9251C17.9254 38.4418 18.3171 38.0501 18.8004 38.0501H41.9004C42.3836 38.0501 42.7754 38.4418 42.7754 38.9251C42.7754 39.4083 42.3836 39.8001 41.9004 39.8001H18.8004C18.3171 39.8001 17.9254 39.4083 17.9254 38.9251Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9418 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7534 33.5997 21.0691C33.7403 21.3847 33.6819 21.7536 33.4508 22.0104L30.3008 25.5104C29.9775 25.8696 29.4242 25.8987 29.065 25.5754C28.7058 25.2522 28.6767 24.6989 29 24.3397L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9083 26.3254 21.425Z" fill="black"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7375" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/vehiclepin_boat_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_boat_active_light.svg
index bcae3633..21a9d5c0 100644
--- a/sprite_assets/FRAM/light/vehiclepin_boat_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_boat_active_light.svg
@@ -1,11 +1,11 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4941)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#007AB5"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#007AB5"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
-<path d="M43.1851 35.6382C42.7907 35.2797 42.3606 34.8854 41.536 34.8854C40.7115 34.8854 40.2813 35.2797 39.887 35.6382C39.5285 35.9609 39.2058 36.2476 38.5606 36.2476C37.9153 36.2476 37.5926 35.9609 37.2341 35.6382C36.8398 35.2797 36.4096 34.8854 35.5851 34.8854C34.7606 34.8854 34.3304 35.2797 33.936 35.6382C33.5775 35.9609 33.2549 36.2476 32.6096 36.2476C31.9643 36.2476 31.6417 35.9609 31.2832 35.6382C31.104 35.459 30.8889 35.2797 30.6379 35.1363C30.6379 35.1363 30.5662 35.1363 30.5304 35.1363C30.2794 35.0288 30.0285 34.9571 29.67 34.9571C28.8455 34.9571 28.4153 35.3514 28.0568 35.7099C27.6983 36.0326 27.4115 36.3193 26.7662 36.3193C26.1209 36.3193 25.7983 36.0326 25.4757 35.7099C25.0813 35.3514 24.687 34.9571 23.8625 34.9571C23.0379 34.9571 22.6077 35.3514 22.2493 35.7099C21.8908 36.0326 21.604 36.3193 20.9228 36.3193C20.2417 36.3193 19.9549 36.0326 19.6323 35.7099C19.4172 35.5307 19.2021 35.3156 18.8794 35.1363L18.7002 36.3193C18.9511 36.4269 19.1304 36.6061 19.3096 36.7854C19.704 37.1439 20.1342 37.5382 20.9228 37.5382C21.7115 37.5382 22.1776 37.1439 22.536 36.7854C22.8945 36.4627 23.1813 36.1759 23.8266 36.1759C24.4719 36.1759 24.7945 36.4627 25.153 36.7854C25.5474 37.1439 25.9417 37.5382 26.7662 37.5382C27.5908 37.5382 28.0209 37.1439 28.3794 36.7854C28.7379 36.4627 29.0247 36.1759 29.7059 36.1759C30.387 36.1759 30.2436 36.2476 30.4587 36.3552C30.6379 36.4627 30.8172 36.6061 30.9606 36.7495C31.3191 37.0722 31.7492 37.4665 32.5738 37.4665C33.3983 37.4665 33.8285 37.0722 34.2228 36.7137C34.5813 36.391 34.8681 36.1043 35.5492 36.1043C36.2304 36.1043 36.5172 36.391 36.8757 36.7137C37.27 37.0722 37.7002 37.4665 38.5247 37.4665C39.3492 37.4665 39.7794 37.0722 40.1738 36.7137C40.5323 36.391 40.8549 36.1043 41.5002 36.1043C42.1455 36.1043 42.4681 36.391 42.8266 36.7137L43.2209 35.7099C43.2209 35.7099 43.1492 35.6382 43.0775 35.6024V35.6741L43.1851 35.6382Z" fill="white"/>
+<path d="M43.1851 35.6382C42.7908 35.2797 42.3606 34.8854 41.536 34.8854C40.7115 34.8854 40.2813 35.2797 39.887 35.6382C39.5285 35.9609 39.2058 36.2476 38.5606 36.2476C37.9153 36.2476 37.5926 35.9609 37.2341 35.6382C36.8398 35.2797 36.4096 34.8854 35.5851 34.8854C34.7606 34.8854 34.3304 35.2797 33.936 35.6382C33.5775 35.9609 33.2549 36.2476 32.6096 36.2476C31.9643 36.2476 31.6417 35.9609 31.2832 35.6382C31.104 35.459 30.8889 35.2797 30.6379 35.1363C30.6379 35.1363 30.5662 35.1363 30.5304 35.1363C30.2794 35.0288 30.0285 34.9571 29.67 34.9571C28.8455 34.9571 28.4153 35.3514 28.0568 35.7099C27.6983 36.0326 27.4115 36.3193 26.7662 36.3193C26.1209 36.3193 25.7983 36.0326 25.4757 35.7099C25.0813 35.3514 24.687 34.9571 23.8625 34.9571C23.0379 34.9571 22.6077 35.3514 22.2493 35.7099C21.8908 36.0326 21.604 36.3193 20.9228 36.3193C20.2417 36.3193 19.9549 36.0326 19.6323 35.7099C19.4172 35.5307 19.2021 35.3156 18.8794 35.1363L18.7002 36.3193C18.9511 36.4269 19.1304 36.6061 19.3096 36.7854C19.704 37.1439 20.1342 37.5382 20.9228 37.5382C21.7115 37.5382 22.1776 37.1439 22.536 36.7854C22.8945 36.4627 23.1813 36.1759 23.8266 36.1759C24.4719 36.1759 24.7945 36.4627 25.153 36.7854C25.5474 37.1439 25.9417 37.5382 26.7662 37.5382C27.5908 37.5382 28.0209 37.1439 28.3794 36.7854C28.7379 36.4627 29.0247 36.1759 29.7059 36.1759C30.387 36.1759 30.2436 36.2476 30.4587 36.3552C30.6379 36.4627 30.8172 36.6061 30.9606 36.7495C31.3191 37.0722 31.7492 37.4665 32.5738 37.4665C33.3983 37.4665 33.8285 37.0722 34.2228 36.7137C34.5813 36.391 34.8681 36.1043 35.5492 36.1043C36.2304 36.1043 36.5172 36.391 36.8757 36.7137C37.27 37.0722 37.7002 37.4665 38.5247 37.4665C39.3492 37.4665 39.7794 37.0722 40.1738 36.7137C40.5323 36.391 40.8549 36.1043 41.5002 36.1043C42.1455 36.1043 42.4681 36.391 42.8266 36.7137L43.2209 35.7099C43.2209 35.7099 43.1492 35.6382 43.0775 35.6024V35.6741L43.1851 35.6382Z" fill="white"/>
 <path d="M30.4945 35.1005C30.2794 34.9929 30.0643 34.9212 29.7417 34.9212C29.4191 34.9212 29.1681 34.9929 28.953 35.1363L30.5304 35.1363L30.4945 35.1363V35.1005Z" fill="white"/>
 <path d="M23.0021 35.1722H24.687C24.4719 35.0288 24.2209 34.9212 23.8625 34.9212C23.504 34.9212 23.2172 35.0288 23.0021 35.1722Z" fill="white"/>
-<path d="M45.1926 30.1892H41.8587L36.7323 26.3892H23.2889C23.0738 26.3892 22.8945 26.5684 22.8587 26.7835L22.07 30.1892H20.8153C20.6002 30.1892 20.4209 30.3326 20.3851 30.5118L19.4172 33.9892L19.3096 34.0967C19.453 34.2043 19.5606 34.3118 19.704 34.4193C20.0625 34.742 20.3493 35.0288 20.9945 35.0288C21.6398 35.0288 21.9625 34.742 22.3209 34.4193C22.7153 34.0609 23.1096 33.6665 23.9342 33.6665C24.7587 33.6665 25.1889 34.0609 25.5474 34.4193C25.9059 34.742 26.1926 35.0288 26.8379 35.0288C27.4832 35.0288 27.8059 34.742 28.1285 34.4193C28.5228 34.0609 28.9172 33.6665 29.7417 33.6665C30.5662 33.6665 30.387 33.7382 30.6021 33.8458C30.9247 33.9892 31.1398 34.2043 31.3908 34.3835C31.7492 34.7061 32.0719 34.9929 32.7172 34.9929C33.3625 34.9929 33.6851 34.7061 34.0436 34.3835C34.4379 34.025 34.8681 33.6307 35.6926 33.6307C36.5172 33.6307 36.9474 34.025 37.3417 34.3835C37.7002 34.7061 38.0228 34.9929 38.6681 34.9929C39.3134 34.9929 39.636 34.7061 39.9945 34.3835C40.3889 34.025 40.8191 33.6307 41.6436 33.6307C42.4681 33.6307 42.5398 33.7741 42.8266 33.9892L45.3002 30.5476C45.3002 30.5476 45.3002 30.476 45.3002 30.4043C45.3002 30.2609 45.1926 30.1533 45.0492 30.1533H45.1568L45.1926 30.1892ZM27.5908 30.1892H23.0738L23.504 28.325H27.5191V28.3967H27.5908V30.225V30.1892ZM32.0719 30.1892H28.0926V28.325H32.0719V30.1892ZM32.7172 30.1892V28.325H37.3775L39.9228 30.1892H32.7172Z" fill="white"/>
+<path d="M45.1926 30.1892H41.8587L36.7323 26.3892H23.2889C23.0738 26.3892 22.8945 26.5684 22.8587 26.7835L22.07 30.1892H20.8153C20.6002 30.1892 20.4209 30.3326 20.3851 30.5118L19.4172 33.9892L19.3096 34.0967C19.453 34.2043 19.5606 34.3118 19.704 34.4193C20.0625 34.742 20.3493 35.0288 20.9945 35.0288C21.6398 35.0288 21.9625 34.742 22.3209 34.4193C22.7153 34.0609 23.1096 33.6665 23.9342 33.6665C24.7587 33.6665 25.1889 34.0609 25.5474 34.4193C25.9059 34.742 26.1926 35.0288 26.8379 35.0288C27.4832 35.0288 27.8059 34.742 28.1285 34.4193C28.5228 34.0609 28.9172 33.6665 29.7417 33.6665C30.5662 33.6665 30.387 33.7382 30.6021 33.8458C30.9247 33.9892 31.1398 34.2043 31.3908 34.3835C31.7492 34.7061 32.0719 34.9929 32.7172 34.9929C33.3625 34.9929 33.6851 34.7061 34.0436 34.3835C34.4379 34.025 34.8681 33.6307 35.6926 33.6307C36.5172 33.6307 36.9474 34.025 37.3417 34.3835C37.7002 34.7061 38.0228 34.9929 38.6681 34.9929C39.3134 34.9929 39.636 34.7061 39.9945 34.3835C40.3889 34.025 40.819 33.6307 41.6436 33.6307C42.4681 33.6307 42.5398 33.7741 42.8266 33.9892L45.3002 30.5476C45.3002 30.5476 45.3002 30.476 45.3002 30.4043C45.3002 30.2609 45.1926 30.1533 45.0492 30.1533H45.1568L45.1926 30.1892ZM27.5908 30.1892H23.0738L23.504 28.325H27.5191V28.3967H27.5908V30.225V30.1892ZM32.0719 30.1892H28.0926V28.325H32.0719V30.1892ZM32.7172 30.1892V28.325H37.3775L39.9228 30.1892H32.7172Z" fill="white"/>
 <path d="M34.9757 35.1005H36.4455C36.2662 34.9929 36.0153 34.9212 35.7285 34.9212C35.4417 34.9212 35.1908 34.9929 34.9757 35.1005Z" fill="white"/>
 <path d="M41.7153 34.9212C41.4285 34.9212 41.2492 34.9212 41.0341 35.0646H42.0379L42.1096 34.9929C42.0021 34.9929 41.8587 34.9929 41.7153 34.9929V34.9212Z" fill="white"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_boat_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_boat_error_light.svg
index cb29e1d7..53b175f0 100644
--- a/sprite_assets/FRAM/light/vehiclepin_boat_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_boat_error_light.svg
@@ -1,11 +1,11 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5061)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
-<path d="M43.1851 35.6382C42.7907 35.2797 42.3606 34.8854 41.536 34.8854C40.7115 34.8854 40.2813 35.2797 39.887 35.6382C39.5285 35.9609 39.2058 36.2476 38.5606 36.2476C37.9153 36.2476 37.5926 35.9609 37.2341 35.6382C36.8398 35.2797 36.4096 34.8854 35.5851 34.8854C34.7606 34.8854 34.3304 35.2797 33.936 35.6382C33.5775 35.9609 33.2549 36.2476 32.6096 36.2476C31.9643 36.2476 31.6417 35.9609 31.2832 35.6382C31.104 35.459 30.8889 35.2797 30.6379 35.1363C30.6379 35.1363 30.5662 35.1363 30.5304 35.1363C30.2794 35.0288 30.0285 34.9571 29.67 34.9571C28.8455 34.9571 28.4153 35.3514 28.0568 35.7099C27.6983 36.0326 27.4115 36.3193 26.7662 36.3193C26.1209 36.3193 25.7983 36.0326 25.4757 35.7099C25.0813 35.3514 24.687 34.9571 23.8625 34.9571C23.0379 34.9571 22.6077 35.3514 22.2493 35.7099C21.8908 36.0326 21.604 36.3193 20.9228 36.3193C20.2417 36.3193 19.9549 36.0326 19.6323 35.7099C19.4172 35.5307 19.2021 35.3156 18.8794 35.1363L18.7002 36.3193C18.9511 36.4269 19.1304 36.6061 19.3096 36.7854C19.704 37.1439 20.1342 37.5382 20.9228 37.5382C21.7115 37.5382 22.1776 37.1439 22.536 36.7854C22.8945 36.4627 23.1813 36.1759 23.8266 36.1759C24.4719 36.1759 24.7945 36.4627 25.153 36.7854C25.5474 37.1439 25.9417 37.5382 26.7662 37.5382C27.5908 37.5382 28.0209 37.1439 28.3794 36.7854C28.7379 36.4627 29.0247 36.1759 29.7059 36.1759C30.387 36.1759 30.2436 36.2476 30.4587 36.3552C30.6379 36.4627 30.8172 36.6061 30.9606 36.7495C31.3191 37.0722 31.7492 37.4665 32.5738 37.4665C33.3983 37.4665 33.8285 37.0722 34.2228 36.7137C34.5813 36.391 34.8681 36.1043 35.5492 36.1043C36.2304 36.1043 36.5172 36.391 36.8757 36.7137C37.27 37.0722 37.7002 37.4665 38.5247 37.4665C39.3492 37.4665 39.7794 37.0722 40.1738 36.7137C40.5323 36.391 40.8549 36.1043 41.5002 36.1043C42.1455 36.1043 42.4681 36.391 42.8266 36.7137L43.2209 35.7099C43.2209 35.7099 43.1492 35.6382 43.0775 35.6024V35.6741L43.1851 35.6382Z" fill="#E31B22"/>
+<path d="M43.1851 35.6382C42.7908 35.2797 42.3606 34.8854 41.536 34.8854C40.7115 34.8854 40.2813 35.2797 39.887 35.6382C39.5285 35.9609 39.2058 36.2476 38.5606 36.2476C37.9153 36.2476 37.5926 35.9609 37.2341 35.6382C36.8398 35.2797 36.4096 34.8854 35.5851 34.8854C34.7606 34.8854 34.3304 35.2797 33.936 35.6382C33.5775 35.9609 33.2549 36.2476 32.6096 36.2476C31.9643 36.2476 31.6417 35.9609 31.2832 35.6382C31.104 35.459 30.8889 35.2797 30.6379 35.1363C30.6379 35.1363 30.5662 35.1363 30.5304 35.1363C30.2794 35.0288 30.0285 34.9571 29.67 34.9571C28.8455 34.9571 28.4153 35.3514 28.0568 35.7099C27.6983 36.0326 27.4115 36.3193 26.7662 36.3193C26.1209 36.3193 25.7983 36.0326 25.4757 35.7099C25.0813 35.3514 24.687 34.9571 23.8625 34.9571C23.0379 34.9571 22.6077 35.3514 22.2493 35.7099C21.8908 36.0326 21.604 36.3193 20.9228 36.3193C20.2417 36.3193 19.9549 36.0326 19.6323 35.7099C19.4172 35.5307 19.2021 35.3156 18.8794 35.1363L18.7002 36.3193C18.9511 36.4269 19.1304 36.6061 19.3096 36.7854C19.704 37.1439 20.1342 37.5382 20.9228 37.5382C21.7115 37.5382 22.1776 37.1439 22.536 36.7854C22.8945 36.4627 23.1813 36.1759 23.8266 36.1759C24.4719 36.1759 24.7945 36.4627 25.153 36.7854C25.5474 37.1439 25.9417 37.5382 26.7662 37.5382C27.5908 37.5382 28.0209 37.1439 28.3794 36.7854C28.7379 36.4627 29.0247 36.1759 29.7059 36.1759C30.387 36.1759 30.2436 36.2476 30.4587 36.3552C30.6379 36.4627 30.8172 36.6061 30.9606 36.7495C31.3191 37.0722 31.7492 37.4665 32.5738 37.4665C33.3983 37.4665 33.8285 37.0722 34.2228 36.7137C34.5813 36.391 34.8681 36.1043 35.5492 36.1043C36.2304 36.1043 36.5172 36.391 36.8757 36.7137C37.27 37.0722 37.7002 37.4665 38.5247 37.4665C39.3492 37.4665 39.7794 37.0722 40.1738 36.7137C40.5323 36.391 40.8549 36.1043 41.5002 36.1043C42.1455 36.1043 42.4681 36.391 42.8266 36.7137L43.2209 35.7099C43.2209 35.7099 43.1492 35.6382 43.0775 35.6024V35.6741L43.1851 35.6382Z" fill="#E31B22"/>
 <path d="M30.4945 35.1005C30.2794 34.9929 30.0643 34.9212 29.7417 34.9212C29.4191 34.9212 29.1681 34.9929 28.953 35.1363L30.5304 35.1363L30.4945 35.1363V35.1005Z" fill="#E31B22"/>
 <path d="M23.0021 35.1722H24.687C24.4719 35.0288 24.2209 34.9212 23.8625 34.9212C23.504 34.9212 23.2172 35.0288 23.0021 35.1722Z" fill="#E31B22"/>
-<path d="M45.1926 30.1892H41.8587L36.7323 26.3892H23.2889C23.0738 26.3892 22.8945 26.5684 22.8587 26.7835L22.07 30.1892H20.8153C20.6002 30.1892 20.4209 30.3326 20.3851 30.5118L19.4172 33.9892L19.3096 34.0967C19.453 34.2043 19.5606 34.3118 19.704 34.4193C20.0625 34.742 20.3493 35.0288 20.9945 35.0288C21.6398 35.0288 21.9625 34.742 22.3209 34.4193C22.7153 34.0609 23.1096 33.6665 23.9342 33.6665C24.7587 33.6665 25.1889 34.0609 25.5474 34.4193C25.9059 34.742 26.1926 35.0288 26.8379 35.0288C27.4832 35.0288 27.8059 34.742 28.1285 34.4193C28.5228 34.0609 28.9172 33.6665 29.7417 33.6665C30.5662 33.6665 30.387 33.7382 30.6021 33.8458C30.9247 33.9892 31.1398 34.2043 31.3908 34.3835C31.7492 34.7061 32.0719 34.9929 32.7172 34.9929C33.3625 34.9929 33.6851 34.7061 34.0436 34.3835C34.4379 34.025 34.8681 33.6307 35.6926 33.6307C36.5172 33.6307 36.9474 34.025 37.3417 34.3835C37.7002 34.7061 38.0228 34.9929 38.6681 34.9929C39.3134 34.9929 39.636 34.7061 39.9945 34.3835C40.3889 34.025 40.8191 33.6307 41.6436 33.6307C42.4681 33.6307 42.5398 33.7741 42.8266 33.9892L45.3002 30.5476C45.3002 30.5476 45.3002 30.476 45.3002 30.4043C45.3002 30.2609 45.1926 30.1533 45.0492 30.1533H45.1568L45.1926 30.1892ZM27.5908 30.1892H23.0738L23.504 28.325H27.5191V28.3967H27.5908V30.225V30.1892ZM32.0719 30.1892H28.0926V28.325H32.0719V30.1892ZM32.7172 30.1892V28.325H37.3775L39.9228 30.1892H32.7172Z" fill="#E31B22"/>
+<path d="M45.1926 30.1892H41.8587L36.7323 26.3892H23.2889C23.0738 26.3892 22.8945 26.5684 22.8587 26.7835L22.07 30.1892H20.8153C20.6002 30.1892 20.4209 30.3326 20.3851 30.5118L19.4172 33.9892L19.3096 34.0967C19.453 34.2043 19.5606 34.3118 19.704 34.4193C20.0625 34.742 20.3493 35.0288 20.9945 35.0288C21.6398 35.0288 21.9625 34.742 22.3209 34.4193C22.7153 34.0609 23.1096 33.6665 23.9342 33.6665C24.7587 33.6665 25.1889 34.0609 25.5474 34.4193C25.9059 34.742 26.1926 35.0288 26.8379 35.0288C27.4832 35.0288 27.8059 34.742 28.1285 34.4193C28.5228 34.0609 28.9172 33.6665 29.7417 33.6665C30.5662 33.6665 30.387 33.7382 30.6021 33.8458C30.9247 33.9892 31.1398 34.2043 31.3908 34.3835C31.7492 34.7061 32.0719 34.9929 32.7172 34.9929C33.3625 34.9929 33.6851 34.7061 34.0436 34.3835C34.4379 34.025 34.8681 33.6307 35.6926 33.6307C36.5172 33.6307 36.9474 34.025 37.3417 34.3835C37.7002 34.7061 38.0228 34.9929 38.6681 34.9929C39.3134 34.9929 39.636 34.7061 39.9945 34.3835C40.3889 34.025 40.819 33.6307 41.6436 33.6307C42.4681 33.6307 42.5398 33.7741 42.8266 33.9892L45.3002 30.5476C45.3002 30.5476 45.3002 30.476 45.3002 30.4043C45.3002 30.2609 45.1926 30.1533 45.0492 30.1533H45.1568L45.1926 30.1892ZM27.5908 30.1892H23.0738L23.504 28.325H27.5191V28.3967H27.5908V30.225V30.1892ZM32.0719 30.1892H28.0926V28.325H32.0719V30.1892ZM32.7172 30.1892V28.325H37.3775L39.9228 30.1892H32.7172Z" fill="#E31B22"/>
 <path d="M34.9757 35.1005H36.4455C36.2662 34.9929 36.0153 34.9212 35.7285 34.9212C35.4417 34.9212 35.1908 34.9929 34.9757 35.1005Z" fill="#E31B22"/>
 <path d="M41.7153 34.9212C41.4285 34.9212 41.2492 34.9212 41.0341 35.0646H42.0379L42.1096 34.9929C42.0021 34.9929 41.8587 34.9929 41.7153 34.9929V34.9212Z" fill="#E31B22"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_bus_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_bus_active_light.svg
index dd24f753..eb7e3767 100644
--- a/sprite_assets/FRAM/light/vehiclepin_bus_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_bus_active_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4893)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#82B962"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#82B962"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M45.3002 36.7389C45.3002 37.0889 45.1072 37.2833 44.7597 37.2833H40.7446V36.9333C40.7446 36.1555 40.4744 35.4555 39.8953 34.9111C39.3548 34.3666 38.6598 34.0555 37.8877 34.0555C37.1156 34.0555 36.3821 34.3278 35.8416 34.9111C35.3011 35.4555 34.9922 36.1555 34.9922 36.9333C34.9922 37.7111 34.9922 37.05 34.9922 37.0889V37.2444H28.931V36.8944C28.931 36.1166 28.6607 35.4166 28.1202 34.8722C27.5797 34.3278 26.8848 34.0166 26.0741 34.0166C25.2633 34.0166 24.5684 34.2889 24.0279 34.8722C23.4874 35.4166 23.2172 36.1166 23.2172 36.8944V37.2444H19.2407C19.0863 37.2444 18.9704 37.2444 18.8546 37.0889C18.7388 36.9722 18.7002 36.8555 18.7002 36.7V26.3944C18.7002 26.2389 18.7388 26.1222 18.8546 26.0055C18.9704 25.8889 19.0863 25.85 19.2407 25.85H44.6825C44.8369 25.85 44.9527 25.85 45.0686 26.0055C45.1844 26.1222 45.223 26.2389 45.223 26.3944H45.3002V36.7389ZM19.9742 32.5778H25.2633V28.1833H19.9742V32.5778ZM28.3519 36.9333C28.3519 37.5555 28.1202 38.0611 27.6956 38.4889C27.2709 38.9166 26.7304 39.15 26.1513 39.15C25.5722 39.15 25.0317 38.9166 24.607 38.4889C24.1823 38.0611 23.9507 37.5166 23.9507 36.9333C23.9507 36.35 24.1823 35.8055 24.607 35.3778C25.0317 34.95 25.5722 34.7555 26.1513 34.7555C26.7304 34.7555 27.2709 34.95 27.6956 35.3778C28.1202 35.8055 28.3519 36.3111 28.3519 36.9333ZM26.2285 32.5778H31.5176V28.1833H26.2285V32.5778ZM32.5214 32.5778H37.8491V28.1833H32.5214V32.5778ZM40.1269 36.9333C40.1269 37.5555 39.8953 38.0611 39.4706 38.4889C39.0459 38.9166 38.5054 39.15 37.9263 39.15C37.3472 39.15 36.8067 38.9166 36.3821 38.4889C35.9574 38.0611 35.7257 37.5166 35.7257 36.9333C35.7257 36.35 35.9574 35.8055 36.3821 35.3778C36.8067 34.95 37.3472 34.7555 37.9263 34.7555C38.5054 34.7555 39.0459 34.95 39.4706 35.3778C39.8953 35.8055 40.1269 36.3111 40.1269 36.9333ZM38.8143 32.5778H44.1034V28.1833H38.8143V32.5778Z" fill="black"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_bus_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_bus_error_light.svg
index e2508fd6..1f3d3406 100644
--- a/sprite_assets/FRAM/light/vehiclepin_bus_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_bus_error_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5013)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M45.3002 36.7389C45.3002 37.0889 45.1072 37.2833 44.7597 37.2833H40.7446V36.9333C40.7446 36.1555 40.4744 35.4555 39.8953 34.9111C39.3548 34.3666 38.6598 34.0555 37.8877 34.0555C37.1156 34.0555 36.3821 34.3278 35.8416 34.9111C35.3011 35.4555 34.9922 36.1555 34.9922 36.9333C34.9922 37.7111 34.9922 37.05 34.9922 37.0889V37.2444H28.931V36.8944C28.931 36.1166 28.6607 35.4166 28.1202 34.8722C27.5797 34.3278 26.8848 34.0166 26.0741 34.0166C25.2633 34.0166 24.5684 34.2889 24.0279 34.8722C23.4874 35.4166 23.2172 36.1166 23.2172 36.8944V37.2444H19.2407C19.0863 37.2444 18.9704 37.2444 18.8546 37.0889C18.7388 36.9722 18.7002 36.8555 18.7002 36.7V26.3944C18.7002 26.2389 18.7388 26.1222 18.8546 26.0055C18.9704 25.8889 19.0863 25.85 19.2407 25.85H44.6825C44.8369 25.85 44.9527 25.85 45.0686 26.0055C45.1844 26.1222 45.223 26.2389 45.223 26.3944H45.3002V36.7389ZM19.9742 32.5778H25.2633V28.1833H19.9742V32.5778ZM28.3519 36.9333C28.3519 37.5555 28.1202 38.0611 27.6956 38.4889C27.2709 38.9166 26.7304 39.15 26.1513 39.15C25.5722 39.15 25.0317 38.9166 24.607 38.4889C24.1823 38.0611 23.9507 37.5166 23.9507 36.9333C23.9507 36.35 24.1823 35.8055 24.607 35.3778C25.0317 34.95 25.5722 34.7555 26.1513 34.7555C26.7304 34.7555 27.2709 34.95 27.6956 35.3778C28.1202 35.8055 28.3519 36.3111 28.3519 36.9333ZM26.2285 32.5778H31.5176V28.1833H26.2285V32.5778ZM32.5214 32.5778H37.8491V28.1833H32.5214V32.5778ZM40.1269 36.9333C40.1269 37.5555 39.8953 38.0611 39.4706 38.4889C39.0459 38.9166 38.5054 39.15 37.9263 39.15C37.3472 39.15 36.8067 38.9166 36.3821 38.4889C35.9574 38.0611 35.7257 37.5166 35.7257 36.9333C35.7257 36.35 35.9574 35.8055 36.3821 35.3778C36.8067 34.95 37.3472 34.7555 37.9263 34.7555C38.5054 34.7555 39.0459 34.95 39.4706 35.3778C39.8953 35.8055 40.1269 36.3111 40.1269 36.9333ZM38.8143 32.5778H44.1034V28.1833H38.8143V32.5778Z" fill="#E31B22"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_citybike_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_citybike_active_light.svg
index 48e25359..935f4d0b 100644
--- a/sprite_assets/FRAM/light/vehiclepin_citybike_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_citybike_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47146)">
 <g clip-path="url(#clip0_10646_47146)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#5B0C0E"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#5B0C0E"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47146" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47146">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_citybike_cluster_light.svg b/sprite_assets/FRAM/light/vehiclepin_citybike_cluster_light.svg
index 39da1501..990e8f2e 100644
--- a/sprite_assets/FRAM/light/vehiclepin_citybike_cluster_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_citybike_cluster_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5203)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#5B0C0E"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#5B0C0E"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M29.2051 24.833C27.8251 24.833 26.7051 25.953 26.7051 27.333C26.7051 28.713 27.8251 29.833 29.2051 29.833C30.5851 29.833 31.7051 28.713 31.7051 27.333C31.7051 25.953 30.5901 24.833 29.2051 24.833ZM25.04 27.333C25.04 25.033 26.9051 23.168 29.2051 23.168C31.5051 23.168 33.375 25.033 33.375 27.333C33.375 29.633 31.5051 31.498 29.2051 31.498C26.9051 31.498 25.04 29.633 25.04 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M27.5649 19.9629C27.9549 20.2079 28.0751 20.7229 27.8301 21.1129L23.665 27.7779C23.51 28.0229 23.2451 28.1679 22.9551 28.1679H18.79C18.33 28.1679 17.9551 27.7929 17.9551 27.3329C17.9551 26.8729 18.33 26.4979 18.79 26.4979H22.4951L26.415 20.2279C26.66 19.8379 27.1749 19.7179 27.5649 19.9629Z" fill="white"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_citybike_default_light.svg b/sprite_assets/FRAM/light/vehiclepin_citybike_default_light.svg
index 5a79daa1..232bd22d 100644
--- a/sprite_assets/FRAM/light/vehiclepin_citybike_default_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_citybike_default_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5156)">
 <g clip-path="url(#clip0_10646_5156)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#5B0C0E"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5156" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5156">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_citybike_selected_light.svg b/sprite_assets/FRAM/light/vehiclepin_citybike_selected_light.svg
index e2ce8bc5..c70e833d 100644
--- a/sprite_assets/FRAM/light/vehiclepin_citybike_selected_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_citybike_selected_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5176)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#5B0C0E" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#5B0C0E" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_active_light.svg
index 374d1d92..b08363d2 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47148)">
 <g clip-path="url(#clip0_10646_47148)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#5B0C0E"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#5B0C0E"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="white"/>
 </g>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
@@ -17,7 +17,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47148" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47148">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_cluster_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_cluster_light.svg
index 35b2f045..5a3a3b18 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_cluster_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_cluster_light.svg
@@ -1,17 +1,17 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5520)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6H52C60.8366 6 68 13.1634 68 22V22C68 30.8366 60.8366 38 52 38H24C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7H52C60.2843 7 67 13.7157 67 22C67 30.2843 60.2843 37 52 37H24C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#5B0C0E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#5B0C0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5520" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5520"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5520" result="shape"/>
 </filter>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_cluster_minimized_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_cluster_minimized_light.svg
index 5b7160e8..d1e93bd4 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_cluster_minimized_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_cluster_minimized_light.svg
@@ -1,16 +1,16 @@
 <svg width="44" height="32" viewBox="0 0 44 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5534)">
-<rect x="10" y="8" width="24" height="12" rx="6" fill="white"/>
-<rect x="9" y="7" width="26" height="14" rx="7" stroke="white" stroke-width="2"/>
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#5B0C0E"/>
+<rect x="10" y="10" width="24" height="12" rx="6" fill="white"/>
+<rect x="9" y="9" width="26" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#5B0C0E"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5534" x="0" y="0" width="44" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5534"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5534" result="shape"/>
 </filter>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_default_dott_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_default_dott_light.svg
new file mode 100644
index 00000000..20f8eb5e
--- /dev/null
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_default_dott_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6949)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="#009DDB"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#009DDB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6949" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6949"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6949" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_default_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_default_light.svg
index 69ca5ca7..508a09d8 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_default_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_default_light.svg
@@ -1,17 +1,17 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5485)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#5B0C0E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#5B0C0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5485" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5485"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5485" result="shape"/>
 </filter>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_default_ryde_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_default_ryde_light.svg
new file mode 100644
index 00000000..6d60caff
--- /dev/null
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_default_ryde_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6968)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#4BCD1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6968" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6968"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6968" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_default_voi_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_default_voi_light.svg
index 4cc04d6d..da98ef78 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_default_voi_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_default_voi_light.svg
@@ -1,19 +1,19 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47410)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#F36960"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6961)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#F36960"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47410" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6961" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47410"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47410" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6961"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6961" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_dott_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_dott_light.svg
new file mode 100644
index 00000000..e6f6004d
--- /dev/null
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_dott_light.svg
@@ -0,0 +1,22 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6945)">
+<g clip-path="url(#clip0_10957_6945)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6945" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6945"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6945" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6945">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_light.svg
index 99e4f7a7..d39c3ccc 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_light.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5471)">
 <g clip-path="url(#clip0_10646_5471)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#5B0C0E"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#5B0C0E"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5471" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5471"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5471" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5471">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_ryde_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_ryde_light.svg
new file mode 100644
index 00000000..312e3373
--- /dev/null
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_ryde_light.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6966)">
+<g clip-path="url(#clip0_10957_6966)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
+<rect width="12" height="12" transform="translate(10 10)" fill="#4BCD1F"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6966" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6966"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6966" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6966">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_voi_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_voi_light.svg
index d6b5ca20..1d093545 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_voi_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_minimized_voi_light.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47398)">
-<g clip-path="url(#clip0_10647_47398)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#F36960"/>
+<g filter="url(#filter0_d_10957_6959)">
+<g clip-path="url(#clip0_10957_6959)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47398" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6959" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47398"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47398" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6959"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6959" result="shape"/>
 </filter>
-<clipPath id="clip0_10647_47398">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<clipPath id="clip0_10957_6959">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_selected_dott_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_selected_dott_light.svg
new file mode 100644
index 00000000..126e17ea
--- /dev/null
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_selected_dott_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6953)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6953" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6953"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6953" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_selected_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_selected_light.svg
index ab905a00..3998e265 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_selected_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_selected_light.svg
@@ -1,15 +1,15 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5505)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#5B0C0E" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5825 35.0335 17.9095 35.0335 18.2751V27.9003H40.5761C40.9184 27.9003 41.2294 28.0999 41.3718 28.4111C41.5143 28.7224 41.4621 29.0882 41.2383 29.3472L30.155 42.1803C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6084V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4724C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4265 34.121 17.3275 34.4636 17.455Z" fill="white"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#5B0C0E" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5505" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5505"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5505" result="shape"/>
 </filter>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_selected_ryde_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_selected_ryde_light.svg
new file mode 100644
index 00000000..fcdcbd72
--- /dev/null
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_selected_ryde_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6970)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6970" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6970"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6970" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ebike_selected_voi_light.svg b/sprite_assets/FRAM/light/vehiclepin_ebike_selected_voi_light.svg
index 9d8c130e..0d815cc7 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ebike_selected_voi_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ebike_selected_voi_light.svg
@@ -1,17 +1,17 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47422)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5825 35.0335 17.9095 35.0335 18.2751V27.9003H40.5761C40.9184 27.9003 41.2294 28.0999 41.3718 28.4111C41.5143 28.7224 41.4621 29.0882 41.2383 29.3472L30.155 42.1803C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6084V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4724C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4265 34.121 17.3275 34.4636 17.455Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6963)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47422" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6963" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47422"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47422" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6963"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6963" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_ferry_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_ferry_active_light.svg
index 24c58e40..125c2db2 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ferry_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ferry_active_light.svg
@@ -1,9 +1,9 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4953)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#007AB5"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#007AB5"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M41.3237 39.4964C41.4009 39.4964 41.4781 39.5736 41.5553 39.6122L40.8218 40.616H40.7446C40.1269 40.3072 39.5864 39.9983 38.4282 39.9983C37.27 39.9983 36.7295 40.2685 36.0732 40.616C35.4169 40.9635 34.6448 41.3495 33.1777 41.3495C31.7106 41.3495 30.9385 40.9635 30.2822 40.616C29.6645 40.3072 29.124 39.9983 27.9272 39.9983C26.7304 39.9983 26.2285 40.2685 25.6108 40.616C24.9159 40.9635 24.1823 41.3495 22.7153 41.3495C21.2482 41.3495 20.5147 40.9635 19.8198 40.616C19.4723 40.423 19.1249 40.2685 18.7002 40.1527L19.0477 38.9559C19.5881 39.1103 20.0128 39.3034 20.3989 39.4964C21.0166 39.8053 21.5571 40.1141 22.7153 40.1141C23.8735 40.1141 24.414 39.8439 25.0703 39.4964C25.7266 39.149 26.4987 38.7629 27.9658 38.7629C29.4329 38.7629 30.205 39.149 30.8613 39.4964C31.479 39.8053 32.0195 40.1141 33.1777 40.1141C34.3359 40.1141 34.8764 39.8439 35.5327 39.4964C36.189 39.149 36.9612 38.7629 38.4282 38.7629C39.8953 38.7629 40.6674 39.149 41.3237 39.4964Z" fill="white"/>
-<path d="M45.0299 34.0915H41.0535C41.0535 34.0915 39.3162 26.5632 39.2389 26.1385C39.1617 25.7138 38.8143 25.791 38.8143 25.791H36.8067C36.8067 25.791 36.5365 24.7101 36.4207 24.131C36.2662 23.5132 35.996 23.6677 35.996 23.6677C35.996 23.6677 33.3707 24.6714 33.0233 24.8259C32.6758 24.9803 32.7916 25.3664 32.7916 25.3664V27.7214H23.8735C23.2558 27.7214 23.2558 28.0688 23.2558 28.0688L21.7887 34.0915H20.8236C20.5919 34.0915 20.4375 34.2459 20.3989 34.4389L19.3951 37.9135C20.09 38.1066 20.5919 38.3768 21.0166 38.5699C21.5957 38.8787 21.9045 39.0331 22.7539 39.0331C23.6032 39.0331 23.9121 38.8787 24.4912 38.5699C25.2247 38.1838 26.2285 37.6819 27.9658 37.6819C29.7031 37.6819 30.7455 38.1838 31.479 38.5699C32.0581 38.8787 32.367 39.0331 33.2163 39.0331C34.0657 39.0331 34.3745 38.8787 34.9536 38.5699C35.6871 38.1838 36.6909 37.6819 38.4668 37.6819C40.2427 37.6819 41.2465 38.1838 41.98 38.5699C42.0572 38.5699 42.2503 38.6857 42.2503 38.6857L45.3002 34.4775C45.3002 34.4775 45.3002 34.4003 45.3002 34.3231C45.3002 34.1687 45.1844 34.0529 45.0299 34.0529V34.0915ZM23.7577 31.1574L24.1823 29.3429H28.1202V31.1574H23.7577ZM33.0619 31.1574H28.6993V29.3429H33.0619V31.1574ZM33.7568 31.1574V29.3429H38.1194L38.5826 31.1574H33.7568Z" fill="white"/>
+<path d="M45.0299 34.0915H41.0535C41.0535 34.0915 39.3162 26.5632 39.2389 26.1385C39.1617 25.7138 38.8143 25.791 38.8143 25.791H36.8067C36.8067 25.791 36.5365 24.7101 36.4207 24.131C36.2662 23.5132 35.996 23.6677 35.996 23.6677C35.996 23.6677 33.3707 24.6714 33.0233 24.8259C32.6758 24.9803 32.7916 25.3664 32.7916 25.3664V27.7214H23.8735C23.2558 27.7214 23.2558 28.0688 23.2558 28.0688L21.7887 34.0915H20.8236C20.5919 34.0915 20.4375 34.2459 20.3989 34.4389L19.3951 37.9135C20.09 38.1066 20.5919 38.3768 21.0166 38.5698C21.5957 38.8787 21.9045 39.0331 22.7539 39.0331C23.6032 39.0331 23.9121 38.8787 24.4912 38.5698C25.2247 38.1838 26.2285 37.6819 27.9658 37.6819C29.7031 37.6819 30.7455 38.1838 31.479 38.5698C32.0581 38.8787 32.367 39.0331 33.2163 39.0331C34.0657 39.0331 34.3745 38.8787 34.9536 38.5698C35.6871 38.1838 36.6909 37.6819 38.4668 37.6819C40.2427 37.6819 41.2465 38.1838 41.98 38.5698C42.0572 38.5698 42.2503 38.6857 42.2503 38.6857L45.3002 34.4775C45.3002 34.4775 45.3002 34.4003 45.3002 34.3231C45.3002 34.1687 45.1844 34.0529 45.0299 34.0529V34.0915ZM23.7577 31.1574L24.1823 29.3429H28.1202V31.1574H23.7577ZM33.0619 31.1574H28.6993V29.3429H33.0619V31.1574ZM33.7568 31.1574V29.3429H38.1194L38.5826 31.1574H33.7568Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10410_4953" x="0" y="0" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/vehiclepin_ferry_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_ferry_error_light.svg
index 4aefc030..ef60151a 100644
--- a/sprite_assets/FRAM/light/vehiclepin_ferry_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_ferry_error_light.svg
@@ -1,9 +1,9 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5073)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M41.3237 39.4964C41.4009 39.4964 41.4781 39.5736 41.5553 39.6122L40.8218 40.616H40.7446C40.1269 40.3072 39.5864 39.9983 38.4282 39.9983C37.27 39.9983 36.7295 40.2685 36.0732 40.616C35.4169 40.9635 34.6448 41.3495 33.1777 41.3495C31.7106 41.3495 30.9385 40.9635 30.2822 40.616C29.6645 40.3072 29.124 39.9983 27.9272 39.9983C26.7304 39.9983 26.2285 40.2685 25.6108 40.616C24.9159 40.9635 24.1823 41.3495 22.7153 41.3495C21.2482 41.3495 20.5147 40.9635 19.8198 40.616C19.4723 40.423 19.1249 40.2685 18.7002 40.1527L19.0477 38.9559C19.5881 39.1103 20.0128 39.3034 20.3989 39.4964C21.0166 39.8053 21.5571 40.1141 22.7153 40.1141C23.8735 40.1141 24.414 39.8439 25.0703 39.4964C25.7266 39.149 26.4987 38.7629 27.9658 38.7629C29.4329 38.7629 30.205 39.149 30.8613 39.4964C31.479 39.8053 32.0195 40.1141 33.1777 40.1141C34.3359 40.1141 34.8764 39.8439 35.5327 39.4964C36.189 39.149 36.9612 38.7629 38.4282 38.7629C39.8953 38.7629 40.6674 39.149 41.3237 39.4964Z" fill="#E31B22"/>
-<path d="M45.0299 34.0915H41.0535C41.0535 34.0915 39.3162 26.5632 39.2389 26.1385C39.1617 25.7138 38.8143 25.791 38.8143 25.791H36.8067C36.8067 25.791 36.5365 24.7101 36.4207 24.131C36.2662 23.5132 35.996 23.6677 35.996 23.6677C35.996 23.6677 33.3707 24.6714 33.0233 24.8259C32.6758 24.9803 32.7916 25.3664 32.7916 25.3664V27.7214H23.8735C23.2558 27.7214 23.2558 28.0688 23.2558 28.0688L21.7887 34.0915H20.8236C20.5919 34.0915 20.4375 34.2459 20.3989 34.4389L19.3951 37.9135C20.09 38.1066 20.5919 38.3768 21.0166 38.5699C21.5957 38.8787 21.9045 39.0331 22.7539 39.0331C23.6032 39.0331 23.9121 38.8787 24.4912 38.5699C25.2247 38.1838 26.2285 37.6819 27.9658 37.6819C29.7031 37.6819 30.7455 38.1838 31.479 38.5699C32.0581 38.8787 32.367 39.0331 33.2163 39.0331C34.0657 39.0331 34.3745 38.8787 34.9536 38.5699C35.6871 38.1838 36.6909 37.6819 38.4668 37.6819C40.2427 37.6819 41.2465 38.1838 41.98 38.5699C42.0572 38.5699 42.2503 38.6857 42.2503 38.6857L45.3002 34.4775C45.3002 34.4775 45.3002 34.4003 45.3002 34.3231C45.3002 34.1687 45.1844 34.0529 45.0299 34.0529V34.0915ZM23.7577 31.1574L24.1823 29.3429H28.1202V31.1574H23.7577ZM33.0619 31.1574H28.6993V29.3429H33.0619V31.1574ZM33.7568 31.1574V29.3429H38.1194L38.5826 31.1574H33.7568Z" fill="#E31B22"/>
+<path d="M45.0299 34.0915H41.0535C41.0535 34.0915 39.3162 26.5632 39.2389 26.1385C39.1617 25.7138 38.8143 25.791 38.8143 25.791H36.8067C36.8067 25.791 36.5365 24.7101 36.4207 24.131C36.2662 23.5132 35.996 23.6677 35.996 23.6677C35.996 23.6677 33.3707 24.6714 33.0233 24.8259C32.6758 24.9803 32.7916 25.3664 32.7916 25.3664V27.7214H23.8735C23.2558 27.7214 23.2558 28.0688 23.2558 28.0688L21.7887 34.0915H20.8236C20.5919 34.0915 20.4375 34.2459 20.3989 34.4389L19.3951 37.9135C20.09 38.1066 20.5919 38.3768 21.0166 38.5698C21.5957 38.8787 21.9045 39.0331 22.7539 39.0331C23.6032 39.0331 23.9121 38.8787 24.4912 38.5698C25.2247 38.1838 26.2285 37.6819 27.9658 37.6819C29.7031 37.6819 30.7455 38.1838 31.479 38.5698C32.0581 38.8787 32.367 39.0331 33.2163 39.0331C34.0657 39.0331 34.3745 38.8787 34.9536 38.5698C35.6871 38.1838 36.6909 37.6819 38.4668 37.6819C40.2427 37.6819 41.2465 38.1838 41.98 38.5698C42.0572 38.5698 42.2503 38.6857 42.2503 38.6857L45.3002 34.4775C45.3002 34.4775 45.3002 34.4003 45.3002 34.3231C45.3002 34.1687 45.1844 34.0529 45.0299 34.0529V34.0915ZM23.7577 31.1574L24.1823 29.3429H28.1202V31.1574H23.7577ZM33.0619 31.1574H28.6993V29.3429H33.0619V31.1574ZM33.7568 31.1574V29.3429H38.1194L38.5826 31.1574H33.7568Z" fill="#E31B22"/>
 </g>
 <defs>
 <filter id="filter0_d_10410_5073" x="0" y="0" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/FRAM/light/vehiclepin_loading_light.svg b/sprite_assets/FRAM/light/vehiclepin_loading_light.svg
index c754e79d..a0fb9f71 100644
--- a/sprite_assets/FRAM/light/vehiclepin_loading_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_loading_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47164)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#B3B3B3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#B3B3B3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 20.3311C32.6441 20.3311 33.1691 20.8561 33.1691 21.5001V25.0001C33.1691 25.6441 32.6441 26.1691 32.0001 26.1691C31.3561 26.1691 30.8311 25.6441 30.8311 25.0001V21.5001C30.8311 20.8561 31.3561 20.3311 32.0001 20.3311Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 37.8311C32.6441 37.8311 33.1691 38.3561 33.1691 39.0001V42.5001C33.1691 43.1441 32.6441 43.6691 32.0001 43.6691C31.3561 43.6691 30.8311 43.1441 30.8311 42.5001V39.0001C30.8311 38.3561 31.3561 37.8311 32.0001 37.8311Z" fill="black"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_metro_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_metro_active_light.svg
index 4d870ba2..51cd279d 100644
--- a/sprite_assets/FRAM/light/vehiclepin_metro_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_metro_active_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4977)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#551125"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#551125"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32 19.75C38.7655 19.75 44.25 25.2345 44.25 32C44.25 38.7655 38.7655 44.25 32 44.25C25.2345 44.25 19.75 38.7655 19.75 32C19.75 25.2345 25.2345 19.75 32 19.75ZM32 21.85C26.3943 21.85 21.85 26.3943 21.85 32C21.85 37.6057 26.3943 42.15 32 42.15C37.6057 42.15 42.15 37.6057 42.15 32C42.15 26.3943 37.6057 21.85 32 21.85Z" fill="white"/>
 <path d="M27.7703 28.9655C27.2068 28.9655 26.75 28.5087 26.75 27.9453C26.75 27.3818 27.2068 26.925 27.7703 26.925H36.221C36.7845 26.925 37.2412 27.3818 37.2412 27.9453C37.2412 28.5087 36.7845 28.9655 36.221 28.9655H33.015V38.153C33.015 38.7174 32.5574 39.175 31.993 39.175C31.4286 39.175 30.971 38.7174 30.971 38.153V28.9655H27.7703Z" fill="white"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_metro_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_metro_error_light.svg
index f9aeade1..d25b0c73 100644
--- a/sprite_assets/FRAM/light/vehiclepin_metro_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_metro_error_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5097)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32 19.75C38.7655 19.75 44.25 25.2345 44.25 32C44.25 38.7655 38.7655 44.25 32 44.25C25.2345 44.25 19.75 38.7655 19.75 32C19.75 25.2345 25.2345 19.75 32 19.75ZM32 21.85C26.3943 21.85 21.85 26.3943 21.85 32C21.85 37.6057 26.3943 42.15 32 42.15C37.6057 42.15 42.15 37.6057 42.15 32C42.15 26.3943 37.6057 21.85 32 21.85Z" fill="#E31B22"/>
 <path d="M27.7703 28.9655C27.2068 28.9655 26.75 28.5087 26.75 27.9453C26.75 27.3818 27.2068 26.925 27.7703 26.925H36.221C36.7845 26.925 37.2412 27.3818 37.2412 27.9453C37.2412 28.5087 36.7845 28.9655 36.221 28.9655H33.015V38.153C33.015 38.7174 32.5574 39.175 31.993 39.175C31.4286 39.175 30.971 38.7174 30.971 38.153V28.9655H27.7703Z" fill="#E31B22"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_otherbus_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_otherbus_active_light.svg
index 8dab5050..c77ee4c0 100644
--- a/sprite_assets/FRAM/light/vehiclepin_otherbus_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_otherbus_active_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4917)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#676767"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#676767"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M45.3002 36.7389C45.3002 37.0889 45.1072 37.2833 44.7597 37.2833H40.7446V36.9333C40.7446 36.1555 40.4744 35.4555 39.8953 34.9111C39.3548 34.3666 38.6598 34.0555 37.8877 34.0555C37.1156 34.0555 36.3821 34.3278 35.8416 34.9111C35.3011 35.4555 34.9922 36.1555 34.9922 36.9333C34.9922 37.7111 34.9922 37.05 34.9922 37.0889V37.2444H28.931V36.8944C28.931 36.1166 28.6607 35.4166 28.1202 34.8722C27.5797 34.3278 26.8848 34.0166 26.0741 34.0166C25.2633 34.0166 24.5684 34.2889 24.0279 34.8722C23.4874 35.4166 23.2172 36.1166 23.2172 36.8944V37.2444H19.2407C19.0863 37.2444 18.9704 37.2444 18.8546 37.0889C18.7388 36.9722 18.7002 36.8555 18.7002 36.7V26.3944C18.7002 26.2389 18.7388 26.1222 18.8546 26.0055C18.9704 25.8889 19.0863 25.85 19.2407 25.85H44.6825C44.8369 25.85 44.9527 25.85 45.0686 26.0055C45.1844 26.1222 45.223 26.2389 45.223 26.3944H45.3002V36.7389ZM19.9742 32.5778H25.2633V28.1833H19.9742V32.5778ZM28.3519 36.9333C28.3519 37.5555 28.1202 38.0611 27.6956 38.4889C27.2709 38.9166 26.7304 39.15 26.1513 39.15C25.5722 39.15 25.0317 38.9166 24.607 38.4889C24.1823 38.0611 23.9507 37.5166 23.9507 36.9333C23.9507 36.35 24.1823 35.8055 24.607 35.3778C25.0317 34.95 25.5722 34.7555 26.1513 34.7555C26.7304 34.7555 27.2709 34.95 27.6956 35.3778C28.1202 35.8055 28.3519 36.3111 28.3519 36.9333ZM26.2285 32.5778H31.5176V28.1833H26.2285V32.5778ZM32.5214 32.5778H37.8491V28.1833H32.5214V32.5778ZM40.1269 36.9333C40.1269 37.5555 39.8953 38.0611 39.4706 38.4889C39.0459 38.9166 38.5054 39.15 37.9263 39.15C37.3472 39.15 36.8067 38.9166 36.3821 38.4889C35.9574 38.0611 35.7257 37.5166 35.7257 36.9333C35.7257 36.35 35.9574 35.8055 36.3821 35.3778C36.8067 34.95 37.3472 34.7555 37.9263 34.7555C38.5054 34.7555 39.0459 34.95 39.4706 35.3778C39.8953 35.8055 40.1269 36.3111 40.1269 36.9333ZM38.8143 32.5778H44.1034V28.1833H38.8143V32.5778Z" fill="white"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_otherbus_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_otherbus_error_light.svg
index 78a50445..44689c5a 100644
--- a/sprite_assets/FRAM/light/vehiclepin_otherbus_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_otherbus_error_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5037)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M45.3002 36.7389C45.3002 37.0889 45.1072 37.2833 44.7597 37.2833H40.7446V36.9333C40.7446 36.1555 40.4744 35.4555 39.8953 34.9111C39.3548 34.3666 38.6598 34.0555 37.8877 34.0555C37.1156 34.0555 36.3821 34.3278 35.8416 34.9111C35.3011 35.4555 34.9922 36.1555 34.9922 36.9333C34.9922 37.7111 34.9922 37.05 34.9922 37.0889V37.2444H28.931V36.8944C28.931 36.1166 28.6607 35.4166 28.1202 34.8722C27.5797 34.3278 26.8848 34.0166 26.0741 34.0166C25.2633 34.0166 24.5684 34.2889 24.0279 34.8722C23.4874 35.4166 23.2172 36.1166 23.2172 36.8944V37.2444H19.2407C19.0863 37.2444 18.9704 37.2444 18.8546 37.0889C18.7388 36.9722 18.7002 36.8555 18.7002 36.7V26.3944C18.7002 26.2389 18.7388 26.1222 18.8546 26.0055C18.9704 25.8889 19.0863 25.85 19.2407 25.85H44.6825C44.8369 25.85 44.9527 25.85 45.0686 26.0055C45.1844 26.1222 45.223 26.2389 45.223 26.3944H45.3002V36.7389ZM19.9742 32.5778H25.2633V28.1833H19.9742V32.5778ZM28.3519 36.9333C28.3519 37.5555 28.1202 38.0611 27.6956 38.4889C27.2709 38.9166 26.7304 39.15 26.1513 39.15C25.5722 39.15 25.0317 38.9166 24.607 38.4889C24.1823 38.0611 23.9507 37.5166 23.9507 36.9333C23.9507 36.35 24.1823 35.8055 24.607 35.3778C25.0317 34.95 25.5722 34.7555 26.1513 34.7555C26.7304 34.7555 27.2709 34.95 27.6956 35.3778C28.1202 35.8055 28.3519 36.3111 28.3519 36.9333ZM26.2285 32.5778H31.5176V28.1833H26.2285V32.5778ZM32.5214 32.5778H37.8491V28.1833H32.5214V32.5778ZM40.1269 36.9333C40.1269 37.5555 39.8953 38.0611 39.4706 38.4889C39.0459 38.9166 38.5054 39.15 37.9263 39.15C37.3472 39.15 36.8067 38.9166 36.3821 38.4889C35.9574 38.0611 35.7257 37.5166 35.7257 36.9333C35.7257 36.35 35.9574 35.8055 36.3821 35.3778C36.8067 34.95 37.3472 34.7555 37.9263 34.7555C38.5054 34.7555 39.0459 34.95 39.4706 35.3778C39.8953 35.8055 40.1269 36.3111 40.1269 36.9333ZM38.8143 32.5778H44.1034V28.1833H38.8143V32.5778Z" fill="#E31B22"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_othertrain_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_othertrain_active_light.svg
index 6a13f60d..d15abb33 100644
--- a/sprite_assets/FRAM/light/vehiclepin_othertrain_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_othertrain_active_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5001)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#676767"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#676767"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1689 21.5001C19.1689 20.8561 19.6871 20.3311 20.3311 20.3311H28.892C31.16 20.3311 33.372 21.0661 35.192 22.4311L42.0311 27.5621C43.7951 28.8851 44.8311 30.9571 44.8311 33.1621C44.8311 35.0941 43.2701 36.6621 41.3311 36.6621H20.3311C19.6871 36.6621 19.1689 36.1371 19.1689 35.4931V32.8681H27.3379C27.8209 32.8681 28.2129 32.4761 28.2129 31.9931C28.2129 28.9341 25.7279 26.4491 22.6689 26.4491H19.1689V21.4931V21.5001ZM19.1689 28.2061V31.1251H26.358C25.966 29.4521 24.4609 28.2061 22.6689 28.2061H19.1689ZM40.6311 29.4311C40.8481 29.5921 41.0439 29.7671 41.2189 29.9561H37.8311C35.0941 29.9561 32.875 27.7371 32.875 25.0001V23.7051C33.19 23.8801 33.498 24.0831 33.792 24.3001L40.6311 29.4311Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1689 40.169C19.1689 39.525 19.6871 39 20.3311 39H43.6689C44.3129 39 44.8311 39.525 44.8311 40.169C44.8311 40.813 44.3129 41.338 43.6689 41.338H20.3311C19.6871 41.338 19.1689 40.813 19.1689 40.169Z" fill="white"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_othertrain_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_othertrain_error_light.svg
index 178efce5..eba67aba 100644
--- a/sprite_assets/FRAM/light/vehiclepin_othertrain_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_othertrain_error_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5121)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1689 21.5001C19.1689 20.8561 19.6871 20.3311 20.3311 20.3311H28.892C31.16 20.3311 33.372 21.0661 35.192 22.4311L42.0311 27.5621C43.7951 28.8851 44.8311 30.9571 44.8311 33.1621C44.8311 35.0941 43.2701 36.6621 41.3311 36.6621H20.3311C19.6871 36.6621 19.1689 36.1371 19.1689 35.4931V32.8681H27.3379C27.8209 32.8681 28.2129 32.4761 28.2129 31.9931C28.2129 28.9341 25.7279 26.4491 22.6689 26.4491H19.1689V21.4931V21.5001ZM19.1689 28.2061V31.1251H26.358C25.966 29.4521 24.4609 28.2061 22.6689 28.2061H19.1689ZM40.6311 29.4311C40.8481 29.5921 41.0439 29.7671 41.2189 29.9561H37.8311C35.0941 29.9561 32.875 27.7371 32.875 25.0001V23.7051C33.19 23.8801 33.498 24.0831 33.792 24.3001L40.6311 29.4311Z" fill="#E31B22"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1689 40.169C19.1689 39.525 19.6871 39 20.3311 39H43.6689C44.3129 39 44.8311 39.525 44.8311 40.169C44.8311 40.813 44.3129 41.338 43.6689 41.338H20.3311C19.6871 41.338 19.1689 40.813 19.1689 40.169Z" fill="#E31B22"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_regionalbus_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_regionalbus_active_light.svg
index 804de493..3af22bbc 100644
--- a/sprite_assets/FRAM/light/vehiclepin_regionalbus_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_regionalbus_active_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4905)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#005686"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#005686"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M45.3002 36.7389C45.3002 37.0889 45.1072 37.2833 44.7597 37.2833H40.7446V36.9333C40.7446 36.1555 40.4744 35.4555 39.8953 34.9111C39.3548 34.3666 38.6598 34.0555 37.8877 34.0555C37.1156 34.0555 36.3821 34.3278 35.8416 34.9111C35.3011 35.4555 34.9922 36.1555 34.9922 36.9333C34.9922 37.7111 34.9922 37.05 34.9922 37.0889V37.2444H28.931V36.8944C28.931 36.1166 28.6607 35.4166 28.1202 34.8722C27.5797 34.3278 26.8848 34.0166 26.0741 34.0166C25.2633 34.0166 24.5684 34.2889 24.0279 34.8722C23.4874 35.4166 23.2172 36.1166 23.2172 36.8944V37.2444H19.2407C19.0863 37.2444 18.9704 37.2444 18.8546 37.0889C18.7388 36.9722 18.7002 36.8555 18.7002 36.7V26.3944C18.7002 26.2389 18.7388 26.1222 18.8546 26.0055C18.9704 25.8889 19.0863 25.85 19.2407 25.85H44.6825C44.8369 25.85 44.9527 25.85 45.0686 26.0055C45.1844 26.1222 45.223 26.2389 45.223 26.3944H45.3002V36.7389ZM19.9742 32.5778H25.2633V28.1833H19.9742V32.5778ZM28.3519 36.9333C28.3519 37.5555 28.1202 38.0611 27.6956 38.4889C27.2709 38.9166 26.7304 39.15 26.1513 39.15C25.5722 39.15 25.0317 38.9166 24.607 38.4889C24.1823 38.0611 23.9507 37.5166 23.9507 36.9333C23.9507 36.35 24.1823 35.8055 24.607 35.3778C25.0317 34.95 25.5722 34.7555 26.1513 34.7555C26.7304 34.7555 27.2709 34.95 27.6956 35.3778C28.1202 35.8055 28.3519 36.3111 28.3519 36.9333ZM26.2285 32.5778H31.5176V28.1833H26.2285V32.5778ZM32.5214 32.5778H37.8491V28.1833H32.5214V32.5778ZM40.1269 36.9333C40.1269 37.5555 39.8953 38.0611 39.4706 38.4889C39.0459 38.9166 38.5054 39.15 37.9263 39.15C37.3472 39.15 36.8067 38.9166 36.3821 38.4889C35.9574 38.0611 35.7257 37.5166 35.7257 36.9333C35.7257 36.35 35.9574 35.8055 36.3821 35.3778C36.8067 34.95 37.3472 34.7555 37.9263 34.7555C38.5054 34.7555 39.0459 34.95 39.4706 35.3778C39.8953 35.8055 40.1269 36.3111 40.1269 36.9333ZM38.8143 32.5778H44.1034V28.1833H38.8143V32.5778Z" fill="white"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_regionalbus_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_regionalbus_error_light.svg
index 165dc3c6..0b624798 100644
--- a/sprite_assets/FRAM/light/vehiclepin_regionalbus_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_regionalbus_error_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5025)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M45.3002 36.7389C45.3002 37.0889 45.1072 37.2833 44.7597 37.2833H40.7446V36.9333C40.7446 36.1555 40.4744 35.4555 39.8953 34.9111C39.3548 34.3666 38.6598 34.0555 37.8877 34.0555C37.1156 34.0555 36.3821 34.3278 35.8416 34.9111C35.3011 35.4555 34.9922 36.1555 34.9922 36.9333C34.9922 37.7111 34.9922 37.05 34.9922 37.0889V37.2444H28.931V36.8944C28.931 36.1166 28.6607 35.4166 28.1202 34.8722C27.5797 34.3278 26.8848 34.0166 26.0741 34.0166C25.2633 34.0166 24.5684 34.2889 24.0279 34.8722C23.4874 35.4166 23.2172 36.1166 23.2172 36.8944V37.2444H19.2407C19.0863 37.2444 18.9704 37.2444 18.8546 37.0889C18.7388 36.9722 18.7002 36.8555 18.7002 36.7V26.3944C18.7002 26.2389 18.7388 26.1222 18.8546 26.0055C18.9704 25.8889 19.0863 25.85 19.2407 25.85H44.6825C44.8369 25.85 44.9527 25.85 45.0686 26.0055C45.1844 26.1222 45.223 26.2389 45.223 26.3944H45.3002V36.7389ZM19.9742 32.5778H25.2633V28.1833H19.9742V32.5778ZM28.3519 36.9333C28.3519 37.5555 28.1202 38.0611 27.6956 38.4889C27.2709 38.9166 26.7304 39.15 26.1513 39.15C25.5722 39.15 25.0317 38.9166 24.607 38.4889C24.1823 38.0611 23.9507 37.5166 23.9507 36.9333C23.9507 36.35 24.1823 35.8055 24.607 35.3778C25.0317 34.95 25.5722 34.7555 26.1513 34.7555C26.7304 34.7555 27.2709 34.95 27.6956 35.3778C28.1202 35.8055 28.3519 36.3111 28.3519 36.9333ZM26.2285 32.5778H31.5176V28.1833H26.2285V32.5778ZM32.5214 32.5778H37.8491V28.1833H32.5214V32.5778ZM40.1269 36.9333C40.1269 37.5555 39.8953 38.0611 39.4706 38.4889C39.0459 38.9166 38.5054 39.15 37.9263 39.15C37.3472 39.15 36.8067 38.9166 36.3821 38.4889C35.9574 38.0611 35.7257 37.5166 35.7257 36.9333C35.7257 36.35 35.9574 35.8055 36.3821 35.3778C36.8067 34.95 37.3472 34.7555 37.9263 34.7555C38.5054 34.7555 39.0459 34.95 39.4706 35.3778C39.8953 35.8055 40.1269 36.3111 40.1269 36.9333ZM38.8143 32.5778H44.1034V28.1833H38.8143V32.5778Z" fill="#E31B22"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_active_light.svg
index cc515f1a..a16d0aeb 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47158)">
 <g clip-path="url(#clip0_10646_47158)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#284320"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#284320"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="white"/>
@@ -19,7 +19,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47158" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47158">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_cluster_generic_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_cluster_generic_light.svg
index 3ef5c725..47afb525 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_cluster_generic_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_cluster_generic_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5441)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#284320"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#284320"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M30.665 28.165C30.205 28.165 29.835 28.54 29.835 29C29.835 29.46 30.205 29.835 30.665 29.835C31.125 29.835 31.5 29.46 31.5 29C31.5 28.54 31.125 28.165 30.665 28.165ZM28.165 29C28.165 27.62 29.285 26.5 30.665 26.5C32.045 26.5 33.165 27.62 33.165 29C33.165 30.38 32.045 31.5 30.665 31.5C29.285 31.5 28.165 30.38 28.165 29Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M25.6649 17.335C25.6649 16.875 26.0399 16.5 26.4999 16.5H27.3148C28.4398 16.5 29.425 17.25 29.725 18.33L31.4701 24.61C31.5401 24.86 31.4899 25.13 31.3299 25.335C31.1749 25.54 30.9249 25.665 30.6649 25.665C29.5749 25.665 28.6099 26.185 27.9999 27C27.5799 27.555 27.3348 28.25 27.3348 29C27.3348 29.46 26.9599 29.835 26.4999 29.835H18.9999C18.7799 29.835 18.565 29.75 18.41 29.59C18.255 29.435 18.165 29.22 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165C16.875 28.165 16.5199 27.815 16.4999 27.365C16.4799 26.92 16.82 26.535 17.265 26.5L26.91 25.695C27.605 24.91 28.54 24.34 29.6 24.11L28.12 18.775C28.02 18.415 27.6898 18.165 27.3148 18.165H26.4999C26.0399 18.165 25.6649 17.79 25.6649 17.33V17.335Z" fill="white"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_default_dott_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_default_dott_light.svg
index 1792f970..d7208b44 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_default_dott_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_default_dott_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5331)">
-<g clip-path="url(#clip0_10646_5331)">
+<g filter="url(#filter0_d_10957_6937)">
+<g clip-path="url(#clip0_10957_6937)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#009DDB"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5331" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6937" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5331"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5331" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6937"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6937" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5331">
+<clipPath id="clip0_10957_6937">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_default_generic_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_default_generic_light.svg
index 600b4ff8..b36d54f5 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_default_generic_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_default_generic_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5289)">
 <g clip-path="url(#clip0_10646_5289)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#284320"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5289" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5289">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_default_ryde_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_default_ryde_light.svg
index 02814566..11dc4994 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_default_ryde_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_default_ryde_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5303)">
-<g clip-path="url(#clip0_10646_5303)">
+<g filter="url(#filter0_d_10957_6935)">
+<g clip-path="url(#clip0_10957_6935)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#4BCD1F"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5303" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6935" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5303"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5303" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6935"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6935" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5303">
+<clipPath id="clip0_10957_6935">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_default_voi_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_default_voi_light.svg
index 1ee326b8..c9ac4971 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_default_voi_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_default_voi_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5317)">
-<g clip-path="url(#clip0_10646_5317)">
+<g filter="url(#filter0_d_10957_6951)">
+<g clip-path="url(#clip0_10957_6951)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#F36960"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5317" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6951" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5317"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5317" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6951"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6951" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5317">
+<clipPath id="clip0_10957_6951">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_dott_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_dott_light.svg
index e0459e3b..668233fc 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_dott_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_dott_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5275)">
-<g clip-path="url(#clip0_10646_5275)">
+<g filter="url(#filter0_d_10957_6933)">
+<g clip-path="url(#clip0_10957_6933)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5275" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6933" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5275"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5275" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6933"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6933" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5275">
+<clipPath id="clip0_10957_6933">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_ryde_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_ryde_light.svg
index 942531b8..361f6931 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_ryde_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_ryde_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5247)">
-<g clip-path="url(#clip0_10646_5247)">
+<g filter="url(#filter0_d_10957_6931)">
+<g clip-path="url(#clip0_10957_6931)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#4BCD1F"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5247" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6931" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5247"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5247" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6931"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6931" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5247">
+<clipPath id="clip0_10957_6931">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_voi_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_voi_light.svg
index dc360065..d98f179e 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_voi_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_minimized_voi_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5261)">
-<g clip-path="url(#clip0_10646_5261)">
+<g filter="url(#filter0_d_10957_6947)">
+<g clip-path="url(#clip0_10957_6947)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5261" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6947" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5261"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5261" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6947"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6947" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5261">
+<clipPath id="clip0_10957_6947">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_selected_dott_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_selected_dott_light.svg
index 91601e61..aece17e0 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_selected_dott_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_selected_dott_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5414)">
+<g filter="url(#filter0_d_10957_6942)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5414" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6942" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5414"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5414" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6942"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6942" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_selected_generic_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_selected_generic_light.svg
index 2e5127e5..0fd733c1 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_selected_generic_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_selected_generic_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5351)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#284320" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#284320" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="white"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_selected_ryde_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_selected_ryde_light.svg
index 05d74a90..6c4c133d 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_selected_ryde_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_selected_ryde_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5372)">
+<g filter="url(#filter0_d_10957_6939)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5372" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6939" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5372"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5372" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6939"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6939" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_scooter_selected_voi_light.svg b/sprite_assets/FRAM/light/vehiclepin_scooter_selected_voi_light.svg
index 4356fcdf..b6f41064 100644
--- a/sprite_assets/FRAM/light/vehiclepin_scooter_selected_voi_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_scooter_selected_voi_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5393)">
+<g filter="url(#filter0_d_10957_6956)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5393" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6956" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5393"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5393" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6956"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6956" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_sharedcar_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_sharedcar_active_light.svg
index 07707959..997bff0a 100644
--- a/sprite_assets/FRAM/light/vehiclepin_sharedcar_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_sharedcar_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4785)">
 <g clip-path="url(#clip0_10410_4785)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#AA8892"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#AA8892"/>
 <path d="M26.1689 40.8971C27.7789 40.8971 29.0811 39.5881 29.0811 37.9781C29.0811 36.3681 27.7789 35.0591 26.1689 35.0591C24.5589 35.0591 23.25 36.3681 23.25 37.9781C23.25 39.5881 24.5589 40.8971 26.1689 40.8971Z" fill="black"/>
 <path d="M37.8311 40.8971C39.4411 40.8971 40.75 39.5881 40.75 37.9781C40.75 36.3681 39.4411 35.0591 37.8311 35.0591C36.2211 35.0591 34.9189 36.3681 34.9189 37.9781C34.9189 39.5881 36.2211 40.8971 37.8311 40.8971Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.4561 29.8091C19.4561 29.3261 19.8481 28.9341 20.3311 28.9341H39C39.483 28.9341 39.875 29.3261 39.875 29.8091C39.875 30.2921 39.483 30.6841 39 30.6841H20.3311C19.8481 30.6841 19.4561 30.2921 19.4561 29.8091Z" fill="black"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10410_4785" result="shape"/>
 </filter>
 <clipPath id="clip0_10410_4785">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_sharedcar_cluster_light.svg b/sprite_assets/FRAM/light/vehiclepin_sharedcar_cluster_light.svg
index d03cfab0..67b1ea24 100644
--- a/sprite_assets/FRAM/light/vehiclepin_sharedcar_cluster_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_sharedcar_cluster_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5112)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#AA8892"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#AA8892"/>
 <path d="M19.835 30.3551C20.985 30.3551 21.915 29.4201 21.915 28.2701C21.915 27.1201 20.985 26.1851 19.835 26.1851C18.685 26.1851 17.75 27.1201 17.75 28.2701C17.75 29.4201 18.685 30.3551 19.835 30.3551Z" fill="black"/>
 <path d="M28.165 30.3551C29.315 30.3551 30.25 29.4201 30.25 28.2701C30.25 27.1201 29.315 26.1851 28.165 26.1851C27.015 26.1851 26.085 27.1201 26.085 28.2701C26.085 29.4201 27.015 30.3551 28.165 30.3551Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15.04 22.4351C15.04 22.0901 15.32 21.8101 15.665 21.8101H29C29.345 21.8101 29.625 22.0901 29.625 22.4351C29.625 22.7801 29.345 23.0601 29 23.0601H15.665C15.32 23.0601 15.04 22.7801 15.04 22.4351Z" fill="black"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_sharedcar_default_light.svg b/sprite_assets/FRAM/light/vehiclepin_sharedcar_default_light.svg
index 5e630d99..983ff096 100644
--- a/sprite_assets/FRAM/light/vehiclepin_sharedcar_default_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_sharedcar_default_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5065)">
 <g clip-path="url(#clip0_10646_5065)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#AA8892"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path d="M19.835 30.3551C20.985 30.3551 21.915 29.4201 21.915 28.2701C21.915 27.1201 20.985 26.1851 19.835 26.1851C18.685 26.1851 17.75 27.1201 17.75 28.2701C17.75 29.4201 18.685 30.3551 19.835 30.3551Z" fill="black"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5065" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5065">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/FRAM/light/vehiclepin_sharedcar_selected_light.svg b/sprite_assets/FRAM/light/vehiclepin_sharedcar_selected_light.svg
index 9c074a91..0140d13b 100644
--- a/sprite_assets/FRAM/light/vehiclepin_sharedcar_selected_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_sharedcar_selected_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5085)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#AA8892" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#AA8892" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path d="M26.1689 40.8971C27.7789 40.8971 29.0811 39.5881 29.0811 37.9781C29.0811 36.3681 27.7789 35.0591 26.1689 35.0591C24.5589 35.0591 23.25 36.3681 23.25 37.9781C23.25 39.5881 24.5589 40.8971 26.1689 40.8971Z" fill="black"/>
 <path d="M37.8311 40.8971C39.4411 40.8971 40.75 39.5881 40.75 37.9781C40.75 36.3681 39.4411 35.0591 37.8311 35.0591C36.2211 35.0591 34.9189 36.3681 34.9189 37.9781C34.9189 39.5881 36.2211 40.8971 37.8311 40.8971Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.4561 29.8091C19.4561 29.3261 19.8481 28.9341 20.3311 28.9341H39C39.483 28.9341 39.875 29.3261 39.875 29.8091C39.875 30.2921 39.483 30.6841 39 30.6841H20.3311C19.8481 30.6841 19.4561 30.2921 19.4561 29.8091Z" fill="black"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_shuttlebus_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_shuttlebus_active_light.svg
index 825ef623..5e8d6b78 100644
--- a/sprite_assets/FRAM/light/vehiclepin_shuttlebus_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_shuttlebus_active_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4929)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#82B962"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#82B962"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M45.3002 36.7389C45.3002 37.0889 45.1072 37.2833 44.7597 37.2833H40.7446V36.9333C40.7446 36.1555 40.4744 35.4555 39.8953 34.9111C39.3548 34.3666 38.6598 34.0555 37.8877 34.0555C37.1156 34.0555 36.3821 34.3278 35.8416 34.9111C35.3011 35.4555 34.9922 36.1555 34.9922 36.9333C34.9922 37.7111 34.9922 37.05 34.9922 37.0889V37.2444H28.931V36.8944C28.931 36.1166 28.6607 35.4166 28.1202 34.8722C27.5797 34.3278 26.8848 34.0166 26.0741 34.0166C25.2633 34.0166 24.5684 34.2889 24.0279 34.8722C23.4874 35.4166 23.2172 36.1166 23.2172 36.8944V37.2444H19.2407C19.0863 37.2444 18.9704 37.2444 18.8546 37.0889C18.7388 36.9722 18.7002 36.8555 18.7002 36.7V26.3944C18.7002 26.2389 18.7388 26.1222 18.8546 26.0055C18.9704 25.8889 19.0863 25.85 19.2407 25.85H44.6825C44.8369 25.85 44.9527 25.85 45.0686 26.0055C45.1844 26.1222 45.223 26.2389 45.223 26.3944H45.3002V36.7389ZM19.9742 32.5778H25.2633V28.1833H19.9742V32.5778ZM28.3519 36.9333C28.3519 37.5555 28.1202 38.0611 27.6956 38.4889C27.2709 38.9166 26.7304 39.15 26.1513 39.15C25.5722 39.15 25.0317 38.9166 24.607 38.4889C24.1823 38.0611 23.9507 37.5166 23.9507 36.9333C23.9507 36.35 24.1823 35.8055 24.607 35.3778C25.0317 34.95 25.5722 34.7555 26.1513 34.7555C26.7304 34.7555 27.2709 34.95 27.6956 35.3778C28.1202 35.8055 28.3519 36.3111 28.3519 36.9333ZM26.2285 32.5778H31.5176V28.1833H26.2285V32.5778ZM32.5214 32.5778H37.8491V28.1833H32.5214V32.5778ZM40.1269 36.9333C40.1269 37.5555 39.8953 38.0611 39.4706 38.4889C39.0459 38.9166 38.5054 39.15 37.9263 39.15C37.3472 39.15 36.8067 38.9166 36.3821 38.4889C35.9574 38.0611 35.7257 37.5166 35.7257 36.9333C35.7257 36.35 35.9574 35.8055 36.3821 35.3778C36.8067 34.95 37.3472 34.7555 37.9263 34.7555C38.5054 34.7555 39.0459 34.95 39.4706 35.3778C39.8953 35.8055 40.1269 36.3111 40.1269 36.9333ZM38.8143 32.5778H44.1034V28.1833H38.8143V32.5778Z" fill="black"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_shuttlebus_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_shuttlebus_error_light.svg
index 3b8abffb..39e29896 100644
--- a/sprite_assets/FRAM/light/vehiclepin_shuttlebus_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_shuttlebus_error_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5049)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path d="M45.3002 36.7389C45.3002 37.0889 45.1072 37.2833 44.7597 37.2833H40.7446V36.9333C40.7446 36.1555 40.4744 35.4555 39.8953 34.9111C39.3548 34.3666 38.6598 34.0555 37.8877 34.0555C37.1156 34.0555 36.3821 34.3278 35.8416 34.9111C35.3011 35.4555 34.9922 36.1555 34.9922 36.9333C34.9922 37.7111 34.9922 37.05 34.9922 37.0889V37.2444H28.931V36.8944C28.931 36.1166 28.6607 35.4166 28.1202 34.8722C27.5797 34.3278 26.8848 34.0166 26.0741 34.0166C25.2633 34.0166 24.5684 34.2889 24.0279 34.8722C23.4874 35.4166 23.2172 36.1166 23.2172 36.8944V37.2444H19.2407C19.0863 37.2444 18.9704 37.2444 18.8546 37.0889C18.7388 36.9722 18.7002 36.8555 18.7002 36.7V26.3944C18.7002 26.2389 18.7388 26.1222 18.8546 26.0055C18.9704 25.8889 19.0863 25.85 19.2407 25.85H44.6825C44.8369 25.85 44.9527 25.85 45.0686 26.0055C45.1844 26.1222 45.223 26.2389 45.223 26.3944H45.3002V36.7389ZM19.9742 32.5778H25.2633V28.1833H19.9742V32.5778ZM28.3519 36.9333C28.3519 37.5555 28.1202 38.0611 27.6956 38.4889C27.2709 38.9166 26.7304 39.15 26.1513 39.15C25.5722 39.15 25.0317 38.9166 24.607 38.4889C24.1823 38.0611 23.9507 37.5166 23.9507 36.9333C23.9507 36.35 24.1823 35.8055 24.607 35.3778C25.0317 34.95 25.5722 34.7555 26.1513 34.7555C26.7304 34.7555 27.2709 34.95 27.6956 35.3778C28.1202 35.8055 28.3519 36.3111 28.3519 36.9333ZM26.2285 32.5778H31.5176V28.1833H26.2285V32.5778ZM32.5214 32.5778H37.8491V28.1833H32.5214V32.5778ZM40.1269 36.9333C40.1269 37.5555 39.8953 38.0611 39.4706 38.4889C39.0459 38.9166 38.5054 39.15 37.9263 39.15C37.3472 39.15 36.8067 38.9166 36.3821 38.4889C35.9574 38.0611 35.7257 37.5166 35.7257 36.9333C35.7257 36.35 35.9574 35.8055 36.3821 35.3778C36.8067 34.95 37.3472 34.7555 37.9263 34.7555C38.5054 34.7555 39.0459 34.95 39.4706 35.3778C39.8953 35.8055 40.1269 36.3111 40.1269 36.9333ZM38.8143 32.5778H44.1034V28.1833H38.8143V32.5778Z" fill="#E31B22"/>
 </g>
diff --git a/sprite_assets/FRAM/light/vehiclepin_train_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_train_active_light.svg
index 5ee3814d..8d496e7e 100644
--- a/sprite_assets/FRAM/light/vehiclepin_train_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_train_active_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4989)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#551125"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#551125"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1689 21.5001C19.1689 20.8561 19.6871 20.3311 20.3311 20.3311H28.892C31.16 20.3311 33.372 21.0661 35.192 22.4311L42.0311 27.5621C43.7951 28.8851 44.8311 30.9571 44.8311 33.1621C44.8311 35.0941 43.2701 36.6621 41.3311 36.6621H20.3311C19.6871 36.6621 19.1689 36.1371 19.1689 35.4931V32.8681H27.3379C27.8209 32.8681 28.2129 32.4761 28.2129 31.9931C28.2129 28.9341 25.7279 26.4491 22.6689 26.4491H19.1689V21.4931V21.5001ZM19.1689 28.2061V31.1251H26.358C25.966 29.4521 24.4609 28.2061 22.6689 28.2061H19.1689ZM40.6311 29.4311C40.8481 29.5921 41.0439 29.7671 41.2189 29.9561H37.8311C35.0941 29.9561 32.875 27.7371 32.875 25.0001V23.7051C33.19 23.8801 33.498 24.0831 33.792 24.3001L40.6311 29.4311Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1689 40.169C19.1689 39.525 19.6871 39 20.3311 39H43.6689C44.3129 39 44.8311 39.525 44.8311 40.169C44.8311 40.813 44.3129 41.338 43.6689 41.338H20.3311C19.6871 41.338 19.1689 40.813 19.1689 40.169Z" fill="white"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_train_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_train_error_light.svg
index 2d711ad4..7f74b29e 100644
--- a/sprite_assets/FRAM/light/vehiclepin_train_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_train_error_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5109)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1689 21.5001C19.1689 20.8561 19.6871 20.3311 20.3311 20.3311H28.892C31.16 20.3311 33.372 21.0661 35.192 22.4311L42.0311 27.5621C43.7951 28.8851 44.8311 30.9571 44.8311 33.1621C44.8311 35.0941 43.2701 36.6621 41.3311 36.6621H20.3311C19.6871 36.6621 19.1689 36.1371 19.1689 35.4931V32.8681H27.3379C27.8209 32.8681 28.2129 32.4761 28.2129 31.9931C28.2129 28.9341 25.7279 26.4491 22.6689 26.4491H19.1689V21.4931V21.5001ZM19.1689 28.2061V31.1251H26.358C25.966 29.4521 24.4609 28.2061 22.6689 28.2061H19.1689ZM40.6311 29.4311C40.8481 29.5921 41.0439 29.7671 41.2189 29.9561H37.8311C35.0941 29.9561 32.875 27.7371 32.875 25.0001V23.7051C33.19 23.8801 33.498 24.0831 33.792 24.3001L40.6311 29.4311Z" fill="#E31B22"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1689 40.169C19.1689 39.525 19.6871 39 20.3311 39H43.6689C44.3129 39 44.8311 39.525 44.8311 40.169C44.8311 40.813 44.3129 41.338 43.6689 41.338H20.3311C19.6871 41.338 19.1689 40.813 19.1689 40.169Z" fill="#E31B22"/>
diff --git a/sprite_assets/FRAM/light/vehiclepin_tram_active_light.svg b/sprite_assets/FRAM/light/vehiclepin_tram_active_light.svg
index b1ba02a7..774857cf 100644
--- a/sprite_assets/FRAM/light/vehiclepin_tram_active_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_tram_active_light.svg
@@ -1,9 +1,9 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_4965)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#82B962"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#82B962"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.4004 28.325C19.4004 27.1652 20.3406 26.225 21.5004 26.225H39.0004C42.4798 26.225 45.3004 29.0456 45.3004 32.525V36.725C45.3004 37.8848 44.3649 38.825 43.2051 38.825C36.3616 38.825 23.3834 38.825 21.5004 38.825C20.3406 38.825 19.4004 37.8849 19.4004 36.725V28.325ZM21.5004 29.025C21.5004 28.6385 21.8138 28.325 22.2004 28.325H24.2974C24.684 28.325 24.9974 28.6385 24.9974 29.025V32.525C24.9974 32.9116 24.684 33.225 24.2974 33.225H22.2004C21.8504 33.225 21.5004 32.875 21.5004 32.525V29.025ZM27.108 28.325C26.7214 28.325 26.408 28.6385 26.408 29.025L26.4004 32.525C26.4004 32.875 26.7504 33.225 27.1004 33.225H29.908C30.2946 33.225 30.608 32.9116 30.608 32.525V29.025C30.608 28.6385 30.2946 28.325 29.908 28.325H27.108ZM32.0185 29.025C32.0185 28.6385 32.3319 28.325 32.7185 28.325H35.5185C35.9051 28.325 36.2185 28.6385 36.2185 29.025V32.525C36.2185 32.9116 35.9051 33.225 35.5185 33.225H33.4185C32.6453 33.225 32.0004 33.2983 32.0004 32.525L32.0185 29.025ZM38.329 28.325C37.9424 28.325 37.629 28.6385 37.629 29.025V32.525C37.629 32.9116 37.9424 33.225 38.329 33.225H42.529C42.9156 33.225 43.229 32.9116 43.229 32.525C43.229 30.2054 41.3486 28.325 39.029 28.325H38.329Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9254 40.9251C19.9254 40.4418 20.3171 40.0501 20.8004 40.0501L43.9004 40.0501C44.3836 40.0501 44.7754 40.4418 44.7754 40.9251C44.7754 41.4083 44.3836 41.8001 43.9004 41.8001L20.8004 41.8001C20.3171 41.8001 19.9254 41.4083 19.9254 40.9251Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.4004 28.325C19.4004 27.1652 20.3406 26.225 21.5004 26.225H39.0004C42.4798 26.225 45.3004 29.0456 45.3004 32.525V36.725C45.3004 37.8848 44.3649 38.8251 43.2051 38.8251C36.3616 38.8251 23.3834 38.8251 21.5004 38.8251C20.3406 38.8251 19.4004 37.8849 19.4004 36.725V28.325ZM21.5004 29.025C21.5004 28.6385 21.8138 28.325 22.2004 28.325H24.2974C24.684 28.325 24.9974 28.6385 24.9974 29.025V32.525C24.9974 32.9116 24.684 33.225 24.2974 33.225H22.2004C21.8504 33.225 21.5004 32.875 21.5004 32.525V29.025ZM27.108 28.325C26.7214 28.325 26.408 28.6385 26.408 29.025L26.4004 32.525C26.4004 32.875 26.7504 33.225 27.1004 33.225H29.908C30.2946 33.225 30.608 32.9116 30.608 32.525V29.025C30.608 28.6385 30.2946 28.325 29.908 28.325H27.108ZM32.0185 29.025C32.0185 28.6385 32.3319 28.325 32.7185 28.325H35.5185C35.9051 28.325 36.2185 28.6385 36.2185 29.025V32.525C36.2185 32.9116 35.9051 33.225 35.5185 33.225H33.4185C32.6453 33.225 32.0004 33.2983 32.0004 32.525L32.0185 29.025ZM38.329 28.325C37.9424 28.325 37.629 28.6385 37.629 29.025V32.525C37.629 32.9116 37.9424 33.225 38.329 33.225H42.529C42.9156 33.225 43.229 32.9116 43.229 32.525C43.229 30.2054 41.3486 28.325 39.029 28.325H38.329Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9254 40.9251C19.9254 40.4418 20.3171 40.0501 20.8004 40.0501H43.9004C44.3836 40.0501 44.7754 40.4418 44.7754 40.9251C44.7754 41.4083 44.3836 41.8001 43.9004 41.8001H20.8004C20.3171 41.8001 19.9254 41.4083 19.9254 40.9251Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M28.3254 23.425C28.3254 22.9418 28.7171 22.55 29.2004 22.55H34.8004C35.1459 22.55 35.4591 22.7534 35.5997 23.0691C35.7403 23.3847 35.6819 23.7536 35.4508 24.0104L32.3008 27.5104C31.9775 27.8696 31.4242 27.8987 31.065 27.5754C30.7058 27.2522 30.6767 26.6989 31 26.3397L32.8357 24.3H29.2004C28.7171 24.3 28.3254 23.9083 28.3254 23.425Z" fill="black"/>
 </g>
 <defs>
diff --git a/sprite_assets/FRAM/light/vehiclepin_tram_error_light.svg b/sprite_assets/FRAM/light/vehiclepin_tram_error_light.svg
index ab68021b..fb0f10e7 100644
--- a/sprite_assets/FRAM/light/vehiclepin_tram_error_light.svg
+++ b/sprite_assets/FRAM/light/vehiclepin_tram_error_light.svg
@@ -1,9 +1,9 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10410_5085)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#F9D2D3"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#F9D2D3"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.4004 28.325C19.4004 27.1652 20.3406 26.225 21.5004 26.225H39.0004C42.4798 26.225 45.3004 29.0456 45.3004 32.525V36.725C45.3004 37.8848 44.3649 38.825 43.2051 38.825C36.3616 38.825 23.3834 38.825 21.5004 38.825C20.3406 38.825 19.4004 37.8849 19.4004 36.725V28.325ZM21.5004 29.025C21.5004 28.6385 21.8138 28.325 22.2004 28.325H24.2974C24.684 28.325 24.9974 28.6385 24.9974 29.025V32.525C24.9974 32.9116 24.684 33.225 24.2974 33.225H22.2004C21.8504 33.225 21.5004 32.875 21.5004 32.525V29.025ZM27.108 28.325C26.7214 28.325 26.408 28.6385 26.408 29.025L26.4004 32.525C26.4004 32.875 26.7504 33.225 27.1004 33.225H29.908C30.2946 33.225 30.608 32.9116 30.608 32.525V29.025C30.608 28.6385 30.2946 28.325 29.908 28.325H27.108ZM32.0185 29.025C32.0185 28.6385 32.3319 28.325 32.7185 28.325H35.5185C35.9051 28.325 36.2185 28.6385 36.2185 29.025V32.525C36.2185 32.9116 35.9051 33.225 35.5185 33.225H33.4185C32.6453 33.225 32.0004 33.2983 32.0004 32.525L32.0185 29.025ZM38.329 28.325C37.9424 28.325 37.629 28.6385 37.629 29.025V32.525C37.629 32.9116 37.9424 33.225 38.329 33.225H42.529C42.9156 33.225 43.229 32.9116 43.229 32.525C43.229 30.2054 41.3486 28.325 39.029 28.325H38.329Z" fill="#E31B22"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9254 40.9251C19.9254 40.4418 20.3171 40.0501 20.8004 40.0501L43.9004 40.0501C44.3836 40.0501 44.7754 40.4418 44.7754 40.9251C44.7754 41.4083 44.3836 41.8001 43.9004 41.8001L20.8004 41.8001C20.3171 41.8001 19.9254 41.4083 19.9254 40.9251Z" fill="#E31B22"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.4004 28.325C19.4004 27.1652 20.3406 26.225 21.5004 26.225H39.0004C42.4798 26.225 45.3004 29.0456 45.3004 32.525V36.725C45.3004 37.8848 44.3649 38.8251 43.2051 38.8251C36.3616 38.8251 23.3834 38.8251 21.5004 38.8251C20.3406 38.8251 19.4004 37.8849 19.4004 36.725V28.325ZM21.5004 29.025C21.5004 28.6385 21.8138 28.325 22.2004 28.325H24.2974C24.684 28.325 24.9974 28.6385 24.9974 29.025V32.525C24.9974 32.9116 24.684 33.225 24.2974 33.225H22.2004C21.8504 33.225 21.5004 32.875 21.5004 32.525V29.025ZM27.108 28.325C26.7214 28.325 26.408 28.6385 26.408 29.025L26.4004 32.525C26.4004 32.875 26.7504 33.225 27.1004 33.225H29.908C30.2946 33.225 30.608 32.9116 30.608 32.525V29.025C30.608 28.6385 30.2946 28.325 29.908 28.325H27.108ZM32.0185 29.025C32.0185 28.6385 32.3319 28.325 32.7185 28.325H35.5185C35.9051 28.325 36.2185 28.6385 36.2185 29.025V32.525C36.2185 32.9116 35.9051 33.225 35.5185 33.225H33.4185C32.6453 33.225 32.0004 33.2983 32.0004 32.525L32.0185 29.025ZM38.329 28.325C37.9424 28.325 37.629 28.6385 37.629 29.025V32.525C37.629 32.9116 37.9424 33.225 38.329 33.225H42.529C42.9156 33.225 43.229 32.9116 43.229 32.525C43.229 30.2054 41.3486 28.325 39.029 28.325H38.329Z" fill="#E31B22"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9254 40.9251C19.9254 40.4418 20.3171 40.0501 20.8004 40.0501H43.9004C44.3836 40.0501 44.7754 40.4418 44.7754 40.9251C44.7754 41.4083 44.3836 41.8001 43.9004 41.8001H20.8004C20.3171 41.8001 19.9254 41.4083 19.9254 40.9251Z" fill="#E31B22"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M28.3254 23.425C28.3254 22.9418 28.7171 22.55 29.2004 22.55H34.8004C35.1459 22.55 35.4591 22.7534 35.5997 23.0691C35.7403 23.3847 35.6819 23.7536 35.4508 24.0104L32.3008 27.5104C31.9775 27.8696 31.4242 27.8987 31.065 27.5754C30.7058 27.2522 30.6767 26.6989 31 26.3397L32.8357 24.3H29.2004C28.7171 24.3 28.3254 23.9083 28.3254 23.425Z" fill="#E31B22"/>
 </g>
 <defs>
diff --git a/sprite_assets/NFK/dark/geofencingzone_parking_dark.svg b/sprite_assets/NFK/dark/geofencingzone_parking_dark.svg
index 26d59b40..36f95b66 100644
--- a/sprite_assets/NFK/dark/geofencingzone_parking_dark.svg
+++ b/sprite_assets/NFK/dark/geofencingzone_parking_dark.svg
@@ -1,17 +1,4 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10043_6332)">
-<path d="M8 12C8 9.79086 9.79086 8 12 8H32C34.2091 8 36 9.79086 36 12V32C36 34.2091 34.2091 36 32 36H12C9.79086 36 8 34.2091 8 32V12Z" fill="#0181A3"/>
-<path d="M18 22.9999V15.9999H22.6667C24.5997 15.9999 26.1667 17.5669 26.1667 19.4999C26.1667 21.4329 24.5997 22.9999 22.6667 22.9999H18ZM18 22.9999V28.8332" stroke="black" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_d_10043_6332" x="0" y="0" width="44" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10043_6332"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10043_6332" result="shape"/>
-</filter>
-</defs>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H24C26.2091 0 28 1.79086 28 4V24C28 26.2091 26.2091 28 24 28H4C1.79086 28 0 26.2091 0 24V4Z" fill="#0181A3"/>
+<path d="M10.7051 21.4166C10.2221 21.4166 9.12695 21.1867 9.12695 20.7037V8.29163C9.12695 7.80863 9.51895 7.41663 10.002 7.41663H14.6641C17.0791 7.41663 19.0391 9.37663 19.0391 11.7916C19.0391 14.2066 17.0791 16.2037 14.6641 16.2037H12.2177V20.7037C12.2177 21.1867 11.1881 21.4166 10.7051 21.4166ZM12.2177 13.2037H13.7177C15.1667 13.2037 16.2177 13.1527 16.2177 11.7037C16.2177 10.3054 15.1667 10.2037 13.7177 10.2037H12.2177V13.2037Z" fill="white"/>
 </svg>
diff --git a/sprite_assets/NFK/dark/stationpin_citybike_parking_default_dark.svg b/sprite_assets/NFK/dark/stationpin_citybike_parking_default_dark.svg
index 79d6ee56..1d8a4948 100644
--- a/sprite_assets/NFK/dark/stationpin_citybike_parking_default_dark.svg
+++ b/sprite_assets/NFK/dark/stationpin_citybike_parking_default_dark.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_8888)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="black"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="black" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#902F2A"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="white"/>
-<path d="M21.085 29.2099C20.74 29.2099 20.46 28.9299 20.46 28.5849V19.4199C20.46 19.0749 20.74 18.7949 21.085 18.7949H24.415C26.14 18.7949 27.54 20.1949 27.54 21.9199C27.54 23.6449 26.14 25.0449 24.415 25.0449H21.71V28.5849C21.71 28.9299 21.43 29.2099 21.085 29.2099ZM21.71 23.7899H24.415C25.45 23.7899 26.29 22.9499 26.29 21.9149C26.29 20.8799 25.45 20.0399 24.415 20.0399H21.71V23.7899Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0181A3"/>
+<path d="M20.7051 31.4166C20.2221 31.4166 19.127 31.1867 19.127 30.7037V18.2916C19.127 17.8086 19.519 17.4166 20.002 17.4166H24.6641C27.0791 17.4166 29.0391 19.3766 29.0391 21.7916C29.0391 24.2066 27.0791 26.2037 24.6641 26.2037H22.2177V30.7037C22.2177 31.1867 21.1881 31.4166 20.7051 31.4166ZM22.2177 23.2037H23.7177C25.1667 23.2037 26.2177 23.1527 26.2177 21.7037C26.2177 20.3054 25.1667 20.2037 23.7177 20.2037H22.2177V23.2037Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8888" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/dark/stationpin_citybike_parking_minimized_dark.svg b/sprite_assets/NFK/dark/stationpin_citybike_parking_minimized_dark.svg
index 8b901353..0cbdef2b 100644
--- a/sprite_assets/NFK/dark/stationpin_citybike_parking_minimized_dark.svg
+++ b/sprite_assets/NFK/dark/stationpin_citybike_parking_minimized_dark.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_8925)">
 <g clip-path="url(#clip0_8318_8925)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#902F2A"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0181A3"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="black" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/NFK/dark/stationpin_citybike_parking_selected_dark.svg b/sprite_assets/NFK/dark/stationpin_citybike_parking_selected_dark.svg
index 55befe5f..9e9ae5d8 100644
--- a/sprite_assets/NFK/dark/stationpin_citybike_parking_selected_dark.svg
+++ b/sprite_assets/NFK/dark/stationpin_citybike_parking_selected_dark.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8904)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#902F2A"/>
-<path d="M38.75 41.9559H21.25C19.479 41.9559 18.0439 40.5139 18.0439 38.7499V21.2499C18.0439 19.4789 19.479 18.0439 21.25 18.0439H38.75C40.521 18.0439 41.9561 19.4859 41.9561 21.2499V38.7499C41.9561 40.5209 40.521 41.9559 38.75 41.9559ZM21.25 19.7939C20.445 19.7939 19.7939 20.4449 19.7939 21.2499V38.7499C19.7939 39.5549 20.445 40.2059 21.25 40.2059H38.75C39.555 40.2059 40.2061 39.5549 40.2061 38.7499V21.2499C40.2061 20.4449 39.555 19.7939 38.75 19.7939H21.25Z" fill="white"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.9019 25.0439 36.4189V23.5879C25.0439 23.1049 25.4359 22.7129 25.9189 22.7129H30.5811C32.9961 22.7129 34.9561 24.6729 34.9561 27.0879C34.9561 29.5029 32.9961 31.4629 30.5811 31.4629H26.7939V36.4189C26.7939 36.9019 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.7059H30.5811C32.0301 29.7059 33.2061 28.5299 33.2061 27.0809C33.2061 25.6319 32.0301 24.4559 30.5811 24.4559H26.7939V29.7059Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0181A3"/>
+<path d="M25.0074 40.3094C24.3174 40.3094 22.7529 39.981 22.7529 39.291V21.5594C22.7529 20.8694 23.3129 20.3094 24.0029 20.3094H30.6631C34.1131 20.3094 36.9131 23.1094 36.9131 26.5594C36.9131 30.0094 34.1131 32.8625 30.6631 32.8625H27.1683V39.291C27.1683 39.981 25.6974 40.3094 25.0074 40.3094ZM27.1683 28.5767H29.3112C31.3812 28.5767 32.8826 28.5039 32.8826 26.4339C32.8826 24.4363 31.3812 24.291 29.3112 24.291H27.1683V28.5767Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8904" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/dark/stationpin_sharedcar_parking_default_dark.svg b/sprite_assets/NFK/dark/stationpin_sharedcar_parking_default_dark.svg
index bea3944d..232c67a1 100644
--- a/sprite_assets/NFK/dark/stationpin_sharedcar_parking_default_dark.svg
+++ b/sprite_assets/NFK/dark/stationpin_sharedcar_parking_default_dark.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_8894)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="black"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="black" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#533B75"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="white"/>
-<path d="M21.085 29.2099C20.74 29.2099 20.46 28.9299 20.46 28.5849V19.4199C20.46 19.0749 20.74 18.7949 21.085 18.7949H24.415C26.14 18.7949 27.54 20.1949 27.54 21.9199C27.54 23.6449 26.14 25.0449 24.415 25.0449H21.71V28.5849C21.71 28.9299 21.43 29.2099 21.085 29.2099ZM21.71 23.7899H24.415C25.45 23.7899 26.29 22.9499 26.29 21.9149C26.29 20.8799 25.45 20.0399 24.415 20.0399H21.71V23.7899Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0181A3"/>
+<path d="M20.7051 31.4166C20.2221 31.4166 19.127 31.1867 19.127 30.7037V18.2916C19.127 17.8086 19.519 17.4166 20.002 17.4166H24.6641C27.0791 17.4166 29.0391 19.3766 29.0391 21.7916C29.0391 24.2066 27.0791 26.2037 24.6641 26.2037H22.2177V30.7037C22.2177 31.1867 21.1881 31.4166 20.7051 31.4166ZM22.2177 23.2037H23.7177C25.1667 23.2037 26.2177 23.1527 26.2177 21.7037C26.2177 20.3054 25.1667 20.2037 23.7177 20.2037H22.2177V23.2037Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8894" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/dark/stationpin_sharedcar_parking_minimized_dark.svg b/sprite_assets/NFK/dark/stationpin_sharedcar_parking_minimized_dark.svg
index 5f61abbc..fd38c544 100644
--- a/sprite_assets/NFK/dark/stationpin_sharedcar_parking_minimized_dark.svg
+++ b/sprite_assets/NFK/dark/stationpin_sharedcar_parking_minimized_dark.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_8927)">
 <g clip-path="url(#clip0_8318_8927)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#533B75"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0181A3"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="black" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/NFK/dark/stationpin_sharedcar_parking_selected_dark.svg b/sprite_assets/NFK/dark/stationpin_sharedcar_parking_selected_dark.svg
index a364175e..0c4d6bec 100644
--- a/sprite_assets/NFK/dark/stationpin_sharedcar_parking_selected_dark.svg
+++ b/sprite_assets/NFK/dark/stationpin_sharedcar_parking_selected_dark.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8918)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#533B75"/>
-<path d="M38.75 41.9559H21.25C19.479 41.9559 18.0439 40.5139 18.0439 38.7499V21.2499C18.0439 19.4789 19.479 18.0439 21.25 18.0439H38.75C40.521 18.0439 41.9561 19.4859 41.9561 21.2499V38.7499C41.9561 40.5209 40.521 41.9559 38.75 41.9559ZM21.25 19.7939C20.445 19.7939 19.7939 20.4449 19.7939 21.2499V38.7499C19.7939 39.5549 20.445 40.2059 21.25 40.2059H38.75C39.555 40.2059 40.2061 39.5549 40.2061 38.7499V21.2499C40.2061 20.4449 39.555 19.7939 38.75 19.7939H21.25Z" fill="white"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.9019 25.0439 36.4189V23.5879C25.0439 23.1049 25.4359 22.7129 25.9189 22.7129H30.5811C32.9961 22.7129 34.9561 24.6729 34.9561 27.0879C34.9561 29.5029 32.9961 31.4629 30.5811 31.4629H26.7939V36.4189C26.7939 36.9019 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.7059H30.5811C32.0301 29.7059 33.2061 28.5299 33.2061 27.0809C33.2061 25.6319 32.0301 24.4559 30.5811 24.4559H26.7939V29.7059Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0181A3"/>
+<path d="M25.0074 40.3094C24.3174 40.3094 22.7529 39.981 22.7529 39.291V21.5594C22.7529 20.8694 23.3129 20.3094 24.0029 20.3094H30.6631C34.1131 20.3094 36.9131 23.1094 36.9131 26.5594C36.9131 30.0094 34.1131 32.8625 30.6631 32.8625H27.1683V39.291C27.1683 39.981 25.6974 40.3094 25.0074 40.3094ZM27.1683 28.5767H29.3112C31.3812 28.5767 32.8826 28.5039 32.8826 26.4339C32.8826 24.4363 31.3812 24.291 29.3112 24.291H27.1683V28.5767Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8918" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/dark/stoppin_busandtram_selected_dark.svg b/sprite_assets/NFK/dark/stoppin_busandtram_selected_dark.svg
index a1e18113..9e5dbe07 100644
--- a/sprite_assets/NFK/dark/stoppin_busandtram_selected_dark.svg
+++ b/sprite_assets/NFK/dark/stoppin_busandtram_selected_dark.svg
@@ -11,7 +11,7 @@
 <path d="M39.8004 36.65C39.8004 38.1964 38.5468 39.45 37.0004 39.45C35.454 39.45 34.2004 38.1964 34.2004 36.65C34.2004 35.1036 35.454 33.85 37.0004 33.85C38.5468 33.85 39.8004 35.1036 39.8004 36.65Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#004D61"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6384 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6384 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6384 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6384 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6384 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6384 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2982 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6384 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05H83.9004C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8H60.8004C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9417 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7533 75.5997 21.069C75.7403 21.3847 75.6819 21.7535 75.4508 22.0103L72.3008 25.5103C71.9775 25.8695 71.4242 25.8986 71.065 25.5754C70.7058 25.2521 70.6767 24.6988 71 24.3396L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9082 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
diff --git a/sprite_assets/NFK/dark/stoppin_metroandtram_selected_dark.svg b/sprite_assets/NFK/dark/stoppin_metroandtram_selected_dark.svg
index 45e81dbb..8e16a244 100644
--- a/sprite_assets/NFK/dark/stoppin_metroandtram_selected_dark.svg
+++ b/sprite_assets/NFK/dark/stoppin_metroandtram_selected_dark.svg
@@ -10,7 +10,7 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M21.1986 22.972C21.6676 20.158 24.1041 18.1 26.9531 18.1H33.0426C35.8986 18.1 38.3281 20.158 38.7971 22.972L40.3365 32.212C40.8475 35.25 38.881 38.246 35.71 38.673C33.995 38.904 31.9579 39.1 29.9979 39.1C28.0379 39.1 26.0077 38.904 24.2857 38.673C21.1217 38.246 19.1552 35.25 19.6592 32.212L21.1986 22.972ZM26.9531 20.431C25.2451 20.431 23.7817 21.67 23.5017 23.357L23.0751 25.919C24.0201 26.927 25.2587 27.585 26.5047 28.005C27.8977 28.467 29.2279 28.6 29.9979 28.6C30.7679 28.6 32.098 28.467 33.491 28.005C34.737 27.592 35.9761 26.927 36.9281 25.919L36.5009 23.357C36.2139 21.67 34.7576 20.431 33.0426 20.431H26.9531ZM26.4979 32.093C25.8539 32.093 25.3289 32.618 25.3289 33.262C25.3289 33.906 25.8539 34.431 26.4979 34.431C27.1489 34.431 27.6668 33.906 27.6668 33.262C27.6668 32.618 27.1489 32.093 26.4979 32.093ZM33.4842 32.093C32.8402 32.093 32.3221 32.618 32.3221 33.262C32.3221 33.906 32.8402 34.431 33.4842 34.431H33.4979C34.1419 34.431 34.6668 33.906 34.6668 33.262C34.6668 32.618 34.1419 32.093 33.4979 32.093H33.4842Z" fill="black"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#004D61"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6384 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6384 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6384 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6384 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6384 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6384 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2982 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6384 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05H83.9004C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8H60.8004C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9417 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7533 75.5997 21.069C75.7403 21.3847 75.6819 21.7535 75.4508 22.0103L72.3008 25.5103C71.9775 25.8695 71.4242 25.8986 71.065 25.5754C70.7058 25.2521 70.6767 24.6988 71 24.3396L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9082 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
diff --git a/sprite_assets/NFK/dark/stoppin_tram_selected_dark.svg b/sprite_assets/NFK/dark/stoppin_tram_selected_dark.svg
index 78ea2f08..4c47525a 100644
--- a/sprite_assets/NFK/dark/stoppin_tram_selected_dark.svg
+++ b/sprite_assets/NFK/dark/stoppin_tram_selected_dark.svg
@@ -6,7 +6,7 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#1A5843"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_8983)"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.825 41.2051 36.825C34.3616 36.825 21.3834 36.825 19.5004 36.825C18.3406 36.825 17.4004 35.8848 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6384 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6384 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6384 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6384 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6384 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6384 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2982 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6384 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4417 18.3171 38.05 18.8004 38.05L41.9004 38.05C42.3836 38.05 42.7754 38.4417 42.7754 38.925C42.7754 39.4082 42.3836 39.8 41.9004 39.8L18.8004 39.8C18.3171 39.8 17.9254 39.4082 17.9254 38.925Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4417 18.3171 38.05 18.8004 38.05H41.9004C42.3836 38.05 42.7754 38.4417 42.7754 38.925C42.7754 39.4082 42.3836 39.8 41.9004 39.8H18.8004C18.3171 39.8 17.9254 39.4082 17.9254 38.925Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9417 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7533 33.5997 21.069C33.7403 21.3847 33.6819 21.7535 33.4508 22.0103L30.3008 25.5103C29.9775 25.8695 29.4242 25.8986 29.065 25.5754C28.7058 25.2521 28.6767 24.6988 29 24.3396L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9082 26.3254 21.425Z" fill="white"/>
 </g>
 <defs>
diff --git a/sprite_assets/NFK/dark/vehiclepin_citybike_active_dark.svg b/sprite_assets/NFK/dark/vehiclepin_citybike_active_dark.svg
index 1e872ef7..c301a67e 100644
--- a/sprite_assets/NFK/dark/vehiclepin_citybike_active_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_citybike_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46924)">
 <g clip-path="url(#clip0_10646_46924)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#902F2A"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#902F2A"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46924" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46924">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_citybike_cluster_dark.svg b/sprite_assets/NFK/dark/vehiclepin_citybike_cluster_dark.svg
index 2d688931..f5843a3a 100644
--- a/sprite_assets/NFK/dark/vehiclepin_citybike_cluster_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_citybike_cluster_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5187)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#902F2A"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#902F2A"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M29.2051 24.833C27.8251 24.833 26.7051 25.953 26.7051 27.333C26.7051 28.713 27.8251 29.833 29.2051 29.833C30.5851 29.833 31.7051 28.713 31.7051 27.333C31.7051 25.953 30.5901 24.833 29.2051 24.833ZM25.04 27.333C25.04 25.033 26.9051 23.168 29.2051 23.168C31.5051 23.168 33.375 25.033 33.375 27.333C33.375 29.633 31.5051 31.498 29.2051 31.498C26.9051 31.498 25.04 29.633 25.04 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M27.5649 19.9629C27.9549 20.2079 28.0751 20.7229 27.8301 21.1129L23.665 27.7779C23.51 28.0229 23.2451 28.1679 22.9551 28.1679H18.79C18.33 28.1679 17.9551 27.7929 17.9551 27.3329C17.9551 26.8729 18.33 26.4979 18.79 26.4979H22.4951L26.415 20.2279C26.66 19.8379 27.1749 19.7179 27.5649 19.9629Z" fill="white"/>
diff --git a/sprite_assets/NFK/dark/vehiclepin_citybike_default_dark.svg b/sprite_assets/NFK/dark/vehiclepin_citybike_default_dark.svg
index 9c6fb0e2..44ca3d44 100644
--- a/sprite_assets/NFK/dark/vehiclepin_citybike_default_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_citybike_default_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5148)">
 <g clip-path="url(#clip0_10646_5148)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#902F2A"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5148" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5148">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_citybike_selected_dark.svg b/sprite_assets/NFK/dark/vehiclepin_citybike_selected_dark.svg
index 74e5535c..564ba1ea 100644
--- a/sprite_assets/NFK/dark/vehiclepin_citybike_selected_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_citybike_selected_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5164)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#902F2A" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#902F2A" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_active_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_active_dark.svg
index 0305a70b..cc95ca85 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_active_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46926)">
 <g clip-path="url(#clip0_10646_46926)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#902F2A"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#902F2A"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.4549C34.8063 19.5824 35.0335 19.9094 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7223 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.4569 29.5304 44.5559 29.1877 44.4283C28.8451 44.3009 28.6178 43.9739 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.161 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.4549Z" fill="white"/>
 </g>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="black" stroke-width="2"/>
@@ -17,7 +17,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46926" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46926">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_cluster_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_cluster_dark.svg
index 32f9f5e3..849e91fb 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_cluster_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_cluster_dark.svg
@@ -1,17 +1,17 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5512)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6H52C60.8366 6 68 13.1634 68 22V22C68 30.8366 60.8366 38 52 38H24C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7H52C60.2843 7 67 13.7157 67 22C67 30.2843 60.2843 37 52 37H24C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#902F2A"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
+<path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#902F2A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5512" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5512"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5512" result="shape"/>
 </filter>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_cluster_minimized_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_cluster_minimized_dark.svg
index f4913e5c..14c47b69 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_cluster_minimized_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_cluster_minimized_dark.svg
@@ -1,16 +1,16 @@
 <svg width="44" height="32" viewBox="0 0 44 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5526)">
-<rect x="10" y="8" width="24" height="12" rx="6" fill="black"/>
-<rect x="9" y="7" width="26" height="14" rx="7" stroke="black" stroke-width="2"/>
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#902F2A"/>
+<rect x="10" y="10" width="24" height="12" rx="6" fill="black"/>
+<rect x="9" y="9" width="26" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#902F2A"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5526" x="0" y="0" width="44" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5526"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5526" result="shape"/>
 </filter>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_default_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_default_dark.svg
index 8626e260..47756382 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_default_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_default_dark.svg
@@ -1,17 +1,17 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5477)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#902F2A"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#902F2A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5477" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5477"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5477" result="shape"/>
 </filter>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_default_dott_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_default_dott_dark.svg
new file mode 100644
index 00000000..d3ba3e35
--- /dev/null
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_default_dott_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6791)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="#009DDB"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#009DDB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6791" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6791"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6791" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_default_ryde_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_default_ryde_dark.svg
new file mode 100644
index 00000000..cf1d62d5
--- /dev/null
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_default_ryde_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6810)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#4BCD1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6810" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6810"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6810" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_default_voi_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_default_voi_dark.svg
index 33f92de4..8aa2e2da 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_default_voi_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_default_voi_dark.svg
@@ -1,19 +1,19 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47418)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#F36960"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6803)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#F36960"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47418" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6803" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47418"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47418" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6803"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6803" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_dark.svg
index 380d5e23..887f7104 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_dark.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5463)">
 <g clip-path="url(#clip0_10646_5463)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#902F2A"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#902F2A"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5463" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5463"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5463" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5463">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_dott_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_dott_dark.svg
new file mode 100644
index 00000000..a67202ba
--- /dev/null
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_dott_dark.svg
@@ -0,0 +1,22 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6787)">
+<g clip-path="url(#clip0_10957_6787)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6787" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6787"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6787" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6787">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_ryde_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_ryde_dark.svg
new file mode 100644
index 00000000..e90d8ba5
--- /dev/null
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_ryde_dark.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6808)">
+<g clip-path="url(#clip0_10957_6808)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
+<rect width="12" height="12" transform="translate(10 10)" fill="#4BCD1F"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6808" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6808"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6808" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6808">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_voi_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_voi_dark.svg
index 8dfcc218..58bc6dcb 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_voi_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_minimized_voi_dark.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47406)">
-<g clip-path="url(#clip0_10647_47406)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#F36960"/>
+<g filter="url(#filter0_d_10957_6801)">
+<g clip-path="url(#clip0_10957_6801)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47406" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6801" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47406"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47406" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6801"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6801" result="shape"/>
 </filter>
-<clipPath id="clip0_10647_47406">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<clipPath id="clip0_10957_6801">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_selected_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_selected_dark.svg
index e4652619..5f6b6563 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_selected_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_selected_dark.svg
@@ -1,15 +1,15 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5493)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#902F2A" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5824 35.0335 17.9095 35.0335 18.275V27.9002H40.5761C40.9184 27.9002 41.2294 28.0998 41.3718 28.4111C41.5143 28.7224 41.4621 29.0881 41.2383 29.3471L30.155 42.1802C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6083V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4723C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4264 34.121 17.3275 34.4636 17.455Z" fill="white"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#902F2A" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5493" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5493"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5493" result="shape"/>
 </filter>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_selected_dott_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_selected_dott_dark.svg
new file mode 100644
index 00000000..73419542
--- /dev/null
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_selected_dott_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6795)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6795" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6795"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6795" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_selected_ryde_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_selected_ryde_dark.svg
new file mode 100644
index 00000000..d4cca79c
--- /dev/null
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_selected_ryde_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6812)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6812" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6812"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6812" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_ebike_selected_voi_dark.svg b/sprite_assets/NFK/dark/vehiclepin_ebike_selected_voi_dark.svg
index f20f632e..f0ad15d3 100644
--- a/sprite_assets/NFK/dark/vehiclepin_ebike_selected_voi_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_ebike_selected_voi_dark.svg
@@ -1,17 +1,17 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47434)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5824 35.0335 17.9095 35.0335 18.275V27.9002H40.5761C40.9184 27.9002 41.2294 28.0998 41.3718 28.4111C41.5143 28.7224 41.4621 29.0881 41.2383 29.3471L30.155 42.1802C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6083V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4723C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4264 34.121 17.3275 34.4636 17.455Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6805)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5824 35.0335 19.9095 35.0335 20.275V29.9002H40.5761C40.9184 29.9002 41.2294 30.0998 41.3718 30.4111C41.5143 30.7224 41.4621 31.0881 41.2383 31.3471L30.155 44.1802C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6083V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4723C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4264 34.121 19.3275 34.4636 19.455Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47434" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6805" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47434"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47434" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6805"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6805" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_loading_dark.svg b/sprite_assets/NFK/dark/vehiclepin_loading_dark.svg
index 5df96a47..7b5889e8 100644
--- a/sprite_assets/NFK/dark/vehiclepin_loading_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_loading_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46942)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#8FA9AF"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#8FA9AF"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 20.331C32.6441 20.331 33.1691 20.856 33.1691 21.5V25C33.1691 25.644 32.6441 26.169 32.0001 26.169C31.3561 26.169 30.8311 25.644 30.8311 25V21.5C30.8311 20.856 31.3561 20.331 32.0001 20.331Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 37.831C32.6441 37.831 33.1691 38.356 33.1691 39V42.5C33.1691 43.144 32.6441 43.669 32.0001 43.669C31.3561 43.669 30.8311 43.144 30.8311 42.5V39C30.8311 38.356 31.3561 37.831 32.0001 37.831Z" fill="black"/>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_active_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_active_dark.svg
index de9ef696..4b5f2f40 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_active_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46936)">
 <g clip-path="url(#clip0_10646_46936)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#414C1C"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#414C1C"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="white"/>
@@ -19,7 +19,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46936" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46936">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_cluster_generic_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_cluster_generic_dark.svg
index af4f2708..ef19b037 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_cluster_generic_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_cluster_generic_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5425)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#414C1C"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#414C1C"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M30.665 28.165C30.205 28.165 29.835 28.54 29.835 29C29.835 29.46 30.205 29.835 30.665 29.835C31.125 29.835 31.5 29.46 31.5 29C31.5 28.54 31.125 28.165 30.665 28.165ZM28.165 29C28.165 27.62 29.285 26.5 30.665 26.5C32.045 26.5 33.165 27.62 33.165 29C33.165 30.38 32.045 31.5 30.665 31.5C29.285 31.5 28.165 30.38 28.165 29Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M25.6649 17.335C25.6649 16.875 26.0399 16.5 26.4999 16.5H27.3148C28.4398 16.5 29.425 17.25 29.725 18.33L31.4701 24.61C31.5401 24.86 31.4899 25.13 31.3299 25.335C31.1749 25.54 30.9249 25.665 30.6649 25.665C29.5749 25.665 28.6099 26.185 27.9999 27C27.5799 27.555 27.3348 28.25 27.3348 29C27.3348 29.46 26.9599 29.835 26.4999 29.835H18.9999C18.7799 29.835 18.565 29.75 18.41 29.59C18.255 29.435 18.165 29.22 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165C16.875 28.165 16.5199 27.815 16.4999 27.365C16.4799 26.92 16.82 26.535 17.265 26.5L26.91 25.695C27.605 24.91 28.54 24.34 29.6 24.11L28.12 18.775C28.02 18.415 27.6898 18.165 27.3148 18.165H26.4999C26.0399 18.165 25.6649 17.79 25.6649 17.33V17.335Z" fill="white"/>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_default_dott_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_default_dott_dark.svg
index 5adaae59..fe71a626 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_default_dott_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_default_dott_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5323)">
-<g clip-path="url(#clip0_10646_5323)">
+<g filter="url(#filter0_d_10957_6779)">
+<g clip-path="url(#clip0_10957_6779)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#009DDB"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5323" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6779" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5323"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5323" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6779"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6779" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5323">
+<clipPath id="clip0_10957_6779">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_default_generic_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_default_generic_dark.svg
index 7de347d7..a9673411 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_default_generic_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_default_generic_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5281)">
 <g clip-path="url(#clip0_10646_5281)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#414C1C"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5281" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5281">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_default_ryde_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_default_ryde_dark.svg
index 69cbed33..b89c4637 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_default_ryde_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_default_ryde_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5295)">
-<g clip-path="url(#clip0_10646_5295)">
+<g filter="url(#filter0_d_10957_6777)">
+<g clip-path="url(#clip0_10957_6777)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#4BCD1F"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5295" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6777" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5295"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5295" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6777"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6777" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5295">
+<clipPath id="clip0_10957_6777">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_default_voi_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_default_voi_dark.svg
index 244fa8bb..f7e498c5 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_default_voi_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_default_voi_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5309)">
-<g clip-path="url(#clip0_10646_5309)">
+<g filter="url(#filter0_d_10957_6793)">
+<g clip-path="url(#clip0_10957_6793)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#F36960"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5309" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6793" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5309"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5309" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6793"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6793" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5309">
+<clipPath id="clip0_10957_6793">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_dott_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_dott_dark.svg
index afbcc1e5..f7127cf6 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_dott_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_dott_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5267)">
-<g clip-path="url(#clip0_10646_5267)">
+<g filter="url(#filter0_d_10957_6775)">
+<g clip-path="url(#clip0_10957_6775)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5267" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6775" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5267"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5267" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6775"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6775" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5267">
+<clipPath id="clip0_10957_6775">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_ryde_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_ryde_dark.svg
index ef6f13ba..28083015 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_ryde_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_ryde_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5239)">
-<g clip-path="url(#clip0_10646_5239)">
+<g filter="url(#filter0_d_10957_6773)">
+<g clip-path="url(#clip0_10957_6773)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#4BCD1F"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5239" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6773" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5239"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5239" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6773"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6773" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5239">
+<clipPath id="clip0_10957_6773">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_voi_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_voi_dark.svg
index ea3d2f1c..9ea74032 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_voi_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_minimized_voi_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5253)">
-<g clip-path="url(#clip0_10646_5253)">
+<g filter="url(#filter0_d_10957_6789)">
+<g clip-path="url(#clip0_10957_6789)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5253" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6789" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5253"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5253" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6789"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6789" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5253">
+<clipPath id="clip0_10957_6789">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_selected_dott_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_selected_dott_dark.svg
index 030f2daf..0103d4cd 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_selected_dott_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_selected_dott_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5402)">
+<g filter="url(#filter0_d_10957_6784)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5402" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6784" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5402"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5402" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6784"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6784" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_selected_generic_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_selected_generic_dark.svg
index bf366d77..321b016c 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_selected_generic_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_selected_generic_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5339)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#414C1C" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#414C1C" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="white"/>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_selected_ryde_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_selected_ryde_dark.svg
index cda0eb04..e85a3dcc 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_selected_ryde_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_selected_ryde_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5360)">
+<g filter="url(#filter0_d_10957_6781)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5360" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6781" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5360"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5360" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6781"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6781" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_scooter_selected_voi_dark.svg b/sprite_assets/NFK/dark/vehiclepin_scooter_selected_voi_dark.svg
index 5af70510..e8b9d56a 100644
--- a/sprite_assets/NFK/dark/vehiclepin_scooter_selected_voi_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_scooter_selected_voi_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5381)">
+<g filter="url(#filter0_d_10957_6798)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5381" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6798" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5381"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5381" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6798"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6798" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_sharedcar_cluster_dark.svg b/sprite_assets/NFK/dark/vehiclepin_sharedcar_cluster_dark.svg
index 1bdd2eab..4f5807d4 100644
--- a/sprite_assets/NFK/dark/vehiclepin_sharedcar_cluster_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_sharedcar_cluster_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5096)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#533B75"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#533B75"/>
 <path d="M19.835 30.355C20.985 30.355 21.915 29.42 21.915 28.27C21.915 27.12 20.985 26.185 19.835 26.185C18.685 26.185 17.75 27.12 17.75 28.27C17.75 29.42 18.685 30.355 19.835 30.355Z" fill="white"/>
 <path d="M28.165 30.355C29.315 30.355 30.25 29.42 30.25 28.27C30.25 27.12 29.315 26.185 28.165 26.185C27.015 26.185 26.085 27.12 26.085 28.27C26.085 29.42 27.015 30.355 28.165 30.355Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15.04 22.435C15.04 22.09 15.32 21.81 15.665 21.81H29C29.345 21.81 29.625 22.09 29.625 22.435C29.625 22.78 29.345 23.06 29 23.06H15.665C15.32 23.06 15.04 22.78 15.04 22.435Z" fill="white"/>
diff --git a/sprite_assets/NFK/dark/vehiclepin_sharedcar_default_dark.svg b/sprite_assets/NFK/dark/vehiclepin_sharedcar_default_dark.svg
index 41824353..b61cd34f 100644
--- a/sprite_assets/NFK/dark/vehiclepin_sharedcar_default_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_sharedcar_default_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5057)">
 <g clip-path="url(#clip0_10646_5057)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#533B75"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path d="M19.835 30.355C20.985 30.355 21.915 29.42 21.915 28.27C21.915 27.12 20.985 26.185 19.835 26.185C18.685 26.185 17.75 27.12 17.75 28.27C17.75 29.42 18.685 30.355 19.835 30.355Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5057" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5057">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/dark/vehiclepin_sharedcar_selected_dark.svg b/sprite_assets/NFK/dark/vehiclepin_sharedcar_selected_dark.svg
index 0d9c2c65..1284263a 100644
--- a/sprite_assets/NFK/dark/vehiclepin_sharedcar_selected_dark.svg
+++ b/sprite_assets/NFK/dark/vehiclepin_sharedcar_selected_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5073)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#533B75" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#533B75" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path d="M26.1689 40.897C27.7789 40.897 29.0811 39.588 29.0811 37.978C29.0811 36.368 27.7789 35.059 26.1689 35.059C24.5589 35.059 23.25 36.368 23.25 37.978C23.25 39.588 24.5589 40.897 26.1689 40.897Z" fill="white"/>
 <path d="M37.8311 40.897C39.4411 40.897 40.75 39.588 40.75 37.978C40.75 36.368 39.4411 35.059 37.8311 35.059C36.2211 35.059 34.9189 36.368 34.9189 37.978C34.9189 39.588 36.2211 40.897 37.8311 40.897Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.4561 29.809C19.4561 29.326 19.8481 28.934 20.3311 28.934H39C39.483 28.934 39.875 29.326 39.875 29.809C39.875 30.292 39.483 30.684 39 30.684H20.3311C19.8481 30.684 19.4561 30.292 19.4561 29.809Z" fill="white"/>
diff --git a/sprite_assets/NFK/light/geofencingzone_parking_light.svg b/sprite_assets/NFK/light/geofencingzone_parking_light.svg
index f74923e1..3aab5cd4 100644
--- a/sprite_assets/NFK/light/geofencingzone_parking_light.svg
+++ b/sprite_assets/NFK/light/geofencingzone_parking_light.svg
@@ -1,17 +1,4 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10043_6323)">
-<path d="M8 12C8 9.79086 9.79086 8 12 8H32C34.2091 8 36 9.79086 36 12V32C36 34.2091 34.2091 36 32 36H12C9.79086 36 8 34.2091 8 32V12Z" fill="#70A4B2"/>
-<path d="M18 22.9999V15.9999H22.6667C24.5997 15.9999 26.1667 17.5669 26.1667 19.4999C26.1667 21.433 24.5997 22.9999 22.6667 22.9999H18ZM18 22.9999V28.8332" stroke="black" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_d_10043_6323" x="0" y="0" width="44" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10043_6323"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10043_6323" result="shape"/>
-</filter>
-</defs>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H24C26.2091 0 28 1.79086 28 4V24C28 26.2091 26.2091 28 24 28H4C1.79086 28 0 26.2091 0 24V4Z" fill="#70A4B2"/>
+<path d="M10.7051 21.4167C10.2221 21.4167 9.12695 21.1868 9.12695 20.7038V8.29169C9.12695 7.80869 9.51895 7.41669 10.002 7.41669H14.6641C17.0791 7.41669 19.0391 9.37669 19.0391 11.7917C19.0391 14.2067 17.0791 16.2038 14.6641 16.2038H12.2177V20.7038C12.2177 21.1868 11.1881 21.4167 10.7051 21.4167ZM12.2177 13.2038H13.7177C15.1667 13.2038 16.2177 13.1528 16.2177 11.7038C16.2177 10.3055 15.1667 10.2038 13.7177 10.2038H12.2177V13.2038Z" fill="white"/>
 </svg>
diff --git a/sprite_assets/NFK/light/stationpin_citybike_parking_default_light.svg b/sprite_assets/NFK/light/stationpin_citybike_parking_default_light.svg
index 65a12b7e..7b809a50 100644
--- a/sprite_assets/NFK/light/stationpin_citybike_parking_default_light.svg
+++ b/sprite_assets/NFK/light/stationpin_citybike_parking_default_light.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_7604)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="white"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="white" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#902F2A"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="white"/>
-<path d="M21.085 29.21C20.74 29.21 20.46 28.93 20.46 28.585V19.42C20.46 19.075 20.74 18.795 21.085 18.795H24.415C26.14 18.795 27.54 20.195 27.54 21.92C27.54 23.645 26.14 25.045 24.415 25.045H21.71V28.585C21.71 28.93 21.43 29.21 21.085 29.21ZM21.71 23.79H24.415C25.45 23.79 26.29 22.95 26.29 21.915C26.29 20.88 25.45 20.04 24.415 20.04H21.71V23.79Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#70A4B2"/>
+<path d="M20.7051 31.4167C20.2221 31.4167 19.127 31.1868 19.127 30.7038V18.2917C19.127 17.8087 19.519 17.4167 20.002 17.4167H24.6641C27.0791 17.4167 29.0391 19.3767 29.0391 21.7917C29.0391 24.2067 27.0791 26.2038 24.6641 26.2038H22.2177V30.7038C22.2177 31.1868 21.1881 31.4167 20.7051 31.4167ZM22.2177 23.2038H23.7177C25.1667 23.2038 26.2177 23.1528 26.2177 21.7038C26.2177 20.3055 25.1667 20.2038 23.7177 20.2038H22.2177V23.2038Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7604" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/light/stationpin_citybike_parking_minimized_light.svg b/sprite_assets/NFK/light/stationpin_citybike_parking_minimized_light.svg
index 99ab2db0..9f335ca4 100644
--- a/sprite_assets/NFK/light/stationpin_citybike_parking_minimized_light.svg
+++ b/sprite_assets/NFK/light/stationpin_citybike_parking_minimized_light.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_7641)">
 <g clip-path="url(#clip0_8318_7641)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#902F2A"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#70A4B2"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="white" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/NFK/light/stationpin_citybike_parking_selected_light.svg b/sprite_assets/NFK/light/stationpin_citybike_parking_selected_light.svg
index eb5b32a9..6247416e 100644
--- a/sprite_assets/NFK/light/stationpin_citybike_parking_selected_light.svg
+++ b/sprite_assets/NFK/light/stationpin_citybike_parking_selected_light.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7620)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#902F2A"/>
-<path d="M38.75 41.956H21.25C19.479 41.956 18.0439 40.514 18.0439 38.75V21.25C18.0439 19.479 19.479 18.044 21.25 18.044H38.75C40.521 18.044 41.9561 19.486 41.9561 21.25V38.75C41.9561 40.521 40.521 41.956 38.75 41.956ZM21.25 19.794C20.445 19.794 19.7939 20.445 19.7939 21.25V38.75C19.7939 39.555 20.445 40.206 21.25 40.206H38.75C39.555 40.206 40.2061 39.555 40.2061 38.75V21.25C40.2061 20.445 39.555 19.794 38.75 19.794H21.25Z" fill="white"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.902 25.0439 36.4189V23.588C25.0439 23.105 25.4359 22.713 25.9189 22.713H30.5811C32.9961 22.713 34.9561 24.673 34.9561 27.088C34.9561 29.503 32.9961 31.463 30.5811 31.463H26.7939V36.4189C26.7939 36.902 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.706H30.5811C32.0301 29.706 33.2061 28.53 33.2061 27.081C33.2061 25.632 32.0301 24.456 30.5811 24.456H26.7939V29.706Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#70A4B2"/>
+<path d="M25.0074 40.3096C24.3174 40.3096 22.7529 39.9812 22.7529 39.2912V21.5596C22.7529 20.8696 23.3129 20.3096 24.0029 20.3096H30.6631C34.1131 20.3096 36.9131 23.1096 36.9131 26.5596C36.9131 30.0096 34.1131 32.8626 30.6631 32.8626H27.1683V39.2912C27.1683 39.9812 25.6974 40.3096 25.0074 40.3096ZM27.1683 28.5769H29.3112C31.3812 28.5769 32.8826 28.504 32.8826 26.434C32.8826 24.4364 31.3812 24.2912 29.3112 24.2912H27.1683V28.5769Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7620" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/light/stationpin_sharedcar_parking_default_light.svg b/sprite_assets/NFK/light/stationpin_sharedcar_parking_default_light.svg
index 173431b3..c78ebfb5 100644
--- a/sprite_assets/NFK/light/stationpin_sharedcar_parking_default_light.svg
+++ b/sprite_assets/NFK/light/stationpin_sharedcar_parking_default_light.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_7610)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="white"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="white" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#533B75"/>
-<path d="M30.25 32.54H17.75C16.485 32.54 15.46 31.51 15.46 30.25V17.75C15.46 16.485 16.485 15.46 17.75 15.46H30.25C31.515 15.46 32.54 16.49 32.54 17.75V30.25C32.54 31.515 31.515 32.54 30.25 32.54ZM17.75 16.71C17.175 16.71 16.71 17.175 16.71 17.75V30.25C16.71 30.825 17.175 31.29 17.75 31.29H30.25C30.825 31.29 31.29 30.825 31.29 30.25V17.75C31.29 17.175 30.825 16.71 30.25 16.71H17.75Z" fill="white"/>
-<path d="M21.085 29.21C20.74 29.21 20.46 28.93 20.46 28.585V19.42C20.46 19.075 20.74 18.795 21.085 18.795H24.415C26.14 18.795 27.54 20.195 27.54 21.92C27.54 23.645 26.14 25.045 24.415 25.045H21.71V28.585C21.71 28.93 21.43 29.21 21.085 29.21ZM21.71 23.79H24.415C25.45 23.79 26.29 22.95 26.29 21.915C26.29 20.88 25.45 20.04 24.415 20.04H21.71V23.79Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#70A4B2"/>
+<path d="M20.7051 31.4167C20.2221 31.4167 19.127 31.1868 19.127 30.7038V18.2917C19.127 17.8087 19.519 17.4167 20.002 17.4167H24.6641C27.0791 17.4167 29.0391 19.3767 29.0391 21.7917C29.0391 24.2067 27.0791 26.2038 24.6641 26.2038H22.2177V30.7038C22.2177 31.1868 21.1881 31.4167 20.7051 31.4167ZM22.2177 23.2038H23.7177C25.1667 23.2038 26.2177 23.1528 26.2177 21.7038C26.2177 20.3055 25.1667 20.2038 23.7177 20.2038H22.2177V23.2038Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7610" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/light/stationpin_sharedcar_parking_minimized_light.svg b/sprite_assets/NFK/light/stationpin_sharedcar_parking_minimized_light.svg
index 3d80c7cc..a44fad3b 100644
--- a/sprite_assets/NFK/light/stationpin_sharedcar_parking_minimized_light.svg
+++ b/sprite_assets/NFK/light/stationpin_sharedcar_parking_minimized_light.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_7643)">
 <g clip-path="url(#clip0_8318_7643)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#533B75"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#70A4B2"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="white" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/NFK/light/stationpin_sharedcar_parking_selected_light.svg b/sprite_assets/NFK/light/stationpin_sharedcar_parking_selected_light.svg
index 5c021fe7..bccb78fe 100644
--- a/sprite_assets/NFK/light/stationpin_sharedcar_parking_selected_light.svg
+++ b/sprite_assets/NFK/light/stationpin_sharedcar_parking_selected_light.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7634)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#533B75"/>
-<path d="M38.75 41.956H21.25C19.479 41.956 18.0439 40.514 18.0439 38.75V21.25C18.0439 19.479 19.479 18.044 21.25 18.044H38.75C40.521 18.044 41.9561 19.486 41.9561 21.25V38.75C41.9561 40.521 40.521 41.956 38.75 41.956ZM21.25 19.794C20.445 19.794 19.7939 20.445 19.7939 21.25V38.75C19.7939 39.555 20.445 40.206 21.25 40.206H38.75C39.555 40.206 40.2061 39.555 40.2061 38.75V21.25C40.2061 20.445 39.555 19.794 38.75 19.794H21.25Z" fill="white"/>
-<path d="M25.9189 37.2939C25.4359 37.2939 25.0439 36.902 25.0439 36.4189V23.588C25.0439 23.105 25.4359 22.713 25.9189 22.713H30.5811C32.9961 22.713 34.9561 24.673 34.9561 27.088C34.9561 29.503 32.9961 31.463 30.5811 31.463H26.7939V36.4189C26.7939 36.902 26.4019 37.2939 25.9189 37.2939ZM26.7939 29.706H30.5811C32.0301 29.706 33.2061 28.53 33.2061 27.081C33.2061 25.632 32.0301 24.456 30.5811 24.456H26.7939V29.706Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#70A4B2"/>
+<path d="M25.0074 40.3096C24.3174 40.3096 22.7529 39.9812 22.7529 39.2912V21.5596C22.7529 20.8696 23.3129 20.3096 24.0029 20.3096H30.6631C34.1131 20.3096 36.9131 23.1096 36.9131 26.5596C36.9131 30.0096 34.1131 32.8626 30.6631 32.8626H27.1683V39.2912C27.1683 39.9812 25.6974 40.3096 25.0074 40.3096ZM27.1683 28.5769H29.3112C31.3812 28.5769 32.8826 28.504 32.8826 26.434C32.8826 24.4364 31.3812 24.2912 29.3112 24.2912H27.1683V28.5769Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7634" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/light/stoppin_busandtram_selected_light.svg b/sprite_assets/NFK/light/stoppin_busandtram_selected_light.svg
index 5da019f0..02cac4e8 100644
--- a/sprite_assets/NFK/light/stoppin_busandtram_selected_light.svg
+++ b/sprite_assets/NFK/light/stoppin_busandtram_selected_light.svg
@@ -10,9 +10,9 @@
 <path d="M26.5004 36.65C26.5004 38.1964 25.2468 39.45 23.7004 39.45C22.154 39.45 20.9004 38.1964 20.9004 36.65C20.9004 35.1036 22.154 33.85 23.7004 33.85C25.2468 33.85 26.5004 35.1036 26.5004 36.65Z" fill="white"/>
 <path d="M39.8004 36.65C39.8004 38.1964 38.5468 39.45 37.0004 39.45C35.454 39.45 34.2004 38.1964 34.2004 36.65C34.2004 35.1036 35.454 33.85 37.0004 33.85C38.5468 33.85 39.8004 35.1036 39.8004 36.65Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#004D61"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4418 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4418 84.7754 38.925C84.7754 39.4083 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4083 59.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7535 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.8251 83.2051 36.8251C76.3616 36.8251 63.3834 36.8251 61.5004 36.8251C60.3406 36.8251 59.4004 35.8849 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.9251C59.9254 38.4418 60.3171 38.0501 60.8004 38.0501H83.9004C84.3836 38.0501 84.7754 38.4418 84.7754 38.9251C84.7754 39.4083 84.3836 39.8001 83.9004 39.8001H60.8004C60.3171 39.8001 59.9254 39.4083 59.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7536 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7756" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/light/stoppin_metroandtram_selected_light.svg b/sprite_assets/NFK/light/stoppin_metroandtram_selected_light.svg
index 6feb9a2b..fd7bc195 100644
--- a/sprite_assets/NFK/light/stoppin_metroandtram_selected_light.svg
+++ b/sprite_assets/NFK/light/stoppin_metroandtram_selected_light.svg
@@ -9,9 +9,9 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.4049 36.5172C24.8599 36.9722 24.8599 37.7142 24.4049 38.1692L21.4928 41.0882C21.0308 41.5432 20.2962 41.5432 19.8412 41.0882C19.3863 40.6332 19.3863 39.8912 19.8412 39.4362L22.7534 36.5172C23.2154 36.0622 23.9499 36.0622 24.4049 36.5172ZM35.5912 36.5172C36.0462 36.0622 36.7808 36.0622 37.2428 36.5172L40.1549 39.4362C40.6099 39.8912 40.6099 40.6332 40.1549 41.0882C39.6999 41.5432 38.9654 41.5432 38.5034 41.0882L35.5912 38.1692C35.1362 37.7142 35.1362 36.9722 35.5912 36.5172Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M21.1986 22.972C21.6676 20.158 24.1041 18.1 26.9531 18.1H33.0426C35.8986 18.1 38.3281 20.158 38.7971 22.972L40.3365 32.212C40.8475 35.25 38.881 38.246 35.71 38.673C33.995 38.904 31.9579 39.1 29.9979 39.1C28.0379 39.1 26.0077 38.904 24.2857 38.673C21.1217 38.246 19.1552 35.25 19.6592 32.212L21.1986 22.972ZM26.9531 20.431C25.2451 20.431 23.7817 21.67 23.5017 23.357L23.0751 25.919C24.0201 26.927 25.2587 27.585 26.5047 28.005C27.8977 28.467 29.2279 28.6 29.9979 28.6C30.7679 28.6 32.098 28.467 33.491 28.005C34.737 27.592 35.9761 26.927 36.9281 25.919L36.5009 23.357C36.2139 21.67 34.7576 20.431 33.0426 20.431H26.9531ZM26.4979 32.093C25.8539 32.093 25.3289 32.618 25.3289 33.262C25.3289 33.906 25.8539 34.431 26.4979 34.431C27.1489 34.431 27.6668 33.906 27.6668 33.262C27.6668 32.618 27.1489 32.093 26.4979 32.093ZM33.4842 32.093C32.8402 32.093 32.3221 32.618 32.3221 33.262C32.3221 33.906 32.8402 34.431 33.4842 34.431H33.4979C34.1419 34.431 34.6668 33.906 34.6668 33.262C34.6668 32.618 34.1419 32.093 33.4979 32.093H33.4842Z" fill="black"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#004D61"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4418 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4418 84.7754 38.925C84.7754 39.4083 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4083 59.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7535 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.8251 83.2051 36.8251C76.3616 36.8251 63.3834 36.8251 61.5004 36.8251C60.3406 36.8251 59.4004 35.8849 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.9251C59.9254 38.4418 60.3171 38.0501 60.8004 38.0501H83.9004C84.3836 38.0501 84.7754 38.4418 84.7754 38.9251C84.7754 39.4083 84.3836 39.8001 83.9004 39.8001H60.8004C60.3171 39.8001 59.9254 39.4083 59.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7536 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7762" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/light/stoppin_plane_selected_light.svg b/sprite_assets/NFK/light/stoppin_plane_selected_light.svg
index 3a6755dc..1573c579 100644
--- a/sprite_assets/NFK/light/stoppin_plane_selected_light.svg
+++ b/sprite_assets/NFK/light/stoppin_plane_selected_light.svg
@@ -5,7 +5,7 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#707070"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7724)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3305 20.9388C34.2023 18.3187 38.0159 17.7875 40.4533 19.2497C40.5765 19.3236 40.6795 19.4266 40.7534 19.5498C42.2335 22.016 41.5819 25.2983 39.3819 27.1595L37.671 28.607L39.2616 34.6503C39.5533 35.7584 39.2343 36.938 38.4241 37.7481L36.888 39.2838C36.7011 39.4706 36.4399 39.563 36.1772 39.5351C35.9145 39.5074 35.6783 39.3622 35.5348 39.1404L31.5593 32.9977L29.3031 35.2535L29.6715 38.5684C29.7008 38.8326 29.6085 39.0959 29.4204 39.2838L27.761 40.9429C27.5621 41.1417 27.2798 41.2328 27.0022 41.1878C26.7246 41.1428 26.4856 40.9671 26.3598 40.7156L24.001 35.9991L19.2836 33.6408C19.032 33.515 18.8562 33.276 18.8111 32.9983C18.7661 32.7206 18.8572 32.4382 19.0562 32.2394L20.7156 30.5802C20.9036 30.3923 21.1667 30.3 21.4309 30.3294L24.7467 30.6977L27.0027 28.4422L20.859 24.4677C20.6371 24.3241 20.492 24.088 20.4641 23.8252C20.4363 23.5624 20.5287 23.3011 20.7156 23.1142L22.2516 21.5785C23.0619 20.7684 24.2416 20.4496 25.3496 20.7411L31.3447 22.3185L32.3305 20.9388Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3305 20.9388C34.2023 18.3187 38.0159 17.7875 40.4533 19.2497C40.5765 19.3236 40.6795 19.4266 40.7534 19.5498C42.2335 22.016 41.5819 25.2983 39.3819 27.1595L37.671 28.607L39.2616 34.6503C39.5533 35.7584 39.2343 36.938 38.4241 37.7481L36.888 39.2838C36.7011 39.4706 36.4399 39.563 36.1772 39.5351C35.9145 39.5074 35.6783 39.3622 35.5348 39.1404L31.5593 32.9977L29.3031 35.2535L29.6715 38.5684C29.7008 38.8326 29.6085 39.0959 29.4204 39.2838L27.761 40.9429C27.5621 41.1417 27.2798 41.2329 27.0022 41.1878C26.7246 41.1428 26.4856 40.9671 26.3598 40.7156L24.001 35.9991L19.2836 33.6408C19.032 33.515 18.8562 33.276 18.8111 32.9983C18.7661 32.7206 18.8572 32.4382 19.0562 32.2394L20.7156 30.5803C20.9036 30.3923 21.1667 30.3 21.4309 30.3294L24.7467 30.6977L27.0027 28.4422L20.859 24.4677C20.6371 24.3241 20.492 24.088 20.4641 23.8252C20.4363 23.5624 20.5287 23.3011 20.7156 23.1142L22.2516 21.5785C23.0619 20.7684 24.2416 20.4496 25.3496 20.7411L31.3447 22.3185L32.3305 20.9388Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7724" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/light/stoppin_tram_selected_light.svg b/sprite_assets/NFK/light/stoppin_tram_selected_light.svg
index f4272b07..1a7a6116 100644
--- a/sprite_assets/NFK/light/stoppin_tram_selected_light.svg
+++ b/sprite_assets/NFK/light/stoppin_tram_selected_light.svg
@@ -5,9 +5,9 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#1A5843"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7699)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.825 41.2051 36.825C34.3616 36.825 21.3834 36.825 19.5004 36.825C18.3406 36.825 17.4004 35.8848 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6385 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6385 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6385 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6385 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6385 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6385 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2983 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6385 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4418 18.3171 38.05 18.8004 38.05L41.9004 38.05C42.3836 38.05 42.7754 38.4418 42.7754 38.925C42.7754 39.4083 42.3836 39.8 41.9004 39.8L18.8004 39.8C18.3171 39.8 17.9254 39.4083 17.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9418 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7534 33.5997 21.0691C33.7403 21.3847 33.6819 21.7535 33.4508 22.0104L30.3008 25.5104C29.9775 25.8696 29.4242 25.8987 29.065 25.5754C28.7058 25.2522 28.6767 24.6989 29 24.3397L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9083 26.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.8251 41.2051 36.8251C34.3616 36.8251 21.3834 36.8251 19.5004 36.8251C18.3406 36.8251 17.4004 35.8849 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6385 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6385 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6385 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6385 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6385 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6385 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2983 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6385 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.9251C17.9254 38.4418 18.3171 38.0501 18.8004 38.0501H41.9004C42.3836 38.0501 42.7754 38.4418 42.7754 38.9251C42.7754 39.4083 42.3836 39.8001 41.9004 39.8001H18.8004C18.3171 39.8001 17.9254 39.4083 17.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9418 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7534 33.5997 21.0691C33.7403 21.3847 33.6819 21.7536 33.4508 22.0104L30.3008 25.5104C29.9775 25.8696 29.4242 25.8987 29.065 25.5754C28.7058 25.2522 28.6767 24.6989 29 24.3397L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9083 26.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7699" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/NFK/light/vehiclepin_citybike_active_light.svg b/sprite_assets/NFK/light/vehiclepin_citybike_active_light.svg
index bc5ffac5..9366204a 100644
--- a/sprite_assets/NFK/light/vehiclepin_citybike_active_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_citybike_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47194)">
 <g clip-path="url(#clip0_10646_47194)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#902F2A"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#902F2A"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47194" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47194">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_citybike_cluster_light.svg b/sprite_assets/NFK/light/vehiclepin_citybike_cluster_light.svg
index 824137a7..94815781 100644
--- a/sprite_assets/NFK/light/vehiclepin_citybike_cluster_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_citybike_cluster_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5199)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#902F2A"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#902F2A"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M29.2051 24.833C27.8251 24.833 26.7051 25.953 26.7051 27.333C26.7051 28.713 27.8251 29.833 29.2051 29.833C30.5851 29.833 31.7051 28.713 31.7051 27.333C31.7051 25.953 30.5901 24.833 29.2051 24.833ZM25.04 27.333C25.04 25.033 26.9051 23.168 29.2051 23.168C31.5051 23.168 33.375 25.033 33.375 27.333C33.375 29.633 31.5051 31.498 29.2051 31.498C26.9051 31.498 25.04 29.633 25.04 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M27.5649 19.9629C27.9549 20.2079 28.0751 20.7229 27.8301 21.1129L23.665 27.7779C23.51 28.0229 23.2451 28.1679 22.9551 28.1679H18.79C18.33 28.1679 17.9551 27.7929 17.9551 27.3329C17.9551 26.8729 18.33 26.4979 18.79 26.4979H22.4951L26.415 20.2279C26.66 19.8379 27.1749 19.7179 27.5649 19.9629Z" fill="white"/>
diff --git a/sprite_assets/NFK/light/vehiclepin_citybike_default_light.svg b/sprite_assets/NFK/light/vehiclepin_citybike_default_light.svg
index 48a327ca..23fdd5cf 100644
--- a/sprite_assets/NFK/light/vehiclepin_citybike_default_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_citybike_default_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5154)">
 <g clip-path="url(#clip0_10646_5154)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#902F2A"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5154" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5154">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_citybike_selected_light.svg b/sprite_assets/NFK/light/vehiclepin_citybike_selected_light.svg
index 9d1cda0f..30f8062b 100644
--- a/sprite_assets/NFK/light/vehiclepin_citybike_selected_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_citybike_selected_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5173)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#902F2A" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#902F2A" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_active_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_active_light.svg
index a541ce45..9eb765d2 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_active_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47196)">
 <g clip-path="url(#clip0_10646_47196)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#902F2A"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#902F2A"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="white"/>
 </g>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
@@ -17,7 +17,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47196" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47196">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_cluster_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_cluster_light.svg
index 5e0c2915..76f940a5 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_cluster_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_cluster_light.svg
@@ -1,17 +1,17 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5518)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6H52C60.8366 6 68 13.1634 68 22V22C68 30.8366 60.8366 38 52 38H24C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7H52C60.2843 7 67 13.7157 67 22C67 30.2843 60.2843 37 52 37H24C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#902F2A"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#902F2A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5518" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5518"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5518" result="shape"/>
 </filter>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_cluster_minimized_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_cluster_minimized_light.svg
index 99344263..91890c68 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_cluster_minimized_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_cluster_minimized_light.svg
@@ -1,16 +1,16 @@
 <svg width="44" height="32" viewBox="0 0 44 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5532)">
-<rect x="10" y="8" width="24" height="12" rx="6" fill="white"/>
-<rect x="9" y="7" width="26" height="14" rx="7" stroke="white" stroke-width="2"/>
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#902F2A"/>
+<rect x="10" y="10" width="24" height="12" rx="6" fill="white"/>
+<rect x="9" y="9" width="26" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#902F2A"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5532" x="0" y="0" width="44" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5532"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5532" result="shape"/>
 </filter>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_default_dott_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_default_dott_light.svg
new file mode 100644
index 00000000..55e8bfbe
--- /dev/null
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_default_dott_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7028)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="#009DDB"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#009DDB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7028" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7028"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7028" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_default_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_default_light.svg
index 07c98a52..8b6a122e 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_default_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_default_light.svg
@@ -1,17 +1,17 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5483)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#902F2A"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#902F2A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5483" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5483"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5483" result="shape"/>
 </filter>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_default_ryde_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_default_ryde_light.svg
new file mode 100644
index 00000000..9c7888ff
--- /dev/null
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_default_ryde_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7047)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#4BCD1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7047" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7047"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7047" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_default_voi_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_default_voi_light.svg
index 9a326cb4..ade97598 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_default_voi_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_default_voi_light.svg
@@ -1,19 +1,19 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47412)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#F36960"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
+<g filter="url(#filter0_d_10957_7040)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#F36960"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47412" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7040" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47412"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47412" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7040"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7040" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_minimized_dott_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_minimized_dott_light.svg
new file mode 100644
index 00000000..61fcf2e6
--- /dev/null
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_minimized_dott_light.svg
@@ -0,0 +1,22 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7024)">
+<g clip-path="url(#clip0_10957_7024)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7024" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7024"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7024" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_7024">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_minimized_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_minimized_light.svg
index f6cdd17c..a6909a52 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_minimized_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_minimized_light.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5469)">
 <g clip-path="url(#clip0_10646_5469)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#902F2A"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#902F2A"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5469" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5469"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5469" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5469">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_minimized_ryde_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_minimized_ryde_light.svg
new file mode 100644
index 00000000..a130804e
--- /dev/null
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_minimized_ryde_light.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7045)">
+<g clip-path="url(#clip0_10957_7045)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
+<rect width="12" height="12" transform="translate(10 10)" fill="#4BCD1F"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7045" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7045"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7045" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_7045">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_minimized_voi_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_minimized_voi_light.svg
index e0d69472..b1e5eefe 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_minimized_voi_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_minimized_voi_light.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47400)">
-<g clip-path="url(#clip0_10647_47400)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#F36960"/>
+<g filter="url(#filter0_d_10957_7038)">
+<g clip-path="url(#clip0_10957_7038)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47400" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7038" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47400"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47400" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7038"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7038" result="shape"/>
 </filter>
-<clipPath id="clip0_10647_47400">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<clipPath id="clip0_10957_7038">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_selected_dott_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_selected_dott_light.svg
new file mode 100644
index 00000000..24b2c124
--- /dev/null
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_selected_dott_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7032)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7032" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7032"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7032" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_selected_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_selected_light.svg
index 51645fe6..2361c4d4 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_selected_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_selected_light.svg
@@ -1,15 +1,15 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5502)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#902F2A" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5825 35.0335 17.9095 35.0335 18.2751V27.9003H40.5761C40.9184 27.9003 41.2294 28.0999 41.3718 28.4111C41.5143 28.7224 41.4621 29.0882 41.2383 29.3472L30.155 42.1803C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6084V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4724C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4265 34.121 17.3275 34.4636 17.455Z" fill="white"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#902F2A" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5502" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5502"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5502" result="shape"/>
 </filter>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_selected_ryde_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_selected_ryde_light.svg
new file mode 100644
index 00000000..d3ac0889
--- /dev/null
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_selected_ryde_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7049)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7049" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7049"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7049" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_ebike_selected_voi_light.svg b/sprite_assets/NFK/light/vehiclepin_ebike_selected_voi_light.svg
index db54da03..e082f2a7 100644
--- a/sprite_assets/NFK/light/vehiclepin_ebike_selected_voi_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_ebike_selected_voi_light.svg
@@ -1,17 +1,17 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47425)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 17.455C34.8063 17.5825 35.0335 17.9095 35.0335 18.2751V27.9003H40.5761C40.9184 27.9003 41.2294 28.0999 41.3718 28.4111C41.5143 28.7224 41.4621 29.0882 41.2383 29.3472L30.155 42.1803C29.9161 42.457 29.5304 42.5559 29.1877 42.4284C28.8451 42.301 28.6178 41.974 28.6178 41.6084V31.9832H23.0752C22.7329 31.9832 22.422 31.7836 22.2796 31.4724C22.1371 31.1611 22.1893 30.7953 22.413 30.5362L33.4963 17.7031C33.7353 17.4265 34.121 17.3275 34.4636 17.455Z" fill="black"/>
+<g filter="url(#filter0_d_10957_7042)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4636 19.455C34.8063 19.5825 35.0335 19.9095 35.0335 20.2751V29.9003H40.5761C40.9184 29.9003 41.2294 30.0999 41.3718 30.4111C41.5143 30.7224 41.4621 31.0882 41.2383 31.3472L30.155 44.1803C29.9161 44.457 29.5304 44.5559 29.1877 44.4284C28.8451 44.301 28.6178 43.974 28.6178 43.6084V33.9832H23.0752C22.7329 33.9832 22.422 33.7836 22.2796 33.4724C22.1371 33.1611 22.1893 32.7953 22.413 32.5362L33.4963 19.7031C33.7353 19.4265 34.121 19.3275 34.4636 19.455Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47425" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7042" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47425"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47425" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7042"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7042" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_loading_light.svg b/sprite_assets/NFK/light/vehiclepin_loading_light.svg
index f5cb76fb..03217b58 100644
--- a/sprite_assets/NFK/light/vehiclepin_loading_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_loading_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47212)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#8FA9AF"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#8FA9AF"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 20.3311C32.6441 20.3311 33.1691 20.8561 33.1691 21.5001V25.0001C33.1691 25.6441 32.6441 26.1691 32.0001 26.1691C31.3561 26.1691 30.8311 25.6441 30.8311 25.0001V21.5001C30.8311 20.8561 31.3561 20.3311 32.0001 20.3311Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M32.0001 37.8311C32.6441 37.8311 33.1691 38.3561 33.1691 39.0001V42.5001C33.1691 43.1441 32.6441 43.6691 32.0001 43.6691C31.3561 43.6691 30.8311 43.1441 30.8311 42.5001V39.0001C30.8311 38.3561 31.3561 37.8311 32.0001 37.8311Z" fill="black"/>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_active_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_active_light.svg
index a28fbabf..15fac531 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_active_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47206)">
 <g clip-path="url(#clip0_10646_47206)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#414C1C"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#414C1C"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="white"/>
@@ -19,7 +19,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47206" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47206">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_cluster_generic_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_cluster_generic_light.svg
index b6db779d..8eb34220 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_cluster_generic_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_cluster_generic_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5437)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#414C1C"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#414C1C"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M30.665 28.165C30.205 28.165 29.835 28.54 29.835 29C29.835 29.46 30.205 29.835 30.665 29.835C31.125 29.835 31.5 29.46 31.5 29C31.5 28.54 31.125 28.165 30.665 28.165ZM28.165 29C28.165 27.62 29.285 26.5 30.665 26.5C32.045 26.5 33.165 27.62 33.165 29C33.165 30.38 32.045 31.5 30.665 31.5C29.285 31.5 28.165 30.38 28.165 29Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M25.6649 17.335C25.6649 16.875 26.0399 16.5 26.4999 16.5H27.3148C28.4398 16.5 29.425 17.25 29.725 18.33L31.4701 24.61C31.5401 24.86 31.4899 25.13 31.3299 25.335C31.1749 25.54 30.9249 25.665 30.6649 25.665C29.5749 25.665 28.6099 26.185 27.9999 27C27.5799 27.555 27.3348 28.25 27.3348 29C27.3348 29.46 26.9599 29.835 26.4999 29.835H18.9999C18.7799 29.835 18.565 29.75 18.41 29.59C18.255 29.435 18.165 29.22 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165C16.875 28.165 16.5199 27.815 16.4999 27.365C16.4799 26.92 16.82 26.535 17.265 26.5L26.91 25.695C27.605 24.91 28.54 24.34 29.6 24.11L28.12 18.775C28.02 18.415 27.6898 18.165 27.3148 18.165H26.4999C26.0399 18.165 25.6649 17.79 25.6649 17.33V17.335Z" fill="white"/>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_default_dott_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_default_dott_light.svg
index 6861c138..be70a159 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_default_dott_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_default_dott_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5329)">
-<g clip-path="url(#clip0_10646_5329)">
+<g filter="url(#filter0_d_10957_7016)">
+<g clip-path="url(#clip0_10957_7016)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#009DDB"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5329" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7016" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5329"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5329" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7016"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7016" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5329">
+<clipPath id="clip0_10957_7016">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_default_generic_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_default_generic_light.svg
index 536edc0f..75c473ca 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_default_generic_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_default_generic_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5287)">
 <g clip-path="url(#clip0_10646_5287)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#414C1C"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.335 28.165C16.875 28.165 16.5 28.54 16.5 29C16.5 29.46 16.875 29.835 17.335 29.835C17.795 29.835 18.165 29.46 18.165 29C18.165 28.54 17.795 28.165 17.335 28.165ZM14.835 29C14.835 27.62 15.955 26.5 17.335 26.5C18.715 26.5 19.835 27.62 19.835 29C19.835 30.38 18.715 31.5 17.335 31.5C15.955 31.5 14.835 30.38 14.835 29Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5287" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5287">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_default_ryde_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_default_ryde_light.svg
index 22e88850..30d48b95 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_default_ryde_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_default_ryde_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5301)">
-<g clip-path="url(#clip0_10646_5301)">
+<g filter="url(#filter0_d_10957_7014)">
+<g clip-path="url(#clip0_10957_7014)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#4BCD1F"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5301" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7014" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5301"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5301" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7014"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7014" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5301">
+<clipPath id="clip0_10957_7014">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_default_voi_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_default_voi_light.svg
index 34b1d194..a0efa494 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_default_voi_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_default_voi_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5315)">
-<g clip-path="url(#clip0_10646_5315)">
+<g filter="url(#filter0_d_10957_7030)">
+<g clip-path="url(#clip0_10957_7030)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#F36960"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5315" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7030" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5315"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5315" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7030"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7030" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5315">
+<clipPath id="clip0_10957_7030">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_minimized_dott_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_minimized_dott_light.svg
index b8923646..c1f8fb65 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_minimized_dott_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_minimized_dott_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5273)">
-<g clip-path="url(#clip0_10646_5273)">
+<g filter="url(#filter0_d_10957_7012)">
+<g clip-path="url(#clip0_10957_7012)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5273" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7012" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5273"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5273" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7012"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7012" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5273">
+<clipPath id="clip0_10957_7012">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_minimized_ryde_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_minimized_ryde_light.svg
index beadc5fa..fca8e6f2 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_minimized_ryde_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_minimized_ryde_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5245)">
-<g clip-path="url(#clip0_10646_5245)">
+<g filter="url(#filter0_d_10957_7010)">
+<g clip-path="url(#clip0_10957_7010)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#4BCD1F"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5245" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7010" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5245"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5245" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7010"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7010" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5245">
+<clipPath id="clip0_10957_7010">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_minimized_voi_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_minimized_voi_light.svg
index 8363f6f3..decacd95 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_minimized_voi_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_minimized_voi_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5259)">
-<g clip-path="url(#clip0_10646_5259)">
+<g filter="url(#filter0_d_10957_7026)">
+<g clip-path="url(#clip0_10957_7026)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5259" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7026" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5259"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5259" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7026"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7026" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5259">
+<clipPath id="clip0_10957_7026">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_selected_dott_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_selected_dott_light.svg
index 811835d1..820c77e1 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_selected_dott_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_selected_dott_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5411)">
+<g filter="url(#filter0_d_10957_7021)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5411" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7021" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5411"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5411" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7021"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7021" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_selected_generic_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_selected_generic_light.svg
index 54a9d43f..29c54dd6 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_selected_generic_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_selected_generic_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5348)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#414C1C" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#414C1C" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="white"/>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_selected_ryde_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_selected_ryde_light.svg
index 67e75a41..8707488b 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_selected_ryde_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_selected_ryde_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5369)">
+<g filter="url(#filter0_d_10957_7018)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5369" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7018" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5369"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5369" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7018"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7018" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_scooter_selected_voi_light.svg b/sprite_assets/NFK/light/vehiclepin_scooter_selected_voi_light.svg
index 2fcca892..9feec416 100644
--- a/sprite_assets/NFK/light/vehiclepin_scooter_selected_voi_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_scooter_selected_voi_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5390)">
+<g filter="url(#filter0_d_10957_7035)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.6689 37.831C22.0249 37.831 21.5 38.356 21.5 39C21.5 39.644 22.0249 40.169 22.6689 40.169C23.3129 40.169 23.8311 39.644 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831ZM19.1689 39C19.1689 37.068 20.7369 35.5 22.6689 35.5C24.6009 35.5 26.1689 37.068 26.1689 39C26.1689 40.932 24.6009 42.5 22.6689 42.5C20.7369 42.5 19.1689 40.932 19.1689 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3311 37.831C40.6871 37.831 40.1689 38.356 40.1689 39C40.1689 39.644 40.6871 40.169 41.3311 40.169C41.9751 40.169 42.5 39.644 42.5 39C42.5 38.356 41.9751 37.831 41.3311 37.831ZM37.8311 39C37.8311 37.068 39.3991 35.5 41.3311 35.5C43.2631 35.5 44.8311 37.068 44.8311 39C44.8311 40.932 43.2631 42.5 41.3311 42.5C39.3991 42.5 37.8311 40.932 37.8311 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3309 22.669C34.3309 22.025 34.8558 21.5 35.4998 21.5H36.6407C38.2157 21.5 39.5949 22.55 40.0149 24.062L42.4581 32.854C42.5561 33.204 42.4859 33.582 42.2619 33.869C42.0449 34.156 41.6949 34.331 41.3309 34.331C39.8049 34.331 38.4538 35.059 37.5998 36.2C37.0118 36.977 36.6688 37.95 36.6688 39C36.6688 39.644 36.1438 40.169 35.4998 40.169H24.9998C24.6918 40.169 24.391 40.05 24.174 39.826C23.957 39.609 23.8311 39.308 23.8311 39C23.8311 38.356 23.3129 37.831 22.6689 37.831C22.0249 37.831 21.5278 37.341 21.4998 36.711C21.4718 36.088 21.948 35.549 22.571 35.5L36.074 34.373C37.047 33.274 38.3559 32.476 39.8399 32.154L37.768 24.685C37.628 24.181 37.1657 23.831 36.6407 23.831H35.4998C34.8558 23.831 34.3309 23.306 34.3309 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5390" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7035" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5390"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5390" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7035"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7035" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_sharedcar_cluster_light.svg b/sprite_assets/NFK/light/vehiclepin_sharedcar_cluster_light.svg
index 4835db4d..42f9f925 100644
--- a/sprite_assets/NFK/light/vehiclepin_sharedcar_cluster_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_sharedcar_cluster_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5108)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#533B75"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#533B75"/>
 <path d="M19.835 30.3551C20.985 30.3551 21.915 29.4201 21.915 28.2701C21.915 27.1201 20.985 26.1851 19.835 26.1851C18.685 26.1851 17.75 27.1201 17.75 28.2701C17.75 29.4201 18.685 30.3551 19.835 30.3551Z" fill="white"/>
 <path d="M28.165 30.3551C29.315 30.3551 30.25 29.4201 30.25 28.2701C30.25 27.1201 29.315 26.1851 28.165 26.1851C27.015 26.1851 26.085 27.1201 26.085 28.2701C26.085 29.4201 27.015 30.3551 28.165 30.3551Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15.04 22.4351C15.04 22.0901 15.32 21.8101 15.665 21.8101H29C29.345 21.8101 29.625 22.0901 29.625 22.4351C29.625 22.7801 29.345 23.0601 29 23.0601H15.665C15.32 23.0601 15.04 22.7801 15.04 22.4351Z" fill="white"/>
diff --git a/sprite_assets/NFK/light/vehiclepin_sharedcar_default_light.svg b/sprite_assets/NFK/light/vehiclepin_sharedcar_default_light.svg
index 925b0777..2ae82fe8 100644
--- a/sprite_assets/NFK/light/vehiclepin_sharedcar_default_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_sharedcar_default_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5063)">
 <g clip-path="url(#clip0_10646_5063)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#533B75"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path d="M19.835 30.3551C20.985 30.3551 21.915 29.4201 21.915 28.2701C21.915 27.1201 20.985 26.1851 19.835 26.1851C18.685 26.1851 17.75 27.1201 17.75 28.2701C17.75 29.4201 18.685 30.3551 19.835 30.3551Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5063" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5063">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/NFK/light/vehiclepin_sharedcar_selected_light.svg b/sprite_assets/NFK/light/vehiclepin_sharedcar_selected_light.svg
index ba70a09f..d3ba6162 100644
--- a/sprite_assets/NFK/light/vehiclepin_sharedcar_selected_light.svg
+++ b/sprite_assets/NFK/light/vehiclepin_sharedcar_selected_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5082)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#533B75" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#533B75" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path d="M26.1689 40.8971C27.7789 40.8971 29.0811 39.5881 29.0811 37.9781C29.0811 36.3681 27.7789 35.0591 26.1689 35.0591C24.5589 35.0591 23.25 36.3681 23.25 37.9781C23.25 39.5881 24.5589 40.8971 26.1689 40.8971Z" fill="white"/>
 <path d="M37.8311 40.8971C39.4411 40.8971 40.75 39.5881 40.75 37.9781C40.75 36.3681 39.4411 35.0591 37.8311 35.0591C36.2211 35.0591 34.9189 36.3681 34.9189 37.9781C34.9189 39.5881 36.2211 40.8971 37.8311 40.8971Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.4561 29.8091C19.4561 29.3261 19.8481 28.9341 20.3311 28.9341H39C39.483 28.9341 39.875 29.3261 39.875 29.8091C39.875 30.2921 39.483 30.6841 39 30.6841H20.3311C19.8481 30.6841 19.4561 30.2921 19.4561 29.8091Z" fill="white"/>
diff --git a/sprite_assets/Troms/dark/geofencingzone_parking_dark.svg b/sprite_assets/Troms/dark/geofencingzone_parking_dark.svg
index 897ae09f..5ec853b6 100644
--- a/sprite_assets/Troms/dark/geofencingzone_parking_dark.svg
+++ b/sprite_assets/Troms/dark/geofencingzone_parking_dark.svg
@@ -1,17 +1,4 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10043_6329)">
-<path d="M8 12C8 9.79086 9.79086 8 12 8H32C34.2091 8 36 9.79086 36 12V32C36 34.2091 34.2091 36 32 36H12C9.79086 36 8 34.2091 8 32V12Z" fill="#0020C2"/>
-<path d="M18 22.9999V15.9999H22.6667C24.5997 15.9999 26.1667 17.5669 26.1667 19.4999C26.1667 21.4329 24.5997 22.9999 22.6667 22.9999H18ZM18 22.9999V28.8332" stroke="white" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_d_10043_6329" x="0" y="0" width="44" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10043_6329"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10043_6329" result="shape"/>
-</filter>
-</defs>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H24C26.2091 0 28 1.79086 28 4V24C28 26.2091 26.2091 28 24 28H4C1.79086 28 0 26.2091 0 24V4Z" fill="#0020C2"/>
+<path d="M10.7051 21.4166C10.2221 21.4166 9.12695 21.1867 9.12695 20.7037V8.29163C9.12695 7.80863 9.51895 7.41663 10.002 7.41663H14.6641C17.0791 7.41663 19.0391 9.37663 19.0391 11.7916C19.0391 14.2066 17.0791 16.2037 14.6641 16.2037H12.2177V20.7037C12.2177 21.1867 11.1881 21.4166 10.7051 21.4166ZM12.2177 13.2037H13.7177C15.1667 13.2037 16.2177 13.1527 16.2177 11.7037C16.2177 10.3054 15.1667 10.2037 13.7177 10.2037H12.2177V13.2037Z" fill="white"/>
 </svg>
diff --git a/sprite_assets/Troms/dark/stationpin_citybike_parking_default_dark.svg b/sprite_assets/Troms/dark/stationpin_citybike_parking_default_dark.svg
index f0d193b0..7ffda1c2 100644
--- a/sprite_assets/Troms/dark/stationpin_citybike_parking_default_dark.svg
+++ b/sprite_assets/Troms/dark/stationpin_citybike_parking_default_dark.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_9209)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="black"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="black" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#8F1011"/>
-<path d="M30.251 32.54H17.751C16.486 32.54 15.4609 31.51 15.4609 30.25V17.75C15.4609 16.485 16.486 15.46 17.751 15.46H30.251C31.516 15.46 32.541 16.49 32.541 17.75V30.25C32.541 31.515 31.516 32.54 30.251 32.54ZM17.751 16.71C17.176 16.71 16.7109 17.175 16.7109 17.75V30.25C16.7109 30.825 17.176 31.29 17.751 31.29H30.251C30.826 31.29 31.291 30.825 31.291 30.25V17.75C31.291 17.175 30.826 16.71 30.251 16.71H17.751Z" fill="white"/>
-<path d="M21.0859 29.2099C20.7409 29.2099 20.4609 28.9299 20.4609 28.5849V19.4199C20.4609 19.0749 20.7409 18.7949 21.0859 18.7949H24.416C26.141 18.7949 27.541 20.1949 27.541 21.9199C27.541 23.6449 26.141 25.0449 24.416 25.0449H21.7109V28.5849C21.7109 28.9299 21.4309 29.2099 21.0859 29.2099ZM21.7109 23.7899H24.416C25.451 23.7899 26.291 22.9499 26.291 21.9149C26.291 20.8799 25.451 20.0399 24.416 20.0399H21.7109V23.7899Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0020C2"/>
+<path d="M20.7051 31.4166C20.2221 31.4166 19.127 31.1867 19.127 30.7037V18.2916C19.127 17.8086 19.519 17.4166 20.002 17.4166H24.6641C27.0791 17.4166 29.0391 19.3766 29.0391 21.7916C29.0391 24.2066 27.0791 26.2037 24.6641 26.2037H22.2177V30.7037C22.2177 31.1867 21.1881 31.4166 20.7051 31.4166ZM22.2177 23.2037H23.7177C25.1667 23.2037 26.2177 23.1527 26.2177 21.7037C26.2177 20.3054 25.1667 20.2037 23.7177 20.2037H22.2177V23.2037Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_9209" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/dark/stationpin_citybike_parking_minimized_dark.svg b/sprite_assets/Troms/dark/stationpin_citybike_parking_minimized_dark.svg
index 689de366..5b5e2d73 100644
--- a/sprite_assets/Troms/dark/stationpin_citybike_parking_minimized_dark.svg
+++ b/sprite_assets/Troms/dark/stationpin_citybike_parking_minimized_dark.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_9246)">
 <g clip-path="url(#clip0_8318_9246)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#8F1011"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0020C2"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="black" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/Troms/dark/stationpin_citybike_parking_selected_dark.svg b/sprite_assets/Troms/dark/stationpin_citybike_parking_selected_dark.svg
index 43dfb765..5951d692 100644
--- a/sprite_assets/Troms/dark/stationpin_citybike_parking_selected_dark.svg
+++ b/sprite_assets/Troms/dark/stationpin_citybike_parking_selected_dark.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_9225)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#8F1011"/>
-<path d="M38.749 41.9559H21.249C19.478 41.9559 18.043 40.5139 18.043 38.7499V21.2499C18.043 19.4789 19.478 18.0439 21.249 18.0439H38.749C40.52 18.0439 41.9551 19.4859 41.9551 21.2499V38.7499C41.9551 40.5209 40.52 41.9559 38.749 41.9559ZM21.249 19.7939C20.444 19.7939 19.793 20.4449 19.793 21.2499V38.7499C19.793 39.5549 20.444 40.2059 21.249 40.2059H38.749C39.554 40.2059 40.2051 39.5549 40.2051 38.7499V21.2499C40.2051 20.4449 39.554 19.7939 38.749 19.7939H21.249Z" fill="white"/>
-<path d="M25.918 37.2939C25.435 37.2939 25.043 36.9019 25.043 36.4189V23.5879C25.043 23.1049 25.435 22.7129 25.918 22.7129H30.5801C32.9951 22.7129 34.9551 24.6729 34.9551 27.0879C34.9551 29.5029 32.9951 31.4629 30.5801 31.4629H26.793V36.4189C26.793 36.9019 26.401 37.2939 25.918 37.2939ZM26.793 29.7059H30.5801C32.0291 29.7059 33.2051 28.5299 33.2051 27.0809C33.2051 25.6319 32.0291 24.4559 30.5801 24.4559H26.793V29.7059Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0020C2"/>
+<path d="M25.0084 40.3094C24.3184 40.3094 22.7539 39.981 22.7539 39.291V21.5594C22.7539 20.8694 23.3139 20.3094 24.0039 20.3094H30.6641C34.1141 20.3094 36.9141 23.1094 36.9141 26.5594C36.9141 30.0094 34.1141 32.8625 30.6641 32.8625H27.1693V39.291C27.1693 39.981 25.6984 40.3094 25.0084 40.3094ZM27.1693 28.5767H29.3122C31.3822 28.5767 32.8836 28.5039 32.8836 26.4339C32.8836 24.4363 31.3822 24.291 29.3122 24.291H27.1693V28.5767Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_9225" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/dark/stationpin_sharedcar_parking_default_dark.svg b/sprite_assets/Troms/dark/stationpin_sharedcar_parking_default_dark.svg
index bc101285..65e680a1 100644
--- a/sprite_assets/Troms/dark/stationpin_sharedcar_parking_default_dark.svg
+++ b/sprite_assets/Troms/dark/stationpin_sharedcar_parking_default_dark.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_9215)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="black"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="black" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#8E2864"/>
-<path d="M30.251 32.54H17.751C16.486 32.54 15.4609 31.51 15.4609 30.25V17.75C15.4609 16.485 16.486 15.46 17.751 15.46H30.251C31.516 15.46 32.541 16.49 32.541 17.75V30.25C32.541 31.515 31.516 32.54 30.251 32.54ZM17.751 16.71C17.176 16.71 16.7109 17.175 16.7109 17.75V30.25C16.7109 30.825 17.176 31.29 17.751 31.29H30.251C30.826 31.29 31.291 30.825 31.291 30.25V17.75C31.291 17.175 30.826 16.71 30.251 16.71H17.751Z" fill="white"/>
-<path d="M21.0859 29.2099C20.7409 29.2099 20.4609 28.9299 20.4609 28.5849V19.4199C20.4609 19.0749 20.7409 18.7949 21.0859 18.7949H24.416C26.141 18.7949 27.541 20.1949 27.541 21.9199C27.541 23.6449 26.141 25.0449 24.416 25.0449H21.7109V28.5849C21.7109 28.9299 21.4309 29.2099 21.0859 29.2099ZM21.7109 23.7899H24.416C25.451 23.7899 26.291 22.9499 26.291 21.9149C26.291 20.8799 25.451 20.0399 24.416 20.0399H21.7109V23.7899Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0020C2"/>
+<path d="M20.7051 31.4166C20.2221 31.4166 19.127 31.1867 19.127 30.7037V18.2916C19.127 17.8086 19.519 17.4166 20.002 17.4166H24.6641C27.0791 17.4166 29.0391 19.3766 29.0391 21.7916C29.0391 24.2066 27.0791 26.2037 24.6641 26.2037H22.2177V30.7037C22.2177 31.1867 21.1881 31.4166 20.7051 31.4166ZM22.2177 23.2037H23.7177C25.1667 23.2037 26.2177 23.1527 26.2177 21.7037C26.2177 20.3054 25.1667 20.2037 23.7177 20.2037H22.2177V23.2037Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_9215" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/dark/stationpin_sharedcar_parking_minimized_dark.svg b/sprite_assets/Troms/dark/stationpin_sharedcar_parking_minimized_dark.svg
index 12f71bd9..775aa715 100644
--- a/sprite_assets/Troms/dark/stationpin_sharedcar_parking_minimized_dark.svg
+++ b/sprite_assets/Troms/dark/stationpin_sharedcar_parking_minimized_dark.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_9248)">
 <g clip-path="url(#clip0_8318_9248)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#8E2864"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0020C2"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="black" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/Troms/dark/stationpin_sharedcar_parking_selected_dark.svg b/sprite_assets/Troms/dark/stationpin_sharedcar_parking_selected_dark.svg
index 10ecf915..03367e58 100644
--- a/sprite_assets/Troms/dark/stationpin_sharedcar_parking_selected_dark.svg
+++ b/sprite_assets/Troms/dark/stationpin_sharedcar_parking_selected_dark.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="black"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_9239)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#8E2864"/>
-<path d="M38.749 41.9559H21.249C19.478 41.9559 18.043 40.5139 18.043 38.7499V21.2499C18.043 19.4789 19.478 18.0439 21.249 18.0439H38.749C40.52 18.0439 41.9551 19.4859 41.9551 21.2499V38.7499C41.9551 40.5209 40.52 41.9559 38.749 41.9559ZM21.249 19.7939C20.444 19.7939 19.793 20.4449 19.793 21.2499V38.7499C19.793 39.5549 20.444 40.2059 21.249 40.2059H38.749C39.554 40.2059 40.2051 39.5549 40.2051 38.7499V21.2499C40.2051 20.4449 39.554 19.7939 38.749 19.7939H21.249Z" fill="white"/>
-<path d="M25.918 37.2939C25.435 37.2939 25.043 36.9019 25.043 36.4189V23.5879C25.043 23.1049 25.435 22.7129 25.918 22.7129H30.5801C32.9951 22.7129 34.9551 24.6729 34.9551 27.0879C34.9551 29.5029 32.9951 31.4629 30.5801 31.4629H26.793V36.4189C26.793 36.9019 26.401 37.2939 25.918 37.2939ZM26.793 29.7059H30.5801C32.0291 29.7059 33.2051 28.5299 33.2051 27.0809C33.2051 25.6319 32.0291 24.4559 30.5801 24.4559H26.793V29.7059Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0020C2"/>
+<path d="M25.0084 40.3094C24.3184 40.3094 22.7539 39.981 22.7539 39.291V21.5594C22.7539 20.8694 23.3139 20.3094 24.0039 20.3094H30.6641C34.1141 20.3094 36.9141 23.1094 36.9141 26.5594C36.9141 30.0094 34.1141 32.8625 30.6641 32.8625H27.1693V39.291C27.1693 39.981 25.6984 40.3094 25.0084 40.3094ZM27.1693 28.5767H29.3122C31.3822 28.5767 32.8836 28.5039 32.8836 26.4339C32.8836 24.4363 31.3822 24.291 29.3122 24.291H27.1693V28.5767Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_9239" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/dark/stoppin_busandtram_selected_dark.svg b/sprite_assets/Troms/dark/stoppin_busandtram_selected_dark.svg
index 8e1c3c73..861ef26e 100644
--- a/sprite_assets/Troms/dark/stoppin_busandtram_selected_dark.svg
+++ b/sprite_assets/Troms/dark/stoppin_busandtram_selected_dark.svg
@@ -11,7 +11,7 @@
 <path d="M39.8004 36.65C39.8004 38.1964 38.5468 39.45 37.0004 39.45C35.454 39.45 34.2004 38.1964 34.2004 36.65C34.2004 35.1036 35.454 33.85 37.0004 33.85C38.5468 33.85 39.8004 35.1036 39.8004 36.65Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#334DCE"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6384 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6384 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6384 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6384 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6384 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6384 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2982 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6384 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05H83.9004C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8H60.8004C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9417 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7533 75.5997 21.069C75.7403 21.3847 75.6819 21.7535 75.4508 22.0103L72.3008 25.5103C71.9775 25.8695 71.4242 25.8986 71.065 25.5754C70.7058 25.2521 70.6767 24.6988 71 24.3396L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9082 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
diff --git a/sprite_assets/Troms/dark/stoppin_metroandtram_selected_dark.svg b/sprite_assets/Troms/dark/stoppin_metroandtram_selected_dark.svg
index f8eef0c9..83087bf5 100644
--- a/sprite_assets/Troms/dark/stoppin_metroandtram_selected_dark.svg
+++ b/sprite_assets/Troms/dark/stoppin_metroandtram_selected_dark.svg
@@ -10,7 +10,7 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M21.1986 22.972C21.6676 20.158 24.1041 18.1 26.9531 18.1H33.0426C35.8986 18.1 38.3281 20.158 38.7971 22.972L40.3365 32.212C40.8475 35.25 38.881 38.246 35.71 38.673C33.995 38.904 31.9579 39.1 29.9979 39.1C28.0379 39.1 26.0077 38.904 24.2857 38.673C21.1217 38.246 19.1552 35.25 19.6592 32.212L21.1986 22.972ZM26.9531 20.431C25.2451 20.431 23.7817 21.67 23.5017 23.357L23.0751 25.919C24.0201 26.927 25.2587 27.585 26.5047 28.005C27.8977 28.467 29.2279 28.6 29.9979 28.6C30.7679 28.6 32.098 28.467 33.491 28.005C34.737 27.592 35.9761 26.927 36.9281 25.919L36.5009 23.357C36.2139 21.67 34.7576 20.431 33.0426 20.431H26.9531ZM26.4979 32.093C25.8539 32.093 25.3289 32.618 25.3289 33.262C25.3289 33.906 25.8539 34.431 26.4979 34.431C27.1489 34.431 27.6668 33.906 27.6668 33.262C27.6668 32.618 27.1489 32.093 26.4979 32.093ZM33.4842 32.093C32.8402 32.093 32.3221 32.618 32.3221 33.262C32.3221 33.906 32.8402 34.431 33.4842 34.431H33.4979C34.1419 34.431 34.6668 33.906 34.6668 33.262C34.6668 32.618 34.1419 32.093 33.4979 32.093H33.4842Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#334DCE"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6384 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6384 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6384 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6384 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6384 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6384 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2982 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6384 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4417 60.3171 38.05 60.8004 38.05H83.9004C84.3836 38.05 84.7754 38.4417 84.7754 38.925C84.7754 39.4082 84.3836 39.8 83.9004 39.8H60.8004C60.3171 39.8 59.9254 39.4082 59.9254 38.925Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9417 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7533 75.5997 21.069C75.7403 21.3847 75.6819 21.7535 75.4508 22.0103L72.3008 25.5103C71.9775 25.8695 71.4242 25.8986 71.065 25.5754C70.7058 25.2521 70.6767 24.6988 71 24.3396L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9082 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
diff --git a/sprite_assets/Troms/dark/stoppin_tram_selected_dark.svg b/sprite_assets/Troms/dark/stoppin_tram_selected_dark.svg
index 9d4fcc76..e2e10880 100644
--- a/sprite_assets/Troms/dark/stoppin_tram_selected_dark.svg
+++ b/sprite_assets/Troms/dark/stoppin_tram_selected_dark.svg
@@ -6,7 +6,7 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#334DCE"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="black" mask="url(#path-1-inside-1_8318_9304)"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.825 41.2051 36.825C34.3616 36.825 21.3834 36.825 19.5004 36.825C18.3406 36.825 17.4004 35.8848 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6384 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6384 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6384 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6384 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6384 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6384 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2982 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6384 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4417 18.3171 38.05 18.8004 38.05L41.9004 38.05C42.3836 38.05 42.7754 38.4417 42.7754 38.925C42.7754 39.4082 42.3836 39.8 41.9004 39.8L18.8004 39.8C18.3171 39.8 17.9254 39.4082 17.9254 38.925Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4417 18.3171 38.05 18.8004 38.05H41.9004C42.3836 38.05 42.7754 38.4417 42.7754 38.925C42.7754 39.4082 42.3836 39.8 41.9004 39.8H18.8004C18.3171 39.8 17.9254 39.4082 17.9254 38.925Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9417 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7533 33.5997 21.069C33.7403 21.3847 33.6819 21.7535 33.4508 22.0103L30.3008 25.5103C29.9775 25.8695 29.4242 25.8986 29.065 25.5754C28.7058 25.2521 28.6767 24.6988 29 24.3396L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9082 26.3254 21.425Z" fill="white"/>
 </g>
 <defs>
diff --git a/sprite_assets/Troms/dark/vehiclepin_citybike_active_dark.svg b/sprite_assets/Troms/dark/vehiclepin_citybike_active_dark.svg
index d739a4b2..f387b2a1 100644
--- a/sprite_assets/Troms/dark/vehiclepin_citybike_active_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_citybike_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46972)">
 <g clip-path="url(#clip0_10646_46972)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#8F1011"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#8F1011"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46972" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46972">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_citybike_cluster_dark.svg b/sprite_assets/Troms/dark/vehiclepin_citybike_cluster_dark.svg
index 82ce33a9..ec33aa0f 100644
--- a/sprite_assets/Troms/dark/vehiclepin_citybike_cluster_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_citybike_cluster_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5191)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#8F1011"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#8F1011"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M29.2051 24.833C27.8251 24.833 26.7051 25.953 26.7051 27.333C26.7051 28.713 27.8251 29.833 29.2051 29.833C30.5851 29.833 31.7051 28.713 31.7051 27.333C31.7051 25.953 30.5901 24.833 29.2051 24.833ZM25.04 27.333C25.04 25.033 26.9051 23.168 29.2051 23.168C31.5051 23.168 33.375 25.033 33.375 27.333C33.375 29.633 31.5051 31.498 29.2051 31.498C26.9051 31.498 25.04 29.633 25.04 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M27.5649 19.9629C27.9549 20.2079 28.0751 20.7229 27.8301 21.1129L23.665 27.7779C23.51 28.0229 23.2451 28.1679 22.9551 28.1679H18.79C18.33 28.1679 17.9551 27.7929 17.9551 27.3329C17.9551 26.8729 18.33 26.4979 18.79 26.4979H22.4951L26.415 20.2279C26.66 19.8379 27.1749 19.7179 27.5649 19.9629Z" fill="white"/>
diff --git a/sprite_assets/Troms/dark/vehiclepin_citybike_default_dark.svg b/sprite_assets/Troms/dark/vehiclepin_citybike_default_dark.svg
index fee7a6e3..e3cbc70f 100644
--- a/sprite_assets/Troms/dark/vehiclepin_citybike_default_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_citybike_default_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5150)">
 <g clip-path="url(#clip0_10646_5150)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#8F1011"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5150" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5150">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_citybike_selected_dark.svg b/sprite_assets/Troms/dark/vehiclepin_citybike_selected_dark.svg
index 3cfe9c08..834318b3 100644
--- a/sprite_assets/Troms/dark/vehiclepin_citybike_selected_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_citybike_selected_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5167)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8F1011" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8F1011" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_active_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_active_dark.svg
index 7030cc21..74d70dcf 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_active_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46974)">
 <g clip-path="url(#clip0_10646_46974)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#8F1011"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#8F1011"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.4549C34.8053 19.5824 35.0326 19.9094 35.0326 20.275V29.9002H40.5752C40.9175 29.9002 41.2284 30.0998 41.3708 30.4111C41.5133 30.7223 41.4611 31.0881 41.2374 31.3471L30.154 44.1802C29.9151 44.4569 29.5294 44.5559 29.1867 44.4283C28.8441 44.3009 28.6168 43.9739 28.6168 43.6083V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4723C22.1361 33.161 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4264 34.12 19.3275 34.4626 19.4549Z" fill="white"/>
 </g>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="black" stroke-width="2"/>
@@ -17,7 +17,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46974" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46974">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_cluster_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_cluster_dark.svg
index 4ec36e22..92b09198 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_cluster_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_cluster_dark.svg
@@ -1,17 +1,17 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5514)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6H52C60.8366 6 68 13.1634 68 22V22C68 30.8366 60.8366 38 52 38H24C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7H52C60.2843 7 67 13.7157 67 22C67 30.2843 60.2843 37 52 37H24C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#8F1011"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
+<path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#8F1011"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5514" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5514"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5514" result="shape"/>
 </filter>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_cluster_minimized_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_cluster_minimized_dark.svg
index f469d1b3..ef41b054 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_cluster_minimized_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_cluster_minimized_dark.svg
@@ -1,16 +1,16 @@
 <svg width="44" height="32" viewBox="0 0 44 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5528)">
-<rect x="10" y="8" width="24" height="12" rx="6" fill="black"/>
-<rect x="9" y="7" width="26" height="14" rx="7" stroke="black" stroke-width="2"/>
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#8F1011"/>
+<rect x="10" y="10" width="24" height="12" rx="6" fill="black"/>
+<rect x="9" y="9" width="26" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#8F1011"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5528" x="0" y="0" width="44" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5528"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5528" result="shape"/>
 </filter>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_default_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_default_dark.svg
index 78ae218c..c8f55cd4 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_default_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_default_dark.svg
@@ -1,17 +1,17 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5479)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#8F1011"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#8F1011"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5479" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5479"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5479" result="shape"/>
 </filter>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_default_dott_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_default_dott_dark.svg
new file mode 100644
index 00000000..c5998fee
--- /dev/null
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_default_dott_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6870)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="#009DDB"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#009DDB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6870" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6870"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6870" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_default_ryde_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_default_ryde_dark.svg
new file mode 100644
index 00000000..5f270a6f
--- /dev/null
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_default_ryde_dark.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6889)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#4BCD1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6889" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6889"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6889" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_default_voi_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_default_voi_dark.svg
index e7fe98bb..8da173a9 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_default_voi_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_default_voi_dark.svg
@@ -1,19 +1,19 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47420)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="black"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="black" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#F36960"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6882)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#F36960"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47420" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6882" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47420"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47420" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6882"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6882" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_dark.svg
index 0a5957f1..7c655304 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_dark.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5465)">
 <g clip-path="url(#clip0_10646_5465)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#8F1011"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#8F1011"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5465" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5465"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5465" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5465">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_dott_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_dott_dark.svg
new file mode 100644
index 00000000..e655ce7a
--- /dev/null
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_dott_dark.svg
@@ -0,0 +1,22 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6866)">
+<g clip-path="url(#clip0_10957_6866)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6866" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6866"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6866" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6866">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_ryde_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_ryde_dark.svg
new file mode 100644
index 00000000..2ee30946
--- /dev/null
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_ryde_dark.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6887)">
+<g clip-path="url(#clip0_10957_6887)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
+<rect width="12" height="12" transform="translate(10 10)" fill="#4BCD1F"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6887" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6887"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6887" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_6887">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_voi_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_voi_dark.svg
index 4cf69163..ae43a063 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_voi_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_minimized_voi_dark.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47408)">
-<g clip-path="url(#clip0_10647_47408)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#F36960"/>
+<g filter="url(#filter0_d_10957_6880)">
+<g clip-path="url(#clip0_10957_6880)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47408" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6880" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47408"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47408" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6880"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6880" result="shape"/>
 </filter>
-<clipPath id="clip0_10647_47408">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<clipPath id="clip0_10957_6880">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_selected_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_selected_dark.svg
index bb917bf1..57e69dee 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_selected_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_selected_dark.svg
@@ -1,15 +1,15 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5496)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#8F1011" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 17.455C34.8053 17.5824 35.0326 17.9095 35.0326 18.275V27.9002H40.5752C40.9175 27.9002 41.2284 28.0998 41.3708 28.4111C41.5133 28.7224 41.4611 29.0881 41.2374 29.3471L30.154 42.1802C29.9151 42.457 29.5294 42.5559 29.1867 42.4284C28.8441 42.301 28.6168 41.974 28.6168 41.6083V31.9832H23.0742C22.7319 31.9832 22.421 31.7836 22.2786 31.4723C22.1361 31.1611 22.1883 30.7953 22.412 30.5362L33.4954 17.7031C33.7343 17.4264 34.12 17.3275 34.4626 17.455Z" fill="white"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8F1011" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5824 35.0326 19.9095 35.0326 20.275V29.9002H40.5752C40.9175 29.9002 41.2284 30.0998 41.3708 30.4111C41.5133 30.7224 41.4611 31.0881 41.2374 31.3471L30.154 44.1802C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6083V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4723C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4264 34.12 19.3275 34.4626 19.455Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5496" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5496"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5496" result="shape"/>
 </filter>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_selected_dott_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_selected_dott_dark.svg
new file mode 100644
index 00000000..71de2f6b
--- /dev/null
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_selected_dott_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6874)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5824 35.0326 19.9095 35.0326 20.275V29.9002H40.5752C40.9175 29.9002 41.2284 30.0998 41.3708 30.4111C41.5133 30.7224 41.4611 31.0881 41.2374 31.3471L30.154 44.1802C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6083V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4723C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4264 34.12 19.3275 34.4626 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6874" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6874"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6874" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_selected_ryde_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_selected_ryde_dark.svg
new file mode 100644
index 00000000..087badaa
--- /dev/null
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_selected_ryde_dark.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_6891)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5824 35.0326 19.9095 35.0326 20.275V29.9002H40.5752C40.9175 29.9002 41.2284 30.0998 41.3708 30.4111C41.5133 30.7224 41.4611 31.0881 41.2374 31.3471L30.154 44.1802C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6083V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4723C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4264 34.12 19.3275 34.4626 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_6891" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6891"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6891" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_ebike_selected_voi_dark.svg b/sprite_assets/Troms/dark/vehiclepin_ebike_selected_voi_dark.svg
index 6c5301d3..6c440109 100644
--- a/sprite_assets/Troms/dark/vehiclepin_ebike_selected_voi_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_ebike_selected_voi_dark.svg
@@ -1,17 +1,17 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47437)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 17.455C34.8053 17.5824 35.0326 17.9095 35.0326 18.275V27.9002H40.5752C40.9175 27.9002 41.2284 28.0998 41.3708 28.4111C41.5133 28.7224 41.4611 29.0881 41.2374 29.3471L30.154 42.1802C29.9151 42.457 29.5294 42.5559 29.1867 42.4284C28.8441 42.301 28.6168 41.974 28.6168 41.6083V31.9832H23.0742C22.7319 31.9832 22.421 31.7836 22.2786 31.4723C22.1361 31.1611 22.1883 30.7953 22.412 30.5362L33.4954 17.7031C33.7343 17.4264 34.12 17.3275 34.4626 17.455Z" fill="black"/>
+<g filter="url(#filter0_d_10957_6884)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5824 35.0326 19.9095 35.0326 20.275V29.9002H40.5752C40.9175 29.9002 41.2284 30.0998 41.3708 30.4111C41.5133 30.7224 41.4611 31.0881 41.2374 31.3471L30.154 44.1802C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6083V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4723C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4264 34.12 19.3275 34.4626 19.455Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47437" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6884" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47437"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47437" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6884"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6884" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_loading_dark.svg b/sprite_assets/Troms/dark/vehiclepin_loading_dark.svg
index 9b13f4be..fdb69549 100644
--- a/sprite_assets/Troms/dark/vehiclepin_loading_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_loading_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46990)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#A9AEB1"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#A9AEB1"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M31.9991 20.331C32.6431 20.331 33.1681 20.856 33.1681 21.5V25C33.1681 25.644 32.6431 26.169 31.9991 26.169C31.3551 26.169 30.8301 25.644 30.8301 25V21.5C30.8301 20.856 31.3551 20.331 31.9991 20.331Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M31.9991 37.831C32.6431 37.831 33.1681 38.356 33.1681 39V42.5C33.1681 43.144 32.6431 43.669 31.9991 43.669C31.3551 43.669 30.8301 43.144 30.8301 42.5V39C30.8301 38.356 31.3551 37.831 31.9991 37.831Z" fill="black"/>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_active_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_active_dark.svg
index b93e7d4c..83f2d0de 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_active_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_active_dark.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_46984)">
 <g clip-path="url(#clip0_10646_46984)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#6B9956"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#6B9956"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
@@ -19,7 +19,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_46984" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_46984">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_cluster_generic_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_cluster_generic_dark.svg
index d6e25d2d..6e176e63 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_cluster_generic_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_cluster_generic_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5429)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#6B9956"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#6B9956"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.3359 28.165C16.8759 28.165 16.501 28.54 16.501 29C16.501 29.46 16.8759 29.835 17.3359 29.835C17.7959 29.835 18.166 29.46 18.166 29C18.166 28.54 17.7959 28.165 17.3359 28.165ZM14.8359 29C14.8359 27.62 15.9559 26.5 17.3359 26.5C18.7159 26.5 19.8359 27.62 19.8359 29C19.8359 30.38 18.7159 31.5 17.3359 31.5C15.9559 31.5 14.8359 30.38 14.8359 29Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M30.666 28.165C30.206 28.165 29.8359 28.54 29.8359 29C29.8359 29.46 30.206 29.835 30.666 29.835C31.126 29.835 31.501 29.46 31.501 29C31.501 28.54 31.126 28.165 30.666 28.165ZM28.166 29C28.166 27.62 29.286 26.5 30.666 26.5C32.046 26.5 33.166 27.62 33.166 29C33.166 30.38 32.046 31.5 30.666 31.5C29.286 31.5 28.166 30.38 28.166 29Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M25.6659 17.335C25.6659 16.875 26.0408 16.5 26.5008 16.5H27.3158C28.4408 16.5 29.4259 17.25 29.7259 18.33L31.4711 24.61C31.5411 24.86 31.4909 25.13 31.3309 25.335C31.1759 25.54 30.9259 25.665 30.6659 25.665C29.5759 25.665 28.6108 26.185 28.0008 27C27.5808 27.555 27.3358 28.25 27.3358 29C27.3358 29.46 26.9608 29.835 26.5008 29.835H19.0008C18.7808 29.835 18.566 29.75 18.411 29.59C18.256 29.435 18.166 29.22 18.166 29C18.166 28.54 17.7959 28.165 17.3359 28.165C16.8759 28.165 16.5208 27.815 16.5008 27.365C16.4808 26.92 16.821 26.535 17.266 26.5L26.911 25.695C27.606 24.91 28.5409 24.34 29.6009 24.11L28.121 18.775C28.021 18.415 27.6908 18.165 27.3158 18.165H26.5008C26.0408 18.165 25.6659 17.79 25.6659 17.33V17.335Z" fill="black"/>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_default_dott_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_default_dott_dark.svg
index 481a7a47..0159d961 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_default_dott_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_default_dott_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5325)">
-<g clip-path="url(#clip0_10646_5325)">
+<g filter="url(#filter0_d_10957_6858)">
+<g clip-path="url(#clip0_10957_6858)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#009DDB"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5325" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6858" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5325"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5325" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6858"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6858" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5325">
+<clipPath id="clip0_10957_6858">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_default_generic_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_default_generic_dark.svg
index 3e518598..44a0d79a 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_default_generic_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_default_generic_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5283)">
 <g clip-path="url(#clip0_10646_5283)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#6B9956"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.3359 28.165C16.8759 28.165 16.501 28.54 16.501 29C16.501 29.46 16.8759 29.835 17.3359 29.835C17.7959 29.835 18.166 29.46 18.166 29C18.166 28.54 17.7959 28.165 17.3359 28.165ZM14.8359 29C14.8359 27.62 15.9559 26.5 17.3359 26.5C18.7159 26.5 19.8359 27.62 19.8359 29C19.8359 30.38 18.7159 31.5 17.3359 31.5C15.9559 31.5 14.8359 30.38 14.8359 29Z" fill="black"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5283" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5283">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_default_ryde_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_default_ryde_dark.svg
index ac81c743..d9dfdf19 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_default_ryde_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_default_ryde_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5297)">
-<g clip-path="url(#clip0_10646_5297)">
+<g filter="url(#filter0_d_10957_6856)">
+<g clip-path="url(#clip0_10957_6856)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#4BCD1F"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5297" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6856" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5297"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5297" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6856"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6856" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5297">
+<clipPath id="clip0_10957_6856">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_default_voi_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_default_voi_dark.svg
index 1169ff26..7aca0e3e 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_default_voi_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_default_voi_dark.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5311)">
-<g clip-path="url(#clip0_10646_5311)">
+<g filter="url(#filter0_d_10957_6872)">
+<g clip-path="url(#clip0_10957_6872)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#F36960"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5311" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6872" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5311"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5311" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6872"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6872" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5311">
+<clipPath id="clip0_10957_6872">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_dott_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_dott_dark.svg
index f39e198e..f63684a7 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_dott_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_dott_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5269)">
-<g clip-path="url(#clip0_10646_5269)">
+<g filter="url(#filter0_d_10957_6854)">
+<g clip-path="url(#clip0_10957_6854)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5269" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6854" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5269"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5269" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6854"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6854" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5269">
+<clipPath id="clip0_10957_6854">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_ryde_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_ryde_dark.svg
index a25c2664..3ea6d2ed 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_ryde_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_ryde_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5241)">
-<g clip-path="url(#clip0_10646_5241)">
+<g filter="url(#filter0_d_10957_6852)">
+<g clip-path="url(#clip0_10957_6852)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#4BCD1F"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5241" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6852" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5241"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5241" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6852"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6852" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5241">
+<clipPath id="clip0_10957_6852">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_voi_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_voi_dark.svg
index bb4b7739..8ff6211e 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_voi_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_minimized_voi_dark.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5255)">
-<g clip-path="url(#clip0_10646_5255)">
+<g filter="url(#filter0_d_10957_6868)">
+<g clip-path="url(#clip0_10957_6868)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="black" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5255" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6868" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5255"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5255" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6868"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6868" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5255">
+<clipPath id="clip0_10957_6868">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_selected_dott_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_selected_dott_dark.svg
index aa0e441f..b4d33b83 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_selected_dott_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_selected_dott_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5405)">
+<g filter="url(#filter0_d_10957_6863)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5405" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6863" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5405"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5405" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6863"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6863" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_selected_generic_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_selected_generic_dark.svg
index 349625f0..8fa24f11 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_selected_generic_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_selected_generic_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5342)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#6B9956" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#6B9956" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_selected_ryde_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_selected_ryde_dark.svg
index b4b05c67..8621f265 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_selected_ryde_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_selected_ryde_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5363)">
+<g filter="url(#filter0_d_10957_6860)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5363" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6860" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5363"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5363" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6860"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6860" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_scooter_selected_voi_dark.svg b/sprite_assets/Troms/dark/vehiclepin_scooter_selected_voi_dark.svg
index 4ece00b1..988ce14c 100644
--- a/sprite_assets/Troms/dark/vehiclepin_scooter_selected_voi_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_scooter_selected_voi_dark.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5384)">
+<g filter="url(#filter0_d_10957_6877)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5384" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_6877" x="0" y="0" width="64" height="69.0001" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5384"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5384" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_6877"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_6877" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_sharedcar_cluster_dark.svg b/sprite_assets/Troms/dark/vehiclepin_sharedcar_cluster_dark.svg
index 0d48635c..dd18e530 100644
--- a/sprite_assets/Troms/dark/vehiclepin_sharedcar_cluster_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_sharedcar_cluster_dark.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5100)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#8E2864"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#8E2864"/>
 <path d="M19.834 30.355C20.984 30.355 21.9141 29.42 21.9141 28.27C21.9141 27.12 20.984 26.185 19.834 26.185C18.684 26.185 17.749 27.12 17.749 28.27C17.749 29.42 18.684 30.355 19.834 30.355Z" fill="white"/>
 <path d="M28.1641 30.355C29.3141 30.355 30.249 29.42 30.249 28.27C30.249 27.12 29.3141 26.185 28.1641 26.185C27.0141 26.185 26.084 27.12 26.084 28.27C26.084 29.42 27.0141 30.355 28.1641 30.355Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15.0391 22.435C15.0391 22.09 15.3191 21.81 15.6641 21.81H28.999C29.344 21.81 29.624 22.09 29.624 22.435C29.624 22.78 29.344 23.06 28.999 23.06H15.6641C15.3191 23.06 15.0391 22.78 15.0391 22.435Z" fill="white"/>
diff --git a/sprite_assets/Troms/dark/vehiclepin_sharedcar_default_dark.svg b/sprite_assets/Troms/dark/vehiclepin_sharedcar_default_dark.svg
index 792c4812..473ffd53 100644
--- a/sprite_assets/Troms/dark/vehiclepin_sharedcar_default_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_sharedcar_default_dark.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5059)">
 <g clip-path="url(#clip0_10646_5059)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="black"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="black"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#8E2864"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="black" stroke-width="2"/>
 <path d="M19.834 30.355C20.984 30.355 21.9141 29.42 21.9141 28.27C21.9141 27.12 20.984 26.185 19.834 26.185C18.684 26.185 17.749 27.12 17.749 28.27C17.749 29.42 18.684 30.355 19.834 30.355Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5059" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5059">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/dark/vehiclepin_sharedcar_selected_dark.svg b/sprite_assets/Troms/dark/vehiclepin_sharedcar_selected_dark.svg
index 53e851e6..7240df2c 100644
--- a/sprite_assets/Troms/dark/vehiclepin_sharedcar_selected_dark.svg
+++ b/sprite_assets/Troms/dark/vehiclepin_sharedcar_selected_dark.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5076)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8E2864" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8E2864" stroke="black" stroke-width="2" stroke-linejoin="round"/>
 <path d="M26.1699 40.897C27.7799 40.897 29.082 39.588 29.082 37.978C29.082 36.368 27.7799 35.059 26.1699 35.059C24.5599 35.059 23.251 36.368 23.251 37.978C23.251 39.588 24.5599 40.897 26.1699 40.897Z" fill="white"/>
 <path d="M37.832 40.897C39.442 40.897 40.751 39.588 40.751 37.978C40.751 36.368 39.442 35.059 37.832 35.059C36.222 35.059 34.9199 36.368 34.9199 37.978C34.9199 39.588 36.222 40.897 37.832 40.897Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.457 29.809C19.457 29.326 19.849 28.934 20.332 28.934H39.001C39.484 28.934 39.876 29.326 39.876 29.809C39.876 30.292 39.484 30.684 39.001 30.684H20.332C19.849 30.684 19.457 30.292 19.457 29.809Z" fill="white"/>
diff --git a/sprite_assets/Troms/light/geofencingzone_parking_light.svg b/sprite_assets/Troms/light/geofencingzone_parking_light.svg
index 6fc33051..758ceeee 100644
--- a/sprite_assets/Troms/light/geofencingzone_parking_light.svg
+++ b/sprite_assets/Troms/light/geofencingzone_parking_light.svg
@@ -1,17 +1,4 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10043_6326)">
-<path d="M8 12C8 9.79086 9.79086 8 12 8H32C34.2091 8 36 9.79086 36 12V32C36 34.2091 34.2091 36 32 36H12C9.79086 36 8 34.2091 8 32V12Z" fill="#0020C2"/>
-<path d="M18 22.9999V15.9999H22.6667C24.5997 15.9999 26.1667 17.5669 26.1667 19.4999C26.1667 21.433 24.5997 22.9999 22.6667 22.9999H18ZM18 22.9999V28.8332" stroke="white" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<filter id="filter0_d_10043_6326" x="0" y="0" width="44" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10043_6326"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10043_6326" result="shape"/>
-</filter>
-</defs>
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H24C26.2091 0 28 1.79086 28 4V24C28 26.2091 26.2091 28 24 28H4C1.79086 28 0 26.2091 0 24V4Z" fill="#0020C2"/>
+<path d="M10.7051 21.4167C10.2221 21.4167 9.12695 21.1868 9.12695 20.7038V8.29169C9.12695 7.80869 9.51895 7.41669 10.002 7.41669H14.6641C17.0791 7.41669 19.0391 9.37669 19.0391 11.7917C19.0391 14.2067 17.0791 16.2038 14.6641 16.2038H12.2177V20.7038C12.2177 21.1868 11.1881 21.4167 10.7051 21.4167ZM12.2177 13.2038H13.7177C15.1667 13.2038 16.2177 13.1528 16.2177 11.7038C16.2177 10.3055 15.1667 10.2038 13.7177 10.2038H12.2177V13.2038Z" fill="white"/>
 </svg>
diff --git a/sprite_assets/Troms/light/stationpin_citybike_parking_default_light.svg b/sprite_assets/Troms/light/stationpin_citybike_parking_default_light.svg
index 555c7af7..4e3ecb5d 100644
--- a/sprite_assets/Troms/light/stationpin_citybike_parking_default_light.svg
+++ b/sprite_assets/Troms/light/stationpin_citybike_parking_default_light.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_7925)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="white"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="white" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#8F1011"/>
-<path d="M30.251 32.54H17.751C16.486 32.54 15.4609 31.51 15.4609 30.25V17.75C15.4609 16.485 16.486 15.46 17.751 15.46H30.251C31.516 15.46 32.541 16.49 32.541 17.75V30.25C32.541 31.515 31.516 32.54 30.251 32.54ZM17.751 16.71C17.176 16.71 16.7109 17.175 16.7109 17.75V30.25C16.7109 30.825 17.176 31.29 17.751 31.29H30.251C30.826 31.29 31.291 30.825 31.291 30.25V17.75C31.291 17.175 30.826 16.71 30.251 16.71H17.751Z" fill="white"/>
-<path d="M21.0859 29.21C20.7409 29.21 20.4609 28.93 20.4609 28.585V19.42C20.4609 19.075 20.7409 18.795 21.0859 18.795H24.416C26.141 18.795 27.541 20.195 27.541 21.92C27.541 23.645 26.141 25.045 24.416 25.045H21.7109V28.585C21.7109 28.93 21.4309 29.21 21.0859 29.21ZM21.7109 23.79H24.416C25.451 23.79 26.291 22.95 26.291 21.915C26.291 20.88 25.451 20.04 24.416 20.04H21.7109V23.79Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0020C2"/>
+<path d="M20.7051 31.4167C20.2221 31.4167 19.127 31.1868 19.127 30.7038V18.2917C19.127 17.8087 19.519 17.4167 20.002 17.4167H24.6641C27.0791 17.4167 29.0391 19.3767 29.0391 21.7917C29.0391 24.2067 27.0791 26.2038 24.6641 26.2038H22.2177V30.7038C22.2177 31.1868 21.1881 31.4167 20.7051 31.4167ZM22.2177 23.2038H23.7177C25.1667 23.2038 26.2177 23.1528 26.2177 21.7038C26.2177 20.3055 25.1667 20.2038 23.7177 20.2038H22.2177V23.2038Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7925" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/light/stationpin_citybike_parking_minimized_light.svg b/sprite_assets/Troms/light/stationpin_citybike_parking_minimized_light.svg
index f88d3dee..5080ad58 100644
--- a/sprite_assets/Troms/light/stationpin_citybike_parking_minimized_light.svg
+++ b/sprite_assets/Troms/light/stationpin_citybike_parking_minimized_light.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_7962)">
 <g clip-path="url(#clip0_8318_7962)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#8F1011"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0020C2"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="white" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/Troms/light/stationpin_citybike_parking_selected_light.svg b/sprite_assets/Troms/light/stationpin_citybike_parking_selected_light.svg
index 803c0011..3345a37c 100644
--- a/sprite_assets/Troms/light/stationpin_citybike_parking_selected_light.svg
+++ b/sprite_assets/Troms/light/stationpin_citybike_parking_selected_light.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7941)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#8F1011"/>
-<path d="M38.749 41.956H21.249C19.478 41.956 18.043 40.514 18.043 38.75V21.25C18.043 19.479 19.478 18.044 21.249 18.044H38.749C40.52 18.044 41.9551 19.486 41.9551 21.25V38.75C41.9551 40.521 40.52 41.956 38.749 41.956ZM21.249 19.794C20.444 19.794 19.793 20.445 19.793 21.25V38.75C19.793 39.555 20.444 40.206 21.249 40.206H38.749C39.554 40.206 40.2051 39.555 40.2051 38.75V21.25C40.2051 20.445 39.554 19.794 38.749 19.794H21.249Z" fill="white"/>
-<path d="M25.918 37.2939C25.435 37.2939 25.043 36.902 25.043 36.4189V23.588C25.043 23.105 25.435 22.713 25.918 22.713H30.5801C32.9951 22.713 34.9551 24.673 34.9551 27.088C34.9551 29.503 32.9951 31.463 30.5801 31.463H26.793V36.4189C26.793 36.902 26.401 37.2939 25.918 37.2939ZM26.793 29.706H30.5801C32.0291 29.706 33.2051 28.53 33.2051 27.081C33.2051 25.632 32.0291 24.456 30.5801 24.456H26.793V29.706Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0020C2"/>
+<path d="M25.0084 40.3096C24.3184 40.3096 22.7539 39.9812 22.7539 39.2912V21.5596C22.7539 20.8696 23.3139 20.3096 24.0039 20.3096H30.6641C34.1141 20.3096 36.9141 23.1096 36.9141 26.5596C36.9141 30.0096 34.1141 32.8626 30.6641 32.8626H27.1693V39.2912C27.1693 39.9812 25.6984 40.3096 25.0084 40.3096ZM27.1693 28.5769H29.3122C31.3822 28.5769 32.8836 28.504 32.8836 26.434C32.8836 24.4364 31.3822 24.2912 29.3122 24.2912H27.1693V28.5769Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7941" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/light/stationpin_sharedcar_parking_default_light.svg b/sprite_assets/Troms/light/stationpin_sharedcar_parking_default_light.svg
index 98bf9968..39b803ab 100644
--- a/sprite_assets/Troms/light/stationpin_sharedcar_parking_default_light.svg
+++ b/sprite_assets/Troms/light/stationpin_sharedcar_parking_default_light.svg
@@ -2,9 +2,8 @@
 <g filter="url(#filter0_d_8318_7931)">
 <path d="M8 12C8 9.79086 9.79086 8 12 8H64C66.2091 8 68 9.79086 68 12V36C68 38.2091 66.2091 40 64 40H12C9.79086 40 8 38.2091 8 36V12Z" fill="white"/>
 <path d="M12 9H64C65.6569 9 67 10.3431 67 12V36C67 37.6569 65.6569 39 64 39H12C10.3431 39 9 37.6569 9 36V12C9 10.3431 10.3431 9 12 9Z" stroke="white" stroke-width="2"/>
-<rect x="10" y="10" width="28" height="28" rx="2" fill="#8E2864"/>
-<path d="M30.251 32.54H17.751C16.486 32.54 15.4609 31.51 15.4609 30.25V17.75C15.4609 16.485 16.486 15.46 17.751 15.46H30.251C31.516 15.46 32.541 16.49 32.541 17.75V30.25C32.541 31.515 31.516 32.54 30.251 32.54ZM17.751 16.71C17.176 16.71 16.7109 17.175 16.7109 17.75V30.25C16.7109 30.825 17.176 31.29 17.751 31.29H30.251C30.826 31.29 31.291 30.825 31.291 30.25V17.75C31.291 17.175 30.826 16.71 30.251 16.71H17.751Z" fill="white"/>
-<path d="M21.0859 29.21C20.7409 29.21 20.4609 28.93 20.4609 28.585V19.42C20.4609 19.075 20.7409 18.795 21.0859 18.795H24.416C26.141 18.795 27.541 20.195 27.541 21.92C27.541 23.645 26.141 25.045 24.416 25.045H21.7109V28.585C21.7109 28.93 21.4309 29.21 21.0859 29.21ZM21.7109 23.79H24.416C25.451 23.79 26.291 22.95 26.291 21.915C26.291 20.88 25.451 20.04 24.416 20.04H21.7109V23.79Z" fill="white"/>
+<path d="M10 14C10 11.7909 11.7909 10 14 10H34C36.2091 10 38 11.7909 38 14V34C38 36.2091 36.2091 38 34 38H14C11.7909 38 10 36.2091 10 34V14Z" fill="#0020C2"/>
+<path d="M20.7051 31.4167C20.2221 31.4167 19.127 31.1868 19.127 30.7038V18.2917C19.127 17.8087 19.519 17.4167 20.002 17.4167H24.6641C27.0791 17.4167 29.0391 19.3767 29.0391 21.7917C29.0391 24.2067 27.0791 26.2038 24.6641 26.2038H22.2177V30.7038C22.2177 31.1868 21.1881 31.4167 20.7051 31.4167ZM22.2177 23.2038H23.7177C25.1667 23.2038 26.2177 23.1528 26.2177 21.7038C26.2177 20.3055 25.1667 20.2038 23.7177 20.2038H22.2177V23.2038Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7931" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/light/stationpin_sharedcar_parking_minimized_light.svg b/sprite_assets/Troms/light/stationpin_sharedcar_parking_minimized_light.svg
index 15bbe6bc..e84a97de 100644
--- a/sprite_assets/Troms/light/stationpin_sharedcar_parking_minimized_light.svg
+++ b/sprite_assets/Troms/light/stationpin_sharedcar_parking_minimized_light.svg
@@ -1,7 +1,7 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_8318_7964)">
 <g clip-path="url(#clip0_8318_7964)">
-<rect x="10" y="10" width="12" height="12" rx="2" fill="#8E2864"/>
+<rect x="10" y="10" width="12" height="12" rx="2" fill="#0020C2"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="3" stroke="white" stroke-width="2"/>
 </g>
diff --git a/sprite_assets/Troms/light/stationpin_sharedcar_parking_selected_light.svg b/sprite_assets/Troms/light/stationpin_sharedcar_parking_selected_light.svg
index 4b53a561..a90a0a49 100644
--- a/sprite_assets/Troms/light/stationpin_sharedcar_parking_selected_light.svg
+++ b/sprite_assets/Troms/light/stationpin_sharedcar_parking_selected_light.svg
@@ -5,9 +5,8 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V44C8 48.4183 11.5817 52 16 52H40.0486C43.0393 52 45.9778 53.0638 48.0226 55.2462C48.2503 55.4893 48.4744 55.7343 48.6944 55.9815C49.879 57.312 52.1727 57.3473 53.384 56.0382C53.6458 55.7553 53.9126 55.4746 54.184 55.1957C56.2608 53.0621 59.1772 52 62.1547 52H86C90.4183 52 94 48.4183 94 44V16C94 11.5817 90.4183 8 86 8H16Z" fill="white"/>
 <path d="M48.6944 55.9815L47.2005 57.3112L47.2006 57.3114L48.6944 55.9815ZM53.384 56.0382L54.852 57.3965L54.8521 57.3964L53.384 56.0382ZM54.184 55.1957L52.7509 53.8008L54.184 55.1957ZM48.0226 55.2462L49.4821 53.8788L48.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 44H10V16H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM40.0486 52V50H16V52V54H40.0486V52ZM48.0226 55.2462L46.5631 56.6137C46.7799 56.8451 46.9925 57.0776 47.2005 57.3112L48.6944 55.9815L50.1883 54.6517C49.9563 54.3911 49.7207 54.1335 49.4821 53.8788L48.0226 55.2462ZM48.6944 55.9815L47.2006 57.3114C49.1611 59.5134 52.8291 59.5827 54.852 57.3965L53.384 56.0382L51.916 54.6799C51.5164 55.1118 50.597 55.1107 50.1882 54.6515L48.6944 55.9815ZM53.384 56.0382L54.8521 57.3964C55.1015 57.1269 55.3567 56.8584 55.6172 56.5907L54.184 55.1957L52.7509 53.8008C52.4686 54.0907 52.19 54.3837 51.916 54.68L53.384 56.0382ZM86 52V50H62.1547V52V54H86V52ZM94 44H92C92 47.3137 89.3137 50 86 50V52V54C91.5229 54 96 49.5228 96 44H94ZM94 16H92V44H94H96V16H94ZM86 8V10C89.3137 10 92 12.6863 92 16H94H96C96 10.4772 91.5229 6 86 6V8ZM16 8V10H86V8V6H16V8ZM54.184 55.1957L55.6172 56.5907C57.2654 54.8974 59.6375 54 62.1547 54V52V50C58.717 50 55.2562 51.2268 52.7509 53.8008L54.184 55.1957ZM40.0486 52V54C42.5852 54 44.9591 54.9017 46.5631 56.6137L48.0226 55.2462L49.4821 53.8788C46.9964 51.2258 43.4933 50 40.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_7955)"/>
-<rect x="10" y="10" width="40" height="40" rx="6" fill="#8E2864"/>
-<path d="M38.749 41.956H21.249C19.478 41.956 18.043 40.514 18.043 38.75V21.25C18.043 19.479 19.478 18.044 21.249 18.044H38.749C40.52 18.044 41.9551 19.486 41.9551 21.25V38.75C41.9551 40.521 40.52 41.956 38.749 41.956ZM21.249 19.794C20.444 19.794 19.793 20.445 19.793 21.25V38.75C19.793 39.555 20.444 40.206 21.249 40.206H38.749C39.554 40.206 40.2051 39.555 40.2051 38.75V21.25C40.2051 20.445 39.554 19.794 38.749 19.794H21.249Z" fill="white"/>
-<path d="M25.918 37.2939C25.435 37.2939 25.043 36.902 25.043 36.4189V23.588C25.043 23.105 25.435 22.713 25.918 22.713H30.5801C32.9951 22.713 34.9551 24.673 34.9551 27.088C34.9551 29.503 32.9951 31.463 30.5801 31.463H26.793V36.4189C26.793 36.902 26.401 37.2939 25.918 37.2939ZM26.793 29.706H30.5801C32.0291 29.706 33.2051 28.53 33.2051 27.081C33.2051 25.632 32.0291 24.456 30.5801 24.456H26.793V29.706Z" fill="white"/>
+<path d="M10 15.7143C10 12.5584 12.5584 10 15.7143 10H44.2857C47.4416 10 50 12.5584 50 15.7143V44.2857C50 47.4416 47.4416 50 44.2857 50H15.7143C12.5584 50 10 47.4416 10 44.2857V15.7143Z" fill="#0020C2"/>
+<path d="M25.0084 40.3096C24.3184 40.3096 22.7539 39.9812 22.7539 39.2912V21.5596C22.7539 20.8696 23.3139 20.3096 24.0039 20.3096H30.6641C34.1141 20.3096 36.9141 23.1096 36.9141 26.5596C36.9141 30.0096 34.1141 32.8626 30.6641 32.8626H27.1693V39.2912C27.1693 39.9812 25.6984 40.3096 25.0084 40.3096ZM27.1693 28.5769H29.3122C31.3822 28.5769 32.8836 28.504 32.8836 26.434C32.8836 24.4364 31.3822 24.2912 29.3122 24.2912H27.1693V28.5769Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_7955" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/light/stoppin_busandtram_selected_light.svg b/sprite_assets/Troms/light/stoppin_busandtram_selected_light.svg
index 23540618..56a1c3e2 100644
--- a/sprite_assets/Troms/light/stoppin_busandtram_selected_light.svg
+++ b/sprite_assets/Troms/light/stoppin_busandtram_selected_light.svg
@@ -10,9 +10,9 @@
 <path d="M26.5004 36.65C26.5004 38.1964 25.2468 39.45 23.7004 39.45C22.154 39.45 20.9004 38.1964 20.9004 36.65C20.9004 35.1036 22.154 33.85 23.7004 33.85C25.2468 33.85 26.5004 35.1036 26.5004 36.65Z" fill="white"/>
 <path d="M39.8004 36.65C39.8004 38.1964 38.5468 39.45 37.0004 39.45C35.454 39.45 34.2004 38.1964 34.2004 36.65C34.2004 35.1036 35.454 33.85 37.0004 33.85C38.5468 33.85 39.8004 35.1036 39.8004 36.65Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#334DCE"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4418 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4418 84.7754 38.925C84.7754 39.4083 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4083 59.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7535 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.8251 83.2051 36.8251C76.3616 36.8251 63.3834 36.8251 61.5004 36.8251C60.3406 36.8251 59.4004 35.8849 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.9251C59.9254 38.4418 60.3171 38.0501 60.8004 38.0501H83.9004C84.3836 38.0501 84.7754 38.4418 84.7754 38.9251C84.7754 39.4083 84.3836 39.8001 83.9004 39.8001H60.8004C60.3171 39.8001 59.9254 39.4083 59.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7536 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8068" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/light/stoppin_metroandtram_selected_light.svg b/sprite_assets/Troms/light/stoppin_metroandtram_selected_light.svg
index 7696fff4..4ad789c4 100644
--- a/sprite_assets/Troms/light/stoppin_metroandtram_selected_light.svg
+++ b/sprite_assets/Troms/light/stoppin_metroandtram_selected_light.svg
@@ -9,9 +9,9 @@
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.4049 36.5172C24.8599 36.9722 24.8599 37.7142 24.4049 38.1692L21.4928 41.0882C21.0308 41.5432 20.2962 41.5432 19.8412 41.0882C19.3863 40.6332 19.3863 39.8912 19.8412 39.4362L22.7534 36.5172C23.2154 36.0622 23.9499 36.0622 24.4049 36.5172ZM35.5912 36.5172C36.0462 36.0622 36.7808 36.0622 37.2428 36.5172L40.1549 39.4362C40.6099 39.8912 40.6099 40.6332 40.1549 41.0882C39.6999 41.5432 38.9654 41.5432 38.5034 41.0882L35.5912 38.1692C35.1362 37.7142 35.1362 36.9722 35.5912 36.5172Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M21.1986 22.972C21.6676 20.158 24.1041 18.1 26.9531 18.1H33.0426C35.8986 18.1 38.3281 20.158 38.7971 22.972L40.3365 32.212C40.8475 35.25 38.881 38.246 35.71 38.673C33.995 38.904 31.9579 39.1 29.9979 39.1C28.0379 39.1 26.0077 38.904 24.2857 38.673C21.1217 38.246 19.1552 35.25 19.6592 32.212L21.1986 22.972ZM26.9531 20.431C25.2451 20.431 23.7817 21.67 23.5017 23.357L23.0751 25.919C24.0201 26.927 25.2587 27.585 26.5047 28.005C27.8977 28.467 29.2279 28.6 29.9979 28.6C30.7679 28.6 32.098 28.467 33.491 28.005C34.737 27.592 35.9761 26.927 36.9281 25.919L36.5009 23.357C36.2139 21.67 34.7576 20.431 33.0426 20.431H26.9531ZM26.4979 32.093C25.8539 32.093 25.3289 32.618 25.3289 33.262C25.3289 33.906 25.8539 34.431 26.4979 34.431C27.1489 34.431 27.6668 33.906 27.6668 33.262C27.6668 32.618 27.1489 32.093 26.4979 32.093ZM33.4842 32.093C32.8402 32.093 32.3221 32.618 32.3221 33.262C32.3221 33.906 32.8402 34.431 33.4842 34.431H33.4979C34.1419 34.431 34.6668 33.906 34.6668 33.262C34.6668 32.618 34.1419 32.093 33.4979 32.093H33.4842Z" fill="white"/>
 <rect x="52" y="10" width="40" height="40" rx="6" fill="#334DCE"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.825 83.2051 36.825C76.3616 36.825 63.3834 36.825 61.5004 36.825C60.3406 36.825 59.4004 35.8848 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.925C59.9254 38.4418 60.3171 38.05 60.8004 38.05L83.9004 38.05C84.3836 38.05 84.7754 38.4418 84.7754 38.925C84.7754 39.4083 84.3836 39.8 83.9004 39.8L60.8004 39.8C60.3171 39.8 59.9254 39.4083 59.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7535 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4004 26.325C59.4004 25.1652 60.3406 24.225 61.5004 24.225H79.0004C82.4798 24.225 85.3004 27.0456 85.3004 30.525V34.725C85.3004 35.8848 84.3649 36.8251 83.2051 36.8251C76.3616 36.8251 63.3834 36.8251 61.5004 36.8251C60.3406 36.8251 59.4004 35.8849 59.4004 34.725V26.325ZM61.5004 27.025C61.5004 26.6385 61.8138 26.325 62.2004 26.325H64.2974C64.684 26.325 64.9974 26.6385 64.9974 27.025V30.525C64.9974 30.9116 64.684 31.225 64.2974 31.225H62.2004C61.8504 31.225 61.5004 30.875 61.5004 30.525V27.025ZM67.108 26.325C66.7214 26.325 66.408 26.6385 66.408 27.025L66.4004 30.525C66.4004 30.875 66.7504 31.225 67.1004 31.225H69.908C70.2946 31.225 70.608 30.9116 70.608 30.525V27.025C70.608 26.6385 70.2946 26.325 69.908 26.325H67.108ZM72.0185 27.025C72.0185 26.6385 72.3319 26.325 72.7185 26.325H75.5185C75.9051 26.325 76.2185 26.6385 76.2185 27.025V30.525C76.2185 30.9116 75.9051 31.225 75.5185 31.225H73.4185C72.6453 31.225 72.0004 31.2983 72.0004 30.525L72.0185 27.025ZM78.329 26.325C77.9424 26.325 77.629 26.6385 77.629 27.025V30.525C77.629 30.9116 77.9424 31.225 78.329 31.225H82.529C82.9156 31.225 83.229 30.9116 83.229 30.525C83.229 28.2054 81.3486 26.325 79.029 26.325H78.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M59.9254 38.9251C59.9254 38.4418 60.3171 38.0501 60.8004 38.0501H83.9004C84.3836 38.0501 84.7754 38.4418 84.7754 38.9251C84.7754 39.4083 84.3836 39.8001 83.9004 39.8001H60.8004C60.3171 39.8001 59.9254 39.4083 59.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.3254 21.425C68.3254 20.9418 68.7171 20.55 69.2004 20.55H74.8004C75.1459 20.55 75.4591 20.7534 75.5997 21.0691C75.7403 21.3847 75.6819 21.7536 75.4508 22.0104L72.3008 25.5104C71.9775 25.8696 71.4242 25.8987 71.065 25.5754C70.7058 25.2522 70.6767 24.6989 71 24.3397L72.8357 22.3H69.2004C68.7171 22.3 68.3254 21.9083 68.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8074" x="0" y="0" width="102" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/light/stoppin_plane_selected_light.svg b/sprite_assets/Troms/light/stoppin_plane_selected_light.svg
index bce70f7b..48d77cd5 100644
--- a/sprite_assets/Troms/light/stoppin_plane_selected_light.svg
+++ b/sprite_assets/Troms/light/stoppin_plane_selected_light.svg
@@ -5,7 +5,7 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#37424A"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_8036)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3314 20.9388C34.2032 18.3187 38.0168 17.7875 40.4542 19.2497C40.5774 19.3236 40.6805 19.4266 40.7544 19.5498C42.2345 22.016 41.5829 25.2983 39.3829 27.1595L37.672 28.607L39.2626 34.6503C39.5543 35.7584 39.2353 36.938 38.4251 37.7481L36.889 39.2838C36.7021 39.4706 36.4409 39.563 36.1782 39.5351C35.9154 39.5074 35.6793 39.3622 35.5358 39.1404L31.5603 32.9977L29.3041 35.2535L29.6725 38.5684C29.7018 38.8326 29.6095 39.0959 29.4214 39.2838L27.762 40.9429C27.5631 41.1417 27.2808 41.2328 27.0032 41.1878C26.7256 41.1428 26.4866 40.9671 26.3607 40.7156L24.002 35.9991L19.2845 33.6408C19.0329 33.515 18.8571 33.276 18.8121 32.9983C18.767 32.7206 18.8582 32.4382 19.0571 32.2394L20.7166 30.5802C20.9045 30.3923 21.1677 30.3 21.4319 30.3294L24.7477 30.6977L27.0037 28.4422L20.86 24.4677C20.6381 24.3241 20.493 24.088 20.4651 23.8252C20.4373 23.5624 20.5297 23.3011 20.7166 23.1142L22.2526 21.5785C23.0629 20.7684 24.2425 20.4496 25.3506 20.7411L31.3457 22.3185L32.3314 20.9388Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.3314 20.9388C34.2032 18.3187 38.0168 17.7875 40.4542 19.2497C40.5774 19.3236 40.6805 19.4266 40.7544 19.5498C42.2345 22.016 41.5829 25.2983 39.3829 27.1595L37.672 28.607L39.2626 34.6503C39.5543 35.7584 39.2353 36.938 38.4251 37.7481L36.889 39.2838C36.7021 39.4706 36.4409 39.563 36.1782 39.5351C35.9154 39.5074 35.6793 39.3622 35.5358 39.1404L31.5603 32.9977L29.3041 35.2535L29.6725 38.5684C29.7018 38.8326 29.6095 39.0959 29.4214 39.2838L27.762 40.9429C27.5631 41.1417 27.2808 41.2329 27.0032 41.1878C26.7256 41.1428 26.4866 40.9671 26.3607 40.7156L24.002 35.9991L19.2845 33.6408C19.0329 33.515 18.8571 33.276 18.8121 32.9983C18.767 32.7206 18.8582 32.4382 19.0571 32.2394L20.7166 30.5803C20.9045 30.3923 21.1677 30.3 21.4319 30.3294L24.7477 30.6977L27.0037 28.4422L20.86 24.4677C20.6381 24.3241 20.493 24.088 20.4651 23.8252C20.4373 23.5624 20.5297 23.3011 20.7166 23.1142L22.2526 21.5785C23.0629 20.7684 24.2425 20.4496 25.3506 20.7411L31.3457 22.3185L32.3314 20.9388Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8036" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/light/stoppin_tram_selected_light.svg b/sprite_assets/Troms/light/stoppin_tram_selected_light.svg
index 7d8ab3cb..1698d72f 100644
--- a/sprite_assets/Troms/light/stoppin_tram_selected_light.svg
+++ b/sprite_assets/Troms/light/stoppin_tram_selected_light.svg
@@ -5,9 +5,9 @@
 </mask>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M16 8C11.5817 8 8 11.5817 8 16V29.7577V44C8 48.4183 11.5817 52 16 52H19.0486C22.0393 52 24.9778 53.0638 27.0226 55.2462C27.2503 55.4893 27.4744 55.7343 27.6944 55.9815C28.879 57.312 31.1727 57.3473 32.384 56.0382C32.6457 55.7553 32.9126 55.4746 33.184 55.1957C35.2608 53.0621 38.1772 52 41.1547 52H44C48.4183 52 52 48.4183 52 44V29.7577V16C52 11.5817 48.4183 8 44 8H16Z" fill="#334DCE"/>
 <path d="M27.6944 55.9815L26.2005 57.3112L26.2006 57.3114L27.6944 55.9815ZM32.384 56.0382L33.852 57.3965L33.8521 57.3964L32.384 56.0382ZM27.0226 55.2462L25.5631 56.6137L27.0226 55.2462ZM8 16H10C10 12.6863 12.6863 10 16 10V8V6C10.4772 6 6 10.4772 6 16H8ZM8 29.7577H10V16H8H6V29.7577H8ZM8 44H10V29.7577H8H6V44H8ZM16 52V50C12.6863 50 10 47.3137 10 44H8H6C6 49.5228 10.4772 54 16 54V52ZM19.0486 52V50H16V52V54H19.0486V52ZM27.0226 55.2462L25.5631 56.6137C25.7799 56.8451 25.9925 57.0776 26.2005 57.3112L27.6944 55.9815L29.1883 54.6517C28.9563 54.3911 28.7207 54.1335 28.4821 53.8788L27.0226 55.2462ZM27.6944 55.9815L26.2006 57.3114C28.1611 59.5134 31.8291 59.5827 33.852 57.3965L32.384 56.0382L30.916 54.6799C30.5164 55.1118 29.597 55.1107 29.1882 54.6516L27.6944 55.9815ZM32.384 56.0382L33.8521 57.3964C34.1015 57.1269 34.3567 56.8584 34.6172 56.5907L33.184 55.1957L31.7509 53.8008C31.4686 54.0907 31.19 54.3837 30.9159 54.68L32.384 56.0382ZM44 52V50H41.1547V52V54H44V52ZM52 44H50C50 47.3137 47.3137 50 44 50V52V54C49.5228 54 54 49.5228 54 44H52ZM52 29.7577H50V44H52H54V29.7577H52ZM52 16H50V29.7577H52H54V16H52ZM44 8V10C47.3137 10 50 12.6863 50 16H52H54C54 10.4772 49.5228 6 44 6V8ZM16 8V10H44V8V6H16V8ZM33.184 55.1957L34.6172 56.5907C36.2654 54.8974 38.6375 54 41.1547 54V52V50C37.717 50 34.2562 51.2268 31.7509 53.8008L33.184 55.1957ZM19.0486 52V54C21.5852 54 23.9591 54.9017 25.5631 56.6137L27.0226 55.2462L28.4821 53.8788C25.9964 51.2258 22.4933 50 19.0486 50V52Z" fill="white" mask="url(#path-1-inside-1_8318_8011)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.825 41.2051 36.825C34.3616 36.825 21.3834 36.825 19.5004 36.825C18.3406 36.825 17.4004 35.8848 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6385 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6385 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6385 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6385 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6385 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6385 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2983 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6385 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.925C17.9254 38.4418 18.3171 38.05 18.8004 38.05L41.9004 38.05C42.3836 38.05 42.7754 38.4418 42.7754 38.925C42.7754 39.4083 42.3836 39.8 41.9004 39.8L18.8004 39.8C18.3171 39.8 17.9254 39.4083 17.9254 38.925Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9418 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7534 33.5997 21.0691C33.7403 21.3847 33.6819 21.7535 33.4508 22.0104L30.3008 25.5104C29.9775 25.8696 29.4242 25.8987 29.065 25.5754C28.7058 25.2522 28.6767 24.6989 29 24.3397L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9083 26.3254 21.425Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4004 26.325C17.4004 25.1652 18.3406 24.225 19.5004 24.225H37.0004C40.4798 24.225 43.3004 27.0456 43.3004 30.525V34.725C43.3004 35.8848 42.3649 36.8251 41.2051 36.8251C34.3616 36.8251 21.3834 36.8251 19.5004 36.8251C18.3406 36.8251 17.4004 35.8849 17.4004 34.725V26.325ZM19.5004 27.025C19.5004 26.6385 19.8138 26.325 20.2004 26.325H22.2974C22.684 26.325 22.9974 26.6385 22.9974 27.025V30.525C22.9974 30.9116 22.684 31.225 22.2974 31.225H20.2004C19.8504 31.225 19.5004 30.875 19.5004 30.525V27.025ZM25.108 26.325C24.7214 26.325 24.408 26.6385 24.408 27.025L24.4004 30.525C24.4004 30.875 24.7504 31.225 25.1004 31.225H27.908C28.2946 31.225 28.608 30.9116 28.608 30.525V27.025C28.608 26.6385 28.2946 26.325 27.908 26.325H25.108ZM30.0185 27.025C30.0185 26.6385 30.3319 26.325 30.7185 26.325H33.5185C33.9051 26.325 34.2185 26.6385 34.2185 27.025V30.525C34.2185 30.9116 33.9051 31.225 33.5185 31.225H31.4185C30.6453 31.225 30.0004 31.2983 30.0004 30.525L30.0185 27.025ZM36.329 26.325C35.9424 26.325 35.629 26.6385 35.629 27.025V30.525C35.629 30.9116 35.9424 31.225 36.329 31.225H40.529C40.9156 31.225 41.229 30.9116 41.229 30.525C41.229 28.2054 39.3486 26.325 37.029 26.325H36.329Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9254 38.9251C17.9254 38.4418 18.3171 38.0501 18.8004 38.0501H41.9004C42.3836 38.0501 42.7754 38.4418 42.7754 38.9251C42.7754 39.4083 42.3836 39.8001 41.9004 39.8001H18.8004C18.3171 39.8001 17.9254 39.4083 17.9254 38.9251Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3254 21.425C26.3254 20.9418 26.7171 20.55 27.2004 20.55H32.8004C33.1459 20.55 33.4591 20.7534 33.5997 21.0691C33.7403 21.3847 33.6819 21.7536 33.4508 22.0104L30.3008 25.5104C29.9775 25.8696 29.4242 25.8987 29.065 25.5754C28.7058 25.2522 28.6767 24.6989 29 24.3397L30.8357 22.3H27.2004C26.7171 22.3 26.3254 21.9083 26.3254 21.425Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_8318_8011" x="0" y="0" width="60" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/sprite_assets/Troms/light/vehiclepin_citybike_active_light.svg b/sprite_assets/Troms/light/vehiclepin_citybike_active_light.svg
index 00dce5c7..a4e26e30 100644
--- a/sprite_assets/Troms/light/vehiclepin_citybike_active_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_citybike_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47242)">
 <g clip-path="url(#clip0_10646_47242)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#8F1011"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#8F1011"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47242" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47242">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_citybike_cluster_light.svg b/sprite_assets/Troms/light/vehiclepin_citybike_cluster_light.svg
index b0f4867e..a15c1b47 100644
--- a/sprite_assets/Troms/light/vehiclepin_citybike_cluster_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_citybike_cluster_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5195)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#8F1011"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#8F1011"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M29.2051 24.833C27.8251 24.833 26.7051 25.953 26.7051 27.333C26.7051 28.713 27.8251 29.833 29.2051 29.833C30.5851 29.833 31.7051 28.713 31.7051 27.333C31.7051 25.953 30.5901 24.833 29.2051 24.833ZM25.04 27.333C25.04 25.033 26.9051 23.168 29.2051 23.168C31.5051 23.168 33.375 25.033 33.375 27.333C33.375 29.633 31.5051 31.498 29.2051 31.498C26.9051 31.498 25.04 29.633 25.04 27.333Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M27.5649 19.9629C27.9549 20.2079 28.0751 20.7229 27.8301 21.1129L23.665 27.7779C23.51 28.0229 23.2451 28.1679 22.9551 28.1679H18.79C18.33 28.1679 17.9551 27.7929 17.9551 27.3329C17.9551 26.8729 18.33 26.4979 18.79 26.4979H22.4951L26.415 20.2279C26.66 19.8379 27.1749 19.7179 27.5649 19.9629Z" fill="white"/>
diff --git a/sprite_assets/Troms/light/vehiclepin_citybike_default_light.svg b/sprite_assets/Troms/light/vehiclepin_citybike_default_light.svg
index b4168ad7..d3597047 100644
--- a/sprite_assets/Troms/light/vehiclepin_citybike_default_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_citybike_default_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5152)">
 <g clip-path="url(#clip0_10646_5152)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#8F1011"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M18.79 24.833C17.41 24.833 16.29 25.953 16.29 27.333C16.29 28.713 17.41 29.833 18.79 29.833C20.17 29.833 21.29 28.713 21.29 27.333C21.29 25.953 20.17 24.833 18.79 24.833ZM14.625 27.333C14.625 25.033 16.49 23.168 18.79 23.168C21.09 23.168 22.9551 25.033 22.9551 27.333C22.9551 29.633 21.09 31.498 18.79 31.498C16.49 31.498 14.625 29.633 14.625 27.333Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5152" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5152">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_citybike_selected_light.svg b/sprite_assets/Troms/light/vehiclepin_citybike_selected_light.svg
index c086b627..52526d5d 100644
--- a/sprite_assets/Troms/light/vehiclepin_citybike_selected_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_citybike_selected_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5170)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8F1011" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8F1011" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24.7061 33.1662C22.7741 33.1662 21.2061 34.7342 21.2061 36.6662C21.2061 38.5982 22.7741 40.1662 24.7061 40.1662C26.6381 40.1662 28.2061 38.5982 28.2061 36.6662C28.2061 34.7342 26.6381 33.1662 24.7061 33.1662ZM18.875 36.6662C18.875 33.4462 21.4861 30.8352 24.7061 30.8352C27.9261 30.8352 30.5371 33.4462 30.5371 36.6662C30.5371 39.8862 27.9261 42.4972 24.7061 42.4972C21.4861 42.4972 18.875 39.8862 18.875 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M39.2871 33.1662C37.3551 33.1662 35.7871 34.7342 35.7871 36.6662C35.7871 38.5982 37.3551 40.1662 39.2871 40.1662C41.2191 40.1662 42.7871 38.5982 42.7871 36.6662C42.7871 34.7342 41.2261 33.1662 39.2871 33.1662ZM33.4561 36.6662C33.4561 33.4462 36.0671 30.8352 39.2871 30.8352C42.5071 30.8352 45.125 33.4462 45.125 36.6662C45.125 39.8862 42.5071 42.4972 39.2871 42.4972C36.0671 42.4972 33.4561 39.8862 33.4561 36.6662Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M36.9909 26.3481C37.5369 26.6911 37.7051 27.4121 37.3621 27.9581L31.5311 37.2891C31.3141 37.6321 30.9431 37.8351 30.5371 37.8351H24.7061C24.0621 37.8351 23.5371 37.3101 23.5371 36.6661C23.5371 36.0221 24.0621 35.4971 24.7061 35.4971H29.8932L35.3811 26.7191C35.7241 26.1731 36.4449 26.0051 36.9909 26.3481Z" fill="white"/>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_active_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_active_light.svg
index 08e0a94e..8bf1c47d 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_active_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47244)">
 <g clip-path="url(#clip0_10646_47244)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#8F1011"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#8F1011"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5825 35.0326 19.9095 35.0326 20.2751V29.9003H40.5752C40.9175 29.9003 41.2284 30.0999 41.3708 30.4111C41.5133 30.7224 41.4611 31.0882 41.2374 31.3472L30.154 44.1803C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6084V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4724C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4265 34.12 19.3275 34.4626 19.455Z" fill="white"/>
 </g>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
@@ -17,7 +17,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47244" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47244">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_cluster_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_cluster_light.svg
index 3ad1b2dd..5e13e93d 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_cluster_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_cluster_light.svg
@@ -1,17 +1,17 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5516)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6H52C60.8366 6 68 13.1634 68 22V22C68 30.8366 60.8366 38 52 38H24C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7H52C60.2843 7 67 13.7157 67 22C67 30.2843 60.2843 37 52 37H24C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#8F1011"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#8F1011"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5516" x="0" y="0" width="76" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5516"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5516" result="shape"/>
 </filter>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_cluster_minimized_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_cluster_minimized_light.svg
index 8b16d3a6..ed57703f 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_cluster_minimized_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_cluster_minimized_light.svg
@@ -1,16 +1,16 @@
 <svg width="44" height="32" viewBox="0 0 44 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5530)">
-<rect x="10" y="8" width="24" height="12" rx="6" fill="white"/>
-<rect x="9" y="7" width="26" height="14" rx="7" stroke="white" stroke-width="2"/>
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#8F1011"/>
+<rect x="10" y="10" width="24" height="12" rx="6" fill="white"/>
+<rect x="9" y="9" width="26" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#8F1011"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5530" x="0" y="0" width="44" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5530"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5530" result="shape"/>
 </filter>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_default_dott_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_default_dott_light.svg
new file mode 100644
index 00000000..c79cf69a
--- /dev/null
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_default_dott_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7107)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="#009DDB"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#009DDB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7107" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7107"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7107" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_default_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_default_light.svg
index 3499c499..22c2ff5c 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_default_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_default_light.svg
@@ -1,17 +1,17 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5481)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#8F1011"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#8F1011"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5481" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5481"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5481" result="shape"/>
 </filter>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_default_ryde_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_default_ryde_light.svg
new file mode 100644
index 00000000..fb4cb8fd
--- /dev/null
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_default_ryde_light.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7126)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#4BCD1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7126" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7126"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7126" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_default_voi_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_default_voi_light.svg
index dd5e8bae..4a2b47f3 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_default_voi_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_default_voi_light.svg
@@ -1,19 +1,19 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47414)">
-<path d="M8 22C8 13.1634 15.1634 6 24 6V6C32.8366 6 40 13.1634 40 22V22C40 30.8366 32.8366 38 24 38V38C15.1634 38 8 30.8366 8 22V22Z" fill="white"/>
-<path d="M24 7C32.2843 7 39 13.7157 39 22C39 30.2843 32.2843 37 24 37C15.7157 37 9 30.2843 9 22C9 13.7157 15.7157 7 24 7Z" stroke="white" stroke-width="2"/>
-<path d="M10 22C10 14.268 16.268 8 24 8V8C31.732 8 38 14.268 38 22V22C38 29.732 31.732 36 24 36V36C16.268 36 10 29.732 10 22V22Z" fill="#F36960"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 13.0393C26.0043 13.1303 26.1667 13.3639 26.1667 13.625V20.5002H30.1257C30.3702 20.5002 30.5923 20.6427 30.694 20.8651C30.7958 21.0874 30.7585 21.3487 30.5987 21.5337L22.682 30.7002C22.5113 30.8978 22.2358 30.9685 21.9911 30.8774C21.7463 30.7864 21.584 30.5528 21.584 30.2917V23.4166H17.625C17.3805 23.4166 17.1585 23.274 17.0567 23.0517C16.955 22.8293 16.9922 22.5681 17.152 22.383L25.0687 13.2165C25.2393 13.0189 25.5148 12.9482 25.7596 13.0393Z" fill="black"/>
+<g filter="url(#filter0_d_10957_7119)">
+<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
+<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#F36960"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7596 15.0393C26.0043 15.1303 26.1667 15.3639 26.1667 15.625V22.5002H30.1257C30.3702 22.5002 30.5923 22.6427 30.694 22.8651C30.7958 23.0874 30.7585 23.3487 30.5987 23.5337L22.682 32.7002C22.5113 32.8978 22.2358 32.9685 21.9911 32.8774C21.7463 32.7864 21.584 32.5528 21.584 32.2917V25.4166H17.625C17.3805 25.4166 17.1585 25.274 17.0567 25.0517C16.955 24.8293 16.9922 24.5681 17.152 24.383L25.0687 15.2165C25.2393 15.0189 25.5148 14.9482 25.7596 15.0393Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47414" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7119" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47414"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47414" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7119"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7119" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_minimized_dott_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_minimized_dott_light.svg
new file mode 100644
index 00000000..d20d1902
--- /dev/null
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_minimized_dott_light.svg
@@ -0,0 +1,22 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7103)">
+<g clip-path="url(#clip0_10957_7103)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7103" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7103"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7103" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_7103">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_minimized_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_minimized_light.svg
index bb000e06..4dff52c2 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_minimized_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_minimized_light.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5467)">
 <g clip-path="url(#clip0_10646_5467)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#8F1011"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#8F1011"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5467" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5467"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5467" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5467">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_minimized_ryde_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_minimized_ryde_light.svg
new file mode 100644
index 00000000..4689edc4
--- /dev/null
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_minimized_ryde_light.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7124)">
+<g clip-path="url(#clip0_10957_7124)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
+<rect width="12" height="12" transform="translate(10 10)" fill="#4BCD1F"/>
+</g>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7124" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7124"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7124" result="shape"/>
+</filter>
+<clipPath id="clip0_10957_7124">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_minimized_voi_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_minimized_voi_light.svg
index ac2a6ec0..1306830c 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_minimized_voi_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_minimized_voi_light.svg
@@ -1,22 +1,22 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47402)">
-<g clip-path="url(#clip0_10647_47402)">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="#F36960"/>
+<g filter="url(#filter0_d_10957_7117)">
+<g clip-path="url(#clip0_10957_7117)">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
-<rect x="9" y="7" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
+<rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47402" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7117" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47402"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47402" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7117"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7117" result="shape"/>
 </filter>
-<clipPath id="clip0_10647_47402">
-<rect x="10" y="8" width="12" height="12" rx="6" fill="white"/>
+<clipPath id="clip0_10957_7117">
+<rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_selected_dott_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_selected_dott_light.svg
new file mode 100644
index 00000000..e7197855
--- /dev/null
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_selected_dott_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7111)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5825 35.0326 19.9095 35.0326 20.2751V29.9003H40.5752C40.9175 29.9003 41.2284 30.0999 41.3708 30.4111C41.5133 30.7224 41.4611 31.0882 41.2374 31.3472L30.154 44.1803C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6084V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4724C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4265 34.12 19.3275 34.4626 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7111" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7111"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7111" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_selected_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_selected_light.svg
index a2847736..564b163e 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_selected_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_selected_light.svg
@@ -1,15 +1,15 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5499)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#8F1011" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 17.455C34.8053 17.5825 35.0326 17.9095 35.0326 18.2751V27.9003H40.5752C40.9175 27.9003 41.2284 28.0999 41.3708 28.4111C41.5133 28.7224 41.4611 29.0882 41.2374 29.3472L30.154 42.1803C29.9151 42.457 29.5294 42.5559 29.1867 42.4284C28.8441 42.301 28.6168 41.974 28.6168 41.6084V31.9832H23.0742C22.7319 31.9832 22.421 31.7836 22.2786 31.4724C22.1361 31.1611 22.1883 30.7953 22.412 30.5362L33.4954 17.7031C33.7343 17.4265 34.12 17.3275 34.4626 17.455Z" fill="white"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8F1011" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5825 35.0326 19.9095 35.0326 20.2751V29.9003H40.5752C40.9175 29.9003 41.2284 30.0999 41.3708 30.4111C41.5133 30.7224 41.4611 31.0882 41.2374 31.3472L30.154 44.1803C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6084V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4724C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4265 34.12 19.3275 34.4626 19.455Z" fill="white"/>
 </g>
 <defs>
 <filter id="filter0_d_10646_5499" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5499"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5499" result="shape"/>
 </filter>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_selected_ryde_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_selected_ryde_light.svg
new file mode 100644
index 00000000..ea039ada
--- /dev/null
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_selected_ryde_light.svg
@@ -0,0 +1,17 @@
+<svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_10957_7128)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5825 35.0326 19.9095 35.0326 20.2751V29.9003H40.5752C40.9175 29.9003 41.2284 30.0999 41.3708 30.4111C41.5133 30.7224 41.4611 31.0882 41.2374 31.3472L30.154 44.1803C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6084V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4724C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4265 34.12 19.3275 34.4626 19.455Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_10957_7128" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="4"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7128"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7128" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_ebike_selected_voi_light.svg b/sprite_assets/Troms/light/vehiclepin_ebike_selected_voi_light.svg
index 2d2c10e0..933e95bf 100644
--- a/sprite_assets/Troms/light/vehiclepin_ebike_selected_voi_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_ebike_selected_voi_light.svg
@@ -1,17 +1,17 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10647_47428)">
-<path d="M32 7C44.6395 7 55 16.6092 55 28.5986C54.9999 35.0433 51.8044 39.9817 47.7822 44.3154C45.7739 46.4793 43.5266 48.5259 41.3398 50.5391C39.1404 52.5639 36.9981 54.5581 35.1318 56.6611C33.512 58.4861 30.5069 58.4302 28.9336 56.5879C27.1079 54.4496 24.9835 52.4564 22.7871 50.4512C20.6053 48.4592 18.3424 46.4462 16.3174 44.3184C12.2556 40.0503 9.00008 35.1686 9 28.5986C9 16.6092 19.3605 7 32 7Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 17.455C34.8053 17.5825 35.0326 17.9095 35.0326 18.2751V27.9003H40.5752C40.9175 27.9003 41.2284 28.0999 41.3708 28.4111C41.5133 28.7224 41.4611 29.0882 41.2374 29.3472L30.154 42.1803C29.9151 42.457 29.5294 42.5559 29.1867 42.4284C28.8441 42.301 28.6168 41.974 28.6168 41.6084V31.9832H23.0742C22.7319 31.9832 22.421 31.7836 22.2786 31.4724C22.1361 31.1611 22.1883 30.7953 22.412 30.5362L33.4954 17.7031C33.7343 17.4265 34.12 17.3275 34.4626 17.455Z" fill="black"/>
+<g filter="url(#filter0_d_10957_7121)">
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4626 19.455C34.8053 19.5825 35.0326 19.9095 35.0326 20.2751V29.9003H40.5752C40.9175 29.9003 41.2284 30.0999 41.3708 30.4111C41.5133 30.7224 41.4611 31.0882 41.2374 31.3472L30.154 44.1803C29.9151 44.457 29.5294 44.5559 29.1867 44.4284C28.8441 44.301 28.6168 43.974 28.6168 43.6084V33.9832H23.0742C22.7319 33.9832 22.421 33.7836 22.2786 33.4724C22.1361 33.1611 22.1883 32.7953 22.412 32.5362L33.4954 19.7031C33.7343 19.4265 34.12 19.3275 34.4626 19.455Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10647_47428" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7121" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
+<feOffset/>
 <feGaussianBlur stdDeviation="4"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10647_47428"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10647_47428" result="shape"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7121"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7121" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_loading_light.svg b/sprite_assets/Troms/light/vehiclepin_loading_light.svg
index 4618666c..d41c0fd9 100644
--- a/sprite_assets/Troms/light/vehiclepin_loading_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_loading_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47260)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#A9AEB1"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#A9AEB1"/>
 <path d="M32 9C44.7025 9 55 19.2975 55 32C55 44.7025 44.7025 55 32 55C19.2975 55 9 44.7025 9 32C9 19.2975 19.2975 9 32 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M31.9991 20.3311C32.6431 20.3311 33.1681 20.8561 33.1681 21.5001V25.0001C33.1681 25.6441 32.6431 26.1691 31.9991 26.1691C31.3551 26.1691 30.8301 25.6441 30.8301 25.0001V21.5001C30.8301 20.8561 31.3551 20.3311 31.9991 20.3311Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M31.9991 37.8311C32.6431 37.8311 33.1681 38.3561 33.1681 39.0001V42.5001C33.1681 43.1441 32.6431 43.6691 31.9991 43.6691C31.3551 43.6691 30.8301 43.1441 30.8301 42.5001V39.0001C30.8301 38.3561 31.3551 37.8311 31.9991 37.8311Z" fill="black"/>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_active_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_active_light.svg
index e032c1d0..a3cc07de 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_active_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_active_light.svg
@@ -1,7 +1,7 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_47254)">
 <g clip-path="url(#clip0_10646_47254)">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="#6B9956"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="#6B9956"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="white"/>
@@ -19,7 +19,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_47254" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_47254">
-<path d="M10 32C10 19.8497 19.8497 10 32 10V10C44.1503 10 54 19.8497 54 32V32C54 44.1503 44.1503 54 32 54V54C19.8497 54 10 44.1503 10 32V32Z" fill="white"/>
+<path d="M10 32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32C54 44.1503 44.1503 54 32 54C19.8497 54 10 44.1503 10 32Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_cluster_generic_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_cluster_generic_light.svg
index cbbe7c2e..178240b8 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_cluster_generic_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_cluster_generic_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5433)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#6B9956"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#6B9956"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.3359 28.165C16.8759 28.165 16.501 28.54 16.501 29C16.501 29.46 16.8759 29.835 17.3359 29.835C17.7959 29.835 18.166 29.46 18.166 29C18.166 28.54 17.7959 28.165 17.3359 28.165ZM14.8359 29C14.8359 27.62 15.9559 26.5 17.3359 26.5C18.7159 26.5 19.8359 27.62 19.8359 29C19.8359 30.38 18.7159 31.5 17.3359 31.5C15.9559 31.5 14.8359 30.38 14.8359 29Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M30.666 28.165C30.206 28.165 29.8359 28.54 29.8359 29C29.8359 29.46 30.206 29.835 30.666 29.835C31.126 29.835 31.501 29.46 31.501 29C31.501 28.54 31.126 28.165 30.666 28.165ZM28.166 29C28.166 27.62 29.286 26.5 30.666 26.5C32.046 26.5 33.166 27.62 33.166 29C33.166 30.38 32.046 31.5 30.666 31.5C29.286 31.5 28.166 30.38 28.166 29Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M25.6659 17.335C25.6659 16.875 26.0408 16.5 26.5008 16.5H27.3158C28.4408 16.5 29.4259 17.25 29.7259 18.33L31.4711 24.61C31.5411 24.86 31.4909 25.13 31.3309 25.335C31.1759 25.54 30.9259 25.665 30.6659 25.665C29.5759 25.665 28.6108 26.185 28.0008 27C27.5808 27.555 27.3358 28.25 27.3358 29C27.3358 29.46 26.9608 29.835 26.5008 29.835H19.0008C18.7808 29.835 18.566 29.75 18.411 29.59C18.256 29.435 18.166 29.22 18.166 29C18.166 28.54 17.7959 28.165 17.3359 28.165C16.8759 28.165 16.5208 27.815 16.5008 27.365C16.4808 26.92 16.821 26.535 17.266 26.5L26.911 25.695C27.606 24.91 28.5409 24.34 29.6009 24.11L28.121 18.775C28.021 18.415 27.6908 18.165 27.3158 18.165H26.5008C26.0408 18.165 25.6659 17.79 25.6659 17.33V17.335Z" fill="black"/>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_default_dott_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_default_dott_light.svg
index a863ced9..d767fa7f 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_default_dott_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_default_dott_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5327)">
-<g clip-path="url(#clip0_10646_5327)">
+<g filter="url(#filter0_d_10957_7095)">
+<g clip-path="url(#clip0_10957_7095)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#009DDB"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5327" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7095" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5327"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5327" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7095"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7095" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5327">
+<clipPath id="clip0_10957_7095">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_default_generic_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_default_generic_light.svg
index c146cfff..60d83a0d 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_default_generic_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_default_generic_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5285)">
 <g clip-path="url(#clip0_10646_5285)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#6B9956"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M17.3359 28.165C16.8759 28.165 16.501 28.54 16.501 29C16.501 29.46 16.8759 29.835 17.3359 29.835C17.7959 29.835 18.166 29.46 18.166 29C18.166 28.54 17.7959 28.165 17.3359 28.165ZM14.8359 29C14.8359 27.62 15.9559 26.5 17.3359 26.5C18.7159 26.5 19.8359 27.62 19.8359 29C19.8359 30.38 18.7159 31.5 17.3359 31.5C15.9559 31.5 14.8359 30.38 14.8359 29Z" fill="black"/>
@@ -21,7 +21,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5285" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5285">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_default_ryde_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_default_ryde_light.svg
index bead65a2..fe04cb62 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_default_ryde_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_default_ryde_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5299)">
-<g clip-path="url(#clip0_10646_5299)">
+<g filter="url(#filter0_d_10957_7093)">
+<g clip-path="url(#clip0_10957_7093)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#4BCD1F"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5299" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7093" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5299"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5299" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7093"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7093" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5299">
+<clipPath id="clip0_10957_7093">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_default_voi_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_default_voi_light.svg
index 7bd09cd7..beebdfdd 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_default_voi_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_default_voi_light.svg
@@ -1,6 +1,6 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5313)">
-<g clip-path="url(#clip0_10646_5313)">
+<g filter="url(#filter0_d_10957_7109)">
+<g clip-path="url(#clip0_10957_7109)">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#F36960"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
@@ -11,16 +11,16 @@
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5313" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7109" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5313"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5313" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7109"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7109" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5313">
+<clipPath id="clip0_10957_7109">
 <path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_minimized_dott_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_minimized_dott_light.svg
index 280dad2a..649d6a55 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_minimized_dott_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_minimized_dott_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5271)">
-<g clip-path="url(#clip0_10646_5271)">
+<g filter="url(#filter0_d_10957_7091)">
+<g clip-path="url(#clip0_10957_7091)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#009DDB"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5271" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7091" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5271"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5271" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7091"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7091" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5271">
+<clipPath id="clip0_10957_7091">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_minimized_ryde_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_minimized_ryde_light.svg
index 3b52d1e4..2c2b9428 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_minimized_ryde_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_minimized_ryde_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5243)">
-<g clip-path="url(#clip0_10646_5243)">
+<g filter="url(#filter0_d_10957_7089)">
+<g clip-path="url(#clip0_10957_7089)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#4BCD1F"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5243" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7089" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5243"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5243" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7089"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7089" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5243">
+<clipPath id="clip0_10957_7089">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_minimized_voi_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_minimized_voi_light.svg
index 4eefbc6c..8c1a9a3c 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_minimized_voi_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_minimized_voi_light.svg
@@ -1,21 +1,21 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5257)">
-<g clip-path="url(#clip0_10646_5257)">
+<g filter="url(#filter0_d_10957_7105)">
+<g clip-path="url(#clip0_10957_7105)">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="#F36960"/>
 </g>
 <rect x="9" y="9" width="14" height="14" rx="7" stroke="white" stroke-width="2"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5257" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7105" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5257"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5257" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7105"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7105" result="shape"/>
 </filter>
-<clipPath id="clip0_10646_5257">
+<clipPath id="clip0_10957_7105">
 <rect x="10" y="10" width="12" height="12" rx="6" fill="white"/>
 </clipPath>
 </defs>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_selected_dott_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_selected_dott_light.svg
index 699d9f8e..28583003 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_selected_dott_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_selected_dott_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5408)">
+<g filter="url(#filter0_d_10957_7100)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#009DDB" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5408" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7100" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5408"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5408" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7100"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7100" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_selected_generic_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_selected_generic_light.svg
index 624b3a4f..c35ce3f3 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_selected_generic_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_selected_generic_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5345)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#6B9956" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#6B9956" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_selected_ryde_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_selected_ryde_light.svg
index 9f8c7830..bcac103f 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_selected_ryde_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_selected_ryde_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5366)">
+<g filter="url(#filter0_d_10957_7097)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#4BCD1F" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5366" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7097" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5366"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5366" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7097"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7097" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_scooter_selected_voi_light.svg b/sprite_assets/Troms/light/vehiclepin_scooter_selected_voi_light.svg
index 0e1250f4..0692ef3d 100644
--- a/sprite_assets/Troms/light/vehiclepin_scooter_selected_voi_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_scooter_selected_voi_light.svg
@@ -1,19 +1,19 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_10646_5387)">
+<g filter="url(#filter0_d_10957_7114)">
 <path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#F36960" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M22.668 37.831C22.024 37.831 21.499 38.356 21.499 39C21.499 39.644 22.024 40.169 22.668 40.169C23.312 40.169 23.8301 39.644 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831ZM19.168 39C19.168 37.068 20.736 35.5 22.668 35.5C24.6 35.5 26.168 37.068 26.168 39C26.168 40.932 24.6 42.5 22.668 42.5C20.736 42.5 19.168 40.932 19.168 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M41.3301 37.831C40.6861 37.831 40.168 38.356 40.168 39C40.168 39.644 40.6861 40.169 41.3301 40.169C41.9741 40.169 42.499 39.644 42.499 39C42.499 38.356 41.9741 37.831 41.3301 37.831ZM37.8301 39C37.8301 37.068 39.3981 35.5 41.3301 35.5C43.2621 35.5 44.8301 37.068 44.8301 39C44.8301 40.932 43.2621 42.5 41.3301 42.5C39.3981 42.5 37.8301 40.932 37.8301 39Z" fill="black"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M34.3299 22.669C34.3299 22.025 34.8548 21.5 35.4988 21.5H36.6397C38.2147 21.5 39.594 22.55 40.014 24.062L42.4571 32.854C42.5551 33.204 42.4849 33.582 42.2609 33.869C42.0439 34.156 41.6939 34.331 41.3299 34.331C39.8039 34.331 38.4528 35.059 37.5988 36.2C37.0108 36.977 36.6678 37.95 36.6678 39C36.6678 39.644 36.1428 40.169 35.4988 40.169H24.9988C24.6908 40.169 24.39 40.05 24.173 39.826C23.956 39.609 23.8301 39.308 23.8301 39C23.8301 38.356 23.312 37.831 22.668 37.831C22.024 37.831 21.5268 37.341 21.4988 36.711C21.4708 36.088 21.947 35.549 22.57 35.5L36.073 34.373C37.046 33.274 38.355 32.476 39.839 32.154L37.767 24.685C37.627 24.181 37.1647 23.831 36.6397 23.831H35.4988C34.8548 23.831 34.3299 23.306 34.3299 22.662V22.669Z" fill="black"/>
 </g>
 <defs>
-<filter id="filter0_d_10646_5387" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_d_10957_7114" x="0" y="0" width="64" height="69" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset/>
 <feGaussianBlur stdDeviation="4"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.23 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10646_5387"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5387" result="shape"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10957_7114"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10957_7114" result="shape"/>
 </filter>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_sharedcar_cluster_light.svg b/sprite_assets/Troms/light/vehiclepin_sharedcar_cluster_light.svg
index 9f7a7edd..5d6e2847 100644
--- a/sprite_assets/Troms/light/vehiclepin_sharedcar_cluster_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_sharedcar_cluster_light.svg
@@ -1,8 +1,8 @@
 <svg width="76" height="48" viewBox="0 0 76 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5104)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24V24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8H52C60.8366 8 68 15.1634 68 24C68 32.8366 60.8366 40 52 40H24C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9H52C60.2843 9 67 15.7157 67 24C67 32.2843 60.2843 39 52 39H24C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
-<path d="M10 24C10 16.268 16.268 10 24 10V10C31.732 10 38 16.268 38 24V24C38 31.732 31.732 38 24 38V38C16.268 38 10 31.732 10 24V24Z" fill="#8E2864"/>
+<path d="M10 24C10 16.268 16.268 10 24 10C31.732 10 38 16.268 38 24C38 31.732 31.732 38 24 38C16.268 38 10 31.732 10 24Z" fill="#8E2864"/>
 <path d="M19.834 30.3551C20.984 30.3551 21.9141 29.4201 21.9141 28.2701C21.9141 27.1201 20.984 26.1851 19.834 26.1851C18.684 26.1851 17.749 27.1201 17.749 28.2701C17.749 29.4201 18.684 30.3551 19.834 30.3551Z" fill="white"/>
 <path d="M28.1641 30.3551C29.3141 30.3551 30.249 29.4201 30.249 28.2701C30.249 27.1201 29.3141 26.1851 28.1641 26.1851C27.0141 26.1851 26.084 27.1201 26.084 28.2701C26.084 29.4201 27.0141 30.3551 28.1641 30.3551Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15.0391 22.4351C15.0391 22.0901 15.3191 21.8101 15.6641 21.8101H28.999C29.344 21.8101 29.624 22.0901 29.624 22.4351C29.624 22.7801 29.344 23.0601 28.999 23.0601H15.6641C15.3191 23.0601 15.0391 22.7801 15.0391 22.4351Z" fill="white"/>
diff --git a/sprite_assets/Troms/light/vehiclepin_sharedcar_default_light.svg b/sprite_assets/Troms/light/vehiclepin_sharedcar_default_light.svg
index d0c1aae8..fb4e3eaf 100644
--- a/sprite_assets/Troms/light/vehiclepin_sharedcar_default_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_sharedcar_default_light.svg
@@ -1,7 +1,7 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5061)">
 <g clip-path="url(#clip0_10646_5061)">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" fill="#8E2864"/>
 <path d="M24 9C32.2843 9 39 15.7157 39 24C39 32.2843 32.2843 39 24 39C15.7157 39 9 32.2843 9 24C9 15.7157 15.7157 9 24 9Z" stroke="white" stroke-width="2"/>
 <path d="M19.834 30.3551C20.984 30.3551 21.9141 29.4201 21.9141 28.2701C21.9141 27.1201 20.984 26.1851 19.834 26.1851C18.684 26.1851 17.749 27.1201 17.749 28.2701C17.749 29.4201 18.684 30.3551 19.834 30.3551Z" fill="white"/>
@@ -23,7 +23,7 @@
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_10646_5061" result="shape"/>
 </filter>
 <clipPath id="clip0_10646_5061">
-<path d="M8 24C8 15.1634 15.1634 8 24 8V8C32.8366 8 40 15.1634 40 24V24C40 32.8366 32.8366 40 24 40V40C15.1634 40 8 32.8366 8 24V24Z" fill="white"/>
+<path d="M8 24C8 15.1634 15.1634 8 24 8C32.8366 8 40 15.1634 40 24C40 32.8366 32.8366 40 24 40C15.1634 40 8 32.8366 8 24Z" fill="white"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/sprite_assets/Troms/light/vehiclepin_sharedcar_selected_light.svg b/sprite_assets/Troms/light/vehiclepin_sharedcar_selected_light.svg
index 8f89f5a6..acd2109d 100644
--- a/sprite_assets/Troms/light/vehiclepin_sharedcar_selected_light.svg
+++ b/sprite_assets/Troms/light/vehiclepin_sharedcar_selected_light.svg
@@ -1,6 +1,6 @@
 <svg width="64" height="69" viewBox="0 0 64 69" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g filter="url(#filter0_d_10646_5079)">
-<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4861 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8E2864" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+<path d="M32 9C44.6395 9 55 18.6092 55 30.5986C54.9999 37.0433 51.8044 41.9817 47.7822 46.3154C45.7739 48.4793 43.5266 50.5259 41.3398 52.5391C39.1404 54.5639 36.9981 56.5581 35.1318 58.6611C33.512 60.4862 30.5069 60.4302 28.9336 58.5879C27.1079 56.4496 24.9835 54.4564 22.7871 52.4512C20.6053 50.4592 18.3424 48.4462 16.3174 46.3184C12.2556 42.0503 9.00008 37.1686 9 30.5986C9 18.6092 19.3605 9 32 9Z" fill="#8E2864" stroke="white" stroke-width="2" stroke-linejoin="round"/>
 <path d="M26.1699 40.8971C27.7799 40.8971 29.082 39.5881 29.082 37.9781C29.082 36.3681 27.7799 35.0591 26.1699 35.0591C24.5599 35.0591 23.251 36.3681 23.251 37.9781C23.251 39.5881 24.5599 40.8971 26.1699 40.8971Z" fill="white"/>
 <path d="M37.832 40.8971C39.442 40.8971 40.751 39.5881 40.751 37.9781C40.751 36.3681 39.442 35.0591 37.832 35.0591C36.222 35.0591 34.9199 36.3681 34.9199 37.9781C34.9199 39.5881 36.222 40.8971 37.832 40.8971Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.457 29.8091C19.457 29.3261 19.849 28.9341 20.332 28.9341H39.001C39.484 28.9341 39.876 29.3261 39.876 29.8091C39.876 30.2921 39.484 30.6841 39.001 30.6841H20.332C19.849 30.6841 19.457 30.2921 19.457 29.8091Z" fill="white"/>