Simplify sidebar UI, remove dead space.
Fix save/OK icons.