Redraw and reorder

Thanks liquid for the icon

Signed-off-by: anerik <anerikgames@gmail.com>