diff --git a/app/utils/icons.js b/app/utils/icons.js
index 7a741b3..a70d072 100644
--- a/app/utils/icons.js
+++ b/app/utils/icons.js
@@ -2,9 +2,12 @@ import activity from 'feather-icons/dist/icons/activity.svg?raw';
 import arrowLeft from 'feather-icons/dist/icons/arrow-left.svg?raw';
 import bookmark from 'feather-icons/dist/icons/bookmark.svg?raw';
 import checkSquare from 'feather-icons/dist/icons/check-square.svg?raw';
+import cigaretteWithSmokeCurl from '@waysidemapping/pinhead/dist/icons/cigarette_with_smoke_curl.svg?raw';
 import clock from 'feather-icons/dist/icons/clock.svg?raw';
 import edit from 'feather-icons/dist/icons/edit.svg?raw';
+import eyeglasses from '@waysidemapping/pinhead/dist/icons/eyeglasses.svg?raw';
 import facebook from 'feather-icons/dist/icons/facebook.svg?raw';
+import fancyMirrorWithReflectionAndStars from '@waysidemapping/pinhead/dist/icons/fancy_mirror_with_reflection_and_stars.svg?raw';
 import gift from 'feather-icons/dist/icons/gift.svg?raw';
 import globe from 'feather-icons/dist/icons/globe.svg?raw';
 import heart from 'feather-icons/dist/icons/heart.svg?raw';
@@ -18,6 +21,7 @@ import map from 'feather-icons/dist/icons/map.svg?raw';
 import mapPin from 'feather-icons/dist/icons/map-pin.svg?raw';
 import menu from 'feather-icons/dist/icons/menu.svg?raw';
 import navigation from 'feather-icons/dist/icons/navigation.svg?raw';
+import needleAndSpoolOfThread from '@waysidemapping/pinhead/dist/icons/needle_and_spool_of_thread.svg?raw';
 import phone from 'feather-icons/dist/icons/phone.svg?raw';
 import plus from 'feather-icons/dist/icons/plus.svg?raw';
 import search from 'feather-icons/dist/icons/search.svg?raw';
@@ -25,6 +29,7 @@ import server from 'feather-icons/dist/icons/server.svg?raw';
 import settings from 'feather-icons/dist/icons/settings.svg?raw';
 import target from 'feather-icons/dist/icons/target.svg?raw';
 import user from 'feather-icons/dist/icons/user.svg?raw';
+import villageBuildings from '@waysidemapping/pinhead/dist/icons/village_buildings.svg?raw';
 import x from 'feather-icons/dist/icons/x.svg?raw';
 import zap from 'feather-icons/dist/icons/zap.svg?raw';
 
@@ -38,36 +43,48 @@ import camera from '@waysidemapping/pinhead/dist/icons/camera.svg?raw';
 import classicalBuilding from '@waysidemapping/pinhead/dist/icons/classical_building.svg?raw';
 import classicalBuildingWithDomeAndFlag from '@waysidemapping/pinhead/dist/icons/classical_building_with_dome_and_flag.svg?raw';
 import classicalBuildingWithFlag from '@waysidemapping/pinhead/dist/icons/classical_building_with_flag.svg?raw';
+import clothesHanger from '@waysidemapping/pinhead/dist/icons/clothes_hanger.svg?raw';
 import cleaver from '@waysidemapping/pinhead/dist/icons/cleaver.svg?raw';
+import cloth from '@waysidemapping/pinhead/dist/icons/cloth.svg?raw';
+import cocktail from '@waysidemapping/pinhead/dist/icons/cocktail.svg?raw';
 import coffeeBean from '@waysidemapping/pinhead/dist/icons/coffee_bean.svg?raw';
 import comedyMaskAndTragedyMask from '@waysidemapping/pinhead/dist/icons/comedy_mask_and_tragedy_mask.svg?raw';
 import croissant from '@waysidemapping/pinhead/dist/icons/croissant.svg?raw';
 import cupAndSaucer from '@waysidemapping/pinhead/dist/icons/cup_and_saucer.svg?raw';
 import donut from '@waysidemapping/pinhead/dist/icons/donut.svg?raw';
 import film from '@waysidemapping/pinhead/dist/icons/film.svg?raw';
