[#57] Change class names; Add i tag accordig to c-r [e5e5771]
[#58] Change used class names in popup with buttons