Message handler fix and change of icon and name