diff --git a/Changelog b/Changelog
index 25cb70068..f341278eb 100644
--- a/Changelog
+++ b/Changelog
@@ -68,6 +68,7 @@
     - COSMETIC: Improved lists renderers
     - COSMETIC: Use a different icon for torrents being checked and for connecting ones
     - COSMETIC: Improved some icons
+    - COSMETIC: Improved systray tooltip style
 
 * Mon May 07 2007 - Christophe Dumez <chris@qbittorrent.org> - v0.9.3
     - BUGFIX: Fixed pause toggle on double-click in download list
diff --git a/TODO b/TODO
index 69c7d709d..d3c0098de 100644
--- a/TODO
+++ b/TODO
@@ -39,7 +39,7 @@
 - improve and test tracker authentication code (remember login/pass) (need a tracker to test this)
 - support zipped torrents? (useful?)
 - Allow to limit the number of downloading torrents simultaneously (other are paused until a download finishes)
-- Improve search plugin install (download drom url, choose in a list taken from plugins.qbittorrent.org)
+- Improve search plugin install (choose in a list taken from plugins.qbittorrent.org)
 - Display the number of DHT node if possible
 - Allow to change action on double-click
   -> in download list
@@ -47,15 +47,17 @@
 
 // in v1.0.0 (partial) - WIP
 - Fix all (or almost all) opened bugs in bug tracker
-- Improve systray tooltip
+- Improve systray tooltip (again)
 - Keep documention up to date
 - Windows port (Chris - Peerkoel)
 * beta 7
   - update doc for plugins (and add screenies)
   - update doc for options
+  - Allow to install search plugins from an url
   - Review torrent content selection
     * check the one in ktorrent
   - Translations update (IN PROGRESS)
+  - Wait that http://pastebin.ca/690649 is fixed
 
 LANGUAGES UPDATED:
 - French *BETA6*
@@ -114,3 +116,4 @@ beta6->beta7 changelog:
 - BUGFIX: Fixed deprecation warning with latest libtorrent svn
 - COSMETIC: Improved some icons
 - COSMETIC: Totally redesigned program preferences
+- COSMETIC: Improved systray tooltip style
\ No newline at end of file
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 9c3bc0a40..b5b317c47 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -1177,7 +1177,16 @@ void GUI::checkConnectionStatus() {
     downloadingTorrentTab->updateRatio();
   // update global informations
   if(systrayIntegration) {
-    myTrayIcon->setToolTip(QString::fromUtf8("<b>")+tr("qBittorrent")+QString::fromUtf8("</b><br>")+tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1)))+QString::fromUtf8("<br>")+tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadUploadRate()/1024., 'f', 1)))); // tray icon
+    QString html = "<div style='vertical-align: middle; height: 18px; font-weight: bold; margin-bottom: 5px;'>";
+    html += tr("qBittorrent");
+    html += "</div>";
+    html += "<div style='vertical-align: baseline; height: 18px;'>";
+    html += "<img src=':/Icons/skin/downloading.png'/>"+tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1)));
+    html += "</div>";
+    html += "<div style='vertical-align: baseline; height: 18px;'>";
+    html += "<img src=':/Icons/skin/seeding.png'/>"+tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadUploadRate()/1024., 'f', 1)));
+    html += "</div>";
+    myTrayIcon->setToolTip(html); // tray icon
   }
   session_status sessionStatus = BTSession->getSessionStatus();
   if(sessionStatus.has_incoming_connections) {