+import fingernailPolished from '@waysidemapping/pinhead/dist/icons/fingernail_polished.svg?raw';
 import fish from '@waysidemapping/pinhead/dist/icons/fish.svg?raw';
 import flagCheckered from '@waysidemapping/pinhead/dist/icons/flag_checkered.svg?raw';
+import flowerBouquet from '@waysidemapping/pinhead/dist/icons/flower_bouquet.svg?raw';
 import fort from '@waysidemapping/pinhead/dist/icons/fort.svg?raw';
 import forkAndKnife from '@waysidemapping/pinhead/dist/icons/fork_and_knife.svg?raw';
 import gravestone from '@waysidemapping/pinhead/dist/icons/gravestone.svg?raw';
 import grecianVase from '@waysidemapping/pinhead/dist/icons/grecian_vase.svg?raw';
 import iceCreamOnCone from '@waysidemapping/pinhead/dist/icons/ice_cream_on_cone.svg?raw';
+import jewel from '@waysidemapping/pinhead/dist/icons/jewel.svg?raw';
 import marketStall from '@waysidemapping/pinhead/dist/icons/market_stall.svg?raw';
 import memorialStoneWithInscription from '@waysidemapping/pinhead/dist/icons/memorial_stone_with_inscription.svg?raw';
+import mobilePhoneWithKeypadAndAntenna from '@waysidemapping/pinhead/dist/icons/mobile_phone_with_keypad_and_antenna.svg?raw';
 import palace from '@waysidemapping/pinhead/dist/icons/palace.svg?raw';
 import personCricketBattingAtCricketBall from '@waysidemapping/pinhead/dist/icons/person_cricket_batting_at_cricket_ball.svg?raw';
+import personBoardingTramWithDestinationDisplayAndPantographOnTramTrack from '@waysidemapping/pinhead/dist/icons/person_boarding_tram_with_destination_display_and_pantograph_on_tram_track.svg?raw';
 import personJockeyingRacehorse from '@waysidemapping/pinhead/dist/icons/person_jockeying_racehorse.svg?raw';
 import personPlayingTennis from '@waysidemapping/pinhead/dist/icons/person_playing_tennis.svg?raw';
 import personRunning from '@waysidemapping/pinhead/dist/icons/person_running.svg?raw';
 import personSleepingInBed from '@waysidemapping/pinhead/dist/icons/person_sleeping_in_bed.svg?raw';
 import personSwimmingInWater from '@waysidemapping/pinhead/dist/icons/person_swimming_in_water.svg?raw';
 import personSwingingGolfClub from '@waysidemapping/pinhead/dist/icons/person_swinging_golf_club.svg?raw';
+import plantInRaisedPlanter from '@waysidemapping/pinhead/dist/icons/plant_in_raised_planter.svg?raw';
 import planeTopRight from '@waysidemapping/pinhead/dist/icons/plane_top_right.svg?raw';
 import roundStructureWithFlag from '@waysidemapping/pinhead/dist/icons/round_structure_with_flag.svg?raw';
 import sailingShipInWater from '@waysidemapping/pinhead/dist/icons/sailing_ship_in_water.svg?raw';
+import scissorsOpen from '@waysidemapping/pinhead/dist/icons/scissors_open.svg?raw';
 import shipwreckInWater from '@waysidemapping/pinhead/dist/icons/shipwreck_in_water.svg?raw';
+import shoppingBag from '@waysidemapping/pinhead/dist/icons/shopping_bag.svg?raw';
 import shoppingBasket from '@waysidemapping/pinhead/dist/icons/shopping_basket.svg?raw';
 import tableTennisPaddle from '@waysidemapping/pinhead/dist/icons/table_tennis_paddle.svg?raw';
+import tattooMachine from '@waysidemapping/pinhead/dist/icons/tattoo_machine.svg?raw';
 import shoppingCart from '@waysidemapping/pinhead/dist/icons/shopping_cart.svg?raw';
 import wallHangingWithMountainsAndSun from '@waysidemapping/pinhead/dist/icons/wall_hanging_with_mountains_and_sun.svg?raw';
 
