diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php
index 9b5fb337ee7..27b37e62c34 100644
--- a/plugins/UserCountryMap/UserCountryMap.php
+++ b/plugins/UserCountryMap/UserCountryMap.php
@@ -72,8 +72,7 @@ public function getJsFiles($notification)
 
     public function getCssFiles($notification)
     {
-        $cssFiles = & $notification->getNotificationObject();
-        $cssFiles[] = "plugins/UserCountryMap/css/qtip.css";
+        $cssFiles = &$notification->getNotificationObject();
         $cssFiles[] = "plugins/UserCountryMap/css/visitor-map.css";
         $cssFiles[] = "plugins/UserCountryMap/css/realtime-map.css";
     }
diff --git a/plugins/UserCountryMap/css/qtip.css b/plugins/UserCountryMap/css/qtip.css
deleted file mode 100644
index 05057adc22c..00000000000
--- a/plugins/UserCountryMap/css/qtip.css
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-* qTip2 - Pretty powerful tooltips
-* http://craigsworks.com/projects/qtip2/
-*
-* Version: nightly
-* Copyright 2009-2010 Craig Michael Thompson - http://craigsworks.com
-*
-* Dual licensed under MIT or GPLv2 licenses
-*   http://en.wikipedia.org/wiki/MIT_License
-*   http://en.wikipedia.org/wiki/GNU_General_Public_License
-*
-* Date: Mon Nov 21 13:18:18.0000000000 2011
-*/
-
-/* Core qTip styles */
-.ui-tooltip, .qtip {
-    position: absolute;
-    left: -28000px;
-    top: -28000px;
-    display: none;
-
-    max-width: 280px;
-    min-width: 50px;
-
-    font-size: 12px;
-    line-height: 14px;
-
-    z-index: 15000;
-}
-
-/* Fluid class for determining actual width in IE */
-.ui-tooltip-fluid {
-    display: block;
-    visibility: hidden;
-    position: static !important;
-    float: left !important;
-}
-
-.ui-tooltip-content {
-    position: relative;
-    padding: 5px 9px;
-    overflow: hidden;
-
-    border-width: 1px;
-    border-style: solid;
-
-    text-align: left;
-    word-wrap: break-word;
-    overflow: hidden;
-    color: #444;
-}
-
-.ui-tooltip-titlebar {
-    position: relative;
-    min-height: 14px;
-    padding: 5px 35px 0px 10px;
-    overflow: hidden;
-
-    border-width: 1px 1px 0;
-    border-style: solid;
-
-    font-weight: bold;
-
-}
-
-.ui-tooltip-titlebar + .ui-tooltip-content {
-    border-top-width: 0px !important;
-}
-
-/*! Default close button class */
-.ui-tooltip-titlebar .ui-state-default {
-    position: absolute;
-    right: 4px;
-    top: 50%;
-    margin-top: -9px;
-
-    cursor: pointer;
-    outline: medium none;
-
-    border-width: 1px;
-    border-style: solid;
-}
-
-* html .ui-tooltip-titlebar .ui-state-default {
-    top: 16px;
-}
-
-/* IE fix */
-
-.ui-tooltip-titlebar .ui-icon,
-.ui-tooltip-icon .ui-icon {
-    display: block;
-    text-indent: -1000em;
-}
-
-.ui-tooltip-icon, .ui-tooltip-icon .ui-icon {
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-}
-
-.ui-tooltip-icon .ui-icon {
-    width: 18px;
-    height: 14px;
-
-    text-align: center;
-
-    color: inherit;
-    background: transparent none no-repeat -100em -100em;
-}
-
-/* Applied to 'focused' tooltips e.g. most recently displayed/interacted with */
-.ui-tooltip-focus {
-
-}
-
-/* Applied on hover of tooltips i.e. added/removed on mouseenter/mouseleave respectively */
-.ui-tooltip-hover {
-
-}
-
-/*! Default tooltip style */
-.ui-tooltip-default {
-
-}
-
-.ui-tooltip-default .ui-tooltip-titlebar,
-.ui-tooltip-default .ui-tooltip-content {
-    border-color: #E7E8E7;
-    background-color: #F7F7F7;
-    box-shadow: 1px 1px 3px rgba(0, 0, 0, .5);
-}
-
-.ui-tooltip-default .ui-tooltip-titlebar .ui-state-hover {
-    border-color: #E7E8E7;
-    color: #111;
-}
-
-.ui-tooltip-titlebar {
-    border-bottom: 0;
-}
-
-.ui-tooltip-content {
-    border-radius: 5px;
-}
-
-.ui-tooltip-content h3 {
-    font-weight: bold;
-    color: #7E7363;
-    font-size: 13px;
-    margin: 0 0 5px;
-}
\ No newline at end of file
diff --git a/themes/default/common.css b/themes/default/common.css
index 85e37e2eeb7..20c64d33e55 100644
--- a/themes/default/common.css
+++ b/themes/default/common.css
@@ -724,9 +724,9 @@ table.entityTable tr td a {
 }
 
 
-/* Piwik Tooltip (plugins/CoreHome/templates/tooltip.js) */
+/* Piwik Tooltips (plugins/CoreHome/templates/tooltip.js) */
 
-.piwik-tooltip {
+.ui-tooltip, .piwik-tooltip {
 	position: absolute;
 	z-index: 2000;
 	text-align: left;
@@ -743,13 +743,23 @@ table.entityTable tr td a {
 	-webkit-box-shadow: 1px 1px 2px #666;
 	box-shadow: 1px 1px 2px #666;
 	overflow: hidden;
+    max-width: 280px;
+   	min-width: 50px;
+    line-height: 14px;
+	left: -28000px;
+	top: -28000px;
+	display: none;
 }
 
-.piwik-tooltip .tip-title {
+.ui-tooltip h3, .piwik-tooltip .tip-title {
 	font-weight: bold;
 	color: #7E7363;
 }
 
+.ui-tooltip h3 {
+	font-size: 13px;
+	margin: 0 0 5px;
+}
 
 
 /* Popover */