Move to Java 7
Fix icon selection problem