GCP-7559 finalized layout of elements plus added icons for buttons