Index: src/main/java/common/javax/swing/plaf/basic/BasicButtonListener.java =================================================================== --- src/main/java/common/javax/swing/plaf/basic/BasicButtonListener.java (revision 490131) +++ src/main/java/common/javax/swing/plaf/basic/BasicButtonListener.java (working copy) @@ -101,9 +101,10 @@ } public void propertyChange(final PropertyChangeEvent event) { - if (event != null && AbstractButton.CONTENT_AREA_FILLED_CHANGED_PROPERTY.equals(event.getPropertyName())) { + if (AbstractButton.CONTENT_AREA_FILLED_CHANGED_PROPERTY.equals(event.getPropertyName())) { LookAndFeel.installProperty(button, StringConstants.OPAQUE_PROPERTY, event.getNewValue()); } + button.revalidate(); button.repaint(); }