Fixes #4922 #4961 west spear icon and police baton rotation

Fixes #4922
Fixes #4961