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

This reverts commit 27f604c462516de96fa4f40b56da241309546829.