Merge pull request #11253 from piwik/3.x-dev3.0.2-b1

Release 3.0.2-b1

22 files changed, 123 insertions, 112 deletions

diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index de54b7d9b3..a7d9abaf32 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -417,7 +417,7 @@ class Visitor implements VisitorInterface
                     break;
                 case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER:
                 case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART:
-                    $details['icon'] = 'plugins/Morpheus/images/' . $details['type'] . '.gif';
+                    $details['icon'] = 'plugins/Morpheus/images/' . $details['type'] . '.png';
                     break;
                 case Action::TYPE_DOWNLOAD:
                     $details['type'] = 'download';
@@ -425,7 +425,7 @@ class Visitor implements VisitorInterface
                     break;
                 case Action::TYPE_OUTLINK:
                     $details['type'] = 'outlink';
-                    $details['icon'] = 'plugins/Morpheus/images/link.gif';
+                    $details['icon'] = 'plugins/Morpheus/images/link.png';
                     break;
                 case Action::TYPE_SITE_SEARCH:
                     $details['type'] = 'search';
diff --git a/plugins/Live/images/pause.gif b/plugins/Live/images/pause.gif
deleted file mode 100644
index 23162c35ba..0000000000
--- a/plugins/Live/images/pause.gif
+++ /dev/null
diff --git a/plugins/Live/images/pause.png b/plugins/Live/images/pause.png
new file mode 100644
index 0000000000..96a0579c0d
--- /dev/null
+++ b/plugins/Live/images/pause.png
diff --git a/plugins/Live/images/play.gif b/plugins/Live/images/play.gif
deleted file mode 100644
index c49479e710..0000000000
--- a/plugins/Live/images/play.gif
+++ /dev/null
diff --git a/plugins/Live/images/play.png b/plugins/Live/images/play.png
new file mode 100644
index 0000000000..c9295ec03f
--- /dev/null
+++ b/plugins/Live/images/play.png
diff --git a/plugins/Live/images/returningVisitor.gif b/plugins/Live/images/returningVisitor.gif
deleted file mode 100644
index bc71867e55..0000000000
--- a/plugins/Live/images/returningVisitor.gif
+++ /dev/null
diff --git a/plugins/Live/images/returningVisitor.png b/plugins/Live/images/returningVisitor.png
new file mode 100644
index 0000000000..7be746f337
--- /dev/null
+++ b/plugins/Live/images/returningVisitor.png
diff --git a/plugins/Live/images/unknown_avatar.jpg b/plugins/Live/images/unknown_avatar.jpg
deleted file mode 100644
index dfd7ec81de..0000000000
--- a/plugins/Live/images/unknown_avatar.jpg
+++ /dev/null
diff --git a/plugins/Live/images/unknown_avatar.png b/plugins/Live/images/unknown_avatar.png
new file mode 100644
index 0000000000..fe4dd7d1f9
--- /dev/null
+++ b/plugins/Live/images/unknown_avatar.png
diff --git a/plugins/Live/images/visitor_profile_background.jpg b/plugins/Live/images/visitor_profile_background.jpg
deleted file mode 100644
index 082d637dcf..0000000000
--- a/plugins/Live/images/visitor_profile_background.jpg
+++ /dev/null
diff --git a/plugins/Live/javascripts/visitorProfile.js b/plugins/Live/javascripts/visitorProfile.js
index 38cf21765d..af07a5b7d4 100644
--- a/plugins/Live/javascripts/visitorProfile.js
+++ b/plugins/Live/javascripts/visitorProfile.js
@@ -127,16 +127,6 @@
                 }
             });
 
