Bug 956942 - update shared/style/headers for the `organic' skin

https://bugzilla.mozilla.org/show_bug.cgi?id=956942