Merge "Add missing 'fill' to spot pointer icons." into main