-            // on hover, show export link (chrome won't let me do this via css :( )
-            $element.on('mouseenter mouseleave', '.visitor-profile-id', function (e) {
-                var $exportLink = $(this).find('.visitor-profile-export');
-                if ($exportLink.css('visibility') == 'hidden') {
-                    $exportLink.css('visibility', 'visible');
-                } else {
-                    $exportLink.css('visibility', 'hidden');
-                }
-            });
-
             var tooltipIsOpened = false;
 
             $('a', $element).on('focus', function () {
@@ -309,4 +299,4 @@
     // add the popup handler that creates a visitor profile
     broadcast.addPopoverHandler('visitorProfile', VisitorProfileControl.showPopover);
 
-})(jQuery, require);
\ No newline at end of file
+})(jQuery, require);
diff --git a/plugins/Live/lang/sk.json b/plugins/Live/lang/sk.json
index 7913b725cd..ceffba0319 100644
--- a/plugins/Live/lang/sk.json
+++ b/plugins/Live/lang/sk.json
@@ -15,8 +15,11 @@
         "PreviousVisitor": "Predchádzajúci návštevník",
         "RealTimeVisitorCount": "Sledovanie návštev v reálnom čase",
         "Referrer_URL": "Referenčné URL",
+        "ShowMap": "zobraziť mapu",
         "SimpleRealTimeWidget_Message": "%1$s a %2$s v posledných %3$s",
+        "VisitedPages": "Navštívené stránky",
         "VisitorLog": "Záznam návštevníka",
+        "VisitorProfile": "Profil užívateľa",
         "VisitorsInRealTime": "Návštevníci v reálnom čase"
     }
 }
\ No newline at end of file
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 3e263416e4..c471009e50 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -33,7 +33,7 @@
 }
 
 #visitsLive .country {
-    background: @theme-color-background-base url(plugins/CoreHome/images/bullet1.gif) no-repeat scroll 0 0;
+    background: @theme-color-background-base url(plugins/CoreHome/images/bullet1.png) no-repeat scroll 0 0;
 }
 
 #visitsLive .referrer {
@@ -107,7 +107,7 @@ ol.visitorLog {
 }
 
 ol.visitorLog li {
-    margin-bottom: 4px;
+    margin-bottom: 7px;
 }
 
 #visitsLive img {
@@ -152,7 +152,7 @@ ol.visitorLog li {
     border-radius: 3px;
     padding: 2px;
     display: block;
-    margin: 5px;
+    margin: 0px 5px 0px 5px;
     float: left;
 }
 
@@ -229,7 +229,8 @@ ol.visitorLog p {
 }
 
 .visitor-log-page-list {
-    position:relative;
+  position:relative;
+  margin-top: 7px;
 }
 
 a.visitor-log-visitor-profile-link {
diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less
index 07e9dd4812..ccf45cac09 100644
--- a/plugins/Live/stylesheets/visitor_profile.less
+++ b/plugins/Live/stylesheets/visitor_profile.less
@@ -8,11 +8,12 @@
     text-align:left;
 
     h1 {
-        font-size:18px;
-        color:#7e7363;
+        font-size:23px;
         text-shadow:0 1px 0 rgba(255,255,255,1);
         margin:9px 0 0 0;
         padding:0;
+        font-weight: normal;
+        color: @theme-color-text;
 
         a {
             font-size:12px;
@@ -20,22 +21,38 @@
         }
     }
 
-    p {
-        font-size:14px;
-        color:#5e5e5c;
-        line-height:20px;
-    }
-
     h2 {
         display:inline-block;
-        font-size:14px;
+        font-size:23px;
         margin:0 0 0 5px;
-        padding:0;
-        font-weight:bold;
+        padding:15px 17px 15px 22px;
         color:black;
         border: none;
+        color: @theme-color-text;
+    }
+
+    p {
+        margin-left: 0;
+        margin-right: 0;
+        .font-default(13px, 18px);
+        color: @color-silver-l60;
+        strong {
+            .font-default(13px, 18px);
+            color: @theme-color-text;
+            font-weight: normal !important;
+        }
+        span {
+            .font-default(13px, 18px);
+        }
+    }
+
+    p {
+        font-size:13px;
+        color:#5e5e5c;
+        line-height:20px;
     }
 
+
     span.truncated-text-line {
         display:inline-block;
         &.event {
@@ -48,7 +65,7 @@
     span, strong {
         display:inline;
         font-size:14px;
-        color:#5e5e5c;
+        color:#413838;
         line-height:19px;
         padding-left:4px;
     }
@@ -58,27 +75,34 @@
     color:#5e5e5c;
 }
 
-.visitor-profile-widget-link:hover {
-    text-decoration:underline;
-}
-
 .visitor-profile-export {
-    float:right;
+    vertical-align: middle;
     margin-top:3px;
 }
 
+.visitor-profile-close:before {
+  content: "\e60a";
+}
+
 .visitor-profile-close {
     z-index: 10;
     position:absolute;
-    right:-17px;
-    top:-16px;
-    height:35px;
-    width:35px;
-    background:url(../images/visitor_profile_close.png) no-repeat;
+    right:6px;
+    top: 4px;
+    height:20px;
+    width:21px;
+    background-color: #d4291f;
+    color: #FFFFFF !important;
+    border-radius: 3px;
+    font-size: 9px;
+    font-weight: 400;
+    font-family: piwik;
+    text-decoration: none !important;
+    text-align: center !important;
+    padding: 4.5px;
 }
 
 .visitor-profile a {
-    text-decoration:none;
     color:#255792;
 }
 
@@ -117,22 +141,18 @@
     }
 }
 
