Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339"

This reverts commit 064e6951.

Reverting due to regression that breaks styles in error page, setup
page and others.

Fixes #10967