diff --git a/build_num b/build_num
index 0e2ee0ab7..8303f3ec2 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2987
+#define BUILD_NUM 2989
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8452ad494..cb2bddb93 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-14  Roman Bovsunivkiy <a2k0001@gmail.com>
+
+	* FWBSettings.cpp (FWBSettings::init): fixed #1504 Added (optional)
+	text to the toolbar buttons. Text is turned on by default but
+	can be turned off in the global Preferences dialog.
+
+	* Preferences.cpp: fixed #1505 move "Clip comments in rules"
+	checkbox to "Appearance" tab.
+
 2010-06-14  Vadim Kurland  <vadim@vk.crocodile.org>
 
 	* release_notes_4.0.2.html: Added release notes for v4.0.2 to
diff --git a/src/gui/FWBSettings.cpp b/src/gui/FWBSettings.cpp
index 4b69b306e..84de18e43 100644
--- a/src/gui/FWBSettings.cpp
+++ b/src/gui/FWBSettings.cpp
@@ -84,6 +84,7 @@ const char* objTooltips = SETTINGS_PATH_PREFIX "/UI/objTooltips";
 const char* tooltipDelay = SETTINGS_PATH_PREFIX "/UI/tooltipDelay";
 const char* showUndoPanel = SETTINGS_PATH_PREFIX "/UI/showUndoPanel";
 const char* userWorkflowFlags = SETTINGS_PATH_PREFIX "/UI/userWorkFlowFlags";
+const char* iconsWithText = SETTINGS_PATH_PREFIX "/UI/IconWithText";
 
 const char* emptyRCSLog = SETTINGS_PATH_PREFIX "/RCS/emptyLog";
 const char* rcsFilePreviewStyle = SETTINGS_PATH_PREFIX "/RCS/FilePreviewStyle";
@@ -117,6 +118,7 @@ const char* appGUID = SETTINGS_PATH_PREFIX "/ApplicationGUID";
 const char* targetStatus = SETTINGS_PATH_PREFIX "/TargetStatus/";
 
 
+
 /**
  * Settings path defined here should match Windows registry paths used
  * in the Windows installer/uninstaller scripts.
@@ -242,6 +244,9 @@ void FWBSettings::init()
         qDebug() << "Default application font:"
                  << QApplication::font();
 
+    ok = contains(iconsWithText);
+    if (!ok) setIconsWithText(true);
+
     ok = contains(clipComment);
     if (!ok) setClipComment(true);
 
@@ -425,6 +430,9 @@ void FWBSettings::setDontSaveStdLib( bool f) { setValue(dontSaveStdLib,f);}
 bool FWBSettings::getShowUndoPanel() {return value(showUndoPanel).toBool();}
 void FWBSettings::setShowUndoPanel(bool f) {setValue(showUndoPanel, f);}
 
+bool FWBSettings::getIconsWithText() { return value(iconsWithText).toBool(); }
+void FWBSettings::setIconsWithText(bool f) {setValue(iconsWithText, f);}
+
 QByteArray FWBSettings::getUserWorkflowFlags()
 {
     return value(userWorkflowFlags).toByteArray();
diff --git a/src/gui/FWBSettings.h b/src/gui/FWBSettings.h
index cc56de2ae..513da70ca 100644
--- a/src/gui/FWBSettings.h
+++ b/src/gui/FWBSettings.h
@@ -250,6 +250,9 @@ class FWBSettings : public QSettings {
     QByteArray getUserWorkflowFlags();
     void setUserWorkflowFlags(const QByteArray &);
     
+    bool getIconsWithText();
+    void setIconsWithText(bool f);
+    
    
 private:
     QFont getFontByType(const char*type);
diff --git a/src/gui/PrefsDialog.cpp b/src/gui/PrefsDialog.cpp
index 9655b226e..cb98ea584 100644
--- a/src/gui/PrefsDialog.cpp
+++ b/src/gui/PrefsDialog.cpp
@@ -132,7 +132,7 @@ PrefsDialog::PrefsDialog(QWidget *parent) : QDialog(parent)
     m_dialog->new_addr_tbl_run_tm->setChecked(
         ! st->getBool("Objects/AddressTable/useCompileTimeForNewObjects"));
 
-    m_dialog->toolbarIconsText->setChecked(st->getBool("/UI/IconWithText"));
+    m_dialog->toolbarIconsText->setChecked(st->getIconsWithText());
 
     m_dialog->emptyRCSLog->setChecked( st->getRCSLogState() );
 
@@ -412,7 +412,7 @@ void PrefsDialog::accept()
     st->setBool("UI/ShowDeletedObjects", m_dialog->deletedObj->isChecked());
     st->setBool("UI/ShowObjectsAttributesInTree", m_dialog->attributesInTree->isChecked());
 
-    st->setBool("/UI/IconWithText", m_dialog->toolbarIconsText->isChecked());
+    st->setIconsWithText(m_dialog->toolbarIconsText->isChecked());
 
     ProjectPanel *pp = mw->activeProject();
     if (pp)
diff --git a/src/res/help/en_US/release_notes_4.0.2.html b/src/res/help/en_US/release_notes_4.0.2.html
index 5e2b263e0..c18fd3238 100644
--- a/src/res/help/en_US/release_notes_4.0.2.html
+++ b/src/res/help/en_US/release_notes_4.0.2.html
@@ -11,6 +11,21 @@
 
 <ul>
 
+  <li>
+    <p>
+      fixed #1505 move "Clip comments in rules" checkbox to
+      "Appearance" tab.
+    </p>
+  </li>
+
+  <li>
+    <p>
+      fixed #1504 Added (optional) text to the toolbar buttons. Text
+      is turned on by default but can be turned off in the global
+      Preferences dialog.
+    </p>
+  </li>
+
   <li>
     <p>
       Added release notes v4.0.1 and v4.0.2 to the package.