Updated raw template
New device icons