Final refactor to rename widget across the file.

Also changed the header to display BELOW the icon.