-.visitor-profile-summary,.visitor-profile-important-visits,.visitor-profile-avatar,.visitor-profile-location {
-    border-bottom:1px solid #d1cec8;
-}
-
 .visitor-profile-avatar > div {
     position:relative;
     float:left;
     min-height:145px;
-    margin:12px 15px 0 0;
+    margin:6px 15px 0 0;
     padding-bottom:4px;
 }
 
 .visitor-profile-avatar > div:first-child {
     width:166px;
     margin-right:0;
-    padding-left:16px;
+    padding-left:7px;
 
     > .visitor-profile-image-frame {
         width:149px;
@@ -226,10 +246,6 @@
     border-bottom:none;
 }
 
-.visitor-profile-avatar ul li:first-child {
-    border-bottom:1px solid #d1cec8; // make sure there is a border if only one item is shown in the list
-}
-
 .visitor-profile-map {
     padding:0 21px 13px 21px;
 
@@ -295,7 +311,7 @@
 
     p {
         margin:13px 0;
-        font-size:14px;
+        font-size:13px;
     }
 }
 
@@ -311,7 +327,7 @@
     padding: 8px 18px 10px 13px;
 
     h1 {
-        margin-left:6px;
+        margin-left:3px;
     }
 }
 
@@ -331,14 +347,15 @@
         > li {
             display:block;
             font-size:12px;
-            font-weight:700;
-            line-height:25px;
+            font-weight: normal;
+            line-height:10px;
             padding:0 0 10px 13px;
+            margin-right: 20px;
+            color: @theme-color-text-lighter;
 
             span {
                 font-size:13px;
                 font-weight:700;
-                line-height:25px;
                 padding-left:0;
             }
         }