@@ -85,10 +102,14 @@ const ICONS = {
   'burger-and-drink-cup-with-straw': burgerAndDrinkCupWithStraw,
   camera,
   'check-square': checkSquare,
+  'cigarette-with-smoke-curl': cigaretteWithSmokeCurl,
   'classical-building': classicalBuilding,
   'classical-building-with-dome-and-flag': classicalBuildingWithDomeAndFlag,
   'classical-building-with-flag': classicalBuildingWithFlag,
+  'clothes-hanger': clothesHanger,
   cleaver,
+  cloth,
+  cocktail,
   clock,
   'coffee-bean': coffeeBean,
   'comedy-mask-and-tragedy-mask': comedyMaskAndTragedyMask,
@@ -96,10 +117,14 @@ const ICONS = {
   'cup-and-saucer': cupAndSaucer,
   donut,
   edit,
+  eyeglasses,
   facebook,
+  'fancy-mirror-with-reflection-and-stars': fancyMirrorWithReflectionAndStars,
   film,
+  'fingernail-polished': fingernailPolished,
   fish,
   'flag-checkered': flagCheckered,
+  'flower-bouquet': flowerBouquet,
   'fork-and-knife': forkAndKnife,
   fort,
   gift,
@@ -111,6 +136,7 @@ const ICONS = {
   'ice-cream-on-cone': iceCreamOnCone,
   info,
   instagram,
+  jewel,
   'log-in': logIn,
   'log-out': logOut,
   mail,
@@ -119,9 +145,13 @@ const ICONS = {
   'market-stall': marketStall,
   'memorial-stone-with-inscription': memorialStoneWithInscription,
   menu,
+  'mobile-phone-with-keypad-and-antenna': mobilePhoneWithKeypadAndAntenna,
   navigation,
+  'needle-and-spool-of-thread': needleAndSpoolOfThread,
   palace,
   'person-cricket-batting-at-cricket-ball': personCricketBattingAtCricketBall,
+  'person-boarding-tram-with-destination-display-and-pantograph-on-tram-track':
+    personBoardingTramWithDestinationDisplayAndPantographOnTramTrack,
   'person-jockeying-racehorse': personJockeyingRacehorse,
   'person-playing-tennis': personPlayingTennis,
   'person-running': personRunning,
@@ -130,18 +160,23 @@ const ICONS = {
   'person-swinging-golf-club': personSwingingGolfClub,
   phone,
   'plane-top-right': planeTopRight,
+  'plant-in-raised-planter': plantInRaisedPlanter,
   plus,
   'round-structure-with-flag': roundStructureWithFlag,
   'sailing-ship-in-water': sailingShipInWater,
+  'scissors-open': scissorsOpen,
   'shipwreck-in-water': shipwreckInWater,
+  'shopping-bag': shoppingBag,
   search,
   server,
   settings,
   'shopping-basket': shoppingBasket,
   'shopping-cart': shoppingCart,
   'table-tennis-paddle': tableTennisPaddle,
+  'tattoo-machine': tattooMachine,
   target,
   user,
+  'village-buildings': villageBuildings,
   'wall-hanging-with-mountains-and-sun': wallHangingWithMountainsAndSun,
   wikipedia,
   x,
diff --git a/app/utils/osm-icons.js b/app/utils/osm-icons.js
index bd0c8b1..66f6645 100644
--- a/app/utils/osm-icons.js
+++ b/app/utils/osm-icons.js
@@ -18,13 +18,14 @@ export const POI_ICON_RULES = [
   { tags: { amenity: 'restaurant' }, icon: 'fork-and-knife' },
   { tags: { amenity: 'fast_food' }, icon: 'burger-and-drink-cup-with-straw' },
   { tags: { amenity: 'pub' }, icon: 'beer-mug-with-foam' },
+  { tags: { amenity: 'bar' }, icon: 'cocktail' },
   { tags: { amenity: 'food_court' }, icon: 'fork-and-knife' },
 
   { tags: { shop: 'coffee' }, icon: 'coffee-bean' },
   { tags: { shop: 'tea' }, icon: 'coffee-bean' },
   { tags: { shop: 'pastry' }, icon: 'donut' }, // Pastry shops often have donuts
 
-  // Groceries
+  // Shopping
   { tags: { shop: 'supermarket' }, icon: 'shopping-cart' },
   { tags: { shop: 'convenience' }, icon: 'shopping-basket' },
   { tags: { shop: 'grocery' }, icon: 'shopping-basket' },
@@ -33,7 +34,34 @@ export const POI_ICON_RULES = [
   { tags: { shop: 'butcher' }, icon: 'cleaver' },
   { tags: { shop: 'seafood' }, icon: 'fish' },
   { tags: { shop: 'deli' }, icon: 'shopping-basket' },
+  { tags: { shop: 'clothes' }, icon: 'clothes-hanger' },
+  { tags: { shop: 'clothing' }, icon: 'clothes-hanger' },
+  { tags: { shop: 'hairdresser' }, icon: 'scissors-open' },
+  { tags: { shop: 'optician' }, icon: 'eyeglasses' },
+  { tags: { shop: 'fabric' }, icon: 'cloth' },
   { tags: { shop: 'flea_market' }, icon: 'market-stall' },
+  { tags: { shop: 'kiosk' }, icon: 'shopping-basket' },
+  { tags: { shop: 'leather' }, icon: 'shopping-bag' },
+  { tags: { shop: 'tailor' }, icon: 'needle-and-spool-of-thread' },
+  { tags: { craft: 'tailor' }, icon: 'needle-and-spool-of-thread' },
+  { tags: { shop: 'jewelry' }, icon: 'jewel' },
+  { tags: { shop: 'jewellery' }, icon: 'jewel' },
+  { tags: { shop: 'tobacco' }, icon: 'cigarette-with-smoke-curl' },
+  { tags: { shop: 'cannabis' }, icon: 'cigarette-with-smoke-curl' },
+  { tags: { shop: 'florist' }, icon: 'flower-bouquet' },
+  { tags: { shop: 'garden_centre' }, icon: 'plant-in-raised-planter' },
+  { tags: { office: 'estate_agent' }, icon: 'village-buildings' },
+  { tags: { shop: 'estate_agent' }, icon: 'village-buildings' },
+  {
+    tags: { shop: 'mobile_phone' },
+    icon: 'mobile-phone-with-keypad-and-antenna',
+  },
+  { tags: { beauty: 'nails' }, icon: 'fingernail-polished' },
+  { tags: { shop: 'tattoo' }, icon: 'tattoo-machine' },
+  {
+    tags: { shop: 'beauty' },
+    icon: 'fancy-mirror-with-reflection-and-stars',
+  },
 
   // Natural
   { tags: { natural: 'beach' }, icon: 'beach-umbrella-in-ground' },
@@ -42,6 +70,10 @@ export const POI_ICON_RULES = [
   { tags: { aeroway: 'aerodrome' }, icon: 'plane-top-right' },
   { tags: { aeroway: 'heliport' }, icon: 'plane-top-right' },
   { tags: { aeroway: 'helipad' }, icon: 'plane-top-right' },
+  {
+    tags: { railway: 'tram_stop' },
+    icon: 'person-boarding-tram-with-destination-display-and-pantograph-on-tram-track',
+  },
 
   // Tourism
   { tags: { tourism: 'museum' }, icon: 'classical-building' },
@@ -101,6 +133,7 @@ export const POI_ICON_RULES = [
   { tags: { sport: 'horse_racing' }, icon: 'person-jockeying-racehorse' },
   { tags: { sport: 'fitness' }, icon: 'barbell' },
   { tags: { sport: 'fitness_centre' }, icon: 'barbell' },
+  { tags: { leisure: 'fitness_centre' }, icon: 'barbell' },
 
   { tags: { sport: 'stadium' }, icon: 'round-structure-with-flag' },
   { tags: { leisure: 'stadium' }, icon: 'round-structure-with-flag' },