Moving to icon format for signature/encryption -- needs bnvk's love though!