Tweaking looks and layout. Finally fixed keeping the icons next to the text.
Some images I'd missed.