Revert "buttons/pictures/headers"

This reverts commit 7f9df8b4ae01fd71ddc4868b459f09d230c29202.