diff --git a/src/formatter/articlegrantleeobject.h b/src/formatter/articlegrantleeobject.h
--- a/src/formatter/articlegrantleeobject.h
+++ b/src/formatter/articlegrantleeobject.h
@@ -36,16 +36,9 @@
     Q_PROPERTY(QString enclosure READ enclosure)
     Q_PROPERTY(QString articleCompleteStoryLink READ articleCompleteStoryLink)
     Q_PROPERTY(QString imageFeed READ imageFeed)
-    Q_PROPERTY(QString deleteAction READ deleteAction)
-    Q_PROPERTY(QString markAsReadAction READ markAsReadAction)
-    Q_PROPERTY(QString markAsUnreadAction READ markAsUnreadAction)
-    Q_PROPERTY(QString markAsImportantAction READ markAsImportantAction)
-    Q_PROPERTY(QString sendUrlAction READ sendUrlAction)
-    Q_PROPERTY(QString sendFileAction READ sendFileAction)
-    Q_PROPERTY(QString openInExternalBrowser READ openInExternalBrowser)
-    Q_PROPERTY(QString openInBackgroundTab READ openInBackgroundTab)
     Q_PROPERTY(Akregator::ArticleGrantleeObject::ArticleStatus articleStatus READ articleStatus)
     Q_PROPERTY(bool important READ important)
+    Q_PROPERTY(QString actionToken READ actionToken)
 
 public:
     explicit ArticleGrantleeObject(const QUrl &imageDir, const Article &article, ArticleFormatter::IconOption icon, QObject *parent = nullptr);
@@ -76,18 +69,14 @@
     QString markAsImportantAction() const;
     QString sendUrlAction() const;
     QString sendFileAction() const;
-    QString openInExternalBrowser() const;
-
-    QString openInBackgroundTab() const;
 
     bool important() const;
+    QString actionToken() const;
 
 private:
-    QString createActionUrl(const QString &actionName) const;
     Article mArticle;
     ArticleFormatter::IconOption mArticleFormatOption;
     QUrl mImageDir;
-    int mIconSize;
 };
 }
 #endif // ARTICLEGRANTLEEOBJECT_H
diff --git a/src/formatter/articlegrantleeobject.cpp b/src/formatter/articlegrantleeobject.cpp
--- a/src/formatter/articlegrantleeobject.cpp
+++ b/src/formatter/articlegrantleeobject.cpp
@@ -19,12 +19,10 @@
 
 #include "articlegrantleeobject.h"
 #include "articleformatter.h"
-#include <MessageViewer/IconNameCache>
 #include "utils.h"
 #include "feed.h"
 #include <QLocale>
 #include <KLocalizedString>
-#include <KIconLoader>
 #include <QDateTime>
 #include <QUrl>
 #include <QUrlQuery>
@@ -37,7 +35,6 @@
     , mArticleFormatOption(iconOption)
     , mImageDir(imageDir)
 {
-    mIconSize = KIconLoader::global()->currentSize(KIconLoader::Small);
 }
 
 ArticleGrantleeObject::~ArticleGrantleeObject()
@@ -117,87 +114,12 @@
     return text;
 }
 
-QString ArticleGrantleeObject::createActionUrl(const QString &actionName) const
+QString ArticleGrantleeObject::actionToken() const
 {
-    QUrl url;
-    url.setScheme(QStringLiteral("akregatoraction"));
-    url.setPath(actionName);
     QUrlQuery query;
     query.addQueryItem(QStringLiteral("id"), mArticle.guid());
     query.addQueryItem(QStringLiteral("feed"), mArticle.feed()->xmlUrl());
-    url.setQuery(query);
-    return url.toDisplayString();
-}
-
-QString ArticleGrantleeObject::deleteAction() const
-{
-    const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("edit-delete"), KIconLoader::Small)).url();
-    const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" height=\"%4\" width=\"%4\" title=\"%3\" src=\"%2\"></a>\n")
-                         .arg(createActionUrl(QStringLiteral("delete")), iconPath, i18n("Delete Article"), QString::number(mIconSize));
-    return text;
-}
-
-QString ArticleGrantleeObject::markAsReadAction() const
-{
-    const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("mail-mark-read"), KIconLoader::Small)).url();
-    const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" height=\"%4\" width=\"%4\" title=\"%3\" src=\"%2\"></a>\n")
-                         .arg(createActionUrl(QStringLiteral("markAsRead")), iconPath, i18n("Mark as Read"), QString::number(mIconSize));
-    return text;
-}
-
-QString ArticleGrantleeObject::markAsUnreadAction() const
-{
-    const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("mail-mark-unread"), KIconLoader::Small)).url();
-    const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" title=\"%3\" height=\"%4\" width=\"%4\" src=\"%2\"></a>\n")
-                         .arg(createActionUrl(QStringLiteral("markAsUnRead")), iconPath, i18n("Mark as Unread"), QString::number(mIconSize));
-    return text;
-}
-
-QString ArticleGrantleeObject::markAsImportantAction() const
-{
-    if (mArticle.keep()) {
-        const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("mail-message"), KIconLoader::Small)).url();
-        const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" title=\"%3\" height=\"%4\" width=\"%4\" src=\"%2\"></a>\n")
-                             .arg(createActionUrl(QStringLiteral("markAsImportant")), iconPath, i18n("Remove Important Status"), QString::number(mIconSize));
-        return text;
-    } else {
-        const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("mail-mark-important"), KIconLoader::Small)).url();
-        const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" title=\"%3\" height=\"%4\" width=\"%4\" src=\"%2\"></a>\n")
-                             .arg(createActionUrl(QStringLiteral("markAsImportant")), iconPath, i18n("Mark as Important"), QString::number(mIconSize));
-        return text;
-    }
-}
-
-QString ArticleGrantleeObject::sendUrlAction() const
-{
-    const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("mail-message-new"), KIconLoader::Small)).url();
-    const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" title=\"%3\" height=\"%4\" width=\"%4\" src=\"%2\"></a>\n")
-                         .arg(createActionUrl(QStringLiteral("sendUrlArticle")), iconPath, i18n("Send Link Address"), QString::number(mIconSize));
-    return text;
-}
-
-QString ArticleGrantleeObject::sendFileAction() const
-{
-    const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("mail-message-new"), KIconLoader::Small)).url();
-    const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" title=\"%3\" height=\"%4\" width=\"%4\" src=\"%2\"></a>\n")
-                         .arg(createActionUrl(QStringLiteral("sendFileArticle")), iconPath, i18n("Send File Address"), QString::number(mIconSize));
-    return text;
-}
-
-QString ArticleGrantleeObject::openInExternalBrowser() const
-{
-    const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("window-new"), KIconLoader::Small)).url();
-    const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" title=\"%3\" height=\"%4\" width=\"%4\" src=\"%2\"></a>\n")
-                         .arg(createActionUrl(QStringLiteral("openInExternalBrowser")), iconPath, i18n("Open Link in External Browser"), QString::number(mIconSize));
-    return text;
-}
-
-QString ArticleGrantleeObject::openInBackgroundTab() const
-{
-    const QString iconPath = QUrl::fromLocalFile(MessageViewer::IconNameCache::instance()->iconPath(QStringLiteral("tab-new"), KIconLoader::Small)).url();
-    const QString text = QStringLiteral("<a href=\"%1\"><img class=\"headimage\" title=\"%3\" height=\"%4\" width=\"%4\" src=\"%2\"></a>\n")
-                         .arg(createActionUrl(QStringLiteral("openInBackgroundTab")), iconPath, i18n("Open In Background Tab"), QString::number(mIconSize));
-    return text;
+    return QLatin1Char('?') + query.toString(QUrl::FullyEncoded);
 }
 
 bool ArticleGrantleeObject::important() const
