HOTFIX: APD-612 firefox design bugs