Use span instead of button for upload buttons, otherwise FF and IE hiccup...
(cherry picked from commit ee3bc84)