--- a/FilterBar.xml	Fri Nov 04 02:54:32 2016 -0400
+++ b/FilterBar.xml	Sun Dec 25 13:04:57 2016 -0500
@@ -8,14 +8,45 @@
       <OnShow method="OnShow" />
     </Scripts>
 
+    <Layers>
+      <Layer level="OVERLAY">
+        <Texture parentKey="CVarsHighlight">
+          <Color a=".5" r="1" g="1" b="1" />
+        </Texture>
+      </Layer>
+    </Layers>
   </Frame>
-  <Button name="WorldPlanFilterPin" virtual="true" inherits="WorldPlanQuestPin" mixin="WorldPlanFilterPinMixin">
+  <Button name="WorldPlanFilterPin" virtual="true" mixin="WorldPlanFilterPinMixin">
     <Scripts>
-      <OnMouseDown method="OnMouseDown" />
       <OnClick method="OnClick" />
       <OnLoad method="OnLoad" />
+      <OnEvent method="OnEvent" />
+      <OnUpdate method="OnUpdate" />
+      <OnShow method="OnShow" />
+      <OnHide method="OnHide" />
+      <OnMouseDown method="OnMouseDown" />
       <OnEnter method="OnEnter" />
       <OnLeave method="OnLeave" />
     </Scripts>
+    <Layers>
+      <Layer level="BACKGROUND">
+        <Texture parentKey="RewardBorder" setAllPoints="true" />
+      </Layer>
+      <Layer level="ARTWORK">
+        <Texture parentKey="icon">
+          <Anchors>
+            <Anchor point="BOTTOMLEFT" x="1" y="1" />
+            <Anchor point="TOPRIGHT" x="-1" y="-1" />
+          </Anchors>
+        </Texture>
+      </Layer>
+      <Layer level="OVERLAY">
+        <FontString parentKey="count" inherits="WorldPlanNumberFontThin">
+          <Anchors>
+            <Anchor point="RIGHT" x="-3" />
+          </Anchors>
+        </FontString>
+      </Layer>
+    </Layers>
   </Button>
 </Ui>
\ No newline at end of file