small type fixes
icon images
Merge commit '124bbd9f0429f0f2153f3d982d35c37222991923'