Revert "[1/2] base: expandable volume panel and tweaks"

This reverts commit a726ce26f36abf7f113fa3cba40e603b7fbe543f.