diff --git a/pmd/src/net/sourceforge/pmd/swingui/ComponentFactory.java b/pmd/src/net/sourceforge/pmd/swingui/ComponentFactory.java
index 2a589623db..c8086ee0df 100644
--- a/pmd/src/net/sourceforge/pmd/swingui/ComponentFactory.java
+++ b/pmd/src/net/sourceforge/pmd/swingui/ComponentFactory.java
@@ -69,7 +69,7 @@ class ComponentFactory {
         }
 
         button = new JButton(title);
-        lineBorder = new LineBorder(background.darker(), 1, true);
+        lineBorder = new LineBorder(Color.DARK_GRAY, 1, true);
         bevelBorder = new BevelBorder(BevelBorder.RAISED);
         compoundBorder = new CompoundBorder(bevelBorder, lineBorder);
         etchedBorder = new EtchedBorder(EtchedBorder.LOWERED);
diff --git a/pmd/src/net/sourceforge/pmd/swingui/HTMLResultRenderer.java b/pmd/src/net/sourceforge/pmd/swingui/HTMLResultRenderer.java
index 2b6f88d7b3..a731daf233 100644
--- a/pmd/src/net/sourceforge/pmd/swingui/HTMLResultRenderer.java
+++ b/pmd/src/net/sourceforge/pmd/swingui/HTMLResultRenderer.java
@@ -88,8 +88,9 @@ class HTMLResultRenderer {
         m_writer.write(fileName);
         m_writer.write("\n<br>\n");
 
-        Color pmdGray = UIManager.getColor("pmdGray");
-        String hexValue = Integer.toHexString(pmdGray.getRGB());
+        //Color pmdGray = UIManager.getColor("pmdGray");
+        //String hexValue = Integer.toHexString(pmdGray.getRGB());
+        String hexValue = Integer.toHexString(Color.WHITE.getRGB());
 
         if (hexValue.startsWith("0x")) {
             hexValue = hexValue.substring(2);
diff --git a/pmd/src/net/sourceforge/pmd/swingui/PMDViewer.java b/pmd/src/net/sourceforge/pmd/swingui/PMDViewer.java
index 025f33eeed..38b2214c9a 100644
--- a/pmd/src/net/sourceforge/pmd/swingui/PMDViewer.java
+++ b/pmd/src/net/sourceforge/pmd/swingui/PMDViewer.java
@@ -109,9 +109,7 @@ public class PMDViewer extends JFrame {
 
             // Setup the User Interface based on this computer's operating system.
             // This must be done before calling Java and Swing classes that call the GUI.
-            String useLookAndFeel = "net.sourceforge.pmd.swingui.PMDLookAndFeel";
-
-            UIManager.setLookAndFeel(useLookAndFeel);
+            UIManager.setLookAndFeel("net.sourceforge.pmd.swingui.PMDLookAndFeel");
 
             PMDViewer pmdViewer = new PMDViewer();
             pmdViewer.setVisible(true);
diff --git a/pmd/src/net/sourceforge/pmd/swingui/PreferencesEditor.java b/pmd/src/net/sourceforge/pmd/swingui/PreferencesEditor.java
index 521f121aa9..91a629f56c 100644
--- a/pmd/src/net/sourceforge/pmd/swingui/PreferencesEditor.java
+++ b/pmd/src/net/sourceforge/pmd/swingui/PreferencesEditor.java
@@ -208,7 +208,7 @@ class PreferencesEditor extends JPanel {
         fontMetrics = button.getFontMetrics(button.getFont());
         width = fontMetrics.stringWidth(button.getText()) + 50;
         size = new Dimension(width, button.getHeight());
-        button.setSize(size);
+        //button.setSize(size);
         button.setPreferredSize(size);
         button.setMinimumSize(size);
         button.setMaximumSize(size);
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index 510c2c4013..ea34bf98ad 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -10,6 +10,7 @@
     <section name="Credits">
         <subsection name="Individuals">
         <ul>
+            <li>Niels Peter Strandberg - various tweaks to the PMD Swing UI</li>
             <li>Ian Shef - documentation updates, bug reports on the Gel IDE plugin</li>
             <li>Astro Jetson Jr - a tweak for the ShortVariableNameRule</li>
             <li>Paul King - a complete rewrite of the Gel plugin</li>