diff --git a/resources/graphics/icons/mini-kfaenza/edit-delete.png b/resources/graphics/icons/mini-kfaenza/edit-delete.png
deleted file mode 100644
index 8614a885d..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/edit-delete.png and /dev/null differ
diff --git a/src/gui/formstandardcategorydetails.cpp b/src/gui/formstandardcategorydetails.cpp
index 1e2094724..2beddc8ab 100644
--- a/src/gui/formstandardcategorydetails.cpp
+++ b/src/gui/formstandardcategorydetails.cpp
@@ -8,10 +8,8 @@
 #include "gui/iconthemefactory.h"
 #include "gui/feedsview.h"
 #include "gui/baselineedit.h"
-
-#if !defined(Q_OS_WIN)
 #include "gui/messagebox.h"
-#endif
+#include "gui/systemtrayicon.h"
 
 #include <QLineEdit>
 #include <QTextEdit>
@@ -104,7 +102,17 @@ void FormStandardCategoryDetails::apply() {
       accept();
     }
     else {
-      // TODO: hlasit chybu
+      if (SystemTrayIcon::isSystemTrayActivated()) {
+        SystemTrayIcon::instance()->showMessage(tr("Cannot add category"),
+                                                tr("Category was not added due to error."),
+                                                QSystemTrayIcon::Critical);
+      }
+      else {
+        MessageBox::show(this,
+                         QMessageBox::Critical,
+                         tr("Cannot add category"),
+                         tr("Category was not added due to error."));
+      }
     }
   }
   else {
@@ -112,7 +120,17 @@ void FormStandardCategoryDetails::apply() {
       accept();
     }
     else {
-      // TODO: hlasit chybu
+      if (SystemTrayIcon::isSystemTrayActivated()) {
+        SystemTrayIcon::instance()->showMessage(tr("Cannot edit category"),
+                                                tr("Category was not edited due to error."),
+                                                QSystemTrayIcon::Critical);
+      }
+      else {
+        MessageBox::show(this,
+                         QMessageBox::Critical,
+                         tr("Cannot edit category"),
+                         tr("Category was not edited due to error."));
+      }
     }
   }
 }
diff --git a/src/gui/formstandardcategorydetails.ui b/src/gui/formstandardcategorydetails.ui
index 04a2937c7..67bbed086 100644
--- a/src/gui/formstandardcategorydetails.ui
+++ b/src/gui/formstandardcategorydetails.ui
@@ -40,6 +40,12 @@
        <property name="toolTip">
         <string>Select parent item for your category.</string>
        </property>
+       <property name="iconSize">
+        <size>
+         <width>13</width>
+         <height>12</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item row="1" column="0">
diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp
index f7cb34487..b41c7a5a0 100644
--- a/src/gui/formstandardfeeddetails.cpp
+++ b/src/gui/formstandardfeeddetails.cpp
@@ -9,10 +9,8 @@
 #include "core/feedsmodelstandardfeed.h"
 #include "gui/iconthemefactory.h"
 #include "gui/baselineedit.h"
-
-#if !defined(Q_OS_WIN)
 #include "gui/messagebox.h"
-#endif
+#include "gui/systemtrayicon.h"
 
 #include <QPushButton>
 #include <QTextCodec>
@@ -192,7 +190,17 @@ void FormStandardFeedDetails::apply() {
       accept();
     }
     else {
-      // TODO: hlasit chybu
+      if (SystemTrayIcon::isSystemTrayActivated()) {
+        SystemTrayIcon::instance()->showMessage(tr("Cannot add feed"),
+                                                tr("Feed was not added due to error."),
+                                                QSystemTrayIcon::Critical);
+      }
+      else {
+        MessageBox::show(this,
+                         QMessageBox::Critical,
+                         tr("Cannot add feed"),
+                         tr("Feed was not added due to error."));
+      }
     }
   }
   else {
@@ -201,7 +209,17 @@ void FormStandardFeedDetails::apply() {
       accept();
     }
     else {
-      // TODO: hlasit chybu
+      if (SystemTrayIcon::isSystemTrayActivated()) {
+        SystemTrayIcon::instance()->showMessage(tr("Cannot edit feed"),
+                                                tr("Feed was not edited due to error."),
+                                                QSystemTrayIcon::Critical);
+      }
+      else {
+        MessageBox::show(this,
+                         QMessageBox::Critical,
+                         tr("Cannot edit feed"),
+                         tr("Feed was not edited due to error."));
+      }
     }
   }
 }
diff --git a/src/gui/formstandardfeeddetails.ui b/src/gui/formstandardfeeddetails.ui
index cf4f2254f..8805636f9 100644
--- a/src/gui/formstandardfeeddetails.ui
+++ b/src/gui/formstandardfeeddetails.ui
@@ -31,6 +31,15 @@
        <property name="toolTip">
         <string>Select parent item for your feed.</string>
        </property>
+       <property name="iconSize">
+        <size>
+         <width>12</width>
+         <height>12</height>
+        </size>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="1" column="0">