Fixed stock toolbar & icon. v0.6.2.7
Merged 0.6.2.7 from upstream