diff --git a/src/AColor.cpp b/src/AColor.cpp
index 331b506da..84dbe3d3b 100644
--- a/src/AColor.cpp
+++ b/src/AColor.cpp
@@ -230,10 +230,13 @@ void AColor::Bevel(wxDC & dc, bool up, const wxRect & r)
    AColor::Line(dc, r.x, r.y + r.height, r.x + r.width, r.y + r.height);
 }
 
-void AColor::Bevel2(wxDC & dc, bool up, const wxRect & r, bool bSel)
+void AColor::Bevel2
+(wxDC & dc, bool up, const wxRect & r, bool bSel, bool bHighlight)
 {
    int index = 0;
-   if( bSel )
+   if ( bHighlight )
+      index = bmpHiliteButtonExpand;
+   else if( bSel )
       index = up ? bmpUpButtonExpandSel : bmpDownButtonExpandSel;
    else
       index = up ? bmpUpButtonExpand : bmpDownButtonExpand;
diff --git a/src/AColor.h b/src/AColor.h
index c0c7e8b68..fe8d0c2c4 100644
--- a/src/AColor.h
+++ b/src/AColor.h
@@ -66,7 +66,8 @@ class AColor {
    static void Line(wxDC & dc, wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
    static void DrawFocus(wxDC & dc, wxRect & r);
    static void Bevel(wxDC & dc, bool up, const wxRect & r);
-   static void Bevel2(wxDC & dc, bool up, const wxRect & r, bool bSel=false);
+   static void Bevel2
+      (wxDC & dc, bool up, const wxRect & r, bool bSel=false, bool bHighlight = false);
    static void BevelTrackInfo(wxDC & dc, bool up, const wxRect & r);
    static wxColour Blend(const wxColour & c1, const wxColour & c2);