Minor pattern improvements and added icons
Added icons