Incorporated ussuri CL suggestions

Also added missing png for hilighting of icon-button.