SOAP-486 and SOAP-487 Added missing buttons to toolbar