diff --git a/src/formatter/html/5.2/combinedview.html b/src/formatter/html/5.2/combinedview.html
--- a/src/formatter/html/5.2/combinedview.html
+++ b/src/formatter/html/5.2/combinedview.html
@@ -69,7 +69,7 @@
     color: rgb(120, 125, 129) ! important;
     font-size: {{ mediumFontSize}}px;
     }
-    .headimage {
+    .headimage, div.theactioncell a img {
     float: right;
     margin-left: 5px;
     }
@@ -100,18 +100,22 @@
     <div class="actionrowtable">
       {% with article.articleStatus as result %}
           {% ifequal article.Unread result %}
-          <div class="theactioncell">{{ article.markAsReadAction|safe }}</div>
+          <div class="theactioncell"><a href="akregatoraction:markAsRead{{ article.actionToken }}">{% icon "mail-mark-read" small _("Mark as Read") %}</a></div>
           {% endifequal %}
           {% ifequal article.Read result %}
-          <div class="theactioncell">{{ article.markAsUnreadAction|safe }}</div>
+          <div class="theactioncell"><a href="akregatoraction:markAsUnRead{{ article.actionToken }}">{% icon "mail-mark-unread" small _("Mark as Unread") %}</a></div>
           {% endifequal %}
       {% endwith %}
-      <div class="theactioncell">{{ article.markAsImportantAction|safe }}</div>
-      <div class="theactioncell">{{ article.openInExternalBrowser|safe }}</div>
-      <div class="theactioncell">{{ article.openInBackgroundTab|safe }}</div>
-      <div class="theactioncell">{{ article.sendFileAction|safe }}</div>
-      <div class="theactioncell">{{ article.sendUrlAction|safe }}</div>
-      <div class="theactioncell theactionbigcell">{{ article.deleteAction|safe }}</div>
+      {% if article.important %}
+        <div class="theactioncell"><a href="akregatoraction:markAsImportant{{ article.actionToken }}">{% icon "mail-message" small _("Remove Important Status") %}</a></div>
+      {% else %}
+        <div class="theactioncell"><a href="akregatoraction:markAsImportant{{ article.actionToken }}">{% icon "mail-mark-important" small _("Mark as Important") %}</a></div>
+      {% endif %}
+      <div class="theactioncell"><a href="akregatoraction:openInExternalBrowser{{ article.actionToken }}">{% icon "window-new" small _("Open Link in External Browser") %}</a></div>
+      <div class="theactioncell"><a href="akregatoraction:openInBackgroundTab{{ article.actionToken }}">{% icon "tab-new" small _("Open In Background Tab") %}</a></div>
+      <div class="theactioncell"><a href="akregatoraction:sendFileArticle{{ article.actionToken }}">{% icon "mail-message-new" small _("Send File Address") %}</a></div>
+      <div class="theactioncell"><a href="akregatoraction:sendUrlArticle{{ article.actionToken }}">{% icon "mail-message-new" small _("Send Link Address") %}</a></div>
+      <div class="theactioncell theactionbigcell"><a href="akregatoraction:delete{{ article.actionToken }}">{% icon "edit-delete" small _("Delete Article") %}</a></div>
     <div>
   </div>
   </div>