Issue #20865: Fixes for picker icon in Firefox

Another pull request for 1.4.0 testing.