correct icons text and many more...