diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 999dc656b..136ab535a 100644
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -101,8 +101,6 @@ void FeedMessageViewer::updateTrayIconStatus(int unread_messages,
                                                int total_messages) {
   Q_UNUSED(total_messages)
 
-  // TODO: Optimize the call isSystemTrayActivated()
-  // because it opens settings (use member variable)?.
   if (SystemTrayIcon::isSystemTrayActivated()) {
     SystemTrayIcon::instance()->setNumber(unread_messages);
   }
diff --git a/src/gui/formstandardfeeddetails.ui b/src/gui/formstandardfeeddetails.ui
index 7fa48a95d..7ad93c019 100644
--- a/src/gui/formstandardfeeddetails.ui
+++ b/src/gui/formstandardfeeddetails.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>375</width>
-    <height>360</height>
+    <height>373</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,9 +16,6 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
      <item row="0" column="0">
       <widget class="QLabel" name="m_lblParentCategory">
        <property name="text">
@@ -101,6 +98,20 @@
       </widget>
      </item>
      <item row="6" column="0">
+      <widget class="QCheckBox" name="m_checkAutoUpdate">
+       <property name="text">
+        <string>Update each</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QSpinBox" name="m_spinAutoUpdate">
+       <property name="suffix">
+        <string> minutes</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="0">
       <widget class="QLabel" name="m_lblIcon">
        <property name="text">
         <string>Icon</string>
@@ -110,7 +121,7 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
+     <item row="7" column="1">
       <widget class="QToolButton" name="m_btnIcon">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -147,7 +158,7 @@
        </property>
       </widget>
      </item>
-     <item row="7" column="0" colspan="2">
+     <item row="8" column="0" colspan="2">
       <widget class="QGroupBox" name="m_gbAuthentication">
        <property name="toolTip">
         <string>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</string>
diff --git a/src/gui/systemtrayicon.cpp b/src/gui/systemtrayicon.cpp
index 5e4b9f943..4713bff60 100644
--- a/src/gui/systemtrayicon.cpp
+++ b/src/gui/systemtrayicon.cpp
@@ -141,7 +141,7 @@ void SystemTrayIcon::setNumber(int number) {
 
     // Numbers with more than 2 digits won't be readable, display
     // infinity symbol in that case.
-    if (number > 99) {
+    if (number > 999) {
       m_font.setPixelSize(100);
 
       tray_painter.setFont(m_font);
@@ -150,8 +150,11 @@ void SystemTrayIcon::setNumber(int number) {
                             QChar(8734));
     }
     else {
-      // Smaller number if it has 2 digits.
-      if (number > 9) {
+      // Smaller number if it has 3 digits.
+      if (number > 99) {
+        m_font.setPixelSize(55);
+      }
+      else if (number > 9) {
         m_font.setPixelSize(80);
       }
       // Bigger number if it has just one digit.