@@ -385,12 +402,12 @@
     }
 
     ol > li ol li span {
-        padding-left:4px;
+        padding-left:5px;
     }
 
     ol > li ol li {
       .action-list-url {
-        margin-left:4px;
+        margin-left:5px;
         line-height:15px;
         font-size:13px;
       }
@@ -417,8 +434,7 @@
 
 .visitor-profile-date {
     float:right;
-    font-size:13px;
-    line-height:26px;
+    margin-top:6px;
 }
 
 .visitor-profile-fog {
@@ -456,7 +472,6 @@ span.visitor-profile-goal-name {
     text-align:center;
 
     > a {
-        font-size:11px;
         display:inline-block;
         color:#5e5e5c;
     }
@@ -467,7 +482,7 @@ span.visitor-profile-goal-name {
 }
 
 .visitor-profile-visit-title-row:hover {
-    background-color:#FAFACF;
+    background-color:#bfbfbf;
 }
 
 .visitor-profile-avatar .loadingPiwik {
diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
index 8d8bc1572a..a36a9da66d 100644
--- a/plugins/Live/templates/_actionsList.twig
+++ b/plugins/Live/templates/_actionsList.twig
@@ -108,7 +108,7 @@
                     {%  else %}
                     <a href="{{ action.url }}" rel="noreferrer" target="_blank" class="{% if action.eventCategory|default(false) is empty %}action-list-url{# don't put URL on new line for events #}{% endif %} truncated-text-line"
                        {% if overrideLinkStyle is not defined or overrideLinkStyle %}style="text-decoration:underline;"{% endif %}>
-                       {{ action.url }}
+                       {{ action.url|replace({'http://': '', 'https://': ''}) }}
                     </a>
                     {%  endif %}
                 {% endif %}
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index b9463c2439..a97c7e310a 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -159,7 +159,11 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
                 {% endif %}
                 {% if visitor.getColumn('countryFlag') %}
                     <span class="visitorLogIconWithDetails">
+
                         <img src="{{ visitor.getColumn('countryFlag') }}"/>
+                        {% if visitor.getColumn('city') %}{{ visitor.getColumn('city')|rawSafeDecoded }}{% endif -%}
+                        {%- if visitor.getColumn('region') %}{% if visitor.getColumn('city') %}, {% endif %}{{ visitor.getColumn('region')|rawSafeDecoded }}{% endif %}
+
                         <ul class="details">
                             <li>{{ 'UserCountry_Country'|translate }}: {{ visitor.getColumn('country') }}</li>
                             {% if visitor.getColumn('region') %}<li>{{ 'UserCountry_Region'|translate }}: {{ visitor.getColumn('region') }}</li>{% endif %}
@@ -194,17 +198,18 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
 
             <div class="col s12 m{% if displayVisitorsInOwnColumn %}7{% else %}8{% endif %} column {% if visitor.getColumn('visitConverted') and not isWidget %}highlightField{% endif %}">
                 {{ postEvent('Live.visitorLogViewBeforeActionsInfo', visitor) }}
+
+                <strong>
+                    {{ visitor.getColumn('actionDetails')|length }}
+                    {% if visitor.getColumn('actionDetails')|length <= 1 %}
+                        {{ 'General_Action'|translate }}
+                    {% else %}
+                        {{ 'General_Actions'|translate }}
+                    {% endif %}
+                    {% if visitor.getColumn('visitDuration') > 0 %}- {{ visitor.getColumn('visitDurationPretty')|raw }}{% endif %}
+                </strong>
+
                 <div class="visitor-log-page-list">
-                    <strong>
-                        {{ visitor.getColumn('actionDetails')|length }}
-                        {% if visitor.getColumn('actionDetails')|length <= 1 %}
-                            {{ 'General_Action'|translate }}
-                        {% else %}
-                            {{ 'General_Actions'|translate }}
-                        {% endif %}
-                        {% if visitor.getColumn('visitDuration') > 0 %}- {{ visitor.getColumn('visitDurationPretty')|raw }}{% endif %}
-                    </strong>
-                    <br/>
                     <ol class='visitorLog'>
                         {% include "@Live/_actionsList.twig" with {'actionDetails': visitor.getColumn('actionDetails')} %}
                     </ol>
diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig
index 9ec0960ba8..c7af9a6c2c 100644
--- a/plugins/Live/templates/getSingleVisitSummary.twig
+++ b/plugins/Live/templates/getSingleVisitSummary.twig
@@ -19,8 +19,8 @@
             {% if widgetizedLink is defined %}<a class="visitor-profile-widget-link" href="{{ widgetizedLink }}" target="_blank" title="{{ 'Widgetize_OpenInNewWindow'|translate }} - {{ 'Live_VisitorProfile'|translate }} {{ 'General_Id'|translate|upper }} {{ visitData.visitorId }}">{% endif %}
                 <strong>{{ visitData.visitorId }}</strong>
             {% if widgetizedLink is defined %}</a>{% endif %}
-            <a class="visitor-profile-export" href="{{ exportLink }}" target="_blank" title="{{ 'General_ExportThisReport'|translate }}" style="visibility:hidden">
-                <img src="plugins/Morpheus/images/export.png"/>
+            <a class="visitor-profile-export" href="{{ exportLink }}" target="_blank" title="{{ 'General_ExportThisReport'|translate }}">
+                <span class="icon-export"></span>
             </a>
         </li>
         <li>
diff --git a/plugins/Live/templates/getVisitList.twig b/plugins/Live/templates/getVisitList.twig
index 18047bf3c2..9266afbcb6 100644
--- a/plugins/Live/templates/getVisitList.twig
+++ b/plugins/Live/templates/getVisitList.twig
@@ -6,7 +6,7 @@
                 {{ 'General_Visit'|translate }} #{{ startCounter }}
 
                 {% if visitInfo.getColumn('visitDuration') != 0 %}
-                    <span>&nbsp;- ({{ visitInfo.getColumn('visitDurationPretty')|raw }})</span>
+                    <span>&nbsp; ({{ visitInfo.getColumn('visitDurationPretty')|raw }})</span>
                 {% endif %}
                 <span class="visitor-profile-date" title="{{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}">
                     {{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index c41acd19a4..1a57eb6958 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -6,14 +6,14 @@
      data-next-visitor="{{ visitorData.nextVisitorId }}"
      data-prev-visitor="{{ visitorData.previousVisitorId }}"
      tabindex="0">
-    <a href class="visitor-profile-close"></a>
+    <a href class="visitor-profile-close" title="{{ 'General_Close'|translate }} "></a>
     <div class="visitor-profile-info">
         <div>
             <div class="visitor-profile-overview">
                 <div class="visitor-profile-avatar">
                     <div>
                         <div class="visitor-profile-image-frame">
-                            <img src="{{ visitorData.visitorAvatar|default("plugins/Live/images/unknown_avatar.jpg") }}"
+                            <img src="{{ visitorData.visitorAvatar|default("plugins/Live/images/unknown_avatar.png") }}"
                                  alt="{{ visitorData.visitorDescription|default('') }}"
                                  title="{{ visitorData.visitorDescription|default('') }}" />
                         </div>
@@ -144,9 +144,6 @@
                 </div>
             </div>
             <div class="visitor-profile-visits-info">
-                <div class="visitor-profile-pages-visited">
-                    <h1>{{ 'Live_VisitedPages'|translate }}</h1>
-                </div>
                 <div class="visitor-profile-visits-container">
                     <ol class="visitor-profile-visits">
                         {% include "@Live/getVisitList.twig" with {'visits': visitorData.lastVisits, 'startCounter': 1} %}
diff --git a/plugins/Live/templates/index.twig b/plugins/Live/templates/index.twig
index bf2ccbeedb..5112c85d10 100644
--- a/plugins/Live/templates/index.twig
+++ b/plugins/Live/templates/index.twig
@@ -39,10 +39,10 @@
 {% spaceless %}
 <div class="visitsLiveFooter">
     <a title="{{ 'Live_OnClickPause'|translate('Live_VisitorsInRealTime'|translate) }}" href="javascript:void(0);" onclick="onClickPause();">
-        <img id="pauseImage" border="0" src="plugins/Live/images/pause.gif" />
+        <img id="pauseImage" border="0" src="plugins/Live/images/pause.png" />
     </a>
     <a title="{{ 'Live_OnClickStart'|translate('Live_VisitorsInRealTime'|translate) }}" href="javascript:void(0);" onclick="onClickPlay();">
-        <img id="playImage" style="display: none;" border="0" src="plugins/Live/images/play.gif" />
+        <img id="playImage" style="display: none;" border="0" src="plugins/Live/images/play.png" />
     </a>
     {% if not disableLink %}
         &nbsp;
diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
index 565400247a..14b86e6b8f 100644
--- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
@@ -112,7 +112,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -214,7 +214,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -316,7 +316,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -418,7 +418,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -520,7 +520,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -622,7 +622,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -724,7 +724,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -826,7 +826,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -928,7 +928,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1030,7 +1030,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
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 cbf2389176..2121164222 100644
--- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
@@ -112,7 +112,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -214,7 +214,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -316,7 +316,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -418,7 +418,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -520,7 +520,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -622,7 +622,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -724,7 +724,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -826,7 +826,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -928,7 +928,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1030,7 +1030,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1132,7 +1132,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1234,7 +1234,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1336,7 +1336,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1438,7 +1438,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1540,7 +1540,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1642,7 +1642,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1744,7 +1744,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1846,7 +1846,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -1948,7 +1948,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>
@@ -2050,7 +2050,7 @@
 			<languageCode />
 			<language>Unknown</language>
 			<deviceType>Unknown</deviceType>
-			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon>
+			<deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon>
 			<deviceBrand>Unknown</deviceBrand>
 			<deviceModel />
 			<operatingSystem>Unknown</operatingSystem>