Improving square icon (fixes #1846)