diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cc4b6c95bd..91884ac0fb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-13 14:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbxbp/toolbar.prg
+    + Added: to send a QIcon() along the text for a toolbar button.
+
+  * contrib/hbxbp/treeview.prg
+    ! Minor. :setCaption() was not setting :caption value.
+
 2012-09-13 16:02 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/src/rtl/hbbffnc.c
   * harbour/include/harbour.hbx
diff --git a/harbour/contrib/hbxbp/toolbar.prg b/harbour/contrib/hbxbp/toolbar.prg
index 05adcdc20a..77a403cf55 100644
--- a/harbour/contrib/hbxbp/toolbar.prg
+++ b/harbour/contrib/hbxbp/toolbar.prg
@@ -257,8 +257,10 @@ METHOD XbpToolbar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS
          oBtn:oAction := QAction( ::oWidget )
          oBtn:oAction:setText( cCaption )
 
-         IF valtype( xImage ) == "C"
+         IF HB_ISCHAR( xImage )
             oBtn:oAction:setIcon( QIcon( xImage ) )
+         ELSEIF HB_ISOBJECT( xImage )
+            oBtn:oAction:setIcon( xImage )
          ENDIF
 
       ENDIF
diff --git a/harbour/contrib/hbxbp/treeview.prg b/harbour/contrib/hbxbp/treeview.prg
index 84dacec4e8..7b91cc64eb 100644
--- a/harbour/contrib/hbxbp/treeview.prg
+++ b/harbour/contrib/hbxbp/treeview.prg
@@ -373,7 +373,7 @@ CLASS XbpTreeViewItem  INHERIT  DataRef
    METHOD   expand( lExpand )                     INLINE   ::oWidget:setExpanded( lExpand )
    METHOD   isExpanded()                          INLINE   ::oWidget:isExpanded()
 
-   METHOD   setCaption( cCaption )                INLINE   ::oWidget:setText( 0, cCaption )
+   METHOD   setCaption( cCaption )                INLINE   ::caption := cCaption, ::oWidget:setText( 0, cCaption )
    METHOD   setImage( xIcon )
    METHOD   setExpandedImage( nResIdoBitmap )
    METHOD   setMarkedImage( nResIdoBitmap )