Reverting databases page toolbar layout.
Merged from upstream. Fixed merge errors.