diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index f20ac79ab..33d2a5960 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -4,10 +4,12 @@
 Fixed:
 <ul>
 <li>Informative buttons now do not accept focus.</li>
+<li>Button for resetting keyboard shortcut now works.</li>
 </ul>
 
 Added:
 <ul>
+<li>"Defragment database" button shortcut is now changeable.</li>
 <li>Added option to clear keyboard shortcuts.</li>
 <li>Added "progress bar" to web browser.</li>
 <li>Added blue color to feeds/categories which contain unread msgs.</li>
diff --git a/src/core/feedsmodelrootitem.cpp b/src/core/feedsmodelrootitem.cpp
index 9ed21f78e..8842d37cf 100755
--- a/src/core/feedsmodelrootitem.cpp
+++ b/src/core/feedsmodelrootitem.cpp
@@ -25,6 +25,7 @@
 FeedsModelRootItem::FeedsModelRootItem(FeedsModelRootItem *parent_item)
   : m_kind(FeedsModelRootItem::RootItem),
     m_parentItem(parent_item) {
+  setupFonts();
 }
 
 FeedsModelRootItem::~FeedsModelRootItem() {
@@ -33,7 +34,11 @@ FeedsModelRootItem::~FeedsModelRootItem() {
   qDeleteAll(m_childItems);
 }
 
-
+void FeedsModelRootItem::setupFonts() {
+  m_normalFont = QtSingleApplication::font("FeedsView");
+  m_boldFont = m_normalFont;
+  m_boldFont.setBold(true);
+}
 
 int FeedsModelRootItem::row() const {
   if (m_parentItem) {
diff --git a/src/core/feedsmodelrootitem.h b/src/core/feedsmodelrootitem.h
index 341b685fb..2254a3fb3 100755
--- a/src/core/feedsmodelrootitem.h
+++ b/src/core/feedsmodelrootitem.h
@@ -21,6 +21,7 @@
 #include <QIcon>
 
 #include <QDateTime>
+#include <QFont>
 
 
 // Represents ROOT item of FeedsModel.
@@ -91,7 +92,7 @@ class FeedsModelRootItem {
 
     // Checks whether THIS object is child (direct or indirect)
     // of the given root.
-    bool isChildOf(FeedsModelRootItem *root) {     
+    bool isChildOf(FeedsModelRootItem *root) {
       FeedsModelRootItem *this_item = this;
 
       while (this_item->kind() != FeedsModelRootItem::RootItem) {
@@ -169,6 +170,8 @@ class FeedsModelRootItem {
     static bool lessThan(FeedsModelRootItem *lhs, FeedsModelRootItem *rhs);
 
   protected:
+    void setupFonts();
+
     Kind m_kind;
     int m_id;
     QString m_title;
@@ -176,6 +179,9 @@ class FeedsModelRootItem {
     QIcon m_icon;
     QDateTime m_creationDate;
 
+    QFont m_normalFont;
+    QFont m_boldFont;
+
     QList<FeedsModelRootItem*> m_childItems;
     FeedsModelRootItem *m_parentItem;
 };
diff --git a/src/core/feedsmodelstandardcategory.cpp b/src/core/feedsmodelstandardcategory.cpp
index 1f10ef526..3781f4a91 100755
--- a/src/core/feedsmodelstandardcategory.cpp
+++ b/src/core/feedsmodelstandardcategory.cpp
@@ -68,8 +68,8 @@ QVariant FeedsModelStandardCategory::data(int column, int role) const {
         return QVariant();
       }
 
-    case Qt::ForegroundRole:
-      return countOfUnreadMessages() > 0 ? QColor(0, 64, 255) : QVariant();
+    case Qt::FontRole:
+      return countOfUnreadMessages() > 0 ? m_boldFont : m_normalFont;
 
     case Qt::DisplayRole:
       if (column == FDS_MODEL_TITLE_INDEX) {
diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp
index 7167daf10..25299bbcc 100755
--- a/src/core/feedsmodelstandardfeed.cpp
+++ b/src/core/feedsmodelstandardfeed.cpp
@@ -274,8 +274,8 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const {
         return QVariant();
       }
 
-    case Qt::ForegroundRole:
-      return countOfUnreadMessages() > 0 ? QColor(0, 64, 255) : QVariant();
+    case Qt::FontRole:
+      return countOfUnreadMessages() > 0 ? m_boldFont : m_normalFont;
 
     default:
       return QVariant();
diff --git a/src/gui/dynamicshortcutswidget.cpp b/src/gui/dynamicshortcutswidget.cpp
index 4c74d640a..5698ce772 100755
--- a/src/gui/dynamicshortcutswidget.cpp
+++ b/src/gui/dynamicshortcutswidget.cpp
@@ -65,7 +65,7 @@ void DynamicShortcutsWidget::updateShortcuts() {
   }
 }
 
-void DynamicShortcutsWidget::populate(const QList<QAction *> actions) {
+void DynamicShortcutsWidget::populate(const QList<QAction*> actions) {
   m_actionBindings.clear();
 
   int row_id = 0;
@@ -73,7 +73,7 @@ void DynamicShortcutsWidget::populate(const QList<QAction *> actions) {
   foreach (QAction *action, actions) {
     // Create shortcut catcher for this action and set default shortcut.
     ShortcutCatcher *catcher = new ShortcutCatcher(this);
-    catcher->setShortcut(action->shortcut());
+    catcher->setDefaultShortcut(action->shortcut());
 
     // Store information for re-initialization of shortcuts
     // of actions when widget gets "confirmed".
diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index 90f2670b8..b38205e3d 100755
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -120,7 +120,8 @@ QList<QAction*> FormMain::allActions() {
              m_ui->m_actionSelectNextFeedCategory <<
              m_ui->m_actionSelectPreviousFeedCategory <<
              m_ui->m_actionSelectNextMessage <<
-             m_ui->m_actionSelectPreviousMessage;
+             m_ui->m_actionSelectPreviousMessage <<
+             m_ui->m_actionDefragmentDatabase;
 
   return actions;
 }
diff --git a/src/gui/shortcutcatcher.cpp b/src/gui/shortcutcatcher.cpp
index 5e379669a..ca231a8dc 100644
--- a/src/gui/shortcutcatcher.cpp
+++ b/src/gui/shortcutcatcher.cpp
@@ -133,5 +133,3 @@ void ShortcutCatcher::updateDisplayShortcut() {
 
   m_btnChange->setText(str);
 }
-
-
diff --git a/src/gui/shortcutcatcher.h b/src/gui/shortcutcatcher.h
index d06683a6a..018ae9c2d 100644
--- a/src/gui/shortcutcatcher.h
+++ b/src/gui/shortcutcatcher.h
@@ -54,14 +54,15 @@ class ShortcutCatcher : public QWidget {
       return m_currentSequence;
     }
 
-    inline void setShortcut(const QKeySequence &key) {
-      m_currentSequence = m_defaultSequence = key;
-      doneRecording();
+    inline void setDefaultShortcut(const QKeySequence &key) {
+      m_defaultSequence = key;
+      setShortcut(key);
     }
 
-  protected slots:
-    void startRecording();
-    void doneRecording();
+    inline void setShortcut(const QKeySequence &key) {
+      m_currentSequence = key;
+      doneRecording();
+    }
 
   public slots:
     inline void resetShortcut() {
@@ -72,6 +73,10 @@ class ShortcutCatcher : public QWidget {
       setShortcut(QKeySequence());
     }
 
+  protected slots:
+    void startRecording();
+    void doneRecording();
+
   signals:
     void shortcutChanged(const QKeySequence &seguence);