Issue #152: added consistent icons; renamed some packages