diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/ShapeDescriptor.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/ShapeDescriptor.java
index cbbee6ee..d995b0e4 100755
--- a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/ShapeDescriptor.java
+++ b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/ShapeDescriptor.java
@@ -36,7 +36,7 @@ public boolean equals(Object other) {
 
         ShapeDescriptor otherOne = (ShapeDescriptor) other;
 
-        return shape.equals(otherOne.shape) && rgbColor.equals(otherOne.rgbColor) && size == otherOne.size;
+        return shape == otherOne.shape && rgbColor.equals(otherOne.rgbColor) && size == otherOne.size;
     }
 
     @Override
diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/priority/PriorityDescriptor.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/priority/PriorityDescriptor.java
index 81e50087..14d5fcb6 100755
--- a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/priority/PriorityDescriptor.java
+++ b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/priority/PriorityDescriptor.java
@@ -116,7 +116,7 @@ public boolean equals(Object other) {
 
         PriorityDescriptor otherOne = (PriorityDescriptor) other;
 
-        return priority.equals(otherOne.priority)
+        return priority == otherOne.priority
                 && StringUtils.equals(label, otherOne.label)
                 && shape.equals(otherOne.shape)
                 && StringUtils.equals(description, otherOne.description)
diff --git a/pom.xml b/pom.xml
index 04a7b10c..38b73ce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <tycho.version>4.0.10</tycho.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <pmd.version>7.18.0</pmd.version>
-    <pmd.build-tools.version>35</pmd.build-tools.version>
+    <pmd.build-tools.version>36</pmd.build-tools.version>
     <checkstyle.version>12.1.2</checkstyle.version>
     <checkstyle.plugin.version>3.6.0</checkstyle.plugin.version>
     <pmd.plugin.version>3.28.0</pmd.plugin.version>