diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index 20ece0431aeb6..8678e61f0847e 100644
--- a/src/gui/tray/activitylistmodel.cpp
+++ b/src/gui/tray/activitylistmodel.cpp
@@ -150,12 +150,13 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
         const auto fileName = activity._fileAction == QStringLiteral("file_renamed") ? activity._renamedFile
                                                                                      : activity._file;
         if (!fileName.isEmpty()) {
-            const auto folder = FolderMan::instance()->folder(activity._folder);
+            auto *folderMan = FolderMan::instance();
+            const auto folder = folderMan->folder(activity._folder);
 
             const QString relPath = folder ? folder->remotePathTrailingSlash() + fileName
                                            : fileName;
 
-            const auto localFiles = FolderMan::instance()->findFileInLocalFolders(relPath, accountState->account());
+            const auto localFiles = folderMan->findFileInLocalFolders(relPath, accountState->account());
 
             if (localFiles.isEmpty()) {
                 return QString();
@@ -180,11 +181,12 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
 
     const auto getDisplayPath = [&activity, &accountState]() {
         if (!activity._file.isEmpty()) {
-            const auto folder = FolderMan::instance()->folder(activity._folder);
+            auto *folderMan = FolderMan::instance();
+            const auto folder = folderMan->folder(activity._folder);
 
             QString relPath = folder ? folder->remotePathTrailingSlash() + activity._file : activity._file;
 
-            const auto localFiles = FolderMan::instance()->findFileInLocalFolders(relPath, accountState->account());
+            const auto localFiles = folderMan->findFileInLocalFolders(relPath, accountState->account());
 
             if (localFiles.count() > 0) {
                 if (relPath.startsWith('/') || relPath.startsWith('\\')) {
@@ -904,11 +906,10 @@ QVariant ActivityListModel::convertLinkToActionButton(const OCC::ActivityLink &a
 
     const auto isReplyIconApplicable = activityLink._verb == QStringLiteral("REPLY");
 
-    const QString replyButtonPath = QStringLiteral("image://svgimage-custom-color/reply.svg");
-
     if (isReplyIconApplicable) {
-        activityLinkCopy._imageSource = QString(replyButtonPath + "/");
-        activityLinkCopy._imageSourceHovered = QString(replyButtonPath + "/");
+        const QString replyButtonPath = QStringLiteral("image://svgimage-custom-color/reply.svg/");
+        activityLinkCopy._imageSource = replyButtonPath;
+        activityLinkCopy._imageSourceHovered = replyButtonPath;
     }
 
     return QVariant::fromValue(activityLinkCopy);
diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index 96144b83f9653..4062eb3ca0d87 100644
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -724,25 +724,26 @@ void User::slotRefresh()
 {
     slotRefreshUserStatus();
     
+    auto *account = _account.data();
     if (checkPushNotificationsAreReady()) {
         // we are relying on WebSocket push notifications - ignore refresh attempts from UI
         slotRefreshActivities();
-        _timeSinceLastCheck[_account.data()].invalidate();
+        _timeSinceLastCheck[account].invalidate();
         return;
     }
 
     // QElapsedTimer isn't actually constructed as invalid.
-    if (!_timeSinceLastCheck.contains(_account.data())) {
-        _timeSinceLastCheck[_account.data()].invalidate();
+    if (!_timeSinceLastCheck.contains(account)) {
+        _timeSinceLastCheck[account].invalidate();
     }
-    QElapsedTimer &timer = _timeSinceLastCheck[_account.data()];
+    QElapsedTimer &timer = _timeSinceLastCheck[account];
 
     // Fetch Activities only if visible and if last check is longer than 15 secs ago
     if (timer.isValid() && timer.elapsed() < NOTIFICATION_REQUEST_FREE_PERIOD) {
         qCDebug(lcActivity) << "Do not check as last check is only secs ago: " << timer.elapsed() / 1000;
         return;
     }
-    if (_account.data() && _account.data()->isConnected()) {
+    if (account && account->isConnected()) {
         slotRefreshActivities();
         slotRefreshNotifications();
         timer.start();