shuttle: add arrow to picker button; adjust css for polyfill; refactor