diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cdf13f49f6..c20138c5d9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-08-03 21:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbide/resources/b_18.png
+  * contrib/hbide/resources/b_19.png
+  * contrib/hbide/resources/b_2.png
+  * contrib/hbide/resources/b_5.png
+  * contrib/hbide/resources/b_8.png
+    % Reordered: to put more glamour to HbIDE.
+
+  * contrib/hbide/edit.prg
+  * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+    ! Fixed: tab key was misbehaving on an empty line.
+    ! Fixed: while in column mode, if the original text cursor was 
+       before logical cursor, insertion of any key was clearing the selection.
+       An annoying bug it was.
+
 2012-08-03 15:31 UTC+0200 Viktor Szakats (harbour syenar.net)
   + bin/commit.hb
   + bin/find.hb
diff --git a/harbour/contrib/hbide/edit.prg b/harbour/contrib/hbide/edit.prg
index a2c1ecf44a..b8e1994f96 100644
--- a/harbour/contrib/hbide/edit.prg
+++ b/harbour/contrib/hbide/edit.prg
@@ -1238,7 +1238,11 @@ METHOD IdeEdit:handleTab( key )
       ENDIF
       cLine := ::getLine( nRow + 1 )
       IF key == Qt_Key_Tab
-         cLine := substr( cLine, 1, nCol ) + cComment + substr( cLine, nCol + 1 )
+         IF empty( cLine )
+            cLine := cComment
+         ELSE
+            cLine := substr( cLine, 1, nCol ) + cComment + substr( cLine, nCol + 1 )
+         ENDIF
       ELSE
          cLine := substr( cLine, 1, nCol - nLen ) + substr( cLine, nCol + 1 )
       ENDIF
diff --git a/harbour/contrib/hbide/resources/b_18.png b/harbour/contrib/hbide/resources/b_18.png
index 8f57c1151d..0f78b27704 100644
Binary files a/harbour/contrib/hbide/resources/b_18.png and b/harbour/contrib/hbide/resources/b_18.png differ
diff --git a/harbour/contrib/hbide/resources/b_19.png b/harbour/contrib/hbide/resources/b_19.png
index 735feeed2b..ede38b7a7e 100644
Binary files a/harbour/contrib/hbide/resources/b_19.png and b/harbour/contrib/hbide/resources/b_19.png differ
diff --git a/harbour/contrib/hbide/resources/b_2.png b/harbour/contrib/hbide/resources/b_2.png
index ede38b7a7e..735feeed2b 100644
Binary files a/harbour/contrib/hbide/resources/b_2.png and b/harbour/contrib/hbide/resources/b_2.png differ
diff --git a/harbour/contrib/hbide/resources/b_5.png b/harbour/contrib/hbide/resources/b_5.png
index 0f78b27704..de7b7080d2 100644
Binary files a/harbour/contrib/hbide/resources/b_5.png and b/harbour/contrib/hbide/resources/b_5.png differ
diff --git a/harbour/contrib/hbide/resources/b_8.png b/harbour/contrib/hbide/resources/b_8.png
index de7b7080d2..8f57c1151d 100644
Binary files a/harbour/contrib/hbide/resources/b_8.png and b/harbour/contrib/hbide/resources/b_8.png differ
diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
index 71c2e0ba14..1eb72790b2 100644
--- a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
@@ -1249,26 +1249,23 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
    }
    else if( ! ctrl && k >= ' ' && k < 127 && columnBegins >= 0 && selectionMode == selectionMode_column )
    {
-      if( isCursorInSelection() )
+      if( block )
       {
-         if( block )
-         {
-            PHB_ITEM p1 = hb_itemPutNI( NULL, 21013 );
-            PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, "HB_QKEYEVENT", NULL, 0 ) ;
-            hb_vmEvalBlockV( block, 2, p1, p2 );
-            hb_itemRelease( p1 );
-            hb_itemRelease( p2 );
+         PHB_ITEM p1 = hb_itemPutNI( NULL, 21013 );
+         PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, "HB_QKEYEVENT", NULL, 0 ) ;
+         hb_vmEvalBlockV( block, 2, p1, p2 );
+         hb_itemRelease( p1 );
+         hb_itemRelease( p2 );
 
-            if( columnBegins == columnEnds )
-            {
-               columnBegins++;
-               columnEnds++;
-               hbPostSelectionInfo();
-            }
-            event->accept();
-            repaint();
-            return true;
+         if( columnBegins == columnEnds )
+         {
+            columnBegins++;
+            columnEnds++;
+            hbPostSelectionInfo();
          }
+         event->accept();
+         repaint();
+         return true;
       }
       else
       {