WP-4371: fix margin error.
WP-4371: update the short url theming.