Use better color picking icon that is accurate
(cherry picked from commit 18c45c9d768bfbe77f65291c2cf174fb05215c91)