--- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java	2016-01-25 00:13:13.000000000 +0400
+++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java	2016-01-25 00:13:13.000000000 +0400
@@ -102,6 +102,7 @@
     //          Install PLAF
     // ********************************
     public void installUI(JComponent c) {
+        super.installUI(c);
         installDefaults((AbstractButton) c);
         installListeners((AbstractButton) c);
         installKeyboardActions((AbstractButton) c);
@@ -381,17 +382,17 @@
         if(model.isEnabled()) {
             /*** paint the text normally */
             g.setColor(b.getForeground());
-            SwingUtilities2.drawStringUnderlineCharAt(c, g,text, mnemonicIndex,
+            getTextUIDrawing().drawStringUnderlineCharAt(c, g,text, mnemonicIndex,
                                           textRect.x + getTextShiftOffset(),
                                           textRect.y + fm.getAscent() + getTextShiftOffset());
         }
         else {
             /*** paint the text disabled ***/
             g.setColor(b.getBackground().brighter());
-            SwingUtilities2.drawStringUnderlineCharAt(c, g,text, mnemonicIndex,
+            getTextUIDrawing().drawStringUnderlineCharAt(c, g,text, mnemonicIndex,
                                           textRect.x, textRect.y + fm.getAscent());
             g.setColor(b.getBackground().darker());
-            SwingUtilities2.drawStringUnderlineCharAt(c, g,text, mnemonicIndex,
+            getTextUIDrawing().drawStringUnderlineCharAt(c, g,text, mnemonicIndex,
                                           textRect.x - 1, textRect.y + fm.getAscent() - 1);
         }
     }