Bug 930601 - toolbar updates for Onet for Fx25, r=mconnor

--HG--
extra : rebase_source : b0f5090098429b47526ba3290aeb2ca8279351d3