Merge pull request #11154 from piwik/3.x-dev3.0.1-b3

Piwik 3.0.1-b3

8 files changed, 147 insertions, 134 deletions

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 39fa33f361..fa22b8034f 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -187,7 +187,7 @@ class API extends \Piwik\Plugin\API
     }
 
     /**
-     * Returns an array describing a visitor using her last visits (uses a maximum of 100).
+     * Returns an array describing a visitor using their last visits (uses a maximum of 100).
      *
      * @param int $idSite Site ID
      * @param bool|false|string $visitorId The ID of the visitor whose profile to retrieve.
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index f50e495537..de54b7d9b3 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -124,7 +124,7 @@ class Visitor implements VisitorInterface
 
     /**
      * Removes fields that are not meant to be displayed (md5 config hash)
-     * Or that the user should only access if he is Super User or admin (cookie, IP)
+     * Or that the user should only access if they are Super User or admin (cookie, IP)
      *
      * @param array $visitorDetails
      * @return array
@@ -158,7 +158,7 @@ class Visitor implements VisitorInterface
         //       ==> also update API/API.php getSuggestedValuesForSegment(), the $segmentsNeedActionsInfo array
 
         // flatten visit custom variables
-        if (!empty($visitorDetailsArray['customVariables']) 
+        if (!empty($visitorDetailsArray['customVariables'])
             && is_array($visitorDetailsArray['customVariables'])) {
             foreach ($visitorDetailsArray['customVariables'] as $thisCustomVar) {
                 $visitorDetailsArray = array_merge($visitorDetailsArray, $thisCustomVar);
diff --git a/plugins/Live/lang/zh-tw.json b/plugins/Live/lang/zh-tw.json
index 2d6f449860..c6e2cb49fd 100644
--- a/plugins/Live/lang/zh-tw.json
+++ b/plugins/Live/lang/zh-tw.json
@@ -1,35 +1,46 @@
 {
     "Live": {
-        "AveragePageGenerationTime": "這個使用者平均花費 %1$s 載入網頁。",
-        "CalculatedOverNPageViews": "以這個訪客過去 %1$s 次頁面訪問來計算。",
+        "AbandonedCartSummary": "%1$s 個棄用的購物車%2$s 和 %3$s 項被棄用的項目%4$s，總價值 %5$s%6$s。",
+        "AveragePageGenerationTime": "這個訪客平均花費 %1$s 載入網頁。",
+        "CalculatedOverNPageViews": "以這個訪客過去 %1$s 次網頁瀏覽來計算。",
         "ClickToViewMoreAboutVisit": "點擊以查看這個訪問紀錄的詳細資訊",
         "ConvertedNGoals": "轉換了 %s 個目標",
+        "EcommerceSummaryConversions": "%1$s 個訂單%2$s總價值 %3$s%4$s，購買了 %5$s 個項目%6$s。",
         "FirstVisit": "首次訪問",
         "GoalType": "類型",
         "HideMap": "隱藏地圖",
+        "KeywordRankedOnSearchResultForThisVisitor": "這個訪客在 %3$s 搜尋結果頁中的關鍵字 %1$s 排名第 %2$s。",
         "LastHours": "最近 %s 小時",
         "LastMinutes": "最近 %s 分鐘",
         "LastVisit": "最後訪問",
         "LinkVisitorLog": "查看詳細的訪客記錄",
         "LoadMoreVisits": "載入更多訪客",
-        "MorePagesNotDisplayed": "更多此訪客的到達頁面未顯示",
+        "MorePagesNotDisplayed": "更多此訪客的到達網頁未顯示",
         "NbVisitor": "1 位訪客",
         "NbVisitors": "%s 位訪客",
         "NextVisitor": "下一位訪客",
         "NoMoreVisits": "這個訪客沒有更多訪問紀錄了。",
+        "PageRefreshed": "這個網頁的連續查看\/重新整理次數。",
+        "PluginDescription": "提供即時訪客紀錄並讓你在展示板小工具中即時查看你的訪客。這個外掛也能讓你查看任何訪客資料。",
         "PreviousVisitor": "上一位訪客",
         "RealTimeVisitorCount": "即時訪客數量",
         "Referrer_URL": "參造連結網址",
         "ShowMap": "顯示地圖",
+        "SimpleRealTimeWidget_Message": "%1$s 和 %2$s 在過去 %3$s",
         "ViewVisitorProfile": "查看訪客資料",
-        "VisitedPages": "到達頁面",
+        "VisitedPages": "到達網頁",
         "VisitorLog": "訪客記錄",
+        "VisitorLogDocumentation": "這個表格顯示所選擇的時間範圍中最新的訪問。你可以將滑鼠移過訪問日期查看訪客最後訪問為何時。%1$s如果日期範圍包含今日，你就可以即時查看訪客！%2$s這裡顯示的資料不論是否和多常使用彙整工作排程，永遠是即時的。",
         "VisitorProfile": "訪客資料",
         "VisitorsInRealTime": "即時訪客資訊",
         "VisitorsLastVisit": "此訪客曾於 %s 天前訪問過。",
         "VisitsFrom": "%1$s%2$s 次訪問%3$s 來自",
-        "VisitSummary": "共停留了 %1$s%2$s 在網站上%3$s，並訪問了 %4$s 個頁面%5$s在過去 %6$s 次%7$s次訪問。",
-        "VisitSummaryWithActionDetails": "共停留了 %1$s%2$s 在網站上%3$s，並執行了 %4$s 個動作%5$s（%6$s）在過去 %7$s 次%8$s次訪問。",
+        "VisitSummary": "共停留了 %1$s%2$s 在網站上%3$s，並訪問了 %4$s 個網頁%5$s在過去 %6$s 次%7$s次訪問。",
+        "VisitSummaryWithActionDetails": "共停留了 %1$s%2$s 在網站上%3$s，並執行了 %4$s 個活動%5$s（%6$s）在過去 %7$s 次%8$s次訪問。",
+        "RowActionTooltipDefault": "以此列建立區隔顯示訪客紀錄",
+        "RowActionTooltipWithDimension": "以此%s建立區隔顯示訪客紀錄",
+        "RowActionTooltipTitle": "開啟已區隔的訪客紀錄",
+        "SegmentedVisitorLogTitle": "訪客紀錄顯示 %1$s 為「%2$s」的訪問紀錄",
         "OnClickPause": "%s 已開始。點擊暫停。",
         "OnClickStart": "%s 已停止。點擊開始。"
     }
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index ff9d7f02fc..3e263416e4 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -292,6 +292,8 @@ a.visitor-log-visitor-profile-link {
 
 .visitorLogIcons .visitorLogIconWithDetails>img {
     margin: auto 5px auto 0;
+    width: 16px;
+    height: 16px;
 }
 
 .visitorLogIcons>span.visitorRank>img {
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index ef88ba439d..ac1ce17e06 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -20,8 +20,8 @@
                 <br />
 
                 {% if visitor.countryFlag is defined %}&nbsp;<img src="{{ visitor.countryFlag }}" title="{{ visitor.location|e('html_attr') }}, {{ 'Provider_ColumnProvider'|translate }} {% if visitor.providerName is defined %}{{ visitor.providerName }}{% endif %}"/>{% endif %}
-                {% if visitor.browserIcon is defined %}&nbsp;<img src="{{ visitor.browserIcon }}" title="{{ visitor.browser|e('html_attr') }}{% if visitor.plugins is defined %}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}{% endif %}"/>{% endif %}
-                {% if visitor.operatingSystemIcon is defined %}&nbsp;<img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}{% if visitor.resolution is defined %}, {{ visitor.resolution }}{% endif %}"/>{% endif %}
+                {% if visitor.browserIcon is defined %}&nbsp;<img width="16px" height="16px" src="{{ visitor.browserIcon }}" title="{{ visitor.browser|e('html_attr') }}{% if visitor.plugins is defined %}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}{% endif %}"/>{% endif %}
+                {% if visitor.operatingSystemIcon is defined %}&nbsp;<img width="16px" height="16px" src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}{% if visitor.resolution is defined %}, {{ visitor.resolution }}{% endif %}"/>{% endif %}
                 &nbsp;
                 {% if visitor.visitConverted %}
                 <span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.goalConversions) }}"
@@ -166,4 +166,4 @@ $('#visitsLive').on('click', '.visits-live-launch-visitor-profile', function (e)
     broadcast.propagateNewPopoverParameter('visitorProfile', $(this).attr('data-visitor-id'));
     return false;
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig
index 7a24a6606f..9ec0960ba8 100644
--- a/plugins/Live/templates/getSingleVisitSummary.twig
+++ b/plugins/Live/templates/getSingleVisitSummary.twig
@@ -26,12 +26,12 @@
         <li>
             {% if visitData.browserName is defined %}
             <div class="visitor-profile-browser" title="{% if visitData.plugins is not defined %}{{ visitData.browser }}{% elseif visitData.plugins %}{{ 'DevicePlugins_BrowserWithPluginsEnabled'|translate(visitData.browser, visitData.plugins) }}{% else %}{{ 'DevicePlugins_BrowserWithNoPluginsEnabled'|translate(visitData.browser) }}{% endif %}">
-                {% if visitData.browserIcon is defined %}<img src="{{ visitData.browserIcon }}"/>{% endif %}<span>{{ visitData.browserName|split(' ')[0] }}</span>
+                {% if visitData.browserIcon is defined %}<img src="{{ visitData.browserIcon }}" width="16px" height="16px"/>{% endif %}<span>{{ visitData.browserName|split(' ')[0] }}</span>
             </div>
             {% endif %}
 
             <div class="visitor-profile-os">
-                {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %}
+                {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}" width="16px" height="16px"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %}
             </div>
         </li>
         {% if visitData.resolution is defined %}<li><span>{{ 'Resolution_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %}
diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
index 53edd3b829..565400247a 100644
--- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
@@ -117,14 +117,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -148,11 +148,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -219,14 +219,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -250,11 +250,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -321,14 +321,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -352,11 +352,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -423,14 +423,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -454,11 +454,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -525,14 +525,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -556,11 +556,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -627,14 +627,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -658,11 +658,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -729,14 +729,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -760,11 +760,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -831,14 +831,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -862,11 +862,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -933,14 +933,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -964,11 +964,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1035,14 +1035,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1066,11 +1066,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
index ef8519446f..cbf2389176 100644
--- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
@@ -117,14 +117,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -148,11 +148,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -219,14 +219,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -250,11 +250,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -321,14 +321,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -352,11 +352,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -423,14 +423,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -454,11 +454,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -525,14 +525,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -556,11 +556,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -627,14 +627,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -658,11 +658,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -729,14 +729,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -760,11 +760,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -831,14 +831,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -862,11 +862,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -933,14 +933,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -964,11 +964,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1035,14 +1035,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1066,11 +1066,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1137,14 +1137,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1168,11 +1168,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1239,14 +1239,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1270,11 +1270,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1341,14 +1341,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1372,11 +1372,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1443,14 +1443,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1474,11 +1474,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1545,14 +1545,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1576,11 +1576,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1647,14 +1647,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1678,11 +1678,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1749,14 +1749,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1780,11 +1780,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1851,14 +1851,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1882,11 +1882,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -1953,14 +1953,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -1984,11 +1984,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
@@ -2055,14 +2055,14 @@
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
 			<operatingSystemName>Unknown</operatingSystemName>
-			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon>
 			<operatingSystemCode>UNK</operatingSystemCode>
 			<operatingSystemVersion>UNK</operatingSystemVersion>
 			<browserFamily />
 			<browserFamilyDescription>Unknown</browserFamilyDescription>
 			<browser>Unknown</browser>
 			<browserName>Unknown</browserName>
-			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon>
 			<browserCode>UNK</browserCode>
 			<browserVersion />
 			<events>0</events>
@@ -2086,11 +2086,11 @@
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>