379 files changed, 987 insertions, 503 deletions

diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index b37bd7ea51..f498aa1432 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -363,9 +363,13 @@ class ProcessedReport
 
         list($newReport, $columns, $rowsMetadata, $totals) = $this->handleTableReport($idSite, $dataTable, $reportMetadata, $showRawMetrics, $formatMetrics);
 
-        foreach ($columns as &$name) {
-            $name = ucfirst($name);
-        }
+	if (function_exists('mb_substr')) {
+            foreach ($columns as &$name) {
+                if (substr($name, 0, 1) === mb_substr($name, 0, 1)) {
+		    $name = ucfirst($name);
+		}
+            }
+	}
         $website = new Site($idSite);
 
         $period = Period\Factory::build($period, $date);
diff --git a/plugins/API/Renderer/Html.php b/plugins/API/Renderer/Html.php
index 1aeab87f51..6a2add0613 100644
--- a/plugins/API/Renderer/Html.php
+++ b/plugins/API/Renderer/Html.php
@@ -13,6 +13,10 @@ use Piwik\Common;
 
 class Html extends ApiRenderer
 {
+    public function renderSuccess($message)
+    {
+        return "<!-- Success: $message -->";
+    }
 
     /**
      * @param $message
diff --git a/plugins/API/lang/et.json b/plugins/API/lang/et.json
index 253cdf8053..61e231ca12 100644
--- a/plugins/API/lang/et.json
+++ b/plugins/API/lang/et.json
@@ -2,6 +2,7 @@
     "API": {
         "LoadedAPIs": "Edukalt laetud %s API-id",
         "MoreInformation": "Et saada rohkem infot Piwiku API-st, vaata %1$sPiwiku API tutvustus%2$s ja %3$sPiwiku API juhend%4$s.",
-        "UserAuthentication": "Kasutaja autentimine"
+        "UserAuthentication": "Kasutaja autentimine",
+        "Glossary": "Sõnastik"
     }
 }
\ No newline at end of file
diff --git a/plugins/API/lang/uk.json b/plugins/API/lang/uk.json
index c3784384ec..db80c1a865 100644
--- a/plugins/API/lang/uk.json
+++ b/plugins/API/lang/uk.json
@@ -1,5 +1,6 @@
 {
     "API": {
+        "ChangeTokenHint": "Якщо ви хочете змінити цей токен, будь ласка, перейдіть в свою %1$sособисту сторінку налаштувань%2$s.",
         "GenerateVisits": "Якщо на сьогодні ще немає даних то можна власноручно згенерувати дані використовуючи плагін %1$s . Щоб увімкнути плагін %2$s , клацніть \"Visitor Generator\" меню в Панелі Адміністратора Piwik.",
         "KeepTokenSecret": "token_auth є секретним, на рівні з логіном та паролем, тож %1$s тримайте цю інформацію секреті%2$s!",
         "LoadedAPIs": "%s API успішно завантажено",
diff --git a/plugins/API/tests/Unit/HtmlRendererTest.php b/plugins/API/tests/Unit/HtmlRendererTest.php
index 374f33e0b6..22b492e10d 100644
--- a/plugins/API/tests/Unit/HtmlRendererTest.php
+++ b/plugins/API/tests/Unit/HtmlRendererTest.php
@@ -32,7 +32,7 @@ class HtmlRendererTest extends \PHPUnit_Framework_TestCase
     {
         $response = $this->builder->renderSuccess('ok');
 
-        $this->assertEquals('Success:ok', $response);
+        $this->assertEquals('<!-- Success: ok -->', $response);
     }
 
     public function test_renderException_shouldIncludeTheMessageAndNotExceptionMessage()
diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json
index 27c9b2f72f..91d219f81b 100644
--- a/plugins/Actions/lang/en.json
+++ b/plugins/Actions/lang/en.json
@@ -29,10 +29,10 @@
         "ColumnIdPageview": "Pageview ID",
         "ColumnInteractionPosition": "Interaction Position",
         "DownloadsReportDocumentation": "In this report, you can see which files your visitors have downloaded. %s What Piwik counts as a download is the click on a download link. Whether the download was completed or not isn't known to Piwik.",
-        "EntryPagesReportDocumentation": "This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during his visit. %s The entry URLs are displayed as a folder structure.",
+        "EntryPagesReportDocumentation": "This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during their visit. %s The entry URLs are displayed as a folder structure.",
         "EntryPageTitles": "Entry page titles",
         "EntryPageTitlesReportDocumentation": "This report contains information about the titles of entry pages that were used during the specified period.",
-        "ExitPagesReportDocumentation": "This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during his visit. %s The exit URLs are displayed as a folder structure.",
+        "ExitPagesReportDocumentation": "This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during their visit. %s The exit URLs are displayed as a folder structure.",
         "ExitPageTitles": "Exit page titles",
         "ExitPageTitlesReportDocumentation": "This report contains information about the titles of exit pages that occurred during the specified period.",
         "LearnMoreAboutSiteSearchLink": "Learn more about Tracking how your visitors use your Search engine.",
diff --git a/plugins/Actions/lang/it.json b/plugins/Actions/lang/it.json
index 2524ca464e..a360a9fb9b 100644
--- a/plugins/Actions/lang/it.json
+++ b/plugins/Actions/lang/it.json
@@ -18,6 +18,7 @@
         "ColumnSearchCategory": "Categoria di Ricerca",
         "ColumnSearches": "Ricerche",
         "ColumnSearchesDocumentation": "Il numero di visite che hanno ricercato questa parola chiave sul motore di ricerca del vostro sito.",
+        "ColumnSearchExits": "%% Esiti Ricerca",
         "ColumnSearchExitsDocumentation": "La percentuale di visite che hanno lasciato il sito dopo aver ricercato questa parola chiave sul motore di ricerca del vostro sito.",
         "ColumnSearchResultsCount": "Numero risultati di ricerca",
         "ColumnSiteSearchKeywords": "Parole chiave uniche",
diff --git a/plugins/Actions/lang/uk.json b/plugins/Actions/lang/uk.json
index b1c7e602dc..5243fc3990 100644
--- a/plugins/Actions/lang/uk.json
+++ b/plugins/Actions/lang/uk.json
@@ -18,6 +18,7 @@
         "ColumnSearchCategory": "Шукати категорію",
         "ColumnSearches": "Пошуки",
         "ColumnSearchesDocumentation": "Число відвідувань, коли відвідувач шукав саме це ключове слово через пошук на сайті.",
+        "ColumnSearchExits": "%% Виходів після пошуку",
         "ColumnSearchExitsDocumentation": "Відсоток відвідувань, коли відвідувач пішов з сайту після пошуку на вашому сайті саме цього ключового слова.",
         "ColumnSearchResultsCount": "Лічильник результатів",
         "ColumnSiteSearchKeywords": "Унікальні ключові слова",
diff --git a/plugins/Actions/lang/zh-tw.json b/plugins/Actions/lang/zh-tw.json
index 01f4e98d36..a98937a74f 100644
--- a/plugins/Actions/lang/zh-tw.json
+++ b/plugins/Actions/lang/zh-tw.json
@@ -29,7 +29,7 @@
         "ColumnIdPageview": "瀏覽數 ID",
         "ColumnInteractionPosition": "互動位置",
         "DownloadsReportDocumentation": "在這份報表你可以查看訪客已下載了哪個檔案。%sPiwik 是透過點擊下載連結來計算下載數，但不知道下載完成與否。",
-        "EntryPagesReportDocumentation": "此報表包含指定期間內之到達網頁的相關資訊。所謂的到達網頁，是訪客進入網站時所訪問的第一個網頁。%s 到達網頁之 URL 以資料夾結構顯示。",
+        "EntryPagesReportDocumentation": "此報表包含指定期間內之到達網頁的相關資訊。所謂的到達網頁，是訪客進入網站時所訪問的第一個網頁。%s 到達網頁的網址以資料夾結構顯示。",
         "EntryPageTitles": "到達網頁標題",
         "EntryPageTitlesReportDocumentation": "此報告包含指定期間內，到達網頁標題的相關資訊。",
         "ExitPagesReportDocumentation": "這份報表包含指定期間內離開網頁的資訊。離開網頁是訪客離開網頁前最後留覽的頁面。%s離開網頁的網址以資料夾結構顯示。",
diff --git a/plugins/Annotations/lang/sk.json b/plugins/Annotations/lang/sk.json
index f5c56e8a00..c18b862b98 100644
--- a/plugins/Annotations/lang/sk.json
+++ b/plugins/Annotations/lang/sk.json
@@ -8,9 +8,14 @@
         "ClickToEditOrAdd": "Klknutím upravíte alebo pridáte anotáciu.",
         "ClickToStarOrUnstar": "Klknutím označíte alebo odznačíte hviezdičkou anotáciu.",
         "CreateNewAnnotation": "Vytvoriť novú anotáciu…",
+        "EnterAnnotationText": "Vložte svoju poznámku...",
         "HideAnnotationsFor": "Skryť anotáciu pre %s…",
+        "IconDesc": "Pozrieť poznámky pre tento časový rozsah.",
+        "IconDescHideNotes": "Skryť poznámky pre tento časový rozsah.",
+        "InlineQuickHelp": "Môžete vytvoriť anotácie na onačenie špeciálnych udalostí (ako nový príspevok na blogu, alebo redizajn webovej stránky), na uloženie Vašich dátových analýz alebo na uloženie čohokoľvek ďalšieho čo si myslíte, že je dôležité.",
         "LoginToAnnotate": "Prihláste sa pre vytvorenie anotácie.",
         "NoAnnotations": "Pre tento časový rozsah nie sú anotácie.",
-        "ViewAndAddAnnotations": "Zobraziť a pridať anotácie pre %s…"
+        "ViewAndAddAnnotations": "Zobraziť a pridať anotácie pre %s…",
+        "YouCannotModifyThisNote": "Nemôžete upraviť túto anotáciu, pretože ste ju nevytvorili, ani nemáte administrátorský prístup pre túto stránku."
     }
 }
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index f81dff22c3..f1701ea4b1 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -56,7 +56,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -162,7 +162,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index f81dff22c3..f1701ea4b1 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -56,7 +56,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -162,7 +162,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index f81dff22c3..f1701ea4b1 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -56,7 +56,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -162,7 +162,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index f81dff22c3..f1701ea4b1 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -56,7 +56,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -162,7 +162,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index f81dff22c3..f1701ea4b1 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -56,7 +56,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -162,7 +162,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
diff --git a/plugins/CoreAdminHome/Commands/SetConfig.php b/plugins/CoreAdminHome/Commands/SetConfig.php
index 49b1925fd3..9f2d6f0b9a 100644
--- a/plugins/CoreAdminHome/Commands/SetConfig.php
+++ b/plugins/CoreAdminHome/Commands/SetConfig.php
@@ -73,12 +73,12 @@ Use the --piwik-domain option to specify which instance to modify.
         foreach ($manipulations as $manipulation) {
             $manipulation->manipulate($config);
 
-            $output->writeln("<info>Setting [{$manipulation->getSectionName()}] {$manipulation->getName()} = {$manipulation->getValueString()}</info>");
+            $output->write("<info>Setting [{$manipulation->getSectionName()}] {$manipulation->getName()} = {$manipulation->getValueString()}...</info>");
+            $output->writeln("<info> done.</info>");
         }
 
         $config->forceSave();
 
-        $this->writeSuccessMessage($output, array("Done."));
     }
 
     /**
diff --git a/plugins/CoreAdminHome/lang/cs.json b/plugins/CoreAdminHome/lang/cs.json
index 7778f7f2ff..c0dc918ab3 100644
--- a/plugins/CoreAdminHome/lang/cs.json
+++ b/plugins/CoreAdminHome/lang/cs.json
@@ -45,6 +45,7 @@
         "JSTracking_VisitorCustomVarsDesc": "Například se jménem \"Typ\" a hodnotou \"zákazník\".",
         "JSTrackingIntro1": "Návštěvníky vašich stránek můžete sledovat mnoha způsoby. Doporučená metoda je pomocí javascriptu. Aby to bylo možné, každá z vašich stránek musí mít javascriptový kód, který můžete vygenerovat zde,",
         "JSTrackingIntro2": "Až budete mít sledovací javascriptový kód, vložte ho do všech stránek, které mají být Piwikem sledovány.",
+        "JSTrackingIntro3b": "Ve většině případů webových stránek, blogů, CMS, atd. můžete použít již připravený zásuvný modul, který zařídí technické detaily za vás. (Podívejte se na náš %1$sseznam integračních zásuvných modulů Piwiku%2$s.) Pokud zásuvný modul neexistuje, můžete upravit šablony vašich webových stránek přidat tento kód do tagu &lt;\/head&gt;, který je často definován v 'header.php', 'header.tpl' nebo podobném souboru s šablonou.",
         "JSTrackingIntro4": "Pokud nechcete ke sledování návštěvníků použít javascript, %1$svygenerujte obrázkový sledovací tag níže%2$s.",
         "JSTrackingIntro5": "Pokud chcete ne jen sledovat zobrazení stránek, podívejte se na %1$sdokumentaci javascriptového sledování%2$s, kde naleznete seznam dostupných funkcí. S použitím těchto funkcí můžete sledovat cíle, vlastní proměnné, objednávky v e-obchodech, opuštěné košíky a mnoho dalšího.",
         "LogoNotWriteableInstruction": "Pokud chcete místo výcchozího loga použít vlastní, je nutné, abyste měli práva k zápisu adresáře %1$s. Piwik potřebuje práva k zápisu log umístěných v souborech %2$s.",
diff --git a/plugins/CoreAdminHome/lang/de.json b/plugins/CoreAdminHome/lang/de.json
index 03a2c0c4dd..39fb10ab2d 100644
--- a/plugins/CoreAdminHome/lang/de.json
+++ b/plugins/CoreAdminHome/lang/de.json
@@ -45,6 +45,7 @@
         "JSTracking_VisitorCustomVarsDesc": "Zum Beispiel mit dem Variablennamen \"Typ\" und dem Wert \"Kunde\".",
         "JSTrackingIntro1": "Es gibt viele verschiedene Möglichkeiten Besucher Ihrer Website zu tracken. Die empfohlene Art und Weise dies zu tun, ist die Verwendung von JavaScript. Um diese Methode zu nutzen müssen Sie sicher stellen, dass auf jeder Seite Ihrer Website ein JavaScript-Code eingebunden ist. Diesen können Sie hier generieren.",
         "JSTrackingIntro2": "Sobald Sie den JavaScript Tracking Code für Ihre Website haben, fügen Sie ihn auf allen Seiten ein, die Sie mit Piwik überwachen möchten.",
+        "JSTrackingIntro3b": "Bei den meisten Webseiten, Blogs und CMS, etc. können Sie ein existierendes Plugin benutzen, das Ihnen die technische Arbeit abnimmt. (Schauen Sie hierzu in die %1$sListe der Plugins um Piwik zu integrieren%2$s.) Falls kein passendes Plugin besteht können Sie die Templates Ihrer Webseite bearbeiten und diesen Quellcode in den %lt;\/head&gt;-Tag einfügen. Dieser ist häufig in einer 'header.php' oder header.tpl' oder ähnlich benannten Template-Datei definiert.",
         "JSTrackingIntro4": "Falls Sie kein JavaScript nutzen möchten um Ihre Besucher zu tracken, %1$sgenerieren Sie einen Link zum Tracking mit Hilfe eines Bildes unterhalb.%2$s",
         "JSTrackingIntro5": "Sollte Sie mehr als nur Seitenaufrufe aufzeichnen wollen, werfen Sie einen Blick in die %1$sPiwik Javascript Tracking Dokumentation%2$s für eine Liste an verfügbaren Funktionen. Mit der Verwendung dieser Funktionen können Sie Ziele, benutzerdefinierte Variablen, Ecommerce Bestellungen, verlassene Warenkörbe und mehr aufzeichnen.",
         "LogoNotWriteableInstruction": "Um Ihr eigenes Logo anstelle des Piwik Logos verwenden zu können werden Schreibrechte auf diesen Ordner benötigt: %1$s Piwik benötigt Schreibzugriff auf Ihre Logos die gespeichert sind in %2$s.",
diff --git a/plugins/CoreAdminHome/lang/et.json b/plugins/CoreAdminHome/lang/et.json
index 0bf39f0ec4..1f3af6c13c 100644
--- a/plugins/CoreAdminHome/lang/et.json
+++ b/plugins/CoreAdminHome/lang/et.json
@@ -1,5 +1,6 @@
 {
     "CoreAdminHome": {
+        "AddNewTrustedHost": "Lisa uus usaldusväärne host",
         "Administration": "Administreerimine",
         "ArchivingSettings": "Arhiveerimise seaded",
         "BrandingSettings": "Brändingu seaded",
@@ -17,6 +18,8 @@
         "LogoUpload": "Vali üleslaadimiseks Logo",
         "MenuDiagnostic": "Diagnostika",
         "MenuGeneralSettings": "Põhiseaded",
+        "MenuSystem": "Süsteem",
+        "MenuDevelopment": "Arendamine",
         "OptOutForYourVisitors": "Piwiku külastajate väljaarvamine",
         "PiwikIsInstalledAt": "Piwik on paigaldatud",
         "TrackAGoal": "Kogu infot eesmärgi kohta",
diff --git a/plugins/CoreAdminHome/lang/it.json b/plugins/CoreAdminHome/lang/it.json
index 83eb659fa6..00fb1062fa 100644
--- a/plugins/CoreAdminHome/lang/it.json
+++ b/plugins/CoreAdminHome/lang/it.json
@@ -45,6 +45,7 @@
         "JSTracking_VisitorCustomVarsDesc": "Per esempio, con il nome di variabile \"Tipo\" e il valore \"Cliente\".",
         "JSTrackingIntro1": "Puoi monitorare i visitatori del tuo sito web con metodi diversi. Il metodo raccomandato è di farlo tramite JavaScript. Per utilizzare questo metodo è necessario che ogni pagina del sito abbia il codice JavaScript, che è possibile generare qui.",
         "JSTrackingIntro2": "Una volta ottenuto il codice JavaScript per il tuo sito web, copialo e incollalo in tutte le pagine che vuoi monitorare con Piwik.",
+        "JSTrackingIntro3b": "Nella maggior parte dei siti web, blog, CMS ecc., puoi utilizzare un plugin che faccia per te il lavoro tecnico. (Vedi la nostra %1$slista di plugin usati per integrare Piwik%2$s. Se non esiste alcun plugin, puoi modificare le template del tuo sito web e aggiungere questo codice al tag &lt;\/head&gt; che spesso è definito in 'header.php', 'header.tpl' o un simile file della template.",
         "JSTrackingIntro4": "Se non vuoi usare il codice JavaScript per monitorare i visitatori, %1$sgenera qui sotto un'immagine per monitorare senza JavaScript%2$s.",
         "JSTrackingIntro5": "Se volete fare altro oltre che tracciare le viste pagina, preghiamo di controllare la %1$sDocumentazione Piwik Javascript Tracking%2$s per l'elenco delle funzioni disponibili. Utilizzando queste funzioni potrete tracciare obiettivi, variabili personalizzate, ordini ecommerce, carrelli abbandonati e altro.",
         "LogoNotWriteableInstruction": "Per utilizzare il tuo logo personalizzato al posto del logo di Piwik, da' i permessi di scrittura a questa directory: %1$s Piwik necessita dell'accesso in scrittura per i tuoi loghi conservati nei files %2$s.",
diff --git a/plugins/CoreAdminHome/lang/ja.json b/plugins/CoreAdminHome/lang/ja.json
index aaa8c6827f..3f6daabe1f 100644
--- a/plugins/CoreAdminHome/lang/ja.json
+++ b/plugins/CoreAdminHome/lang/ja.json
@@ -44,6 +44,7 @@
         "JSTracking_VisitorCustomVarsDesc": "たとえば、変数名\"Type\"で、値が\"Customer\"の場合、",
         "JSTrackingIntro1": "様々な方法で訪問者を追跡できますが、JavaScriptでトラックすることが推奨されています。そのためには、各々のウェブページにここで生成されたJavaScriptコードを埋め込みます。",
         "JSTrackingIntro2": "ウェブサイトのためのJavaScriptのトラッキングコードをコピーして、追跡したいすべてのページにペーストします。",
+        "JSTrackingIntro3b": "ほとんどのウェブサイト、ブログ、CMS などでは、あらかじめ作られたプラグインを使って技術的な仕事をすることができます。 プラグインが存在しない場合は、ウェブサイトのテンプレートを編集し、このコードを 'header.php' 、'header.tpl' などのテンプレートファイルで定義されている &lt;\/head&gt; タグに追加することができます( %1$s Piwik の統合に使用されるプラグインのリスト%2$s を参照 ) 。",
         "JSTrackingIntro4": "訪問者を追跡するためにJavaScriptを使用したくない場合は、%1$s以下の画像によるトラッキングリンクを生成します。%2$s",
         "JSTrackingIntro5": "ページビューを追跡する以上のことをしたい場合は、%1$sPiwik Javascriptトラッキングドキュメント%2$sの使用可能な機能のリストを参照してください。これらの機能を使って、ゴール（目標）、カスタム変数、eコマース注文、破棄されたショッピングカート等々の追跡が可能です。",
         "LogoNotWriteableInstruction": "Piwik デフォルトロゴの代わりにカスタムロゴを使用するには、このディレクトリへの書込権限を与えて下さい。 :%1$s ロゴを %2$s ファイルに保存するには、書込アクセスが必要です。",
diff --git a/plugins/CoreAdminHome/lang/sk.json b/plugins/CoreAdminHome/lang/sk.json
index 658df4956d..bad1a9dcfb 100644
--- a/plugins/CoreAdminHome/lang/sk.json
+++ b/plugins/CoreAdminHome/lang/sk.json
@@ -1,18 +1,50 @@
 {
     "CoreAdminHome": {
+        "AddNewTrustedHost": "Pridať nového dôveryhodného hostiteľa",
         "Administration": "Administrácia",
         "ArchivingSettings": "Archivačné nastavenia",
+        "BrandingSettings": "Nastavenia Brandingu",
+        "ReleaseChannel": "Kanál vydania",
+        "ClickHereToOptIn": "Kliknite sem pre prihásenie.",
+        "ClickHereToOptOut": "Kliknite sem pre odhásenie.",
+        "CustomLogoHelpText": "Môžete prispôsobiť logo Piwiku, ktoré bude zobrazené v užívateľskom rozhraní a emailových reportoch.",
         "EmailServerSettings": "Nastavenia e-mailového servera",
         "ForBetaTestersOnly": "Len pre beta testerov",
         "ImageTracking": "Sledovanie obrázkom",
+        "ImageTrackingIntro1": "Keď má návštevník vypnutý JavaScript, alebo keď JavaScript nemôže byť použitý, môžete použiť obrázkový sledovací odkaz pre sledovanie návštevníkov.",
+        "ImageTrackingLink": "Link pre Sledovanie obrázkom",
+        "ImportingServerLogs": "Importujem Serverové logy",
+        "InvalidPluginsWarning": "Nasledujúce moduly nie sú kompatibilné s %1$s a nemohli byť načítané: %2$s.",
+        "InvalidPluginsYouCanUninstall": "Môžete aktualizovať alebo odinštalovať tieto moduly na stránke %1$sSpráva modulov%2$s.",
         "JavaScriptTracking": "Sledovanie JavaScriptom",
+        "JSTracking_DisableCookies": "Deaktivovať všetky sledovacie cookies",
+        "JSTracking_EnableDoNotTrack": "Aktivovať detekciu DoNotTrack u klienta",
+        "JSTracking_TrackNoScript": "Sledovať užívateľov s vypnutým JavaScriptom",
         "JSTracking_VisitorCustomVars": "Sledovať vlastné premenné pre tohto zákazníka",
-        "LogoUpload": "Vyberte logo pre načítanie",
+        "JSTrackingIntro1": "Návštevníkov Vašej stránky môžete sledovať rôznymi spôsobmi. Odporúčaný spôsob je prostredníctvom JavaScriptu. Aby ste mohli použiť tento spôsob, uistite sa, že každá stránka Vášho webu má JavaScriptový kód, ktorý si môžete vygenerovať tu.",
+        "JSTrackingIntro2": "Akonáhle máte JavaScriptový sledovací kód pre Vašu webovú stránku, skopírujte a vložte ho na všetky stránky, ktoré chcete sledovať Piwikom.",
+        "JSTrackingIntro3b": "Na väčšine webových stránok, blogov, CMS, atď. môžete použiť predpripravený modul aby za Vás spravil technickú prácu. (Pozrite náš %1$slzoznam modulov použitých pre integráciu s Piwikom%2$s). Ak neexistuje žiadny modul môžete upraviť šablóny Vášho webu a pridať tento kód do &lt;\/head&gt; tagu, ktorý je často definovaný v 'header.php', 'header.tpl' alebo podobnom súbore šablóny.",
+        "JSTrackingIntro4": "Ak nechcete použiť JavaScript na sledovanie návštevníkov, %1$svygenerujte odkaz na sledovanie obrázkom nižšie%2$s.",
+        "JSTrackingIntro5": "Ak chcete robiť viac než len sledovať zobrazenia stránok, prosím pozrite sa na %1$sdokumentáciu JavaScriptového sledovania Piwikom%2$s pre zoznam dostupných funkcií. Použitím týchto funkcií môžete sledovať ciele, vlastné premenné, objednávky z elektronického obchodu a ďalšie.",
+        "LogoUpload": "Vyberte logo pre nahranie",
+        "FaviconUpload": "Vyberte Favicon pre nahranie",
         "MenuDiagnostic": "Diagnostika",
         "MenuGeneralSettings": "Všeobecné nastavenie",
+        "MenuSystem": "Systém",
+        "MenuDevelopment": "Vývoj",
+        "MenuMeasurables": "Metriky",
+        "OptOutForYourVisitors": "Odhlásenie pre Vašich návštevníkov",
+        "PiwikIsInstalledAt": "Piwik je nainštalovaný na",
+        "PersonalPluginSettings": "Osobné nastavenia modulu",
+        "PluginSettings": "Nastavenia modulov",
+        "PluginSettingsSaveFailed": "Uloženie nastavení modulu zlyhalo",
+        "PluginSettingsSaveSuccess": "Nastavenia modulu aktualizované.",
+        "SettingsSaveSuccess": "Nastavenia aktualizované.",
+        "SendPluginUpdateCommunication": "Poslať e-mail keď je dostupná aktualizácia modulu",
         "TrackAGoal": "Sledovať cieľ",
         "TrackingCode": "Kód sledovania",
         "TrustedHostConfirm": "Ste si istí, že chcete zmeniť dôveryhodné hostname pre Piwik?",
+        "UpdateSettings": "Aktualizovať nastavenia",
         "UseCustomLogo": "Použiť vlastné logo"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/uk.json b/plugins/CoreAdminHome/lang/uk.json
index 5d8455ce5f..5e36a71799 100644
--- a/plugins/CoreAdminHome/lang/uk.json
+++ b/plugins/CoreAdminHome/lang/uk.json
@@ -45,6 +45,7 @@
         "JSTracking_VisitorCustomVarsDesc": "Наприклад, ім'я змінної «Тип», а значення – «Клієнт».",
         "JSTrackingIntro1": "Ви можете відстежувати відвідувачів різними способами. Ми рекомендуємо використовувати для цього JavaScript. Щоб використовувати цей метод ви повинні переконатися, що цей код розміщений на кожній сторінці.",
         "JSTrackingIntro2": "Як тільки ви отримали Javascript код для вашого сайту, скопіюйте і вставте його на всі сторінки вашого сайту, на яких ви хочете відслідковувати відвідувачів.",
+        "JSTrackingIntro3b": "У більшості веб-сайтів, блогів, CMS і т.д. Ви можете використовувати заздалегідь розроблений плагін, щоб зробити технічну роботу за вас. (Дивіться наші %1$sсписки плагінів використовуваних для інтеграції з Piwik%2$s.) Якщо жоден плагін не підходить ви можете редагувати шаблони сайту і додати цей код &lt;\/head&gt; тег, який часто використовується в 'header.php', 'header.tpl' або аналогічний файл шаблону.",
         "JSTrackingIntro4": "Якщо ви не хочете або не можете використовувати JavaScript, %1$sскористайтеся відстеженням відвідувачів через зображення%2$s.",
         "JSTrackingIntro5": "Якщо ви хочете більше, ніж просте відстеження сторінок, будь ласка, ознайомтеся з %1$sPiwik Javascript Tracking documentation%2$s для перегляду всіх функцій. За допомогою цих функцій ви можете відстежувати цілі, призначені для користувача змінні, замовлення електронної комерції, неоформлені замовлення і багато іншого.",
         "LogoNotWriteableInstruction": "Щоб використовувати власне лого замість стандартного Piwik, відкрийте для запису цю папку: %1$s Piwik потрібен доступ на запис вашого лого, що зберігається в файлах %2$s.",
diff --git a/plugins/CoreAdminHome/tests/Integration/SetConfigTest.php b/plugins/CoreAdminHome/tests/Integration/SetConfigTest.php
index 93cf57e7c5..868ea70997 100644
--- a/plugins/CoreAdminHome/tests/Integration/SetConfigTest.php
+++ b/plugins/CoreAdminHome/tests/Integration/SetConfigTest.php
@@ -131,7 +131,7 @@ class SetConfigTest extends ConsoleCommandTestCase
         $this->assertEquals(array('def'), $config->MySection['object_value']);
         $this->assertArrayNotHasKey('other_array_value', $config->MySection);
 
-        $this->assertContains("Done.", $this->applicationTester->getDisplay());
+        $this->assertContains("done.", $this->applicationTester->getDisplay());
     }
 
     /**
@@ -150,7 +150,7 @@ class SetConfigTest extends ConsoleCommandTestCase
         $config = self::makeNewConfig();
 
         $this->assertEquals(0, $config->Tracker['debug']);
-        $this->assertContains("Done.", $this->applicationTester->getDisplay());
+        $this->assertContains("done.", $this->applicationTester->getDisplay());
     }
 
     public function getOptionsForSettingValueToZeroTests()
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
index 2e3632d69e..e7e46820f5 100644
--- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
@@ -130,7 +130,7 @@ class RowEvolution
         $metricsText = Piwik::translate('RowEvolution_AvailableMetrics');
         $popoverTitle = '';
         if ($this->rowLabel) {
-            $icon = $this->rowIcon ? '<img src="' . $this->rowIcon . '" alt="">' : '';
+            $icon = $this->rowIcon ? '<img width="16px" height="16px" src="' . $this->rowIcon . '" alt="">' : '';
             $metricsText = sprintf(Piwik::translate('RowEvolution_MetricsFor'), $this->dimension . ': ' . $icon . ' ' . $this->rowLabel);
             $popoverTitle = $icon . ' ' . $this->rowLabel;
         }
diff --git a/plugins/CoreHome/Visitor.php b/plugins/CoreHome/Visitor.php
index efc818a2f1..962eabce31 100644
--- a/plugins/CoreHome/Visitor.php
+++ b/plugins/CoreHome/Visitor.php
@@ -32,9 +32,9 @@ class Visitor
         $status = $this->getVisitEcommerceStatus();
 
         if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) {
-            return "plugins/Morpheus/images/ecommerceOrder.gif";
+            return "plugins/Morpheus/images/ecommerceOrder.png";
         } elseif ($status == 'abandonedCart') {
-            return "plugins/Morpheus/images/ecommerceAbandonedCart.gif";
+            return "plugins/Morpheus/images/ecommerceAbandonedCart.png";
         }
         // Note: it is important that there is no icon when there was no ecommerce conversion
         return null;
@@ -83,7 +83,7 @@ class Visitor
         if ($type == 'returning'
             || $type == 'returningCustomer'
         ) {
-            return "plugins/Live/images/returningVisitor.gif";
+            return "plugins/Live/images/returningVisitor.png";
         }
         return null;
     }
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js b/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js
index d539bb3328..f872818897 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js
@@ -37,5 +37,15 @@
             return piwik.helper.getCurrentQueryStringWithParametersModified(newParameters) +
             '#' + piwik.helper.getQueryStringWithParametersModified(hash.substring(1), newParameters);
         };
+
+        Mousetrap.bind('w', function(event) {
+            if (event.preventDefault) {
+                event.preventDefault();
+            } else {
+                event.returnValue = false; // IE
+            }
+            $('.siteSelector .title').trigger('click').focus();
+        });
     }
+
 })();
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
index eabca54afd..463a723720 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
@@ -34,6 +34,7 @@
                    ng-model="view.searchTerm"
                    ng-change="model.searchSite(view.searchTerm)"
                    placeholder="{{ 'General_Search' | translate }}"
+                   tabindex="4"
                    class="websiteSearch inp browser-default"/>
             <img title="Clear"
                  ng-show="view.searchTerm"
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
index 5cb46eea9d..96336373f8 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
@@ -25,7 +25,7 @@
 
     > .siteSelector {
       position: absolute;
-      z-index: 999;
+      z-index: 998;
     }
 
     a.title {
diff --git a/plugins/CoreHome/images/bg_header.jpg b/plugins/CoreHome/images/bg_header.jpg
deleted file mode 100644
index 1733b0e355..0000000000
--- a/plugins/CoreHome/images/bg_header.jpg
+++ /dev/null
diff --git a/plugins/CoreHome/images/bg_header.png b/plugins/CoreHome/images/bg_header.png
new file mode 100644
index 0000000000..f0fc545f9f
--- /dev/null
+++ b/plugins/CoreHome/images/bg_header.png
diff --git a/plugins/CoreHome/images/bullet1.gif b/plugins/CoreHome/images/bullet1.gif
deleted file mode 100644
index f2707da68c..0000000000
--- a/plugins/CoreHome/images/bullet1.gif
+++ /dev/null
diff --git a/plugins/CoreHome/images/bullet1.png b/plugins/CoreHome/images/bullet1.png
new file mode 100644
index 0000000000..6a4bc2a467
--- /dev/null
+++ b/plugins/CoreHome/images/bullet1.png
diff --git a/plugins/CoreHome/images/bullet2.gif b/plugins/CoreHome/images/bullet2.gif
deleted file mode 100644
index 26e1b6af33..0000000000
--- a/plugins/CoreHome/images/bullet2.gif
+++ /dev/null
diff --git a/plugins/CoreHome/images/bullet2.png b/plugins/CoreHome/images/bullet2.png
new file mode 100644
index 0000000000..2e00eda5ec
--- /dev/null
+++ b/plugins/CoreHome/images/bullet2.png
diff --git a/plugins/CoreHome/images/favicon.ico b/plugins/CoreHome/images/favicon.ico
index e29ea5b420..616228c5bc 100644
--- a/plugins/CoreHome/images/favicon.ico
+++ b/plugins/CoreHome/images/favicon.ico
diff --git a/plugins/CoreHome/images/more_date.gif b/plugins/CoreHome/images/more_date.gif
deleted file mode 100644
index 87da6b4963..0000000000
--- a/plugins/CoreHome/images/more_date.gif
+++ /dev/null
diff --git a/plugins/CoreHome/images/more_date.png b/plugins/CoreHome/images/more_date.png
new file mode 100644
index 0000000000..17983a7e4a
--- /dev/null
+++ b/plugins/CoreHome/images/more_date.png
diff --git a/plugins/CoreHome/images/more_period.gif b/plugins/CoreHome/images/more_period.gif
deleted file mode 100644
index b0c9787851..0000000000
--- a/plugins/CoreHome/images/more_period.gif
+++ /dev/null
diff --git a/plugins/CoreHome/images/more_period.png b/plugins/CoreHome/images/more_period.png
new file mode 100644
index 0000000000..92b10dd782
--- /dev/null
+++ b/plugins/CoreHome/images/more_period.png
diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js
index a413c9ad5a..fdf58f2cf0 100644
--- a/plugins/CoreHome/javascripts/calendar.js
+++ b/plugins/CoreHome/javascripts/calendar.js
@@ -100,7 +100,7 @@
             var parts = dateStr.split(',');
             dateStr = parts[0];
         }
-        
+
         var splitDate = dateStr.split('-');
         currentYear = splitDate[0];
         currentMonth = splitDate[1] - 1;
@@ -215,6 +215,7 @@
                 }
 
             });
+
         } else {
             // Let broadcast do its job:
             // It will replace date value to both search query and hash and load the new page.
@@ -514,7 +515,7 @@
 
         // Apply date range button will reload the page with the selected range
         $('#calendarApply')
-            .on('click', function () {
+            .on("click", function() {
                 var $selectedPeriod = $('#periodMore [name=period]:checked');
 
                 if (!$selectedPeriod.is('#period_id_range')) {
@@ -697,4 +698,13 @@
         initTopControls();
     });
 
+    Mousetrap.bind('d', function(event) {
+        if (event.preventDefault) {
+            event.preventDefault();
+        } else {
+            event.returnValue = false; // IE
+        }
+        $('#periodString .title').trigger('click').focus();
+    });
+
 }(jQuery));
diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
index c92048e90a..170755885c 100644
--- a/plugins/CoreHome/lang/en.json
+++ b/plugins/CoreHome/lang/en.json
@@ -67,6 +67,7 @@
         "Segments": "Segments",
         "OneClickUpdateNotPossibleAsMultiServerEnvironment": "The one-click update is not available as you are using Piwik with multiple servers. Please download the latest version from %1$s to proceed.",
         "AdblockIsMaybeUsed": "In case you are using an ad blocker, please disable it for this site to make sure Piwik works without any issues.",
-        "ChangeCurrentWebsite": "Choose a website, currently selected website: %s"
+        "ChangeCurrentWebsite": "Choose a website, currently selected website: %s",
+        "LeadingAnalyticsPlatformRespectsYourPrivacy": "The leading open analytics platform that respects your privacy."
     }
 }
diff --git a/plugins/CoreHome/lang/et.json b/plugins/CoreHome/lang/et.json
index 009ee32f7b..48dadf7d03 100644
--- a/plugins/CoreHome/lang/et.json
+++ b/plugins/CoreHome/lang/et.json
@@ -1,8 +1,10 @@
 {
     "CoreHome": {
         "CategoryNoData": "Informatsioon puudub selles kategoorias. Proovi \"Include all population\".",
+        "ChangeVisualization": "Muuda visualiseerimist",
         "CheckForUpdates": "Kontrolli uuendusi",
         "CheckPiwikOut": "Proovi Piwikut!",
+        "CloseSearch": "Sulge otsing",
         "CloseWidgetDirections": "Sa saad antud vidina sulgeda, valides 'X' vidina ülaservas.",
         "Default": "vaikimisi",
         "ExcludeRowsWithLowPopulation": "Kuvatakse kõiki ridu %s Eemalda ebapopulaarsemad",
@@ -24,6 +26,8 @@
         "UnFlattenDataTable": "Antud raport on lame %s Tee see hierarhiliseks",
         "ViewAllPiwikVideoTutorials": "Vaata kõiki Piwiku video õpetusi",
         "WebAnalyticsReports": "Veebi analüüsi raportid",
-        "YouAreUsingTheLatestVersion": "Kasutad uusimat Piwiku versiooni!"
+        "YouAreUsingTheLatestVersion": "Kasutad uusimat Piwiku versiooni!",
+        "SystemSummaryWidget": "Süsteemi kokkuvõte",
+        "SystemSummaryNWebsites": "%d veebilehte"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/it.json b/plugins/CoreHome/lang/it.json
index 22ea450526..e20dfcc1c2 100644
--- a/plugins/CoreHome/lang/it.json
+++ b/plugins/CoreHome/lang/it.json
@@ -5,6 +5,7 @@
         "CheckForUpdates": "Cerca aggiornamenti",
         "CheckPiwikOut": "Controlla Piwik!",
         "ClickToEditX": "Clicca per modificare %s",
+        "ClickToSeeFullInformation": "Clicca per vedere le informazioni complete",
         "CloseSearch": "Chiudi la ricerca",
         "CloseWidgetDirections": "Potete chiudere questo widget cliccando sull'icona 'X' nella parte alta del widget stesso.",
         "ChooseX": "Scegli %1$s",
diff --git a/plugins/CoreHome/lang/sk.json b/plugins/CoreHome/lang/sk.json
index 4d5dc4001f..da17249fc1 100644
--- a/plugins/CoreHome/lang/sk.json
+++ b/plugins/CoreHome/lang/sk.json
@@ -1,20 +1,25 @@
 {
     "CoreHome": {
         "CategoryNoData": "Pre túto kategóriu nie sú dáta. Skúste použiť „Vrátane celej populácie“.",
+        "ChangeVisualization": "Zmeniť zobrazenie",
         "CheckForUpdates": "Skontrolovať aktualizácie",
         "CheckPiwikOut": "Vyskúšajte Piwik!",
         "ClickToEditX": "Kliknite pre editovanie %s",
+        "ClickToSeeFullInformation": "Klinite pre viac informácií.",
+        "CloseSearch": "Zavrieť vyhľadávanie",
         "CloseWidgetDirections": "Túto miniaplikáciu môžete zavrieť kliknutím na ikonu 'X' navrchu.",
+        "ChooseX": "Vyberte %1$s",
         "DataForThisReportHasBeenPurged": "Dáta pre tento report sú viac ako %s mesiacov staré a boli zmazané.",
         "DataTableExcludeAggregateRows": "Súhrnné riadky sú zobrazené %s Schovať ich",
         "DataTableIncludeAggregateRows": "Súhrnné riadky sú schované %s Zobraziť ich",
+        "DataTableHowToSearch": "Stlačte enter alebo kliknite na ikonu hľadania pre vyhľadávanie",
         "Default": "Prednastavené",
         "DonateCall1": "Používanie projektu Piwik Vás nebude nikdy nič stáť, ale to neznamená, že jeho vývoj nič nestojí.",
         "DonateCall2": "Piwik potrebuje Vašu neustálu podporu aby rástol a prospieval.",
         "DonateFormInstructions": "Kliknite na bežec a vyberte hodnotu, potom kliknite na subscribe -prispieť- pre finančnú podporu.",
         "ExcludeRowsWithLowPopulation": "Všetky riadky sú zobrazené %s Vylúčiť nízku populáciu",
         "ExternalHelp": "Nápoveda (otvorí sa nová tabuľka)",
-        "FlattenDataTable": "Report je hierarchický %s Urobiť ho jednotný",
+        "FlattenDataTable": "Report je hierarchický %s Urobiť ho plochý",
         "HowMuchIsPiwikWorth": "Ako veľmi je Piwik pre Vás cenný?",
         "IncludeRowsWithLowPopulation": "Riadky s nízkou populáciou sú skryté %s Zobraziť všetky riadky",
         "InjectedHostEmailBody": "Hello, dnes som sa pokúšal vstúpiť do Piwiku ale objavilo sa neznáme hostname varovanie.",
@@ -23,6 +28,7 @@
         "InjectedHostSuperUserWarning": "Piwik môže byť zle nakonfigurovaný (napr., ak bol práve Piwik presunutý na nový server alebo URL). Môžete buďto %1$s kliknúť sem a pridať %2$s ako platné Piwik hostname (ak tomu dôverujete)%3$s, alebo %4$s kliknúť sem a vsúpiť %5$s do Piwiku bezpečne%6$s.",
         "InjectedHostWarningIntro": "Práve vstupujete do Piwiku z %1$s, ale Piwik bol nakonfigurovaný aby bežal na tejto adrese: %2$s.",
         "JavascriptDisabled": "JavaScript musí byť povolený za účelom používania Piwiku v štandardnom prezeraní.<br \/> Ale vyzerá to tak, že JavaScript je buďto vypnutý alebo nie je podporovaný Vašim perhliadačom.<br \/> Pre štandardné prezeranie zmente nastavenia Vášho prehliadača a povoľte JavaScript , potom %1$s skúste znova%2$s.<br \/>",
+        "MainNavigation": "Hlavná navigácia",
         "MakeOneTimeDonation": "Jednorázovo finančne podporiť.",
         "Menu": "Menu",
         "NoPrivilegesAskPiwikAdmin": "Ste prihlásený ako '%1$s' ale vyzerá to tak , že nemáte žiadne povolenie do Piwiku. %2$s Spýtajte sa Vášho Piwik administrátora (Kliknite pre email)%3$s aby Vám dal 'prezerací' prístup na webstránku.",
@@ -45,6 +51,7 @@
         "YouAreUsingTheLatestVersion": "Používate najnovšiu verziu Piwiku!",
         "ClickRowToExpandOrContract": "Kliknite na tento riadok pre rozvinutie alebo zbalenie podtabuľky.",
         "UndoPivotBySubtable": "Tento report bol pivotovaný %s Naspäť pivot",
+        "NoSuchPage": "Táto stránka neexistuje",
         "PivotBySubtable": "Tento report nebol pivotovaný %1$s Pivotovať podľa %2$s"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/uk.json b/plugins/CoreHome/lang/uk.json
index 062015e246..9da96fb0c8 100644
--- a/plugins/CoreHome/lang/uk.json
+++ b/plugins/CoreHome/lang/uk.json
@@ -5,6 +5,7 @@
         "CheckForUpdates": "Перевірити на оновлення",
         "CheckPiwikOut": "Перевірити Piwik на оновлення!",
         "ClickToEditX": "Редагувати %s",
+        "ClickToSeeFullInformation": "Натисніть, щоб побачити повну інформацію",
         "CloseSearch": "Закрити пошук",
         "CloseWidgetDirections": "Ви можете закрити цей віджет, натиснувши на значок 'X' у верхній частині віджета.",
         "ChooseX": "Вибирати %1$s",
diff --git a/plugins/CoreHome/stylesheets/cloud.less b/plugins/CoreHome/stylesheets/cloud.less
index 75969a7f2d..b0853a2a68 100644
--- a/plugins/CoreHome/stylesheets/cloud.less
+++ b/plugins/CoreHome/stylesheets/cloud.less
@@ -10,6 +10,7 @@
   }
 }
 
+
 .tagCloud {
 
     img {
@@ -18,11 +19,13 @@
 
     .word a {
         text-decoration: none;
+
     }
 
     .word {
-        padding: 4px 8px 4px 0;
-        white-space: nowrap;
+      padding: 5px 15px 10px 8px;
+      white-space: nowrap;
+      display: inline-block;
     }
 
     .valueIsZero {
@@ -30,37 +33,37 @@
     }
 
     span.size0, span.size0 a {
-        color: #255792;
-        font-size: 28px;
+        color: #1f497a !important;
+        font-size: 46px;
     }
 
     span.size1, span.size1 a {
-        color: #255792;
-        font-size: 24px;
+        color: #24568f !important;
+        font-size: 40px;
     }
 
     span.size2, span.size2 a {
-        color: #255792;
-        font-size: 20px;
+        color: #2962a3 !important;
+        font-size: 32px;
     }
 
     span.size3, span.size3 a {
-        color: #255792;
-        font-size: 16px;
+        color: #255792 !important;
+        font-size: 28px;
     }
 
     span.size4, span.size4 a {
-        color: #255792;
-        font-size: 15px;
+        color:  #337acc !important;
+        font-size: 19px;
     }
 
     span.size5, span.size5 a {
-        color: #255792;
+        color: #5c95d6 !important;
         font-size: 14px;
     }
 
     span.size6, span.size6 a {
-        color: #255792;
-        font-size: 11px;
+        color: #5c95d6 !important;
+        font-size: 16px;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less
index 815eb1e20e..4d03fdbc3a 100644
--- a/plugins/CoreHome/stylesheets/layout.less
+++ b/plugins/CoreHome/stylesheets/layout.less
@@ -366,3 +366,54 @@ nav {
 .widgetize {
   width: auto;
 }
+
+@media print {
+
+  #secondNavBar{
+    display: none;
+  }
+
+  nav .icon-menu-hamburger, nav .icon-more-verti{
+    display: none;
+  }
+
+  nav ul a{
+    display: none;
+  }
+
+  #root, #standalone {
+    .dashboard-manager{
+      display: none !important;
+      visibility: hidden !important;
+    }
+  }
+
+  #root{
+    #secondNavBar + .pageWrap {
+      margin-left: 0px;
+    }
+
+    .top_controls{
+      .quick-access {
+      display: none !important;
+      }
+    }
+  }
+
+  .dataTableAction{
+    display: none !important;
+  }
+
+  .select-dropdown, .caret{
+    display: none !important;
+  }
+
+  .dataTable td .ratio{
+    margin-right: 4px;
+    visibility: visible;
+  }
+  .dataTableFooterNavigation > .row{
+    margin-bottom: -20px !important;
+  }
+}
+
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
index 2e3a4d1124..f901ddd6be 100644
--- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
@@ -1,4 +1,8 @@
-<h2 id="{{ reportId }}" style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt; font-weight:normal;">
+{% set fontStyle = "color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"%}
+{% set styleTableHeader = "border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;" ~ fontStyle %}
+{% set styleTableCell = "border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;" ~ fontStyle %}
+
+<h2 id="{{ reportId }}" style=" {{fontStyle}} font-size: {{ reportTitleTextSize }}pt; font-weight:normal; margin:45px 0 30px 0;">
     {{ reportName }}
 </h2>
 
@@ -13,7 +17,8 @@
                     src="cid:{{ reportId }}"
                 {% endif %}
                 height="{{ graphHeight }}"
-                width="{{ graphWidth }}"/>
+                width="{{ graphWidth }}"
+                margin="0 auto"/>
     {% endif %}
 
     {% if displayGraph and displayTable %}
@@ -22,16 +27,16 @@
     {% endif %}
 
     {% if displayTable %}
-        <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb({{ tableHeaderBgColor }}); color: rgb({{ tableHeaderTextColor }}); font-size: {{ reportTableHeaderTextSize }}pt; text-transform: {{ reportTableHeaderTextTransform }}; line-height:2.5em;">
-            {% for columnName in reportColumns %}
-                <th style="font-weight: {{ reportTableHeaderTextWeight }}; font-size:10px; text-align:left; padding: 6px 0;">
+        <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;">
+            <thead style="background-color: rgb({{tableBgColor}});">
+            {% for columnId, columnName in reportColumns %}
+                <th style="{{ styleTableHeader }}{% if columnId == 'label' %}{%  else %} text-align:right;{% endif %}">
                     &nbsp;{{ columnName }}&nbsp;&nbsp;
                 </th>
             {% endfor %}
             </thead>
             <tbody>
-            {% set cycleValues=['','background-color: rgb('~tableBgColor~')'] %}
+            {% set cycleValues=['background-color: rgb('~tableBgColor~')',''] %}
             {% set cycleIndex=1 %}
             {% for rowId,row in reportRows %}
                 {% set rowMetrics=row.columns %}
@@ -41,10 +46,10 @@
                 {% else %}
                     {% set rowMetadata=null %}
                 {% endif %}
-                <tr style="{{ cycle(cycleValues, cycleIndex) }};line-height: 22px;">
+                <tr style="{{ cycle(cycleValues, cycleIndex) }};{{styleTableCell}}">
                     {% set cycleIndex=cycleIndex+1 %}
                     {% for columnId, columnName in reportColumns %}
-                        <td style="font-size: {{ reportTableRowTextSize }}; {% if columnId == 'label' %}border-right: 1px solid rgb({{ tableCellBorderColor }}); {%  else %}border-left: 1px solid rgb({{ tableCellBorderColor }}); {% endif %} padding: 5px 0 5px 5px;">
+                        <td style="padding:17px 15px;{% if columnId == 'label' %}{%  else %} text-align:right;{% endif %}">
                             {% if columnId == 'label' %}
                                 {% if rowMetrics[columnId] is defined %}
                                     {% if rowMetadata.logo is defined %}
@@ -73,8 +78,8 @@
             </tbody>
         </table>
     {% endif %}
-    <br/>
-    <a style="text-decoration:none; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportBackToTopTextSize }}pt;" href="#reportTop">
-        {{ 'ScheduledReports_TopOfReport'|translate }}
-    </a>
+    <p style="width: 100%; text-align:center;">
+      <a style="text-decoration:none; font-size: 9pt;" href="#reportTop">
+          {{ 'ScheduledReports_TopOfReport'|translate }} &#8593;
+    </a></p>
 {% endif %}
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
index 691287b6e3..825f2753ac 100644
--- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
@@ -1,2 +1,15 @@
+{% set fontStyle = 'color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; '%}
+{% set styleParagraph = 'font-size:15px;line-height:24px;margin:0 0 16px;' %}
+
+<hr style=" border: 0; margin-top: 50px;  height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
+
+<p style='{{styleParagraph}}{{fontStyle}}text-align:center;font-size:13px; color:#666; padding:30px'>
+  {{'General_PoweredBy'|translate}}
+  <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+  <br />
+  {{ 'CoreHome_LeadingAnalyticsPlatformRespectsYourPrivacy'|translate }}
+</p>
+
+</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
index 7b8ce0a5d5..01e21348ff 100644
--- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
@@ -1,37 +1,62 @@
-<html>
+{% set fontStyle = "color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; "%}
+{% set styleParagraph = 'font-size:15px;line-height:24px;margin:0 0 16px;' %}
+
+<html style="background-color:#edecec">
+
 <head>
     <meta charset="utf-8">
     <meta name="robots" content="noindex,nofollow">
+    <meta name="generator" content="Piwik Analytics">
 </head>
-<body style="font-family: {{ reportFontFamily }}; color: rgb({{ reportTextColor }});line-height: 1.33;">
-
-<a id="reportTop" rel="noreferrer" target="_blank" href="{{ currentPath }}"><img title="{{ 'General_GoTo'|translate("Piwik") }}" border="0" alt="Piwik" src='{{ logoHeader }}'/></a>
 
-<h1 style="font-weight:normal; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
-    {{ reportTitle }}
-</h1>
+<body style="{{fontStyle}} line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);">
 
-<p>
-    {{ description }} - {{ 'General_DateRange'|translate }} {{ prettyDate }}
-</p>
+  <a name="reportTop"></a>
 
-{% if displaySegment %}
-<p style="color: rgb({{ reportTitleTextColor }});">
-    {{ 'ScheduledReports_CustomVisitorSegment'|translate("Piwik") }} {{ segmentName }}
-</p>
-{% endif %}
+  <table style="width:100%; background-color:#37474f; padding:10px 0; margin: 0 0 25px 0; height:64px;">
+    <tr>
+      <td>
+          <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="{{ piwikUrl }}" style="lineheight:17px">
+              <img src="{{ piwikUrl }}/plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, {{ 'General_OpenSourceWebAnalytics'|translate }}" />
+          </a>
+      </td>
+      <td align="right">
+          <a style="font-size:16px; padding:0 15px; color:#ffffff" title="{{'Dashboard_TopLinkTooltip'|translate(websiteName)}}" target="_blank" href="{{ piwikUrl }}{{ linkTo({'module': 'CoreHome', 'action': 'index', 'idSite': idSite, 'period': period, 'date': date, 'token_auth': null, 'method': null, 'idReport': null, 'outputType': null, 'format': null})|raw }}">
+              {{ 'Dashboard_Dashboard'|translate }}
+          </a>
+      </td>
+    </tr>
+  </table>
 
-{% if reportMetadata|length > 1 %}
-    <h2 style="font-weight:normal; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
-        {{ 'ScheduledReports_TableOfContent'|translate }}
+  <div style="margin:0 20px;">
+    <h2 style='{{fontStyle}} color:#37474f; line-height:30px; margin:25px 0 15px 0;'>
+        {{'ScheduledReports_EmailHello'|translate}}
     </h2>
-    <ul>
-        {% for metadata in reportMetadata %}
-            <li>
-                <a href="#{{ metadata.uniqueId }}" style="text-decoration:none; color: rgb({{ reportTextColor }});">
-                    {{ metadata.name }}
-                </a>
-            </li>
-        {% endfor %}
-    </ul>
-{% endif %}
+
+    <p style='{{styleParagraph}}{{fontStyle}}'>
+        {{'ScheduledReports_PleaseFindBelow'|translate(period,reportTitle)}}
+        <br />{{ description }}
+        <br />{{ 'General_DateRange'|translate }} {{ prettyDate }}
+        <br />{{ 'ScheduledReports_SentFromX'|translate(piwikUrl) }}
+    </p>
+
+    {% if displaySegment %}
+        <p style="{{styleParagraph}}{{fontStyle}}">
+            {{ 'ScheduledReports_CustomVisitorSegment'|translate("Piwik") }} {{ segmentName }}
+        </p>
+    {% endif %}
+
+    {% if reportMetadata|length > 1 %}
+        <h2 style="{{fontStyle}}font-weight:normal; font-size: {{ reportTitleTextSize }}pt;">
+            {{ 'ScheduledReports_TableOfContent'|translate }}
+        </h2>
+        <ul>
+            {% for metadata in reportMetadata %}
+                <li>
+                    <a href="#{{ metadata.uniqueId }}" style="text-decoration:none; color: rgb({{ reportTextColor }});">
+                        {{ metadata.name }}
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig
index 3a54c3fac0..cd49028b33 100644
--- a/plugins/CoreHome/templates/_dataTableCell.twig
+++ b/plugins/CoreHome/templates/_dataTableCell.twig
@@ -7,7 +7,7 @@
        href='{% if row.getMetadata('url')|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.getMetadata('url')|rawSafeDecoded }}'>
     {% if not row.getMetadata('logo') %}
         <img class="link" width="10" height="9"
-             src="plugins/Morpheus/images/link.gif"/>
+             src="plugins/Morpheus/images/link.png"/>
     {% endif %}
 {% endif %}
 
diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig
index 10263d0c87..c4de056774 100755
--- a/plugins/CoreHome/templates/_donate.twig
+++ b/plugins/CoreHome/templates/_donate.twig
@@ -33,7 +33,7 @@
         </div>
 
         <div class="donate-submit">
-            <input type="image" src="plugins/Morpheus/images/paypal_subscribe.gif" border="0" name="submit"
+            <input type="image" src="plugins/Morpheus/images/paypal_subscribe.png" border="0" name="submit"
                 title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/>
 			<a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a>
             <a href="index.php?module=CoreHome&action=redirectToPaypal&idSite=1&cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82"
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig
index 97ed8271a7..ee3b5af8f8 100644
--- a/plugins/CoreHome/templates/_headerMessage.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
@@ -16,16 +16,20 @@
      class="piwikSelector borderedControl {% if isPiwikDemo or not latest_version_available %}header_info{% else %}{% endif %} {% if isPiwikDemo %}isPiwikDemo{% else %}piwikTopControl{% endif %} {% if latest_version_available %}update_available{% endif %}"
         >
 
-    <a class="title" href="#">
         {% if isPiwikDemo %}
+        <a class="title" style="cursor:default;">
             {{ 'General_YouAreViewingDemoShortMessage'|translate }}
+          </a>
         {% elseif latest_version_available %}
+        <a class="title" href="?module=CoreUpdater&action=newVersionAvailable" style="cursor:pointer;">
             {{ 'General_NewUpdatePiwikX'|translate(latest_version_available) }}
             <span class="icon-warning"></span>
+          </a>
         {% elseif isSuperUser and isAdminArea is defined and isAdminArea %}
+        <a class="title">
             {{ updateCheck|raw }}
+          </a>
         {% endif %}
-    </a>
 
     <div class="dropdown positionInViewport">
         {% if isPiwikDemo %}
diff --git a/plugins/CoreHome/templates/_periodSelect.twig b/plugins/CoreHome/templates/_periodSelect.twig
index c02f14d1a6..8740cf616d 100644
--- a/plugins/CoreHome/templates/_periodSelect.twig
+++ b/plugins/CoreHome/templates/_periodSelect.twig
@@ -29,7 +29,7 @@
                         <span id="otherPeriods">
                             {% for label,thisPeriod in periodsNames %}
                                 <p>
-                                    <input type="radio" name="period" id="period_id_{{ label }}" value="{{ linkTo( { 'period': label} ) }}"{% if label==period %} checked="checked"{% endif %} />
+                                    <input type="radio" name="period"  tabindex="4" id="period_id_{{ label }}" value="{{ linkTo( { 'period': label} ) }}"{% if label==period %} checked="checked"{% endif %} />
                                     <label for="period_id_{{ label }}">{{ thisPeriod.singular }}</label>
                                 </p>
                             {% endfor %}
diff --git a/plugins/CorePluginsAdmin/images/paypal_donate.jpg b/plugins/CorePluginsAdmin/images/paypal_donate.jpg
deleted file mode 100644
index e21d93f2c6..0000000000
--- a/plugins/CorePluginsAdmin/images/paypal_donate.jpg
+++ /dev/null
diff --git a/plugins/CorePluginsAdmin/images/paypal_donate.png b/plugins/CorePluginsAdmin/images/paypal_donate.png
new file mode 100644
index 0000000000..45a1df1786
--- /dev/null
+++ b/plugins/CorePluginsAdmin/images/paypal_donate.png
diff --git a/plugins/CorePluginsAdmin/lang/sk.json b/plugins/CorePluginsAdmin/lang/sk.json
index d0eb8b5522..b26124fc3f 100644
--- a/plugins/CorePluginsAdmin/lang/sk.json
+++ b/plugins/CorePluginsAdmin/lang/sk.json
@@ -14,6 +14,8 @@
         "ChangeLookByManageThemes": "Výzor Piwiku môžete zmeniť %1$s spravovaním motívov%2$s.",
         "History": "História",
         "Inactive": "Neaktívny",
+        "InstalledPlugins": "Nainštalované pluginy",
+        "InstalledThemes": "Nainštalované témy",
         "InfoPluginUpdateIsRecommended": "Aktualizujte teraz Vaše pluginy aby ste vyťažili z najnovších vylepšení.",
         "InfoThemeIsUsedByOtherUsersAsWell": "Pozn.: ostatní %1$s užívatelia registrovaní na tomto Piwiku používajú motív %2$s.",
         "InfoThemeUpdateIsRecommended": "Aktualizujte svoje motívy, aby ste si mohli vychutnať najnovšiu verziu.",
@@ -31,6 +33,7 @@
         "MissingRequirementsPleaseInstallNotice": "Prosím nainštalujte %1$s %2$s ako je to požadované z %3$s.",
         "NoZipFileSelected": "Prosím vyberte ZIP súbor.",
         "NumUpdatesAvailable": "%s aktualizácia(e) dostupná",
+        "NoPluginSettings": "Žiadne nastavenia pluginu nemôžu byť konfigurované",
         "Origin": "Pôvod",
         "OriginCore": "Jadro",
         "OriginThirdParty": "Tretia strana",
@@ -39,6 +42,7 @@
         "PluginNotWorkingAlternative": "Ak ste používali tento plugin, možno nájdete aj aktuálnejšiu verziu na trhu. Ak nie, možno ju budete chcieť odinštalovať.",
         "PluginRequirement": "%1$s potrebuje %2$s.",
         "PluginsManagement": "Správa modulov",
+        "PluginActivated": "Plugin aktivovaný",
         "Status": "Stav",
         "SuccessfullyActicated": "Úspešne ste aktivovali <strong>%s<\/strong>.",
         "TeaserExtendPiwik": "Rozšíriť Piwik s pluginmi a motívmi",
@@ -49,6 +53,6 @@
         "ThemesManagement": "Spravovať motívy",
         "UninstallConfirm": "Práve sa chystáte odinštalovať plugin %s. Plugin bude kompletne odstránený z Vašej platformy a už nebude spätne návratný. Naozaj to chcete urobiť?",
         "Version": "Verzia",
-        "Websites": "Stránky"
+        "Websites": "Webstránky"
     }
 }
\ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index 81b0263220..6e6f3c7115 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -158,7 +158,7 @@
                                         <p>{{ 'CorePluginsAdmin_ConsiderDonatingCreatorOf'|translate("<b>" ~ name ~ "</b>")|raw }}</p>
                                         <div class="donation-links">
                                             {% if plugin.info.donate.paypal is defined and plugin.info.donate.paypal %}
-                                                <a class="donation-link paypal" target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&item_name=Piwik%20Plugin%20{{ name|escape('url') }}&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted&business={{ plugin.info.donate.paypal|escape('url') }}"><img src="plugins/CorePluginsAdmin/images/paypal_donate.jpg" height="30"/></a>
+                                                <a class="donation-link paypal" target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&item_name=Piwik%20Plugin%20{{ name|escape('url') }}&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted&business={{ plugin.info.donate.paypal|escape('url') }}"><img src="plugins/CorePluginsAdmin/images/paypal_donate.png" height="30"/></a>
                                             {% endif %}
                                             {% if plugin.info.donate.flattr is defined and plugin.info.donate.flattr %}
                                                 <a class="donation-link flattr" target="_blank" href="{{ plugin.info.donate.flattr }}"><img class="alignnone" title="Flattr" alt="" src="plugins/CorePluginsAdmin/images/flattr.png" height="29" /></a>
diff --git a/plugins/CoreUpdater/lang/cs.json b/plugins/CoreUpdater/lang/cs.json
index 15e96c0db5..b0ada7bdf4 100644
--- a/plugins/CoreUpdater/lang/cs.json
+++ b/plugins/CoreUpdater/lang/cs.json
@@ -35,6 +35,7 @@
         "MajorUpdateWarning1": "Toto je velká aktualizace! Zabere více času, než obvykle.",
         "MajorUpdateWarning2": "Následující doporučení je především důležité pro velké instalace.",
         "NeedHelpUpgrading": "Potřebujete pomoc s aktualizací Piwiku?",
+        "NeedHelpUpgradingText": "Pokud při aktualizaci Piwiku potřebujete pomoct, tvůrci Piwiku vám pomohou, aby se aktualizace podařila, poskytnou vám doporučení i další podporu. %1$sKontaktujte experty na Piwik a začněte s bezpečenou aktualizací Piwiku.%2$s",
         "NoteForLargePiwikInstances": "Důležitá poznámka pro rozsáhlé instalace Piwiku",
         "NotificationClickToUpdatePlugins": "Klikněte zde pro aktualizaci vašich zásuvných modulů:",
         "NotificationClickToUpdateThemes": "Klikněte zde pro aktualizaci vašich šablon:",
diff --git a/plugins/CoreUpdater/lang/de.json b/plugins/CoreUpdater/lang/de.json
index ee837fd0cd..7dec2653a3 100644
--- a/plugins/CoreUpdater/lang/de.json
+++ b/plugins/CoreUpdater/lang/de.json
@@ -34,6 +34,8 @@
         "ListOfSqlQueriesFYI": "Zu Ihrer Information: Dies sind die SQL Queries, welche ausgeführt werden, um die Datenbank für Piwik %s zu aktualisieren",
         "MajorUpdateWarning1": "Dies ist ein umfangreiche Aktualisierung. Das Einspielen dauert länger als üblich.",
         "MajorUpdateWarning2": "Der folgende Hinweis ist besonders für große Installationen wichtig.",
+        "NeedHelpUpgrading": "Brauchen Sie Hilfe beim Upgrade von Piwik?",
+        "NeedHelpUpgradingText": "Wenn Sie Hilfe beim Upgrade von Piwik brauchen, sind die Ersteller von Piwik hier, um Ihnen zu einem erfolgreichen Upgrade zu helfen. Für Anleitungen, best practises und weiterführenden Support, %1$skontaktiere die Piwik-Experten um das Upgrade sicher durchzuführen.%2$s",
         "NoteForLargePiwikInstances": "Wichtiger Hinweis für große Piwik-Installationen",
         "NotificationClickToUpdatePlugins": "Klicken Sie hier, um Ihre Plugins jetzt zu aktualisieren:",
         "NotificationClickToUpdateThemes": "Klicken Sie hier, um Ihre Themes jetzt zu aktualisieren:",
@@ -59,6 +61,7 @@
         "ThankYouUpdatePiwik": "Vielen Dank, dass Sie Piwik nutzen und es aktuell halten!",
         "PostUpdateMessage": "Piwik wird immer frei herunterzuladen und zu nutzen sein, aber es braucht Ihre dauerhafte Unterstützung um zu wachsen und zu gedeihen.",
         "PostUpdateSupport": "Wenn Sie beim Einsatz von Piwik Hilfe benötigen, holen Sie sich Support von dessen Schöpfer:",
+        "ServicesSupport": "Service & Support",
         "CloudHosting": "Cloud-Hosting",
         "Updating": "Aktualisiere",
         "UpdateUsingHttpsFailed": "Das Herunterladen der neuesten Piwik Version über eine sichere HTTPS-Verbindung war aufgrund des folgenden Fehlers nicht erfolgreich:",
diff --git a/plugins/CoreUpdater/lang/it.json b/plugins/CoreUpdater/lang/it.json
index 3f52ab2256..c97bf4f637 100644
--- a/plugins/CoreUpdater/lang/it.json
+++ b/plugins/CoreUpdater/lang/it.json
@@ -34,6 +34,8 @@
         "ListOfSqlQueriesFYI": "INFO: queste sono le query SQL che verranno eseguite per aggiornare il tuo database a Piwik %s",
         "MajorUpdateWarning1": "Si tratta di un importante aggiornamento! Ci vorrà più tempo del solito.",
         "MajorUpdateWarning2": "Il seguente consiglio è particolarmente importante per le installazioni di grandi dimensioni.",
+        "NeedHelpUpgrading": "Hai bisogno di aiuto ad aggiornare Piwik?",
+        "NeedHelpUpgradingText": "Se hai bisogno di aiuto ad aggiornare Piwik, i suoi creatori sono qui per aiutarti a fare l'aggiornamento con successo e per fornirti tutte le istruzioni, le migliori pratiche e un supporto continuo. %1$sContatta gli esperti di Piwik per cominciare ad aggiornarlo in sicurezza%2$s",
         "NoteForLargePiwikInstances": "Nota importante per grandi installazioni di Piwik",
         "NotificationClickToUpdatePlugins": "Aggiorna i tuoi plugin adesso:",
         "NotificationClickToUpdateThemes": "Aggiorna i tuoi temi adesso:",
@@ -59,6 +61,7 @@
         "ThankYouUpdatePiwik": "Grazie per l'utilizzo di Piwik e per averlo aggiornato!",
         "PostUpdateMessage": "Piwik sarà sempre gratuito da scaricare e utilizzare, ma necessita del tuo continuo sostegno per crescere e migliorare.",
         "PostUpdateSupport": "Se hai bisogno di aiuto per utilizzare Piwik, puoi averlo dai suoi creatori:",
+        "ServicesSupport": "Servizi & Supporto",
         "CloudHosting": "Cloud hosting",
         "Updating": "Aggiornamento",
         "UpdateUsingHttpsFailed": "Il download dell'ultima versione di Piwik tramite connessione sicura HTTPS non ha avuto successo a causa del seguente errore:",
diff --git a/plugins/CoreUpdater/lang/ja.json b/plugins/CoreUpdater/lang/ja.json
index 13f8901be9..33b5b0564d 100644
--- a/plugins/CoreUpdater/lang/ja.json
+++ b/plugins/CoreUpdater/lang/ja.json
@@ -34,6 +34,8 @@
         "ListOfSqlQueriesFYI": "FYI：これらはデータベースを Piwik %s にアップグレードするために実行される SQL クエリです",
         "MajorUpdateWarning1": "これは最新版へのアップデートです！通常よりも時間がかかります",
         "MajorUpdateWarning2": "以下のアドバイスは、特に大規模なインストールの際、重要です。",
+        "NeedHelpUpgrading": "Piwik のアップグレードをお手伝いしますか？",
+        "NeedHelpUpgradingText": "Piwik をアップグレードするためのサポートが必要な場合は、Piwik のクリエイターがPiwik のアップグレードを成功させ、すべての解説、ベストプラクティス、継続的なサポートを提供致します。%1$s Piwik の専門家に連絡して、安全にPiwik をアップグレードしてください。%2$s",
         "NoteForLargePiwikInstances": "Piwik のデータベースが大きい場合の重要注意",
         "NotificationClickToUpdatePlugins": "お使いのプラグインを今すぐアップデートするにはここをクリック:",
         "NotificationClickToUpdateThemes": "お使いのテーマを今すぐアップデートするにはここをクリック:",
@@ -59,6 +61,7 @@
         "ThankYouUpdatePiwik": "Piwik を利用し、最新の状態を維持して頂きありがとうございます！",
         "PostUpdateMessage": "Piwik は、常に無料でダウンロードして自由に使用できますが、成長し、改善するためには皆様のご支援が必要です。",
         "PostUpdateSupport": "Piwik の使い方で助けが必要な場合は、そのクリエイターからサポートを得ることができます：",
+        "ServicesSupport": "サービスとサポート",
         "CloudHosting": "クラウドホスティング",
         "Updating": "アップデート",
         "UpdateUsingHttpsFailed": "以下のエラーにより、セキュリティで保護された HTTPS 接続で Piwik の最新バージョンをダウンロードできませんでした。",
diff --git a/plugins/CoreUpdater/lang/uk.json b/plugins/CoreUpdater/lang/uk.json
index d682d5dfe6..5fe30a0a63 100644
--- a/plugins/CoreUpdater/lang/uk.json
+++ b/plugins/CoreUpdater/lang/uk.json
@@ -31,8 +31,11 @@
         "Latest2XStableRelease": "Останній стабільний 2.X",
         "Latest2XBetaRelease": "Останній тестовий 2.X",
         "LtsSupportVersion": "Версія Довгострокової підтримки",
+        "ListOfSqlQueriesFYI": "FYI: ці запити SQL, які будуть виконані, щоб оновити свою базу даних Piwik %s",
         "MajorUpdateWarning1": "Це велике оновлення! Може знадобитися більше часу, ніж зазвичай.",
         "MajorUpdateWarning2": "Наступна порада особливо важлива для великих оновлень!",
+        "NeedHelpUpgrading": "Потрібна допомога в оновленні Piwik?",
+        "NeedHelpUpgradingText": "Якщо вам потрібна підтримка, щоб оновити Piwik, творці Piwik можуть допомогти вам успішно оновити Piwik і надати всі інструкції, кращі практики та постійну підтримку.%1$sЗв'яжіться з експертами Piwik, щоб почати роботу з модернізації вашого Piwik безпечно.%2$s",
         "NoteForLargePiwikInstances": "Важліве зауваження для великих інсталяцій Piwik",
         "NotificationClickToUpdatePlugins": "Для оновлення плагінів, натисніть сюди:",
         "NotificationClickToUpdateThemes": "Для поновлення тем натисніть сюди:",
@@ -58,6 +61,7 @@
         "ThankYouUpdatePiwik": "Спасибі за те, що користуєтеся Piwik і оновлюєте його!",
         "PostUpdateMessage": "Piwik завжди буде вільним для скачування і використання, але йому потрібна постійна підтримка щоб рости і поліпшуватися.",
         "PostUpdateSupport": "Якщо вам потрібна допомога у використанні Piwik, то ви зможете отримати підтримку від його творців:",
+        "ServicesSupport": "Обслуговування та підтримка",
         "CloudHosting": "Хмарний хостинг",
         "Updating": "Оновлення",
         "UpdateUsingHttpsFailed": "Не вдалося завантажити останню версію Piwik з безпечного HTTPS, виникла наступна помилка:",
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
-Subproject e59fd118a975459ecc28cf94c41fa9017fb6dce
+Subproject e98ea40f25ceaffbcf553343bd7e110f383f95c
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
-Subproject 4e0fdd35cfece7be43b65191ff1f1ae71f0acb0
+Subproject 9b94b55b6026e5fc8f0946ce16c737a1e95061d
diff --git a/plugins/CustomVariables/lang/et.json b/plugins/CustomVariables/lang/et.json
index 9001c72de1..f31dad1d55 100644
--- a/plugins/CustomVariables/lang/et.json
+++ b/plugins/CustomVariables/lang/et.json
@@ -4,6 +4,8 @@
         "ColumnCustomVariableValue": "Kohandatud muutuja väärtus",
         "CustomVariables": "Kohandatud muutujad",
         "ScopePage": "skoop: lehekülg",
-        "ScopeVisit": "skoop: külastus"
+        "ScopeVisit": "skoop: külastus",
+        "Index": "Indeks",
+        "Usages": "Kasutamised"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
index 5c5f0395b3..1b915466bf 100644
--- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
@@ -97,7 +97,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
diff --git a/plugins/Dashboard/lang/zh-tw.json b/plugins/Dashboard/lang/zh-tw.json
index 460dd9be1d..9b4bf1e9c2 100644
--- a/plugins/Dashboard/lang/zh-tw.json
+++ b/plugins/Dashboard/lang/zh-tw.json
@@ -11,7 +11,7 @@
         "DashboardName": "展示板名稱：",
         "DashboardOf": "%s 的展示板",
         "DefaultDashboard": "預設展示板 - 使用預選小工具以及欄位版面",
-        "DeleteWidgetConfirm": "你確定要從展示板中刪除此小工具嗎？",
+        "DeleteWidgetConfirm": "你確定要從展示板中刪除這個小工具嗎？",
         "EmptyDashboard": "空白展示板 - 依你的喜好選擇小工具",
         "LoadingWidget": "小工具載入中，請稍候...",
         "ManageDashboard": "展示板管理",
diff --git a/plugins/DevicePlugins/lang/sk.json b/plugins/DevicePlugins/lang/sk.json
index 842b3ce1b3..02e12f6404 100644
--- a/plugins/DevicePlugins/lang/sk.json
+++ b/plugins/DevicePlugins/lang/sk.json
@@ -1,5 +1,7 @@
 {
     "DevicePlugins": {
-        "WidgetPlugins": "Zoznam modulov"
+        "BrowserWithNoPluginsEnabled": "%1$s bez žiadnych aktivovaných modulov",
+        "BrowserWithPluginsEnabled": "%1$s s modulmi %2$s aktivovanými",
+        "WidgetPlugins": "Moduly prehliadača"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php
index d19d0cf403..c49b70bde0 100644
--- a/plugins/DevicesDetection/Controller.php
+++ b/plugins/DevicesDetection/Controller.php
@@ -48,7 +48,7 @@ class Controller extends \Piwik\Plugin\Controller
         $view->device_type_logo    = getDeviceTypeLogo($uaParser->getDeviceName());
         $view->device_model        = $uaParser->getModel();
         $view->device_brand        = getDeviceBrandLabel($uaParser->getBrand());
-        $view->device_brand_logo   = getBrandLogo($uaParser->getBrand());
+        $view->device_brand_logo   = getBrandLogo($view->device_brand);
 
         return $view->render();
     }
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index 4f59edc8a9..e50edf8dde 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -17,11 +17,11 @@ use DeviceDetector\Parser\Client\Browser AS BrowserParser;
 function getBrandLogo($label)
 {
     $label = preg_replace("/[^a-z0-9_-]+/i", "_", $label);
-    $path = dirname(__FILE__) . '/images/brand/' . $label . '.ico';
+    $path = dirname(__FILE__) . '/images/brand/' . $label . '.png';
     if (file_exists($path)) {
-        return 'plugins/DevicesDetection/images/brand/' . $label . '.ico';
+        return 'plugins/DevicesDetection/images/brand/' . $label . '.png';
     } else {
-        return 'plugins/DevicesDetection/images/brand/Unknown.ico';
+        return 'plugins/DevicesDetection/images/brand/Unknown.png';
     }
 }
 
@@ -160,17 +160,17 @@ function getDeviceTypeLogo($label)
     $label = strtolower($label);
 
     $deviceTypeLogos = Array(
-        "desktop"       => "normal.gif",
+        "desktop"       => "normal.png",
         "smartphone"    => "smartphone.png",
         "tablet"        => "tablet.png",
         "tv"            => "tv.png",
-        "feature phone" => "mobile.gif",
-        "console"       => "console.gif",
+        "feature phone" => "mobile.png",
+        "console"       => "console.png",
         "car browser"   => "carbrowser.png",
         "camera"        => "camera.png");
 
     if (!array_key_exists($label, $deviceTypeLogos)) {
-        $label = 'unknown.gif';
+        $label = 'unknown.png';
     } else {
         $label = $deviceTypeLogos[$label];
     }
diff --git a/plugins/DevicesDetection/images/brand/3Q.ico b/plugins/DevicesDetection/images/brand/3Q.png
index 8a2e5e2f1c..8a2e5e2f1c 100644
--- a/plugins/DevicesDetection/images/brand/3Q.ico
+++ b/plugins/DevicesDetection/images/brand/3Q.png
diff --git a/plugins/DevicesDetection/images/brand/Acer.ico b/plugins/DevicesDetection/images/brand/Acer.png
index 33e2e60ca3..33e2e60ca3 100644
--- a/plugins/DevicesDetection/images/brand/Acer.ico
+++ b/plugins/DevicesDetection/images/brand/Acer.png
diff --git a/plugins/DevicesDetection/images/brand/Alcatel.ico b/plugins/DevicesDetection/images/brand/Alcatel.png
index 91ccc70297..91ccc70297 100644
--- a/plugins/DevicesDetection/images/brand/Alcatel.ico
+++ b/plugins/DevicesDetection/images/brand/Alcatel.png
diff --git a/plugins/DevicesDetection/images/brand/Apple.ico b/plugins/DevicesDetection/images/brand/Apple.png
index 3ce2b7d569..3ce2b7d569 100644
--- a/plugins/DevicesDetection/images/brand/Apple.ico
+++ b/plugins/DevicesDetection/images/brand/Apple.png
diff --git a/plugins/DevicesDetection/images/brand/Archos.ico b/plugins/DevicesDetection/images/brand/Archos.png
index a397830f7b..a397830f7b 100644
--- a/plugins/DevicesDetection/images/brand/Archos.ico
+++ b/plugins/DevicesDetection/images/brand/Archos.png
diff --git a/plugins/DevicesDetection/images/brand/Asus.ico b/plugins/DevicesDetection/images/brand/Asus.png
index d5e7e4a436..d5e7e4a436 100644
--- a/plugins/DevicesDetection/images/brand/Asus.ico
+++ b/plugins/DevicesDetection/images/brand/Asus.png
diff --git a/plugins/DevicesDetection/images/brand/Audiovox.ico b/plugins/DevicesDetection/images/brand/Audiovox.png
index d674fc28d8..d674fc28d8 100644
--- a/plugins/DevicesDetection/images/brand/Audiovox.ico
+++ b/plugins/DevicesDetection/images/brand/Audiovox.png
diff --git a/plugins/DevicesDetection/images/brand/Avvio.ico b/plugins/DevicesDetection/images/brand/Avvio.png
index 9f28e1750c..9f28e1750c 100644
--- a/plugins/DevicesDetection/images/brand/Avvio.ico
+++ b/plugins/DevicesDetection/images/brand/Avvio.png
diff --git a/plugins/DevicesDetection/images/brand/BBK.ico b/plugins/DevicesDetection/images/brand/BBK.png
index 6352fd1b02..6352fd1b02 100644
--- a/plugins/DevicesDetection/images/brand/BBK.ico
+++ b/plugins/DevicesDetection/images/brand/BBK.png
diff --git a/plugins/DevicesDetection/images/brand/BangOlufsen.ico b/plugins/DevicesDetection/images/brand/BangOlufsen.png
index c3260f449d..c3260f449d 100644
--- a/plugins/DevicesDetection/images/brand/BangOlufsen.ico
+++ b/plugins/DevicesDetection/images/brand/BangOlufsen.png
diff --git a/plugins/DevicesDetection/images/brand/Barnes_Noble.ico b/plugins/DevicesDetection/images/brand/Barnes_Noble.png
index 2eb62cb8e1..2eb62cb8e1 100644
--- a/plugins/DevicesDetection/images/brand/Barnes_Noble.ico
+++ b/plugins/DevicesDetection/images/brand/Barnes_Noble.png
diff --git a/plugins/DevicesDetection/images/brand/Becker.ico b/plugins/DevicesDetection/images/brand/Becker.png
index 133ff9ac2b..133ff9ac2b 100644
--- a/plugins/DevicesDetection/images/brand/Becker.ico
+++ b/plugins/DevicesDetection/images/brand/Becker.png
diff --git a/plugins/DevicesDetection/images/brand/Beetel.ico b/plugins/DevicesDetection/images/brand/Beetel.png
index d7602ecb37..d7602ecb37 100644
--- a/plugins/DevicesDetection/images/brand/Beetel.ico
+++ b/plugins/DevicesDetection/images/brand/Beetel.png
diff --git a/plugins/DevicesDetection/images/brand/BenQ.ico b/plugins/DevicesDetection/images/brand/BenQ.png
index 10414987cf..10414987cf 100644
--- a/plugins/DevicesDetection/images/brand/BenQ.ico
+++ b/plugins/DevicesDetection/images/brand/BenQ.png
diff --git a/plugins/DevicesDetection/images/brand/Cat.ico b/plugins/DevicesDetection/images/brand/Cat.png
index a6b262f172..a6b262f172 100644
--- a/plugins/DevicesDetection/images/brand/Cat.ico
+++ b/plugins/DevicesDetection/images/brand/Cat.png
diff --git a/plugins/DevicesDetection/images/brand/Celkon.ico b/plugins/DevicesDetection/images/brand/Celkon.png
index c35d5864b4..c35d5864b4 100644
--- a/plugins/DevicesDetection/images/brand/Celkon.ico
+++ b/plugins/DevicesDetection/images/brand/Celkon.png
diff --git a/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico b/plugins/DevicesDetection/images/brand/Cherry_Mobile.png
index 393f1ca49d..393f1ca49d 100644
--- a/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico
+++ b/plugins/DevicesDetection/images/brand/Cherry_Mobile.png
diff --git a/plugins/DevicesDetection/images/brand/CnM.ico b/plugins/DevicesDetection/images/brand/CnM.png
index dae12ed0fc..dae12ed0fc 100644
--- a/plugins/DevicesDetection/images/brand/CnM.ico
+++ b/plugins/DevicesDetection/images/brand/CnM.png
diff --git a/plugins/DevicesDetection/images/brand/Compal.ico b/plugins/DevicesDetection/images/brand/Compal.png
index 8f89ab9894..8f89ab9894 100644
--- a/plugins/DevicesDetection/images/brand/Compal.ico
+++ b/plugins/DevicesDetection/images/brand/Compal.png
diff --git a/plugins/DevicesDetection/images/brand/Compaq.ico b/plugins/DevicesDetection/images/brand/Compaq.png
index b0738259bd..b0738259bd 100644
--- a/plugins/DevicesDetection/images/brand/Compaq.ico
+++ b/plugins/DevicesDetection/images/brand/Compaq.png
diff --git a/plugins/DevicesDetection/images/brand/ConCorde.ico b/plugins/DevicesDetection/images/brand/ConCorde.png
index 27efdbab49..27efdbab49 100644
--- a/plugins/DevicesDetection/images/brand/ConCorde.ico
+++ b/plugins/DevicesDetection/images/brand/ConCorde.png
diff --git a/plugins/DevicesDetection/images/brand/Coolpad.ico b/plugins/DevicesDetection/images/brand/Coolpad.png
index 75caa69358..75caa69358 100644
--- a/plugins/DevicesDetection/images/brand/Coolpad.ico
+++ b/plugins/DevicesDetection/images/brand/Coolpad.png
diff --git a/plugins/DevicesDetection/images/brand/CreNova.ico b/plugins/DevicesDetection/images/brand/CreNova.png
index 282b466ec6..282b466ec6 100644
--- a/plugins/DevicesDetection/images/brand/CreNova.ico
+++ b/plugins/DevicesDetection/images/brand/CreNova.png
diff --git a/plugins/DevicesDetection/images/brand/Cricket.ico b/plugins/DevicesDetection/images/brand/Cricket.png
index 1e45f3ae52..1e45f3ae52 100644
--- a/plugins/DevicesDetection/images/brand/Cricket.ico
+++ b/plugins/DevicesDetection/images/brand/Cricket.png
diff --git a/plugins/DevicesDetection/images/brand/Crius_Mea.ico b/plugins/DevicesDetection/images/brand/Crius_Mea.png
index 4c3473a737..4c3473a737 100644
--- a/plugins/DevicesDetection/images/brand/Crius_Mea.ico
+++ b/plugins/DevicesDetection/images/brand/Crius_Mea.png
diff --git a/plugins/DevicesDetection/images/brand/Crosscall.ico b/plugins/DevicesDetection/images/brand/Crosscall.png
index 39eab86c5d..39eab86c5d 100644
--- a/plugins/DevicesDetection/images/brand/Crosscall.ico
+++ b/plugins/DevicesDetection/images/brand/Crosscall.png
diff --git a/plugins/DevicesDetection/images/brand/DMM.ico b/plugins/DevicesDetection/images/brand/DMM.png
index 07d2fd3e09..07d2fd3e09 100644
--- a/plugins/DevicesDetection/images/brand/DMM.ico
+++ b/plugins/DevicesDetection/images/brand/DMM.png
diff --git a/plugins/DevicesDetection/images/brand/Danew.ico b/plugins/DevicesDetection/images/brand/Danew.png
index 373eded938..373eded938 100644
--- a/plugins/DevicesDetection/images/brand/Danew.ico
+++ b/plugins/DevicesDetection/images/brand/Danew.png
diff --git a/plugins/DevicesDetection/images/brand/Dell.ico b/plugins/DevicesDetection/images/brand/Dell.png
index 0a719c2cfd..0a719c2cfd 100644
--- a/plugins/DevicesDetection/images/brand/Dell.ico
+++ b/plugins/DevicesDetection/images/brand/Dell.png
diff --git a/plugins/DevicesDetection/images/brand/Denver.ico b/plugins/DevicesDetection/images/brand/Denver.png
index 0ae2e6211a..0ae2e6211a 100644
--- a/plugins/DevicesDetection/images/brand/Denver.ico
+++ b/plugins/DevicesDetection/images/brand/Denver.png
diff --git a/plugins/DevicesDetection/images/brand/DoCoMo.ico b/plugins/DevicesDetection/images/brand/DoCoMo.png
index cf9f3ef0e6..cf9f3ef0e6 100644
--- a/plugins/DevicesDetection/images/brand/DoCoMo.ico
+++ b/plugins/DevicesDetection/images/brand/DoCoMo.png
diff --git a/plugins/DevicesDetection/images/brand/Easypix.ico b/plugins/DevicesDetection/images/brand/Easypix.png
index a14cd928ba..a14cd928ba 100644
--- a/plugins/DevicesDetection/images/brand/Easypix.ico
+++ b/plugins/DevicesDetection/images/brand/Easypix.png
diff --git a/plugins/DevicesDetection/images/brand/Ericsson.ico b/plugins/DevicesDetection/images/brand/Ericsson.png
index a377acd22e..a377acd22e 100644
--- a/plugins/DevicesDetection/images/brand/Ericsson.ico
+++ b/plugins/DevicesDetection/images/brand/Ericsson.png
diff --git a/plugins/DevicesDetection/images/brand/Evertek.ico b/plugins/DevicesDetection/images/brand/Evertek.png
index c09bf2c331..c09bf2c331 100644
--- a/plugins/DevicesDetection/images/brand/Evertek.ico
+++ b/plugins/DevicesDetection/images/brand/Evertek.png
diff --git a/plugins/DevicesDetection/images/brand/Fly.ico b/plugins/DevicesDetection/images/brand/Fly.png
index a4ae584c37..a4ae584c37 100644
--- a/plugins/DevicesDetection/images/brand/Fly.ico
+++ b/plugins/DevicesDetection/images/brand/Fly.png
diff --git a/plugins/DevicesDetection/images/brand/Fujitsu.ico b/plugins/DevicesDetection/images/brand/Fujitsu.png
index e2ac9cae5c..e2ac9cae5c 100644
--- a/plugins/DevicesDetection/images/brand/Fujitsu.ico
+++ b/plugins/DevicesDetection/images/brand/Fujitsu.png
diff --git a/plugins/DevicesDetection/images/brand/Gemini.ico b/plugins/DevicesDetection/images/brand/Gemini.png
index deeb01e570..deeb01e570 100644
--- a/plugins/DevicesDetection/images/brand/Gemini.ico
+++ b/plugins/DevicesDetection/images/brand/Gemini.png
diff --git a/plugins/DevicesDetection/images/brand/Gigabyte.ico b/plugins/DevicesDetection/images/brand/Gigabyte.png
index ced0200cd8..ced0200cd8 100644
--- a/plugins/DevicesDetection/images/brand/Gigabyte.ico
+++ b/plugins/DevicesDetection/images/brand/Gigabyte.png
diff --git a/plugins/DevicesDetection/images/brand/Gigaset.ico b/plugins/DevicesDetection/images/brand/Gigaset.png
index 5ad69fb6d2..5ad69fb6d2 100644
--- a/plugins/DevicesDetection/images/brand/Gigaset.ico
+++ b/plugins/DevicesDetection/images/brand/Gigaset.png
diff --git a/plugins/DevicesDetection/images/brand/Gionee.ico b/plugins/DevicesDetection/images/brand/Gionee.png
index 704085f1be..704085f1be 100644
--- a/plugins/DevicesDetection/images/brand/Gionee.ico
+++ b/plugins/DevicesDetection/images/brand/Gionee.png
diff --git a/plugins/DevicesDetection/images/brand/Google.ico b/plugins/DevicesDetection/images/brand/Google.png
index fe481b517c..fe481b517c 100644
--- a/plugins/DevicesDetection/images/brand/Google.ico
+++ b/plugins/DevicesDetection/images/brand/Google.png
diff --git a/plugins/DevicesDetection/images/brand/Gradiente.ico b/plugins/DevicesDetection/images/brand/Gradiente.png
index 28d671dfbc..28d671dfbc 100644
--- a/plugins/DevicesDetection/images/brand/Gradiente.ico
+++ b/plugins/DevicesDetection/images/brand/Gradiente.png
diff --git a/plugins/DevicesDetection/images/brand/Grundig.ico b/plugins/DevicesDetection/images/brand/Grundig.png
index 0a0351a95a..0a0351a95a 100644
--- a/plugins/DevicesDetection/images/brand/Grundig.ico
+++ b/plugins/DevicesDetection/images/brand/Grundig.png
diff --git a/plugins/DevicesDetection/images/brand/HP.ico b/plugins/DevicesDetection/images/brand/HP.png
index 5ca41db9b7..5ca41db9b7 100644
--- a/plugins/DevicesDetection/images/brand/HP.ico
+++ b/plugins/DevicesDetection/images/brand/HP.png
diff --git a/plugins/DevicesDetection/images/brand/HTC.ico b/plugins/DevicesDetection/images/brand/HTC.png
index 28c75f0c66..28c75f0c66 100644
--- a/plugins/DevicesDetection/images/brand/HTC.ico
+++ b/plugins/DevicesDetection/images/brand/HTC.png
diff --git a/plugins/DevicesDetection/images/brand/Haier.ico b/plugins/DevicesDetection/images/brand/Haier.png
index 03ccce3ff8..03ccce3ff8 100644
--- a/plugins/DevicesDetection/images/brand/Haier.ico
+++ b/plugins/DevicesDetection/images/brand/Haier.png
diff --git a/plugins/DevicesDetection/images/brand/Huawei.ico b/plugins/DevicesDetection/images/brand/Huawei.png
index 441a40221c..441a40221c 100644
--- a/plugins/DevicesDetection/images/brand/Huawei.ico
+++ b/plugins/DevicesDetection/images/brand/Huawei.png
diff --git a/plugins/DevicesDetection/images/brand/Humax.ico b/plugins/DevicesDetection/images/brand/Humax.png
index cdb27bf41d..cdb27bf41d 100644
--- a/plugins/DevicesDetection/images/brand/Humax.ico
+++ b/plugins/DevicesDetection/images/brand/Humax.png
diff --git a/plugins/DevicesDetection/images/brand/Hyundai.ico b/plugins/DevicesDetection/images/brand/Hyundai.png
index 3565bcf03f..3565bcf03f 100644
--- a/plugins/DevicesDetection/images/brand/Hyundai.ico
+++ b/plugins/DevicesDetection/images/brand/Hyundai.png
diff --git a/plugins/DevicesDetection/images/brand/INQ.ico b/plugins/DevicesDetection/images/brand/INQ.png
index 3d012cf243..3d012cf243 100644
--- a/plugins/DevicesDetection/images/brand/INQ.ico
+++ b/plugins/DevicesDetection/images/brand/INQ.png
diff --git a/plugins/DevicesDetection/images/brand/Ikea.ico b/plugins/DevicesDetection/images/brand/Ikea.png
index d9c160a039..d9c160a039 100644
--- a/plugins/DevicesDetection/images/brand/Ikea.ico
+++ b/plugins/DevicesDetection/images/brand/Ikea.png
diff --git a/plugins/DevicesDetection/images/brand/Intek.ico b/plugins/DevicesDetection/images/brand/Intek.png
index b0d505a3e9..b0d505a3e9 100644
--- a/plugins/DevicesDetection/images/brand/Intek.ico
+++ b/plugins/DevicesDetection/images/brand/Intek.png
diff --git a/plugins/DevicesDetection/images/brand/Inverto.ico b/plugins/DevicesDetection/images/brand/Inverto.png
index 88729a4ed6..88729a4ed6 100644
--- a/plugins/DevicesDetection/images/brand/Inverto.ico
+++ b/plugins/DevicesDetection/images/brand/Inverto.png
diff --git a/plugins/DevicesDetection/images/brand/Jolla.ico b/plugins/DevicesDetection/images/brand/Jolla.png
index 92b8535708..92b8535708 100644
--- a/plugins/DevicesDetection/images/brand/Jolla.ico
+++ b/plugins/DevicesDetection/images/brand/Jolla.png
diff --git a/plugins/DevicesDetection/images/brand/KDDI.ico b/plugins/DevicesDetection/images/brand/KDDI.png
index 0142b8b082..0142b8b082 100644
--- a/plugins/DevicesDetection/images/brand/KDDI.ico
+++ b/plugins/DevicesDetection/images/brand/KDDI.png
diff --git a/plugins/DevicesDetection/images/brand/Karbonn.ico b/plugins/DevicesDetection/images/brand/Karbonn.png
index 8f200aeaaf..8f200aeaaf 100644
--- a/plugins/DevicesDetection/images/brand/Karbonn.ico
+++ b/plugins/DevicesDetection/images/brand/Karbonn.png
diff --git a/plugins/DevicesDetection/images/brand/Kindle.ico b/plugins/DevicesDetection/images/brand/Kindle.png
index cbf915881b..cbf915881b 100644
--- a/plugins/DevicesDetection/images/brand/Kindle.ico
+++ b/plugins/DevicesDetection/images/brand/Kindle.png
diff --git a/plugins/DevicesDetection/images/brand/Kyocera.ico b/plugins/DevicesDetection/images/brand/Kyocera.png
index 5bc4da8b73..5bc4da8b73 100644
--- a/plugins/DevicesDetection/images/brand/Kyocera.ico
+++ b/plugins/DevicesDetection/images/brand/Kyocera.png
diff --git a/plugins/DevicesDetection/images/brand/LG.ico b/plugins/DevicesDetection/images/brand/LG.png
index 8e7d07b93a..8e7d07b93a 100644
--- a/plugins/DevicesDetection/images/brand/LG.ico
+++ b/plugins/DevicesDetection/images/brand/LG.png
diff --git a/plugins/DevicesDetection/images/brand/LGUPlus.ico b/plugins/DevicesDetection/images/brand/LGUPlus.png
index db5f4fe1a4..db5f4fe1a4 100644
--- a/plugins/DevicesDetection/images/brand/LGUPlus.ico
+++ b/plugins/DevicesDetection/images/brand/LGUPlus.png
diff --git a/plugins/DevicesDetection/images/brand/Lanix.ico b/plugins/DevicesDetection/images/brand/Lanix.png
index 790f8ad843..790f8ad843 100644
--- a/plugins/DevicesDetection/images/brand/Lanix.ico
+++ b/plugins/DevicesDetection/images/brand/Lanix.png
diff --git a/plugins/DevicesDetection/images/brand/Le_Pan.ico b/plugins/DevicesDetection/images/brand/Le_Pan.png
index cea70792e3..cea70792e3 100644
--- a/plugins/DevicesDetection/images/brand/Le_Pan.ico
+++ b/plugins/DevicesDetection/images/brand/Le_Pan.png
diff --git a/plugins/DevicesDetection/images/brand/Lenovo.ico b/plugins/DevicesDetection/images/brand/Lenovo.png
index 42c92f4eb6..42c92f4eb6 100644
--- a/plugins/DevicesDetection/images/brand/Lenovo.ico
+++ b/plugins/DevicesDetection/images/brand/Lenovo.png
diff --git a/plugins/DevicesDetection/images/brand/Loewe.ico b/plugins/DevicesDetection/images/brand/Loewe.png
index aabc403d55..aabc403d55 100644
--- a/plugins/DevicesDetection/images/brand/Loewe.ico
+++ b/plugins/DevicesDetection/images/brand/Loewe.png
diff --git a/plugins/DevicesDetection/images/brand/MSI.ico b/plugins/DevicesDetection/images/brand/MSI.png
index 88cb1029d8..88cb1029d8 100644
--- a/plugins/DevicesDetection/images/brand/MSI.ico
+++ b/plugins/DevicesDetection/images/brand/MSI.png
diff --git a/plugins/DevicesDetection/images/brand/Manta_Multimedia.ico b/plugins/DevicesDetection/images/brand/Manta_Multimedia.png
index 05c79869d3..05c79869d3 100644
--- a/plugins/DevicesDetection/images/brand/Manta_Multimedia.ico
+++ b/plugins/DevicesDetection/images/brand/Manta_Multimedia.png
diff --git a/plugins/DevicesDetection/images/brand/MediaTek.ico b/plugins/DevicesDetection/images/brand/MediaTek.png
index 0901a828de..0901a828de 100644
--- a/plugins/DevicesDetection/images/brand/MediaTek.ico
+++ b/plugins/DevicesDetection/images/brand/MediaTek.png
diff --git a/plugins/DevicesDetection/images/brand/Medion.ico b/plugins/DevicesDetection/images/brand/Medion.png
index 7873a80802..7873a80802 100644
--- a/plugins/DevicesDetection/images/brand/Medion.ico
+++ b/plugins/DevicesDetection/images/brand/Medion.png
diff --git a/plugins/DevicesDetection/images/brand/Metz.ico b/plugins/DevicesDetection/images/brand/Metz.png
index 5801781743..5801781743 100644
--- a/plugins/DevicesDetection/images/brand/Metz.ico
+++ b/plugins/DevicesDetection/images/brand/Metz.png
diff --git a/plugins/DevicesDetection/images/brand/MicroMax.ico b/plugins/DevicesDetection/images/brand/MicroMax.png
index 1b3beda0cf..1b3beda0cf 100644
--- a/plugins/DevicesDetection/images/brand/MicroMax.ico
+++ b/plugins/DevicesDetection/images/brand/MicroMax.png
diff --git a/plugins/DevicesDetection/images/brand/Microsoft.ico b/plugins/DevicesDetection/images/brand/Microsoft.png
index f1417973d0..f1417973d0 100644
--- a/plugins/DevicesDetection/images/brand/Microsoft.ico
+++ b/plugins/DevicesDetection/images/brand/Microsoft.png
diff --git a/plugins/DevicesDetection/images/brand/Mio.ico b/plugins/DevicesDetection/images/brand/Mio.png
index a7abb66268..a7abb66268 100644
--- a/plugins/DevicesDetection/images/brand/Mio.ico
+++ b/plugins/DevicesDetection/images/brand/Mio.png
diff --git a/plugins/DevicesDetection/images/brand/Mitsubishi.ico b/plugins/DevicesDetection/images/brand/Mitsubishi.png
index 248a92fc4d..248a92fc4d 100644
--- a/plugins/DevicesDetection/images/brand/Mitsubishi.ico
+++ b/plugins/DevicesDetection/images/brand/Mitsubishi.png
diff --git a/plugins/DevicesDetection/images/brand/Motorola.ico b/plugins/DevicesDetection/images/brand/Motorola.png
index 7a4daa95a7..7a4daa95a7 100644
--- a/plugins/DevicesDetection/images/brand/Motorola.ico
+++ b/plugins/DevicesDetection/images/brand/Motorola.png
diff --git a/plugins/DevicesDetection/images/brand/MyPhone.ico b/plugins/DevicesDetection/images/brand/MyPhone.png
index 3717270632..3717270632 100644
--- a/plugins/DevicesDetection/images/brand/MyPhone.ico
+++ b/plugins/DevicesDetection/images/brand/MyPhone.png
diff --git a/plugins/DevicesDetection/images/brand/NEC.ico b/plugins/DevicesDetection/images/brand/NEC.png
index f2c60d1cd1..f2c60d1cd1 100644
--- a/plugins/DevicesDetection/images/brand/NEC.ico
+++ b/plugins/DevicesDetection/images/brand/NEC.png
diff --git a/plugins/DevicesDetection/images/brand/NGM.ico b/plugins/DevicesDetection/images/brand/NGM.png
index 533c88ba67..533c88ba67 100644
--- a/plugins/DevicesDetection/images/brand/NGM.ico
+++ b/plugins/DevicesDetection/images/brand/NGM.png
diff --git a/plugins/DevicesDetection/images/brand/Nexian.ico b/plugins/DevicesDetection/images/brand/Nexian.png
index fba9dd7dba..fba9dd7dba 100644
--- a/plugins/DevicesDetection/images/brand/Nexian.ico
+++ b/plugins/DevicesDetection/images/brand/Nexian.png
diff --git a/plugins/DevicesDetection/images/brand/Nikon.ico b/plugins/DevicesDetection/images/brand/Nikon.png
index 99d714d1bd..99d714d1bd 100644
--- a/plugins/DevicesDetection/images/brand/Nikon.ico
+++ b/plugins/DevicesDetection/images/brand/Nikon.png
diff --git a/plugins/DevicesDetection/images/brand/Nintendo.ico b/plugins/DevicesDetection/images/brand/Nintendo.png
index 20c6f4b5eb..20c6f4b5eb 100644
--- a/plugins/DevicesDetection/images/brand/Nintendo.ico
+++ b/plugins/DevicesDetection/images/brand/Nintendo.png
diff --git a/plugins/DevicesDetection/images/brand/Nokia.ico b/plugins/DevicesDetection/images/brand/Nokia.png
index 5af67b3573..5af67b3573 100644
--- a/plugins/DevicesDetection/images/brand/Nokia.ico
+++ b/plugins/DevicesDetection/images/brand/Nokia.png
diff --git a/plugins/DevicesDetection/images/brand/O2.ico b/plugins/DevicesDetection/images/brand/O2.png
index 468e9f5e62..468e9f5e62 100644
--- a/plugins/DevicesDetection/images/brand/O2.ico
+++ b/plugins/DevicesDetection/images/brand/O2.png
diff --git a/plugins/DevicesDetection/images/brand/OPPO.ico b/plugins/DevicesDetection/images/brand/OPPO.png
index d947bb8c5a..d947bb8c5a 100644
--- a/plugins/DevicesDetection/images/brand/OPPO.ico
+++ b/plugins/DevicesDetection/images/brand/OPPO.png
diff --git a/plugins/DevicesDetection/images/brand/Onda.ico b/plugins/DevicesDetection/images/brand/Onda.png
index 386ea8ed58..386ea8ed58 100644
--- a/plugins/DevicesDetection/images/brand/Onda.ico
+++ b/plugins/DevicesDetection/images/brand/Onda.png
diff --git a/plugins/DevicesDetection/images/brand/OnePlus.ico b/plugins/DevicesDetection/images/brand/OnePlus.png
index 1f9c73a7d5..1f9c73a7d5 100644
--- a/plugins/DevicesDetection/images/brand/OnePlus.ico
+++ b/plugins/DevicesDetection/images/brand/OnePlus.png
diff --git a/plugins/DevicesDetection/images/brand/Orange.ico b/plugins/DevicesDetection/images/brand/Orange.png
index d3303f5825..d3303f5825 100644
--- a/plugins/DevicesDetection/images/brand/Orange.ico
+++ b/plugins/DevicesDetection/images/brand/Orange.png
diff --git a/plugins/DevicesDetection/images/brand/PEAQ.ico b/plugins/DevicesDetection/images/brand/PEAQ.png
index 0626e7a93e..0626e7a93e 100644
--- a/plugins/DevicesDetection/images/brand/PEAQ.ico
+++ b/plugins/DevicesDetection/images/brand/PEAQ.png
diff --git a/plugins/DevicesDetection/images/brand/Panasonic.ico b/plugins/DevicesDetection/images/brand/Panasonic.png
index 6480c23af7..6480c23af7 100644
--- a/plugins/DevicesDetection/images/brand/Panasonic.ico
+++ b/plugins/DevicesDetection/images/brand/Panasonic.png
diff --git a/plugins/DevicesDetection/images/brand/Pantech.ico b/plugins/DevicesDetection/images/brand/Pantech.png
index f3ff1432eb..f3ff1432eb 100644
--- a/plugins/DevicesDetection/images/brand/Pantech.ico
+++ b/plugins/DevicesDetection/images/brand/Pantech.png
diff --git a/plugins/DevicesDetection/images/brand/Philips.ico b/plugins/DevicesDetection/images/brand/Philips.png
index 6f952a104b..6f952a104b 100644
--- a/plugins/DevicesDetection/images/brand/Philips.ico
+++ b/plugins/DevicesDetection/images/brand/Philips.png
diff --git a/plugins/DevicesDetection/images/brand/Polaroid.ico b/plugins/DevicesDetection/images/brand/Polaroid.png
index 3c1dc59aca..3c1dc59aca 100644
--- a/plugins/DevicesDetection/images/brand/Polaroid.ico
+++ b/plugins/DevicesDetection/images/brand/Polaroid.png
diff --git a/plugins/DevicesDetection/images/brand/PolyPad.ico b/plugins/DevicesDetection/images/brand/PolyPad.png
index d6ef005892..d6ef005892 100644
--- a/plugins/DevicesDetection/images/brand/PolyPad.ico
+++ b/plugins/DevicesDetection/images/brand/PolyPad.png
diff --git a/plugins/DevicesDetection/images/brand/Quechua.ico b/plugins/DevicesDetection/images/brand/Quechua.png
index b720b484b0..b720b484b0 100644
--- a/plugins/DevicesDetection/images/brand/Quechua.ico
+++ b/plugins/DevicesDetection/images/brand/Quechua.png
diff --git a/plugins/DevicesDetection/images/brand/RIM.ico b/plugins/DevicesDetection/images/brand/RIM.png
index 3263638840..3263638840 100644
--- a/plugins/DevicesDetection/images/brand/RIM.ico
+++ b/plugins/DevicesDetection/images/brand/RIM.png
diff --git a/plugins/DevicesDetection/images/brand/SFR.ico b/plugins/DevicesDetection/images/brand/SFR.png
index 59a47182cc..59a47182cc 100644
--- a/plugins/DevicesDetection/images/brand/SFR.ico
+++ b/plugins/DevicesDetection/images/brand/SFR.png
diff --git a/plugins/DevicesDetection/images/brand/Sagem.ico b/plugins/DevicesDetection/images/brand/Sagem.png
index 1f2f11d894..1f2f11d894 100644
--- a/plugins/DevicesDetection/images/brand/Sagem.ico
+++ b/plugins/DevicesDetection/images/brand/Sagem.png
diff --git a/plugins/DevicesDetection/images/brand/Samsung.ico b/plugins/DevicesDetection/images/brand/Samsung.png
index ddef8460a2..ddef8460a2 100644
--- a/plugins/DevicesDetection/images/brand/Samsung.ico
+++ b/plugins/DevicesDetection/images/brand/Samsung.png
diff --git a/plugins/DevicesDetection/images/brand/Sanyo.ico b/plugins/DevicesDetection/images/brand/Sanyo.png
index 5bc4da8b73..5bc4da8b73 100644
--- a/plugins/DevicesDetection/images/brand/Sanyo.ico
+++ b/plugins/DevicesDetection/images/brand/Sanyo.png
diff --git a/plugins/DevicesDetection/images/brand/Sega.ico b/plugins/DevicesDetection/images/brand/Sega.png
index 58e505f18a..58e505f18a 100644
--- a/plugins/DevicesDetection/images/brand/Sega.ico
+++ b/plugins/DevicesDetection/images/brand/Sega.png
diff --git a/plugins/DevicesDetection/images/brand/Selevision.ico b/plugins/DevicesDetection/images/brand/Selevision.png
index 7f54997696..7f54997696 100644
--- a/plugins/DevicesDetection/images/brand/Selevision.ico
+++ b/plugins/DevicesDetection/images/brand/Selevision.png
diff --git a/plugins/DevicesDetection/images/brand/Sencor.ico b/plugins/DevicesDetection/images/brand/Sencor.png
index bc0540c337..bc0540c337 100644
--- a/plugins/DevicesDetection/images/brand/Sencor.ico
+++ b/plugins/DevicesDetection/images/brand/Sencor.png
diff --git a/plugins/DevicesDetection/images/brand/Sharp.ico b/plugins/DevicesDetection/images/brand/Sharp.png
index 5d7b8523cf..5d7b8523cf 100644
--- a/plugins/DevicesDetection/images/brand/Sharp.ico
+++ b/plugins/DevicesDetection/images/brand/Sharp.png
diff --git a/plugins/DevicesDetection/images/brand/Siemens.ico b/plugins/DevicesDetection/images/brand/Siemens.png
index f11c4d6a5a..f11c4d6a5a 100644
--- a/plugins/DevicesDetection/images/brand/Siemens.ico
+++ b/plugins/DevicesDetection/images/brand/Siemens.png
diff --git a/plugins/DevicesDetection/images/brand/Smart.ico b/plugins/DevicesDetection/images/brand/Smart.png
index 9e3d779c63..9e3d779c63 100644
--- a/plugins/DevicesDetection/images/brand/Smart.ico
+++ b/plugins/DevicesDetection/images/brand/Smart.png
diff --git a/plugins/DevicesDetection/images/brand/Smartfren.ico b/plugins/DevicesDetection/images/brand/Smartfren.png
index 853f640448..853f640448 100644
--- a/plugins/DevicesDetection/images/brand/Smartfren.ico
+++ b/plugins/DevicesDetection/images/brand/Smartfren.png
diff --git a/plugins/DevicesDetection/images/brand/Softbank.ico b/plugins/DevicesDetection/images/brand/Softbank.png
index d0b8dc8dc2..d0b8dc8dc2 100644
--- a/plugins/DevicesDetection/images/brand/Softbank.ico
+++ b/plugins/DevicesDetection/images/brand/Softbank.png
diff --git a/plugins/DevicesDetection/images/brand/Sony.ico b/plugins/DevicesDetection/images/brand/Sony.png
index 8d9dbf3796..8d9dbf3796 100644
--- a/plugins/DevicesDetection/images/brand/Sony.ico
+++ b/plugins/DevicesDetection/images/brand/Sony.png
diff --git a/plugins/DevicesDetection/images/brand/Sony_Ericsson.ico b/plugins/DevicesDetection/images/brand/Sony_Ericsson.png
index a3cb9d2909..a3cb9d2909 100644
--- a/plugins/DevicesDetection/images/brand/Sony_Ericsson.ico
+++ b/plugins/DevicesDetection/images/brand/Sony_Ericsson.png
diff --git a/plugins/DevicesDetection/images/brand/Spice.ico b/plugins/DevicesDetection/images/brand/Spice.png
index e9d7e0602a..e9d7e0602a 100644
--- a/plugins/DevicesDetection/images/brand/Spice.ico
+++ b/plugins/DevicesDetection/images/brand/Spice.png
diff --git a/plugins/DevicesDetection/images/brand/T-Mobile.ico b/plugins/DevicesDetection/images/brand/T-Mobile.png
index 8908033d19..8908033d19 100644
--- a/plugins/DevicesDetection/images/brand/T-Mobile.ico
+++ b/plugins/DevicesDetection/images/brand/T-Mobile.png
diff --git a/plugins/DevicesDetection/images/brand/TCL.ico b/plugins/DevicesDetection/images/brand/TCL.png
index a66cd3e924..a66cd3e924 100644
--- a/plugins/DevicesDetection/images/brand/TCL.ico
+++ b/plugins/DevicesDetection/images/brand/TCL.png
diff --git a/plugins/DevicesDetection/images/brand/TechniSat.ico b/plugins/DevicesDetection/images/brand/TechniSat.png
index f29d4e26ee..f29d4e26ee 100644
--- a/plugins/DevicesDetection/images/brand/TechniSat.ico
+++ b/plugins/DevicesDetection/images/brand/TechniSat.png
diff --git a/plugins/DevicesDetection/images/brand/TechnoTrend.ico b/plugins/DevicesDetection/images/brand/TechnoTrend.png
index 9ef288505f..9ef288505f 100644
--- a/plugins/DevicesDetection/images/brand/TechnoTrend.ico
+++ b/plugins/DevicesDetection/images/brand/TechnoTrend.png
diff --git a/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico b/plugins/DevicesDetection/images/brand/Tecno_Mobile.png
index 7ea787c5ba..7ea787c5ba 100644
--- a/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico
+++ b/plugins/DevicesDetection/images/brand/Tecno_Mobile.png
diff --git a/plugins/DevicesDetection/images/brand/Telefunken.ico b/plugins/DevicesDetection/images/brand/Telefunken.png
index 9656092a10..9656092a10 100644
--- a/plugins/DevicesDetection/images/brand/Telefunken.ico
+++ b/plugins/DevicesDetection/images/brand/Telefunken.png
diff --git a/plugins/DevicesDetection/images/brand/Telit.ico b/plugins/DevicesDetection/images/brand/Telit.png
index f06186c545..f06186c545 100644
--- a/plugins/DevicesDetection/images/brand/Telit.ico
+++ b/plugins/DevicesDetection/images/brand/Telit.png
diff --git a/plugins/DevicesDetection/images/brand/Thomson.ico b/plugins/DevicesDetection/images/brand/Thomson.png
index 89c5133956..89c5133956 100644
--- a/plugins/DevicesDetection/images/brand/Thomson.ico
+++ b/plugins/DevicesDetection/images/brand/Thomson.png
diff --git a/plugins/DevicesDetection/images/brand/TiPhone.ico b/plugins/DevicesDetection/images/brand/TiPhone.png
index da1531ac76..da1531ac76 100644
--- a/plugins/DevicesDetection/images/brand/TiPhone.ico
+++ b/plugins/DevicesDetection/images/brand/TiPhone.png
diff --git a/plugins/DevicesDetection/images/brand/Tolino.ico b/plugins/DevicesDetection/images/brand/Tolino.png
index 23b44b02b7..23b44b02b7 100644
--- a/plugins/DevicesDetection/images/brand/Tolino.ico
+++ b/plugins/DevicesDetection/images/brand/Tolino.png
diff --git a/plugins/DevicesDetection/images/brand/Toshiba.ico b/plugins/DevicesDetection/images/brand/Toshiba.png
index 3ea1260dab..3ea1260dab 100644
--- a/plugins/DevicesDetection/images/brand/Toshiba.ico
+++ b/plugins/DevicesDetection/images/brand/Toshiba.png
diff --git a/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico b/plugins/DevicesDetection/images/brand/Tunisie_Telecom.png
index 44e87d65ed..44e87d65ed 100644
--- a/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico
+++ b/plugins/DevicesDetection/images/brand/Tunisie_Telecom.png
diff --git a/plugins/DevicesDetection/images/brand/Unknown.ico b/plugins/DevicesDetection/images/brand/Unknown.png
index 2c75a533a1..2c75a533a1 100644
--- a/plugins/DevicesDetection/images/brand/Unknown.ico
+++ b/plugins/DevicesDetection/images/brand/Unknown.png
diff --git a/plugins/DevicesDetection/images/brand/Vertu.ico b/plugins/DevicesDetection/images/brand/Vertu.png
index caa2ec1a17..caa2ec1a17 100644
--- a/plugins/DevicesDetection/images/brand/Vertu.ico
+++ b/plugins/DevicesDetection/images/brand/Vertu.png
diff --git a/plugins/DevicesDetection/images/brand/Vestel.ico b/plugins/DevicesDetection/images/brand/Vestel.png
index 74466e4d31..74466e4d31 100644
--- a/plugins/DevicesDetection/images/brand/Vestel.ico
+++ b/plugins/DevicesDetection/images/brand/Vestel.png
diff --git a/plugins/DevicesDetection/images/brand/Videocon.ico b/plugins/DevicesDetection/images/brand/Videocon.png
index aee145d59e..aee145d59e 100644
--- a/plugins/DevicesDetection/images/brand/Videocon.ico
+++ b/plugins/DevicesDetection/images/brand/Videocon.png
diff --git a/plugins/DevicesDetection/images/brand/Videoweb.ico b/plugins/DevicesDetection/images/brand/Videoweb.png
index 8892f58f13..8892f58f13 100644
--- a/plugins/DevicesDetection/images/brand/Videoweb.ico
+++ b/plugins/DevicesDetection/images/brand/Videoweb.png
diff --git a/plugins/DevicesDetection/images/brand/ViewSonic.ico b/plugins/DevicesDetection/images/brand/ViewSonic.png
index 0a57879b00..0a57879b00 100644
--- a/plugins/DevicesDetection/images/brand/ViewSonic.ico
+++ b/plugins/DevicesDetection/images/brand/ViewSonic.png
diff --git a/plugins/DevicesDetection/images/brand/Voxtel.ico b/plugins/DevicesDetection/images/brand/Voxtel.png
index b2b4b9afe5..b2b4b9afe5 100644
--- a/plugins/DevicesDetection/images/brand/Voxtel.ico
+++ b/plugins/DevicesDetection/images/brand/Voxtel.png
diff --git a/plugins/DevicesDetection/images/brand/Wiko.ico b/plugins/DevicesDetection/images/brand/Wiko.png
index 5ab15ac0c8..5ab15ac0c8 100644
--- a/plugins/DevicesDetection/images/brand/Wiko.ico
+++ b/plugins/DevicesDetection/images/brand/Wiko.png
diff --git a/plugins/DevicesDetection/images/brand/Wolder.ico b/plugins/DevicesDetection/images/brand/Wolder.png
index 2d7884166d..2d7884166d 100644
--- a/plugins/DevicesDetection/images/brand/Wolder.ico
+++ b/plugins/DevicesDetection/images/brand/Wolder.png
diff --git a/plugins/DevicesDetection/images/brand/Woxter.ico b/plugins/DevicesDetection/images/brand/Woxter.png
index 9ca46b13a7..9ca46b13a7 100644
--- a/plugins/DevicesDetection/images/brand/Woxter.ico
+++ b/plugins/DevicesDetection/images/brand/Woxter.png
diff --git a/plugins/DevicesDetection/images/brand/Xiaomi.ico b/plugins/DevicesDetection/images/brand/Xiaomi.png
index 662a1a843b..662a1a843b 100644
--- a/plugins/DevicesDetection/images/brand/Xiaomi.ico
+++ b/plugins/DevicesDetection/images/brand/Xiaomi.png
diff --git a/plugins/DevicesDetection/images/brand/Yarvik.ico b/plugins/DevicesDetection/images/brand/Yarvik.png
index 0b24f3935f..0b24f3935f 100644
--- a/plugins/DevicesDetection/images/brand/Yarvik.ico
+++ b/plugins/DevicesDetection/images/brand/Yarvik.png
diff --git a/plugins/DevicesDetection/images/brand/Yuandao.ico b/plugins/DevicesDetection/images/brand/Yuandao.png
index 50b25f57bd..50b25f57bd 100644
--- a/plugins/DevicesDetection/images/brand/Yuandao.ico
+++ b/plugins/DevicesDetection/images/brand/Yuandao.png
diff --git a/plugins/DevicesDetection/images/brand/ZTE.ico b/plugins/DevicesDetection/images/brand/ZTE.png
index b1e74f2aae..b1e74f2aae 100644
--- a/plugins/DevicesDetection/images/brand/ZTE.ico
+++ b/plugins/DevicesDetection/images/brand/ZTE.png
diff --git a/plugins/DevicesDetection/images/brand/Zonda.ico b/plugins/DevicesDetection/images/brand/Zonda.png
index 6002ce66e4..6002ce66e4 100644
--- a/plugins/DevicesDetection/images/brand/Zonda.ico
+++ b/plugins/DevicesDetection/images/brand/Zonda.png
diff --git a/plugins/DevicesDetection/images/brand/Zopo.ico b/plugins/DevicesDetection/images/brand/Zopo.png
index 03d6f4530e..03d6f4530e 100644
--- a/plugins/DevicesDetection/images/brand/Zopo.ico
+++ b/plugins/DevicesDetection/images/brand/Zopo.png
diff --git a/plugins/DevicesDetection/images/brand/bq.ico b/plugins/DevicesDetection/images/brand/bq.png
index 088f3d1144..088f3d1144 100644
--- a/plugins/DevicesDetection/images/brand/bq.ico
+++ b/plugins/DevicesDetection/images/brand/bq.png
diff --git a/plugins/DevicesDetection/images/brand/eTouch.ico b/plugins/DevicesDetection/images/brand/eTouch.png
index 30e09812b6..30e09812b6 100644
--- a/plugins/DevicesDetection/images/brand/eTouch.ico
+++ b/plugins/DevicesDetection/images/brand/eTouch.png
diff --git a/plugins/DevicesDetection/images/brand/i-mobile.ico b/plugins/DevicesDetection/images/brand/i-mobile.png
index 2b02066876..2b02066876 100644
--- a/plugins/DevicesDetection/images/brand/i-mobile.ico
+++ b/plugins/DevicesDetection/images/brand/i-mobile.png
diff --git a/plugins/DevicesDetection/images/brand/iBerry.ico b/plugins/DevicesDetection/images/brand/iBerry.png
index 528e04a4c5..528e04a4c5 100644
--- a/plugins/DevicesDetection/images/brand/iBerry.ico
+++ b/plugins/DevicesDetection/images/brand/iBerry.png
diff --git a/plugins/DevicesDetection/images/brand/teXet.ico b/plugins/DevicesDetection/images/brand/teXet.png
index 2d046b9f73..2d046b9f73 100644
--- a/plugins/DevicesDetection/images/brand/teXet.ico
+++ b/plugins/DevicesDetection/images/brand/teXet.png
diff --git a/plugins/DevicesDetection/images/screens/console.gif b/plugins/DevicesDetection/images/screens/console.gif
deleted file mode 100644
index 7957a9106a..0000000000
--- a/plugins/DevicesDetection/images/screens/console.gif
+++ /dev/null
diff --git a/plugins/DevicesDetection/images/screens/console.png b/plugins/DevicesDetection/images/screens/console.png
new file mode 100644
index 0000000000..78bcdfa660
--- /dev/null
+++ b/plugins/DevicesDetection/images/screens/console.png
diff --git a/plugins/DevicesDetection/images/screens/dual.gif b/plugins/DevicesDetection/images/screens/dual.gif
deleted file mode 100644
index a8cb8b2963..0000000000
--- a/plugins/DevicesDetection/images/screens/dual.gif
+++ /dev/null
diff --git a/plugins/DevicesDetection/images/screens/dual.png b/plugins/DevicesDetection/images/screens/dual.png
new file mode 100644
index 0000000000..0311d7c599
--- /dev/null
+++ b/plugins/DevicesDetection/images/screens/dual.png
diff --git a/plugins/DevicesDetection/images/screens/mobile.gif b/plugins/DevicesDetection/images/screens/mobile.gif
deleted file mode 100644
index 814642933f..0000000000
--- a/plugins/DevicesDetection/images/screens/mobile.gif
+++ /dev/null
diff --git a/plugins/DevicesDetection/images/screens/mobile.png b/plugins/DevicesDetection/images/screens/mobile.png
new file mode 100644
index 0000000000..77e59f4b84
--- /dev/null
+++ b/plugins/DevicesDetection/images/screens/mobile.png
diff --git a/plugins/DevicesDetection/images/screens/normal.gif b/plugins/DevicesDetection/images/screens/normal.gif
deleted file mode 100644
index afe97e9d9f..0000000000
--- a/plugins/DevicesDetection/images/screens/normal.gif
+++ /dev/null
diff --git a/plugins/DevicesDetection/images/screens/normal.png b/plugins/DevicesDetection/images/screens/normal.png
new file mode 100644
index 0000000000..a89b2421c5
--- /dev/null
+++ b/plugins/DevicesDetection/images/screens/normal.png
diff --git a/plugins/DevicesDetection/images/screens/unknown.gif b/plugins/DevicesDetection/images/screens/unknown.gif
deleted file mode 100644
index 2c44083422..0000000000
--- a/plugins/DevicesDetection/images/screens/unknown.gif
+++ /dev/null
diff --git a/plugins/DevicesDetection/images/screens/unknown.png b/plugins/DevicesDetection/images/screens/unknown.png
new file mode 100644
index 0000000000..166a505bbc
--- /dev/null
+++ b/plugins/DevicesDetection/images/screens/unknown.png
diff --git a/plugins/DevicesDetection/images/screens/wide.gif b/plugins/DevicesDetection/images/screens/wide.gif
deleted file mode 100644
index 1b09fc529b..0000000000
--- a/plugins/DevicesDetection/images/screens/wide.gif
+++ /dev/null
diff --git a/plugins/DevicesDetection/images/screens/wide.png b/plugins/DevicesDetection/images/screens/wide.png
new file mode 100644
index 0000000000..8a7bb13d7e
--- /dev/null
+++ b/plugins/DevicesDetection/images/screens/wide.png
diff --git a/plugins/DevicesDetection/lang/et.json b/plugins/DevicesDetection/lang/et.json
index 1879f9957f..305bd8e5a8 100644
--- a/plugins/DevicesDetection/lang/et.json
+++ b/plugins/DevicesDetection/lang/et.json
@@ -1,6 +1,7 @@
 {
     "DevicesDetection": {
         "BrowserEngine": "Veebisirvija",
+        "BrowserEngines": "Veebimootorid",
         "BrowserFamily": "Sirvija tüüp",
         "Browsers": "Veebisirvijad",
         "BrowserVersion": "Sirvija versioon",
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
index a225fdb0be..0f038157ba 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
@@ -18,7 +18,7 @@
 		</goals>
 		<nb_conversions>2</nb_conversions>
 		<revenue>52.26</revenue>
-		<logo>plugins/DevicesDetection/images/brand/Apple.ico</logo>
+		<logo>plugins/DevicesDetection/images/brand/Apple.png</logo>
 		<segment>deviceBrand==Apple</segment>
 	</row>
 	<row>
@@ -39,7 +39,7 @@
 		</goals>
 		<nb_conversions>3</nb_conversions>
 		<revenue>62.26</revenue>
-		<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+		<logo>plugins/DevicesDetection/images/brand/Unknown.png</logo>
 		<segment>deviceBrand==Unknown</segment>
 	</row>
 	<row>
@@ -60,7 +60,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42.26</revenue>
-		<logo>plugins/DevicesDetection/images/brand/HTC.ico</logo>
+		<logo>plugins/DevicesDetection/images/brand/HTC.png</logo>
 		<segment>deviceBrand==HTC</segment>
 	</row>
 	<row>
@@ -73,7 +73,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/DevicesDetection/images/brand/Philips.ico</logo>
+		<logo>plugins/DevicesDetection/images/brand/Philips.png</logo>
 		<segment>deviceBrand==Philips</segment>
 	</row>
 	<row>
@@ -86,7 +86,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo>
+		<logo>plugins/DevicesDetection/images/brand/Samsung.png</logo>
 		<segment>deviceBrand==Samsung</segment>
 	</row>
 	<row>
@@ -107,7 +107,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>10</revenue>
-		<logo>plugins/DevicesDetection/images/brand/ViewSonic.ico</logo>
+		<logo>plugins/DevicesDetection/images/brand/ViewSonic.png</logo>
 		<segment>deviceBrand==ViewSonic</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
index 4f1c727203..7db59b5306 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
@@ -60,7 +60,7 @@
 		</goals>
 		<nb_conversions>2</nb_conversions>
 		<revenue>52.26</revenue>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<logo>plugins/DevicesDetection/images/screens/unknown.png</logo>
 	</row>
 	<row>
 		<label>Desktop</label>
@@ -81,7 +81,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>10</revenue>
 		<segment>deviceType==desktop</segment>
-		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
+		<logo>plugins/DevicesDetection/images/screens/normal.png</logo>
 	</row>
 	<row>
 		<label>Tv</label>
@@ -112,30 +112,30 @@
 		<label>Console</label>
 		<nb_visits>0</nb_visits>
 		<segment>deviceType==console</segment>
-		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
+		<logo>plugins/DevicesDetection/images/screens/console.png</logo>
 	</row>
 	<row>
 		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
 		<segment>deviceType==feature+phone</segment>
-		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
+		<logo>plugins/DevicesDetection/images/screens/mobile.png</logo>
 	</row>
 	<row>
 		<label>Phablet</label>
 		<nb_visits>0</nb_visits>
 		<segment>deviceType==phablet</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<logo>plugins/DevicesDetection/images/screens/unknown.png</logo>
 	</row>
 	<row>
 		<label>Portable media player</label>
 		<nb_visits>0</nb_visits>
 		<segment>deviceType==portable+media+player</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<logo>plugins/DevicesDetection/images/screens/unknown.png</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
 		<nb_visits>0</nb_visits>
 		<segment>deviceType==smart+display</segment>
-		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+		<logo>plugins/DevicesDetection/images/screens/unknown.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/et.json b/plugins/Diagnostics/lang/et.json
new file mode 100644
index 0000000000..119085ad7f
--- /dev/null
+++ b/plugins/Diagnostics/lang/et.json
@@ -0,0 +1,6 @@
+{
+    "Diagnostics": {
+        "ConfigFileTitle": "Seadistuste fail",
+        "Sections": "Sektsioonid"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/et.json b/plugins/Ecommerce/lang/et.json
new file mode 100644
index 0000000000..e5e6184cf6
--- /dev/null
+++ b/plugins/Ecommerce/lang/et.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Müük",
+        "SalesAdjective": "Müük %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/sk.json b/plugins/Ecommerce/lang/sk.json
index 7fac6327f8..69466629cd 100644
--- a/plugins/Ecommerce/lang/sk.json
+++ b/plugins/Ecommerce/lang/sk.json
@@ -1,5 +1,7 @@
 {
     "Ecommerce": {
-        "Sales": "Predaje"
+        "Sales": "Predaje",
+        "SalesBy": "Predaje podľa %s",
+        "SalesAdjective": "Predaje %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/Ecommerce/templates/getSparklines.twig b/plugins/Ecommerce/templates/getSparklines.twig
index 62487c46e2..17e6c880fd 100644
--- a/plugins/Ecommerce/templates/getSparklines.twig
+++ b/plugins/Ecommerce/templates/getSparklines.twig
@@ -3,7 +3,7 @@
     <div class="sparkline">{{ sparkline(urlSparklineConversions) }}
         <strong>{{ nb_conversions|number }}</strong>
         {{ 'General_EcommerceOrders'|translate }}
-        <img src='plugins/Morpheus/images/ecommerceOrder.gif'>
+        <img src='plugins/Morpheus/images/ecommerceOrder.png'>
 
         {% if goalAllowMultipleConversionsPerVisit is defined and goalAllowMultipleConversionsPerVisit %}
             ({{ 'General_NVisits'|translate("<strong>"~nb_visits_converted~"</strong>")|raw }})
@@ -31,7 +31,7 @@
 </div>
 <div id='rightcolumn' {% if not isWidget %}style='width:30%;'{% endif %}>
     <div>
-        <img src='plugins/Morpheus/images/ecommerceAbandonedCart.gif'> {{ 'General_AbandonedCarts'|translate }}
+        <img src='plugins/Morpheus/images/ecommerceAbandonedCart.png'> {{ 'General_AbandonedCarts'|translate }}
     </div>
 
     <div class="sparkline">
diff --git a/plugins/Events/lang/et.json b/plugins/Events/lang/et.json
index ad62ea4639..c387262e9d 100644
--- a/plugins/Events/lang/et.json
+++ b/plugins/Events/lang/et.json
@@ -1,7 +1,9 @@
 {
     "Events": {
+        "AvgValue": "Keskmine väärtus",
         "Event": "Sündmus",
         "EventAction": "Sündmuse tegevus",
+        "EventCategories": "Ürituse kategooriad",
         "EventCategory": "Sündmuse kategooria",
         "EventName": "Sündmuse nimi",
         "Events": "Sündmused",
diff --git a/plugins/ExampleReport/Reports/GetExampleReport.php b/plugins/ExampleReport/Reports/GetExampleReport.php
index 9e0980f050..7e0fc66f9d 100644
--- a/plugins/ExampleReport/Reports/GetExampleReport.php
+++ b/plugins/ExampleReport/Reports/GetExampleReport.php
@@ -50,7 +50,7 @@ class GetExampleReport extends Base
         // $this->constantRowsCount = true;
 
         // If a subcategory is specified, the report will be displayed in the menu under this menu item
-        // $this->subCategory = 'ExampleReportName';
+        // $this->subcategoryId = 'ExampleReportName';
     }
 
     /**
diff --git a/plugins/Feedback/lang/zh-tw.json b/plugins/Feedback/lang/zh-tw.json
index c1999b20ab..9d7cdce0c4 100644
--- a/plugins/Feedback/lang/zh-tw.json
+++ b/plugins/Feedback/lang/zh-tw.json
@@ -1,7 +1,7 @@
 {
     "Feedback": {
         "DoYouHaveBugReportOrFeatureRequest": "你想回報 Bug 或是建議新功能？",
-        "HowToCreateTicket": "請閱讀撰寫優質%1$s Bug 回報%2$s或%3$s功能請求%4$s的建議。接著註冊或登入到%5$s我們的問題追蹤區%6$s並建立%7$s新的問題%8$s。",
+        "HowToCreateTicket": "請閱讀撰寫優質 %1$sBug 回報%2$s或%3$s功能請求%4$s的建議。接著註冊或登入到%5$s我們的問題追蹤區%6$s並建立%7$s新的問題%8$s。",
         "IWantTo": "我想要：",
         "LearnWaysToParticipate": "了解所有你可以%1$s參與%2$s的方法",
         "ManuallySendEmailTo": "請手動寄送你的訊息至",
diff --git a/plugins/Goals/lang/et.json b/plugins/Goals/lang/et.json
index cf8d0cdffa..6e4c8b525f 100644
--- a/plugins/Goals/lang/et.json
+++ b/plugins/Goals/lang/et.json
@@ -10,6 +10,7 @@
         "BestKeywords": "Sinu parimad tulutoovad märksõnad on:",
         "BestReferrers": "Sinu parimad tulutoovad veebilehtede suunajad on:",
         "CaseSensitive": "Tähtede tõusutundlik võrdlus",
+        "CategoryTextReferrers_Referrers": "Viitajad",
         "ClickOutlink": "Klikivad välise lehe lingile",
         "ColumnConversions": "Tulu tekitamised",
         "ColumnVisits": "Külastuste koguarv, hoolimata sellest, kas eesmärgini jõuti või ei.",
@@ -19,6 +20,7 @@
         "ConversionsOverview": "Tulu tekitamiste ülevaade",
         "ConversionsOverviewBy": "Tulu tekitamiste ülevaade külastuse tüübi järgi",
         "DaysToConv": "Päevi tulu tekitamiseni",
+        "Details": "Eesmärgi andmed",
         "DefaultGoalConvertedOncePerVisit": "(vaikimisi) Eesmärgi jaoks saab klienti muudada ainult ühe korra külastuse jooksul (hetk kui külastajast saab tulutoov klient)",
         "DefaultRevenue": "Eesmärgi vaikimisi kasum on",
         "Download": "Laevad alla faili",
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 6d3af32f46..5fa34da734 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -80,13 +80,15 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
      * Installation Step 1: Welcome
      *
      * Can also display an error message when there is a failure early (eg. DB connection failed)
+     *
+     * @param string $possibleErrorMessage Possible error message which may be set in the frontcontroller when event. Config.badConfigurationFile was triggered
      */
-    function welcome()
+    function welcome($possibleErrorMessage = null)
     {
         // Delete merged js/css files to force regenerations based on updated activated plugin list
         Filesystem::deleteAllCacheOnUpdate();
 
-        $this->checkPiwikIsNotInstalled();
+        $this->checkPiwikIsNotInstalled($possibleErrorMessage);
         $view = new View(
             '@Installation/welcome',
             $this->getInstallationSteps(),
@@ -594,14 +596,17 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         LanguagesManager::setLanguageForSession($translator->getCurrentLanguage());
     }
 
-    private function checkPiwikIsNotInstalled()
+    private function checkPiwikIsNotInstalled($possibleErrorMessage = null)
     {
         if (!SettingsPiwik::isPiwikInstalled()) {
             return;
         }
+
+        $possibleErrorMessage = $possibleErrorMessage ? sprintf('<br/><br/>Original error was "%s".<br/>', $possibleErrorMessage) : '';
+
         \Piwik\Plugins\Login\Controller::clearSession();
         $message = Piwik::translate('Installation_InvalidStateError',
-            array('<br /><strong>',
+            array($possibleErrorMessage . '<br /><strong>',
                   // piwik-is-already-installed is checked against in checkPiwikServerWorking
                   '</strong><a id="piwik-is-already-installed" href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>',
                   '</a>')
diff --git a/plugins/Installation/lang/et.json b/plugins/Installation/lang/et.json
index ad3ef6ee84..6ca193870a 100644
--- a/plugins/Installation/lang/et.json
+++ b/plugins/Installation/lang/et.json
@@ -27,6 +27,7 @@
         "NfsFilesystemWarning": "Sinu server kasutab NFS failisüsteemi",
         "NfsFilesystemWarningSuffixAdmin": "See tähendab, et Piwik on väga aeglane faili põhiste sessioonidega töötamisel.",
         "Optional": "Valikuline",
+        "Password": "Parool",
         "PasswordDoNotMatch": "salasõnad ei kattu",
         "PercentDone": "%s %% Tehtud",
         "PleaseFixTheFollowingErrors": "Palun paranda järgnevad vead",
diff --git a/plugins/Installation/lang/sk.json b/plugins/Installation/lang/sk.json
index 33fea7cc0f..466eceae8e 100644
--- a/plugins/Installation/lang/sk.json
+++ b/plugins/Installation/lang/sk.json
@@ -15,6 +15,7 @@
         "DatabaseSetupLogin": "Prihlásenie",
         "DatabaseSetupServer": "Databázový server",
         "DatabaseSetupTablePrefix": "Prefix tabuľky",
+        "Email": "E-mail",
         "Extension": "rozšírenie",
         "Filesystem": "Súborový systém",
         "GoBackAndDefinePrefix": "Choďte späť a zadefinujte predponu pre Piwik tabuľky",
@@ -22,15 +23,26 @@
         "Installation": "Inštalácia",
         "InstallationStatus": "Stav inštalácie",
         "Legend": "Legenda",
+        "NfsFilesystemWarning": "Váš server používa systém súborov NFS.",
         "Optional": "Voliteľné",
-        "PasswordDoNotMatch": "heslo nie je zhodné",
+        "Password": "Heslo",
+        "PasswordDoNotMatch": "heslo sa nezhoduje",
+        "PasswordRepeat": "Heslo (znovu)",
         "PercentDone": "%s %% Dokončené",
+        "PleaseFixTheFollowingErrors": "Prosím opravte nasledovné chyby",
         "DefaultSettings": "Štandardné Piwik nastavania",
         "Requirements": "Piwik požiadavky",
+        "RestartWebServer": "Po vykonaní tejto zmeny reštartuje Váš webový server.",
+        "SeeBelowForMoreInfo": "Pozrite nižšie pre viac informácií.",
         "SetupWebsite": "Nastavenie webstránky",
         "SetupWebsiteError": "Vyskytla sa chyba pridávaní webstránky",
         "SetupWebsiteSetupSuccess": "Webstránka %s bola úspešne vytvorená!",
+        "SetupWebSiteURL": "URL webovej stránky",
+        "SiteSetup": "Prosím nastavte prvú webovú stránku, ktorú chcete sledovať a analyzovať s Piwikom:",
+        "SiteSetupFootnote": "Poznámka: po skončení Inštalácie Piwiku, budete môcť pridať viac webových stránok pre sledovanie!",
         "SuperUser": "Super užívateľ",
+        "SuperUserLogin": "prihlásenie (login) superpoužívateľa",
+        "SuperUserSetupError": "Vyskytla sa chyba pri pridávaní Super užívateľa",
         "SuperUserSetupSuccess": "Super užívateľ bol úspešne vytvorený!",
         "SystemCheck": "Kontrola systému",
         "SystemCheckDatabaseExtensions": "MySQL rozšírenia",
@@ -38,17 +50,24 @@
         "SystemCheckExtensions": "Ostatné požadované rozšírenia",
         "SystemCheckFileIntegrity": "Integrita súborov",
         "SystemCheckFunctions": "Požadované funkcie",
+        "SystemCheckFunctionHelp": "Je potrebné aktivovať túto zabudovanú funkciu.",
         "SystemCheckGDFreeType": "GD > 2.x + Freetype (grafika)",
         "SystemCheckGDHelp": "„Sparklines“ (malé grafy) nebudú fungovať.",
         "SystemCheckMbstring": "mbstring",
         "SystemCheckMemoryLimit": "Pamäťový limit",
         "SystemCheckMemoryLimitHelp": "Na webstránkach s vysokou premávkou archivačný proces bude vyžadovať viac pamäte, než je to aktuálne povolené.<br \/> Pozrite si direktívu memory_limit vo vašom php.ini súbore, ak je to potrebné.",
+        "SystemCheckNoErrorsOrWarnings": "Nie sú žiadne chyby alebo varovania",
+        "SystemCheckViewFullSystemCheck": "Zobraziť hlásenie z celkovej kontroly systému",
         "SystemCheckOpenURL": "Otvoriť URL",
+        "SystemCheckOtherExtensions": "Ostatné rozšírenia",
+        "SystemCheckOtherFunctions": "Ostatné funkcie",
+        "SystemCheckPageSpeedDisabled": "PageSpeed deaktivovaný",
         "SystemCheckPhp": "PHP verzia",
         "SystemCheckTimeLimitHelp": "Na webstránkach s vysokou premávkou bude spúšťanie archivačného procesu trvať dlhšie, než je to aktuálne povolené.<br \/> Pozrite si direktívu max_execution_time vo vašom php.ini súbore, ak je to potrebné.",
         "SystemCheckWarning": "Piwik bude fungovať normálne, ale niektoré vlastnosti budú chýbať.",
         "SystemCheckWriteDirs": "Priečinky s prístupom na zápis",
         "SystemCheckWriteDirsHelp": "Na vyriešenie problém v Linuxe skúste napísať nasledovné príkazy",
+        "SystemCheckZlibHelp": "Je potrebné nastaviť a rebuild PHP s aktivovanou podporou \"zlib\", --with-zlib",
         "SystemCheckUpdateHttps": "Aktualizovať cez HTTPS",
         "NotSupported": "nepodporované",
         "Tables": "Vytváranie tabuliek",
@@ -60,6 +79,7 @@
         "TablesUpdatedSuccess": "Databáza bola úspešne aktualizovaná z %1$s na %2$s!",
         "TablesWarningHelp": "Vyberte si použitie už existujúcich tabuliek alebo výber čistej inštalácie s vymazaním všetkých existujúcich dát v databáze.",
         "TablesWithSameNamesFound": "Niektoré %1$s tabuľky vo vašej databáze %2$s majú rovnaké názvy, ako sa snaží vytvoriť Piwik",
+        "Timezone": "Časové pásmo webovej stránky",
         "Welcome": "Vitajte!",
         "WelcomeHelp": "<p>Piwik je open source projekt analýzy webstránok, ktorý zjednodušuje získavanie informácií o Vašich návštevníkoch.<\/p><p>Tento proces je rozdelený do %s jednoduchých krokov a bude trvať asi 5 minút.<\/p>",
         "WelcomeToCommunity": "Vitajte v Piwik komunite",
diff --git a/plugins/Installation/lang/uk.json b/plugins/Installation/lang/uk.json
index 244462565a..14d0da7c63 100644
--- a/plugins/Installation/lang/uk.json
+++ b/plugins/Installation/lang/uk.json
@@ -26,8 +26,12 @@
         "InsufficientPrivilegesHelp": "Ви можете додати ці привілеї за допомогою такого інструменту, як phpMyAdmin або шляхом реалізації права SQL запиту. Якщо ви не знаєте, як зробити ці речі, будь ласка, зверніться до системного адміністратора щоб вам надали ці привілеї для вас.",
         "InsufficientPrivilegesMain": "Або база даних не існує (і не може бути створений), або вказаний користувач не має достатніх привілеїв. Користувач бази даних повинен мати такі привілеї: %s",
         "InvalidStateError": "Помилка: Piwik вже встановлено. %1$s Поверніться %2$s до Piwik%3$s.",
+        "JsTagArchivingHelp1": "Для середніх і високо навантажених сайтів є певні оптимізації, які повинні бути зроблені, щоб допомогти Piwik працювати швидше (як от %1$sналаштування автоматичного архівування%2$s).",
+        "JSTracking_EndNote": "Примітка: Після процесу установки, ви можете створити настроюваний код відстеження в розділі адміністрування %1$sкод відстеження%2$s .",
+        "JSTracking_Intro": "Для відстеження веб-трафіку за допомогою Piwik вам потрібно переконатися, що деякі додаткові коди додаєються до кожної з ваших веб-сторінок.",
         "LargePiwikInstances": "Доомога для великих інсталяцій Piwik",
         "Legend": "Підказка",
+        "LoadDataInfileRecommended": "Якщо ваш сервер Piwik відстежує сайти з високим трафіком (наприклад > 100,000 сторінок в місяць), ми рекомендуємо це, щоб спробувати вирішити цю проблему.",
         "NfsFilesystemWarning": "Ваш сервер використовує файлову систему NFS.",
         "NfsFilesystemWarningSuffixAdmin": "Це означає, що Piwik буде вкрай повільним при використанні сесій на основі файлів.",
         "YouMayInstallPiwikNow": "Ви можете %1$sвстановити Piwik прямо зараз%2$s",
diff --git a/plugins/LanguagesManager/lang/et.json b/plugins/LanguagesManager/lang/et.json
index 65fa8889e6..49ff4dfaf2 100644
--- a/plugins/LanguagesManager/lang/et.json
+++ b/plugins/LanguagesManager/lang/et.json
@@ -1,5 +1,6 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Rohkem infot Piwiku tõlkimisest"
+        "AboutPiwikTranslations": "Rohkem infot Piwiku tõlkimisest",
+        "TranslationSearch": "Tõlke otsing"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/sk.json b/plugins/LanguagesManager/lang/sk.json
index beb0e1ea87..3f5de4fb20 100644
--- a/plugins/LanguagesManager/lang/sk.json
+++ b/plugins/LanguagesManager/lang/sk.json
@@ -1,5 +1,6 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "O prekladoch Piwik"
+        "AboutPiwikTranslations": "O prekladoch Piwik",
+        "TranslationSearch": "Hľadanie prekladu"
     }
 }
\ No newline at end of file
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>
diff --git a/plugins/Login/lang/ja.json b/plugins/Login/lang/ja.json
index d1ddc683a3..2a5f9ec5eb 100644
--- a/plugins/Login/lang/ja.json
+++ b/plugins/Login/lang/ja.json
@@ -15,6 +15,7 @@
         "ChangeYourPassword": "パスワードを変更してください",
         "MailPasswordChangeBody": "こんにちは、%1$s\n\nパスワードリセット要求が %2$s から受信されました。このパスワードの変更を確認して新しい資格情報でログインできるようにするには、次のリンクにアクセスしてください：\n\n%3$s\n\n注意：パスワードを変更すると、token_auth も変更されます。設定ページであなたの新しいtoken_auth を調べることができます。\n\n外部アプリケーションで API token_auth を使用している場合、またはアーカイブする場合は、token_auth を更新してください。そうでない場合は、API へのリクエストが失敗します。\n\n注：このリンクは24時間後に有効期限が切れます。\n\nPiwik のご利用、ありがとうございます！",
         "MailTopicPasswordChange": "パスワード変更の確認",
+        "NewPassword": "新しいパスワード",
         "NewPasswordRepeat": "新しいパスワード ( 再入力 )",
         "PasswordChanged": "パスワードが変更されました。",
         "PasswordRepeat": "パスワード（再入力）",
diff --git a/plugins/Login/lang/sk.json b/plugins/Login/lang/sk.json
index cdbc884839..a9db093f1c 100644
--- a/plugins/Login/lang/sk.json
+++ b/plugins/Login/lang/sk.json
@@ -3,14 +3,18 @@
         "ConfirmationLinkSent": "Potvrdzovací odkaz bol zaslaný na váš e-mail. Skontrolujte si došlú poštu a navštívte tento odkaz pre autorizovanie požiadavky pre zmenu hesla.",
         "ContactAdmin": "Možné dôvody: Váš server ma zakázanú funkciu mail(). <br \/>Skontaktujte svojho administrátora Piwik.",
         "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Používateľ s prístupom Super Používateľ nemôže byť autorizovaný pomocou '%s' mechanizmu.",
-        "ExceptionPasswordMD5HashExpected": "Očakávajte že heslo bude v MD5 hash.",
-        "InvalidOrExpiredToken": "Token je neplatný, alebo už vypršal.",
+        "ExceptionPasswordMD5HashExpected": "Parameter hesla je očakávaný ako MD5 hash hesla.",
+        "InvalidNonceOrHeadersOrReferrer": "Bezpečnosť formuláru zlyhala. Prosím znovu načítajte formulár a overte, že cookies sú aktivované. Ak používate proxy server, musíte %1$s konfigurovať Piwik aby akceptoval proxy hlavičku%2$s ktorá presmerúva hlavičku Hostiteľa. Tiež skontrolujte, že hlavička Referrer je poslaná správne.",
+        "InvalidOrExpiredToken": "Token je neplatný alebo už vypršal.",
         "InvalidUsernameEmail": "Neplatné meno používateľa alebo e-mailová adresa",
         "LogIn": "Prihlásiť sa",
         "LoginOrEmail": "Používateľské meno alebo e-mail",
         "LoginPasswordNotCorrect": "Meno používateľa a heslo nie sú správne",
         "LostYourPassword": "Zabudli ste heslo?",
+        "ChangeYourPassword": "Zmeniť heslo",
         "MailTopicPasswordChange": "Potvrďte zmenu hesla",
+        "NewPassword": "Nové heslo",
+        "NewPasswordRepeat": "Nové heslo (znovu)",
         "PasswordChanged": "Vaše heslo bolo zmenené.",
         "PasswordRepeat": "Heslo (znovu)",
         "PasswordsDoNotMatch": "Heslá sa nezhodujú.",
diff --git a/plugins/Marketplace/lang/et.json b/plugins/Marketplace/lang/et.json
index ecda36197d..62222e20d8 100644
--- a/plugins/Marketplace/lang/et.json
+++ b/plugins/Marketplace/lang/et.json
@@ -4,9 +4,11 @@
         "ActionActivatePlugin": "Aktiveeri lisatarkvara",
         "ActionActivateTheme": "Aktiveeri kujundus",
         "ActionInstall": "Paigalda",
+        "AddToCart": "Lisa ostukorvi",
         "Authors": "Autorid",
         "BackToMarketplace": "Tagasi Marketisse",
         "ByXDevelopers": "arendajate %s poolt",
+        "CannotInstall": "Ei saa paigaldada",
         "Developer": "Arendaja",
         "Marketplace": "Market",
         "FeaturedPlugin": "Esiletõstetud lisatarkvara",
diff --git a/plugins/Marketplace/lang/uk.json b/plugins/Marketplace/lang/uk.json
index af593a7b8d..19cb6c1b9c 100644
--- a/plugins/Marketplace/lang/uk.json
+++ b/plugins/Marketplace/lang/uk.json
@@ -64,7 +64,7 @@
         "OverviewPluginSubscriptionsMissingInfo": "Можливо не вистачає підписки, наприклад, якщо платіж ще не завершився. У такому випадку спробуйте ще раз через кілька годин, або зв'яжіться з командою Piwik.",
         "NoValidSubscriptionNoUpdates": "Після закінчення підписки ви більше не будете отримувати оновлення для цього плагіна.",
         "PluginSubscriptionsList": "Це список користувачів, пов'язаних з вашим ліцензійним ключем.",
-        "PaidPluginsNoLicenseKeyIntro": "Якщо ви придбали %1$sсплатний преміум плагін%2$s, будь ласка, введіть отриманий ліцензійний ключ нижче.",
+        "PaidPluginsNoLicenseKeyIntro": "Якщо ви придбали %1$sплатний преміум плагін%2$s, будь ласка, введіть отриманий ліцензійний ключ нижче.",
         "PaidPluginsWithLicenseKeyIntro": "Ліцензійний ключ був створений. З міркувань безпеки ми не показуємо ліцензійний ключ тут. Якщо ви втратили свій ліцензійний ключ, будь ласка, зв'яжіться з командою Piwik.",
         "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "У разі, якщо Ви придбали %1$sплатний премум плагін%2$s в Маркеті, попросіть користувача з супер доступом, щоб він додав ліцензійний ключ.",
         "PluginDescription": "Розширити і розширити функціональні можливості Piwik через Маркет шляхом завантаження плагінів і тем.",
diff --git a/plugins/Marketplace/stylesheets/plugin-details.less b/plugins/Marketplace/stylesheets/plugin-details.less
index 46ca2b7526..347c832356 100644
--- a/plugins/Marketplace/stylesheets/plugin-details.less
+++ b/plugins/Marketplace/stylesheets/plugin-details.less
@@ -100,4 +100,8 @@
         margin-right: 5px;
     }
 
+    img {
+        max-width: 100%;
+    }
+
 }
diff --git a/plugins/MobileAppMeasurable/lang/et.json b/plugins/MobileAppMeasurable/lang/et.json
new file mode 100644
index 0000000000..50f26bdb93
--- /dev/null
+++ b/plugins/MobileAppMeasurable/lang/et.json
@@ -0,0 +1,6 @@
+{
+    "MobileAppMeasurable": {
+        "MobileApp": "Mobiilirakendus",
+        "MobileApps": "Mobiilirakendused"
+    }
+}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/en.json b/plugins/MobileMessaging/lang/en.json
index 8414a84ef6..92f5581bda 100644
--- a/plugins/MobileMessaging/lang/en.json
+++ b/plugins/MobileMessaging/lang/en.json
@@ -27,7 +27,7 @@
         "Settings_PhoneNumbers_Add": "Add a new Phone Number",
         "Settings_PhoneNumbers_CountryCode_Help": "If you do not know the phone country code, look for your country here.",
         "Settings_PhoneNumbers_Help": "Before receiving SMS (text messages) reports on a phone, the phone number must be entered below.",
-        "Settings_PhoneNumbers_HelpAdd": "When you click \"Add\", a SMS containing a code will be sent to the phone. The user receiving the code should then login to Piwik, click on Settings, then click on Mobile Messaging. After entering the code, the user will be able to receive text reports on his phone.",
+        "Settings_PhoneNumbers_HelpAdd": "When you click \"Add\", a SMS containing a code will be sent to the phone. The user receiving the code should then login to Piwik, click on Settings, then click on Mobile Messaging. After entering the code, the user will be able to receive text reports on their phone.",
         "Settings_PleaseSignUp": "To create SMS reports and receive short text messages with your websites' stats on your mobile phone, please sign up with the SMS API and enter your information below.",
         "Settings_SMSAPIAccount": "Manage SMS API Account",
         "Settings_SMSProvider": "SMS Provider",
diff --git a/plugins/MobileMessaging/lang/et.json b/plugins/MobileMessaging/lang/et.json
index 9e05406d50..f7c0d58c72 100644
--- a/plugins/MobileMessaging/lang/et.json
+++ b/plugins/MobileMessaging/lang/et.json
@@ -2,6 +2,8 @@
     "MobileMessaging": {
         "PhoneNumbers": "Telefoninumbrid",
         "Settings_APIKey": "API võti",
+        "Settings_CountryCode": "Riigikood",
+        "Settings_SelectCountry": "Vali riik",
         "Settings_CredentialNotProvided": "Enne kui saad luua ja hallata telefoninumbreid, palun ühenda Piwik oma SMS kontoga ülal.",
         "Settings_CredentialNotProvidedByAdmin": "Enne kui saad luua ja hallata telefoninumbreid, palu Piwiku haldajal luua ühendus SMS kontoga.",
         "Settings_CredentialProvided": "Sinu %s SMS API konto on korrektselt seadistatud!",
diff --git a/plugins/Morpheus/fonts/piwik.svg b/plugins/Morpheus/fonts/piwik.svg
index b48f0bcb13..1d0176dd66 100644
--- a/plugins/Morpheus/fonts/piwik.svg
+++ b/plugins/Morpheus/fonts/piwik.svg
@@ -114,8 +114,11 @@
 <glyph unicode="&#xe657;" glyph-name="user-manage" data-tags="uniE657" d="M695 501q5 1 9 2t8 1q11 0 20 5.5t16 12.5l202 202q18 17 18 41.5t-18 41.5l-63 64q-17 17-41.5 17t-41.5-17l-202-201q-8-8-13-17.5t-6-19.5q0-5-0.5-9t-2.5-8q-4-17-0.5-33.5t15.5-28.5l40-39q12-12 28-15t32 1v0zM206 167l-10 10-50-40-83-132 21-22 132 84 40 50-9 9 167 167-42 41-166-167zM434 630q14 52 1 105.5t-53 94.5q-41 40-94.5 53.5t-104.5-0.5l116-116-30-114-114-30-116 116q-14-52-0.5-105t53.5-94q42-42 98.5-54.5t109.5 5.5l478-478q14-14 32-21t37-7q18 0 36 7t32 21q28 28 28 68t-28 69l-481 480zM855 29q-16 0-26.5 11t-10.5 26 10.5 26 26.5 11q15 0 26-11t11-26-11-26-26-11v0 0z" />
 <glyph unicode="&#xe658;" glyph-name="user-personal" data-tags="uniE658" d="M600 648q0-38-14.5-83t-39.5-83.5-58.5-64-71.5-25.5-71.5 25.5-58.5 64-39.5 83.5-14.5 83q0 76 54 130t130 54 130-54 54-130v0zM763 64q15 0 26 11.5t11 28.5v0 1q0 60-30 113.5t-82.5 93.5-122 63-149.5 23-149.5-23-122-63-82.5-93.5-30-113.5v-1q0-17 11-28.5t26-11.5h694zM944 736h-192q-20 0-34-14t-14-34 14-34 34-14h192q20 0 34 14t14 34-14 34-34 14v0zM944 544h-192q-20 0-34-14t-14-34 14-34 34-14h192q20 0 34 14t14 34-14 34-34 14v0zM944 352h-96q-20 0-34-14t-14-34 14-34 34-14h96q20 0 34 14t14 34-14 34-34 14v0z" />
 <glyph unicode="&#xe659;" glyph-name="user-platform" data-tags="uniE659" d="M960 896h-896q-26 0-45-19t-19-45v-640q0-26 19-45t45-19h320l-64-128h-33q-13 0-22-9t-9-22v-2q0-13 9-22t22-9h450q13 0 22 9t9 22v2q0 13-9 22t-22 9h-33l-64 128h320q26 0 45 19t19 45v640q0 26-19 45t-45 19v0zM960 320h-896v512h896v-512z" />
+<glyph unicode="&#xe85d;" glyph-name="assignment" data-tags="assignment" d="M742.038 585.592v92.444h-460.074v-92.444h460.074zM742.038 402.852v90.296h-460.074v-90.296h460.074zM604.444 217.962v92.444h-322.482v-92.444h322.482zM512 860.778c-25.798 0-45.148-19.348-45.148-45.148s19.348-47.298 45.148-47.298 45.148 21.498 45.148 47.298-19.348 45.148-45.148 45.148zM832.332 860.778c49.448 0 92.444-42.998 92.444-92.444v-640.666c0-49.448-42.998-92.444-92.444-92.444h-640.666c-49.448 0-92.444 42.998-92.444 92.444v640.666c0 49.448 42.998 92.444 92.444 92.444h191.34c19.348 53.748 68.796 92.444 128.992 92.444s109.644-38.698 128.992-92.444h191.34z" />
 <glyph unicode="&#xe88e;" glyph-name="info2" data-tags="info" d="M562.479 580.507v103.361h-100.958v-103.361h100.958zM562.479 169.465v307.681h-100.958v-307.681h100.958zM512 938.667c283.643 0 512-228.357 512-512s-228.357-512-512-512-512 228.357-512 512 228.357 512 512 512z" />
 <glyph unicode="&#xe88f;" glyph-name="info_outline" data-tags="info_outline" d="M461.521 580.507v103.361h100.958v-103.361h-100.958zM512 15.625c225.953 0 411.042 185.089 411.042 411.042s-185.089 411.042-411.042 411.042-411.042-185.089-411.042-411.042 185.089-411.042 411.042-411.042zM512 938.667c283.643 0 512-228.357 512-512s-228.357-512-512-512-512 228.357-512 512 228.357 512 512 512zM461.521 169.465v307.681h100.958v-307.681h-100.958z" />
 <glyph unicode="&#xe8b8;" glyph-name="settings" data-tags="settings" d="M512 246.385c98.554 0 180.282 81.728 180.282 180.282s-81.728 180.282-180.282 180.282-180.282-81.728-180.282-180.282 81.728-180.282 180.282-180.282zM894.197 376.188l108.169-84.131c9.615-7.211 12.019-21.634 4.808-33.653l-103.361-177.878c-7.211-12.019-19.23-14.423-31.249-9.615l-127.399 50.479c-26.441-19.23-55.286-38.46-86.535-50.479l-19.23-134.61c-2.404-12.019-12.019-21.634-24.038-21.634h-206.723c-12.019 0-21.634 9.615-24.038 21.634l-19.23 134.61c-31.249 12.019-60.094 28.845-86.535 50.479l-127.399-50.479c-12.019-4.808-24.038-2.404-31.249 9.615l-103.361 177.878c-7.211 12.019-4.808 26.441 4.808 33.653l108.169 84.131c-2.404 16.826-2.404 33.653-2.404 50.479s0 33.653 2.404 50.479l-108.169 84.131c-9.615 7.211-12.019 21.634-4.808 33.653l103.361 177.878c7.211 12.019 19.23 14.423 31.249 9.615l127.399-50.479c26.441 19.23 55.286 38.46 86.535 50.479l19.23 134.61c2.404 12.019 12.019 21.634 24.038 21.634h206.723c12.019 0 21.634-9.615 24.038-21.634l19.23-134.61c31.249-12.019 60.094-28.845 86.535-50.479l127.399 50.479c12.019 4.808 24.038 2.404 31.249-9.615l103.361-177.878c7.211-12.019 4.808-26.441-4.808-33.653l-108.169-84.131c2.404-16.826 2.404-33.653 2.404-50.479s0-33.653-2.404-50.479z" />
+<glyph unicode="&#xe95e;" glyph-name="archive" data-tags="box-add, box, download, storage, inbox, archive" d="M832 896h-640l-192-192v-672c0-17.674 14.326-32 32-32h960c17.672 0 32 14.326 32 32v672l-192 192zM512 128l-320 256h192v192h256v-192h192l-320-256zM154.51 768l64 64h586.978l64-64h-714.978z" />
+<glyph unicode="&#xe9aa;" glyph-name="lab" data-tags="lab, beta, beaker, test, experiment" d="M956.29 155.518l-316.29 527.024v213.458h32c17.6 0 32 14.4 32 32s-14.4 32-32 32h-320c-17.6 0-32-14.4-32-32s14.4-32 32-32h32v-213.458l-316.288-527.024c-72.442-120.734-16.512-219.518 124.288-219.518h640c140.8 0 196.73 98.784 124.29 219.518zM241.038 320l206.962 344.938v231.062h128v-231.062l206.964-344.938h-541.926z" />
 <glyph unicode="&#xea5b;" glyph-name="funnel" data-tags="filter, funnel" d="M512 960c-282.77 0-512-71.634-512-160v-96l384-384v-320c0-35.346 57.306-64 128-64 70.692 0 128 28.654 128 64v320l384 384v96c0 88.366-229.23 160-512 160zM94.384 821.176c23.944 13.658 57.582 26.62 97.278 37.488 87.944 24.076 201.708 37.336 320.338 37.336 118.628 0 232.394-13.26 320.338-37.336 39.696-10.868 73.334-23.83 97.28-37.488 15.792-9.006 24.324-16.624 28.296-21.176-3.972-4.552-12.506-12.168-28.296-21.176-23.946-13.658-57.584-26.62-97.28-37.488-87.942-24.076-201.708-37.336-320.338-37.336s-232.394 13.26-320.338 37.336c-39.696 10.868-73.334 23.83-97.278 37.488-15.792 9.008-24.324 16.624-28.298 21.176 3.974 4.552 12.506 12.168 28.298 21.176z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/plugins/Morpheus/fonts/piwik.ttf b/plugins/Morpheus/fonts/piwik.ttf
index b4998f16af..83d95f1742 100755
--- a/plugins/Morpheus/fonts/piwik.ttf
+++ b/plugins/Morpheus/fonts/piwik.ttf
diff --git a/plugins/Morpheus/fonts/piwik.woff b/plugins/Morpheus/fonts/piwik.woff
index 8e0035ab9b..ee16b4a277 100644
--- a/plugins/Morpheus/fonts/piwik.woff
+++ b/plugins/Morpheus/fonts/piwik.woff
diff --git a/plugins/Morpheus/fonts/selection.json b/plugins/Morpheus/fonts/selection.json
index de49a2c70d..cc873bd6ef 100644
--- a/plugins/Morpheus/fonts/selection.json
+++ b/plugins/Morpheus/fonts/selection.json
@@ -26,7 +26,7 @@
         "name": "alien"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 0
     },
     {
@@ -54,7 +54,7 @@
         "name": "annotation"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 1
     },
     {
@@ -79,7 +79,7 @@
         "name": "arrow-left"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 2
     },
     {
@@ -104,7 +104,7 @@
         "name": "arrow-right"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 3
     },
     {
@@ -131,7 +131,7 @@
         "name": "business"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 4
     },
     {
@@ -162,7 +162,7 @@
         "name": "calendar"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 5
     },
     {
@@ -189,7 +189,7 @@
         "name": "chart-bar"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 6
     },
     {
@@ -214,7 +214,7 @@
         "name": "chart-line-details"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 7
     },
     {
@@ -239,7 +239,7 @@
         "name": "chart-line"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 8
     },
     {
@@ -265,7 +265,7 @@
         "name": "chart-pie"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 9
     },
     {
@@ -291,7 +291,7 @@
         "name": "close"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 10
     },
     {
@@ -317,7 +317,7 @@
         "name": "collapsed-arrows"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 11
     },
     {
@@ -343,7 +343,7 @@
         "name": "configure"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 12
     },
     {
@@ -368,7 +368,7 @@
         "name": "datepicker-arr-l"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 13
     },
     {
@@ -393,7 +393,7 @@
         "name": "datepicker-arr-r"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 14
     },
     {
@@ -419,7 +419,7 @@
         "name": "delete"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 15
     },
     {
@@ -450,7 +450,7 @@
         "name": "document"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 16
     },
     {
@@ -478,7 +478,7 @@
         "name": "download"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 17
     },
     {
@@ -504,7 +504,7 @@
         "name": "drop"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 18
     },
     {
@@ -530,7 +530,7 @@
         "name": "ecommerce-abandoned"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 19
     },
     {
@@ -556,7 +556,7 @@
         "name": "ecommerce-order"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 20
     },
     {
@@ -581,7 +581,7 @@
         "name": "email"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 21
     },
     {
@@ -606,7 +606,7 @@
         "name": "error"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 22
     },
     {
@@ -632,7 +632,7 @@
         "name": "export"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 23
     },
     {
@@ -657,7 +657,7 @@
         "name": "feed"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 24
     },
     {
@@ -683,7 +683,7 @@
         "name": "finance"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 25
     },
     {
@@ -708,7 +708,7 @@
         "name": "folder-charts"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 26
     },
     {
@@ -733,7 +733,7 @@
         "name": "folder"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 27
     },
     {
@@ -761,7 +761,7 @@
         "name": "fullscreen"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 28
     },
     {
@@ -788,7 +788,7 @@
         "name": "goal"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 29
     },
     {
@@ -813,7 +813,7 @@
         "name": "help-alt"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 30
     },
     {
@@ -838,7 +838,7 @@
         "name": "help"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 31
     },
     {
@@ -866,7 +866,7 @@
         "name": "code"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 32
     },
     {
@@ -891,7 +891,7 @@
         "name": "alert"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 33
     },
     {
@@ -918,7 +918,7 @@
         "name": "edit"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 34
     },
     {
@@ -945,7 +945,7 @@
         "name": "image"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 35
     },
     {
@@ -973,7 +973,7 @@
         "name": "info"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 36
     },
     {
@@ -999,7 +999,7 @@
         "name": "insights"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 37
     },
     {
@@ -1031,7 +1031,7 @@
         "name": "locked-2"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 38
     },
     {
@@ -1056,7 +1056,7 @@
         "name": "locked"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 39
     },
     {
@@ -1081,7 +1081,7 @@
         "name": "locked-3"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 40
     },
     {
@@ -1106,7 +1106,7 @@
         "name": "locked-4"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 41
     },
     {
@@ -1134,7 +1134,7 @@
         "name": "maximise"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 42
     },
     {
@@ -1159,7 +1159,7 @@
         "name": "minimise"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 43
     },
     {
@@ -1184,7 +1184,7 @@
         "name": "minus"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 44
     },
     {
@@ -1209,7 +1209,7 @@
         "name": "newtab"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 45
     },
     {
@@ -1234,7 +1234,7 @@
         "name": "ok"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 46
     },
     {
@@ -1259,7 +1259,7 @@
         "name": "open-source"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 47
     },
     {
@@ -1284,7 +1284,7 @@
         "name": "add"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 48
     },
     {
@@ -1309,7 +1309,7 @@
         "name": "puzzle"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 49
     },
     {
@@ -1334,7 +1334,7 @@
         "name": "refresh"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 50
     },
     {
@@ -1360,7 +1360,7 @@
         "name": "reload"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 51
     },
     {
@@ -1386,7 +1386,7 @@
         "name": "search"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 52
     },
     {
@@ -1416,7 +1416,7 @@
         "name": "users"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 53
     },
     {
@@ -1445,7 +1445,7 @@
         "name": "server-alt"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 54
     },
     {
@@ -1474,7 +1474,7 @@
         "name": "server"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 55
     },
     {
@@ -1499,7 +1499,7 @@
         "name": "hide"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 56
     },
     {
@@ -1525,7 +1525,7 @@
         "name": "show"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 57
     },
     {
@@ -1550,7 +1550,7 @@
         "name": "arrow-top"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 58
     },
     {
@@ -1575,7 +1575,7 @@
         "name": "arrow-bottom"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 59
     },
     {
@@ -1600,7 +1600,7 @@
         "name": "star"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 60
     },
     {
@@ -1625,7 +1625,7 @@
         "name": "success"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 61
     },
     {
@@ -1658,7 +1658,7 @@
         "name": "table-more"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 62
     },
     {
@@ -1689,7 +1689,7 @@
         "name": "table"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 63
     },
     {
@@ -1715,7 +1715,7 @@
         "name": "tag-cloud"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 64
     },
     {
@@ -1740,7 +1740,7 @@
         "name": "user"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 65
     },
     {
@@ -1768,7 +1768,7 @@
         "name": "user-add"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 66
     },
     {
@@ -1793,7 +1793,7 @@
         "name": "play"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 67
     },
     {
@@ -1823,7 +1823,7 @@
         "name": "visitor-profile"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 68
     },
     {
@@ -1851,7 +1851,7 @@
         "name": "zoom-in"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 69
     },
     {
@@ -1878,7 +1878,7 @@
         "name": "zoom-out"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 70
     },
     {
@@ -1906,7 +1906,7 @@
         "name": "sign-out"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 71
     },
     {
@@ -1933,7 +1933,7 @@
         "name": "sign-in"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 72
     },
     {
@@ -1960,7 +1960,7 @@
         "name": "menu-hamburger"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 73
     },
     {
@@ -1987,7 +1987,7 @@
         "name": "menu-horiz"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 74
     },
     {
@@ -2014,7 +2014,7 @@
         "name": "menu-verti"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 75
     },
     {
@@ -2041,7 +2041,7 @@
         "name": "admin-administration"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 76
     },
     {
@@ -2068,7 +2068,7 @@
         "name": "admin-development"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 77
     },
     {
@@ -2095,7 +2095,7 @@
         "name": "admin-diagnostic"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 78
     },
     {
@@ -2122,7 +2122,7 @@
         "name": "admin-platform"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 79
     },
     {
@@ -2149,7 +2149,7 @@
         "name": "admin-settings"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 80
     },
     {
@@ -2176,7 +2176,7 @@
         "name": "reporting-actions"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 81
     },
     {
@@ -2203,7 +2203,7 @@
         "name": "reporting-dashboard"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 82
     },
     {
@@ -2230,7 +2230,7 @@
         "name": "reporting-ecommerce"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 83
     },
     {
@@ -2257,7 +2257,7 @@
         "name": "reporting-goal"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 84
     },
     {
@@ -2284,7 +2284,7 @@
         "name": "reporting-referer"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 85
     },
     {
@@ -2311,7 +2311,7 @@
         "name": "reporting-visitors"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 86
     },
     {
@@ -2338,7 +2338,7 @@
         "name": "user-manage"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 87
     },
     {
@@ -2365,7 +2365,7 @@
         "name": "user-personal"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 88
     },
     {
@@ -2392,7 +2392,7 @@
         "name": "user-platform"
       },
       "setIdx": 0,
-      "setId": 6,
+      "setId": 15,
       "iconIdx": 89
     },
     {
@@ -2419,7 +2419,7 @@
         "name": "info2"
       },
       "setIdx": 1,
-      "setId": 5,
+      "setId": 14,
       "iconIdx": 0
     },
     {
@@ -2446,7 +2446,7 @@
         "name": "info_outline"
       },
       "setIdx": 1,
-      "setId": 5,
+      "setId": 14,
       "iconIdx": 1
     },
     {
@@ -2473,34 +2473,122 @@
         "name": "settings"
       },
       "setIdx": 1,
-      "setId": 5,
+      "setId": 14,
       "iconIdx": 2
     },
     {
       "icon": {
         "paths": [
+          "M742.038 374.408v-92.444h-460.074v92.444h460.074zM742.038 557.148v-90.296h-460.074v90.296h460.074zM604.444 742.038v-92.444h-322.482v92.444h322.482zM512 99.222c-25.798 0-45.148 19.348-45.148 45.148s19.348 47.298 45.148 47.298 45.148-21.498 45.148-47.298-19.348-45.148-45.148-45.148zM832.332 99.222c49.448 0 92.444 42.998 92.444 92.444v640.666c0 49.448-42.998 92.444-92.444 92.444h-640.666c-49.448 0-92.444-42.998-92.444-92.444v-640.666c0-49.448 42.998-92.444 92.444-92.444h191.34c19.348-53.748 68.796-92.444 128.992-92.444s109.644 38.698 128.992 92.444h191.34z"
+        ],
+        "attrs": [],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": [
+          "assignment"
+        ],
+        "defaultCode": 59485,
+        "grid": 32
+      },
+      "attrs": [],
+      "properties": {
+        "order": 210,
+        "ligatures": "assignment",
+        "id": 3,
+        "prevSize": 24,
+        "code": 59485,
+        "name": "assignment"
+      },
+      "setIdx": 1,
+      "setId": 14,
+      "iconIdx": 3
+    },
+    {
+      "icon": {
+        "paths": [
           "M512 0c-282.77 0-512 71.634-512 160v96l384 384v320c0 35.346 57.306 64 128 64 70.692 0 128-28.654 128-64v-320l384-384v-96c0-88.366-229.23-160-512-160zM94.384 138.824c23.944-13.658 57.582-26.62 97.278-37.488 87.944-24.076 201.708-37.336 320.338-37.336 118.628 0 232.394 13.26 320.338 37.336 39.696 10.868 73.334 23.83 97.28 37.488 15.792 9.006 24.324 16.624 28.296 21.176-3.972 4.552-12.506 12.168-28.296 21.176-23.946 13.658-57.584 26.62-97.28 37.488-87.942 24.076-201.708 37.336-320.338 37.336s-232.394-13.26-320.338-37.336c-39.696-10.868-73.334-23.83-97.278-37.488-15.792-9.008-24.324-16.624-28.298-21.176 3.974-4.552 12.506-12.168 28.298-21.176z"
         ],
+        "attrs": [],
+        "isMulticolor": false,
+        "isMulticolor2": false,
         "tags": [
           "filter",
           "funnel"
         ],
         "defaultCode": 59995,
-        "grid": 16,
-        "attrs": []
+        "grid": 16
       },
       "attrs": [],
       "properties": {
         "ligatures": "filter, funnel",
         "name": "funnel",
         "order": 203,
-        "id": 348,
+        "id": 0,
         "prevSize": 32,
         "code": 59995
       },
-      "setIdx": 5,
+      "setIdx": 2,
+      "setId": 13,
+      "iconIdx": 0
+    },
+    {
+      "icon": {
+        "paths": [
+          "M832 64h-640l-192 192v672c0 17.674 14.326 32 32 32h960c17.672 0 32-14.326 32-32v-672l-192-192zM512 832l-320-256h192v-192h256v192h192l-320 256zM154.51 192l64-64h586.978l64 64h-714.978z"
+        ],
+        "tags": [
+          "box-add",
+          "box",
+          "download",
+          "storage",
+          "inbox",
+          "archive"
+        ],
+        "defaultCode": 59742,
+        "grid": 16,
+        "attrs": []
+      },
+      "attrs": [],
+      "properties": {
+        "ligatures": "box-add, box3",
+        "name": "archive",
+        "order": 211,
+        "id": 95,
+        "prevSize": 32,
+        "code": 59742
+      },
+      "setIdx": 14,
+      "setId": 1,
+      "iconIdx": 94
+    },
+    {
+      "icon": {
+        "paths": [
+          "M956.29 804.482l-316.29-527.024v-213.458h32c17.6 0 32-14.4 32-32s-14.4-32-32-32h-320c-17.6 0-32 14.4-32 32s14.4 32 32 32h32v213.458l-316.288 527.024c-72.442 120.734-16.512 219.518 124.288 219.518h640c140.8 0 196.73-98.784 124.29-219.518zM241.038 640l206.962-344.938v-231.062h128v231.062l206.964 344.938h-541.926z"
+        ],
+        "tags": [
+          "lab",
+          "beta",
+          "beaker",
+          "test",
+          "experiment"
+        ],
+        "defaultCode": 59818,
+        "grid": 16,
+        "attrs": []
+      },
+      "attrs": [],
+      "properties": {
+        "ligatures": "lab, beta",
+        "name": "lab",
+        "order": 212,
+        "id": 171,
+        "prevSize": 32,
+        "code": 59818
+      },
+      "setIdx": 14,
       "setId": 1,
-      "iconIdx": 347
+      "iconIdx": 170
     }
   ],
   "height": 1024,
diff --git a/plugins/Morpheus/images/calendar.gif b/plugins/Morpheus/images/calendar.gif
deleted file mode 100644
index ec93ddf260..0000000000
--- a/plugins/Morpheus/images/calendar.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/calendar.png b/plugins/Morpheus/images/calendar.png
new file mode 100644
index 0000000000..275c10bd67
--- /dev/null
+++ b/plugins/Morpheus/images/calendar.png
diff --git a/plugins/Morpheus/images/collapsed_arrows.gif b/plugins/Morpheus/images/collapsed_arrows.gif
deleted file mode 100644
index 458728fdec..0000000000
--- a/plugins/Morpheus/images/collapsed_arrows.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/collapsed_arrows.png b/plugins/Morpheus/images/collapsed_arrows.png
new file mode 100644
index 0000000000..9ebb885294
--- /dev/null
+++ b/plugins/Morpheus/images/collapsed_arrows.png
diff --git a/plugins/Morpheus/images/ecommerceAbandonedCart.gif b/plugins/Morpheus/images/ecommerceAbandonedCart.gif
deleted file mode 100644
index b4ec1d75f7..0000000000
--- a/plugins/Morpheus/images/ecommerceAbandonedCart.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/ecommerceAbandonedCart.png b/plugins/Morpheus/images/ecommerceAbandonedCart.png
new file mode 100644
index 0000000000..b0e83ae2cf
--- /dev/null
+++ b/plugins/Morpheus/images/ecommerceAbandonedCart.png
diff --git a/plugins/Morpheus/images/ecommerceOrder.gif b/plugins/Morpheus/images/ecommerceOrder.gif
deleted file mode 100644
index 664e035509..0000000000
--- a/plugins/Morpheus/images/ecommerceOrder.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/ecommerceOrder.png b/plugins/Morpheus/images/ecommerceOrder.png
new file mode 100644
index 0000000000..ed8bc4998e
--- /dev/null
+++ b/plugins/Morpheus/images/ecommerceOrder.png
diff --git a/plugins/Morpheus/images/expanded_arrows.gif b/plugins/Morpheus/images/expanded_arrows.gif
deleted file mode 100644
index ed33959206..0000000000
--- a/plugins/Morpheus/images/expanded_arrows.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/expanded_arrows.png b/plugins/Morpheus/images/expanded_arrows.png
new file mode 100644
index 0000000000..eaf98d9ffa
--- /dev/null
+++ b/plugins/Morpheus/images/expanded_arrows.png
diff --git a/plugins/Morpheus/images/icon-calendar.gif b/plugins/Morpheus/images/icon-calendar.gif
deleted file mode 100644
index bf90166633..0000000000
--- a/plugins/Morpheus/images/icon-calendar.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/icon-calendar.png b/plugins/Morpheus/images/icon-calendar.png
new file mode 100644
index 0000000000..7539fdb7f6
--- /dev/null
+++ b/plugins/Morpheus/images/icon-calendar.png
diff --git a/plugins/Morpheus/images/li_dbl_gray.gif b/plugins/Morpheus/images/li_dbl_gray.gif
deleted file mode 100644
index 42fe8b3b89..0000000000
--- a/plugins/Morpheus/images/li_dbl_gray.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/li_dbl_gray.png b/plugins/Morpheus/images/li_dbl_gray.png
new file mode 100644
index 0000000000..19764affd0
--- /dev/null
+++ b/plugins/Morpheus/images/li_dbl_gray.png
diff --git a/plugins/Morpheus/images/link.gif b/plugins/Morpheus/images/link.gif
deleted file mode 100644
index 543c76d96c..0000000000
--- a/plugins/Morpheus/images/link.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/link.png b/plugins/Morpheus/images/link.png
new file mode 100644
index 0000000000..d3af66f4ae
--- /dev/null
+++ b/plugins/Morpheus/images/link.png
diff --git a/plugins/Morpheus/images/logo-email.png b/plugins/Morpheus/images/logo-email.png
new file mode 100644
index 0000000000..6a717c69cb
--- /dev/null
+++ b/plugins/Morpheus/images/logo-email.png
diff --git a/plugins/Morpheus/images/paypal_subscribe.gif b/plugins/Morpheus/images/paypal_subscribe.gif
deleted file mode 100755
index 50d8ee52e9..0000000000
--- a/plugins/Morpheus/images/paypal_subscribe.gif
+++ /dev/null
diff --git a/plugins/Morpheus/images/paypal_subscribe.png b/plugins/Morpheus/images/paypal_subscribe.png
new file mode 100644
index 0000000000..975c136f64
--- /dev/null
+++ b/plugins/Morpheus/images/paypal_subscribe.png
diff --git a/plugins/Morpheus/stylesheets/base/icons.css b/plugins/Morpheus/stylesheets/base/icons.css
index 9a3fd839f1..2c19c30050 100644
--- a/plugins/Morpheus/stylesheets/base/icons.css
+++ b/plugins/Morpheus/stylesheets/base/icons.css
@@ -1,6 +1,6 @@
 @font-face {
     font-family: 'piwik';
-    src: url('plugins/Morpheus/fonts/piwik.woff?42xrcb') format('woff');
+    src: url('plugins/Morpheus/fonts/piwik.woff?43xrdb') format('woff');
     font-weight: normal;
     font-style: normal;
 }
@@ -307,4 +307,12 @@
 .icon-funnel:before {
 	content: "\ea5b";
 }
-
+.icon-form:before {
+    content: "\e85d";
+}
+.icon-lab:before {
+    content: "\e9aa";
+}
+.icon-archive:before {
+    content: "\e95e";
+}
\ No newline at end of file
diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less
index 7f709e8c1b..db3515a1f6 100644
--- a/plugins/Morpheus/stylesheets/main.less
+++ b/plugins/Morpheus/stylesheets/main.less
@@ -26,9 +26,11 @@ h2 {
     width: 100%;
     padding: 16px 0 16px 0;
     margin: 0;
-    a, a:hover {
-        text-decoration: none;
+    .inlineHelp {
+      a, a:hover {
+        text-decoration: underline;
         color: @theme-color-text;
+      }
     }
 }
 h3 {
@@ -212,7 +214,6 @@ p {
       margin-right: 0;
       a {
         font-family: @theme-fontFamily-base;
-        font-size: 11px;
         line-height: 12px;
         display: inline-block;
         width: 100%;
@@ -505,9 +506,6 @@ div.sparkline {
     top: -19px;
 }
 
-.visitor-profile-date {
-    padding-top: 3px;
-}
 
 .visitor-profile-more-info > a {
     color: @theme-color-link;
@@ -524,43 +522,34 @@ div.sparkline {
     li {
         margin: 0 !important;
         background: @color-silver-l95;
-        padding: 5px 10px !important;
-        border-bottom: 1px solid @color-silver-l80;
+        padding: 7px 10px !important;
         > div {
             border: 0px !important;
             margin: 0 !important;
         }
-
-        &:first-child {
-            border-top: 1px solid @color-silver-l80;
-        }
     }
 
     ol.visitor-profile-visits {
         > li {
             padding: 0 0 0 !important;
             span {
-                color: @theme-color-text-lighter;
-                .font-default(13px, 18px);
                 font-weight: normal;
                 margin-right: 20px;
             }
 
-            h2 {
-                margin-left: 20px;
-                margin-bottom: 12px;
-            }
-
             ol {
                 background: @theme-color-background-contrast !important;
                 border-top: 0 !important;
                 li {
                     background: @theme-color-background-contrast !important;
-                    .font-default(11px, 19px);
                     font-weight: normal;
                     color: @theme-color-text-lighter;
                     &:last-child {
                         border-bottom: 0 !important;
+                        padding-bottom: 20px !important;
+                    }
+                    &:first-child {
+                        padding-top: 20px !important;
                     }
                 }
             }
@@ -568,14 +557,6 @@ div.sparkline {
     }
 }
 
-.visitor-profile-visit-title-row {
-  padding-top:10px;
-
-  &:hover {
-    background-color: @color-silver-l90;
-  }
-}
-
 .widget .visitor-profile .visitor-profile-info > div > div {
     min-width: 100% !important;
 }
@@ -602,31 +583,7 @@ div.sparkline {
         }
     }
 
-    h1 {
-        .font-default(15px, 20px);
-        font-weight: normal;
-        color: @theme-color-text;
-    }
-
-    h2 {
-        .font-default(13px, 18px);
-        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);
-        }
-    }
 
     .visitor-profile-avatar {
        ul {
diff --git a/plugins/Morpheus/stylesheets/ui/_popups.less b/plugins/Morpheus/stylesheets/ui/_popups.less
index 05f13f8f18..4ffa175a59 100644
--- a/plugins/Morpheus/stylesheets/ui/_popups.less
+++ b/plugins/Morpheus/stylesheets/ui/_popups.less
@@ -1,6 +1,10 @@
 .ui-dialog-title {
     color: @theme-color-text;
     font-weight: normal;
+    img {
+        width: 16px;
+        height: 16px;
+    }
 }
 
 .ui-dialog .ui-widget-header {
diff --git a/plugins/Morpheus/stylesheets/uibase/_headerMessage.less b/plugins/Morpheus/stylesheets/uibase/_headerMessage.less
index 9afb25999f..1a00389f44 100644
--- a/plugins/Morpheus/stylesheets/uibase/_headerMessage.less
+++ b/plugins/Morpheus/stylesheets/uibase/_headerMessage.less
@@ -11,6 +11,7 @@
   &.update_available:not(.isPiwikDemo) .title {
     color: #CA8100;
     font-weight: bold;
+    cursor: default;
   }
 
   .icon-warning {
@@ -27,6 +28,9 @@
 
 #header_message .dropdown {
   font-size: 12px;
+  margin-top: 0px;
+  border-top:5px solid #edecec;
+  box-shadow: 8px 6px 7px 0px rgba(0, 0, 0, 0.3);
 }
 
 #header_message .header_short {
diff --git a/plugins/Morpheus/stylesheets/uibase/_periodSelect.less b/plugins/Morpheus/stylesheets/uibase/_periodSelect.less
index 95cad2a3c3..f31796b11b 100644
--- a/plugins/Morpheus/stylesheets/uibase/_periodSelect.less
+++ b/plugins/Morpheus/stylesheets/uibase/_periodSelect.less
@@ -43,7 +43,7 @@
   position:absolute;
   right: 19px;
   top: 9px;
-  background: url("plugins/Morpheus/images/icon-calendar.gif") no-repeat scroll;
+  background: url("plugins/Morpheus/images/icon-calendar.png") no-repeat scroll;
   cursor:pointer;
 }
 
diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig
index a663901446..621a8a6fdc 100644
--- a/plugins/Morpheus/templates/demo.twig
+++ b/plugins/Morpheus/templates/demo.twig
@@ -604,11 +604,13 @@
                         'delete',
                         'plus',
                         'minus',
+                        'archive'
                     ],
                     'Alerts': [
                         'error',
                         'warning',
                         'info',
+                        'info2',
                         'success',
                         'help',
                         'help-alt',
@@ -646,6 +648,8 @@
                         'chart-line',
                         'chart-line-details',
                         'funnel',
+                        'form',
+                        'lab'
                     ],
                     'Users': [
                         'user',
diff --git a/plugins/MultiSites/angularjs/site/site.directive.html b/plugins/MultiSites/angularjs/site/site.directive.html
index 57aba591eb..e5eec42a52 100644
--- a/plugins/MultiSites/angularjs/site/site.directive.html
+++ b/plugins/MultiSites/angularjs/site/site.directive.html
@@ -4,7 +4,7 @@
 
         <span style="width: 10px; margin-left:3px;">
             <a rel="noreferrer"  target="_blank" title="{{ 'General_GoTo'|translate:website.main_url }}" ng-href="{{ website.main_url }}">
-            <img src="plugins/Morpheus/images/link.gif"/></a>
+            <img src="plugins/Morpheus/images/link.png"/></a>
         </span>
     </td>
     <td ng-if="website.isGroup" class="multisites-label label">
diff --git a/plugins/MultiSites/images/arrow_asc.gif b/plugins/MultiSites/images/arrow_asc.gif
deleted file mode 100644
index df463fa72f..0000000000
--- a/plugins/MultiSites/images/arrow_asc.gif
+++ /dev/null
diff --git a/plugins/MultiSites/images/arrow_asc.png b/plugins/MultiSites/images/arrow_asc.png
new file mode 100644
index 0000000000..0c18e14aa6
--- /dev/null
+++ b/plugins/MultiSites/images/arrow_asc.png
diff --git a/plugins/MultiSites/images/arrow_desc.gif b/plugins/MultiSites/images/arrow_desc.gif
deleted file mode 100644
index e8234178ef..0000000000
--- a/plugins/MultiSites/images/arrow_desc.gif
+++ /dev/null
diff --git a/plugins/MultiSites/images/arrow_desc.png b/plugins/MultiSites/images/arrow_desc.png
new file mode 100644
index 0000000000..67e3b70809
--- /dev/null
+++ b/plugins/MultiSites/images/arrow_desc.png
diff --git a/plugins/MultiSites/lang/et.json b/plugins/MultiSites/lang/et.json
index 3f09c47068..2b9190d5eb 100644
--- a/plugins/MultiSites/lang/et.json
+++ b/plugins/MultiSites/lang/et.json
@@ -1,5 +1,7 @@
 {
     "MultiSites": {
-        "Evolution": "Muutus ajas"
+        "Evolution": "Muutus ajas",
+        "LoadingWebsites": "Veebilehtede avamine",
+        "Pagination": "%1$s - %2$s \/ %3$s"
     }
 }
\ No newline at end of file
diff --git a/plugins/Overlay/stylesheets/overlay.css b/plugins/Overlay/stylesheets/overlay.css
index 465bf7fb76..784677bc28 100644
--- a/plugins/Overlay/stylesheets/overlay.css
+++ b/plugins/Overlay/stylesheets/overlay.css
@@ -27,7 +27,7 @@ a#overlayTitle .icon-help {
 
 #overlayDateRangeSelection {
     padding: 0 0 0 25px;
-    background: url(../../Morpheus/images/icon-calendar.gif) 2px center no-repeat;
+    background: url(../../Morpheus/images/icon-calendar.png) 2px center no-repeat;
     margin: 20px 10px;
 }
 
diff --git a/plugins/PrivacyManager/lang/et.json b/plugins/PrivacyManager/lang/et.json
index 3954ec521c..5a46cf4353 100644
--- a/plugins/PrivacyManager/lang/et.json
+++ b/plugins/PrivacyManager/lang/et.json
@@ -1,5 +1,6 @@
 {
     "PrivacyManager": {
+        "AnonymizeIpMaskLength": "%1$s bait(i) - nt. %2$s",
         "ClickHereSettings": "Vajuta siia, et minna %s seadete lehele.",
         "CurrentDBSize": "Praegune andmebaasi suurus",
         "DBPurged": "Andmebaas tühjendatud.",
diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php
index 7f3d2079cb..31429d7885 100644
--- a/plugins/Referrers/Controller.php
+++ b/plugins/Referrers/Controller.php
@@ -247,8 +247,9 @@ class Controller extends \Piwik\Plugin\Controller
         }
 
         // configure selectable columns
-        // todo: should use SettingsPiwik::isUniqueVisitorsEnabled
-        if (Common::getRequestVar('period', false) == 'day') {
+        $period = Common::getRequestVar('period', false);
+
+        if (SettingsPiwik::isUniqueVisitorsEnabled($period)) {
             $selectable = array('nb_visits', 'nb_uniq_visitors', 'nb_users', 'nb_actions');
         } else {
             $selectable = array('nb_visits', 'nb_actions');
diff --git a/plugins/Referrers/images/searchEngines/xx.gif b/plugins/Referrers/images/searchEngines/xx.gif
deleted file mode 100644
index 5ddb8b8edb..0000000000
--- a/plugins/Referrers/images/searchEngines/xx.gif
+++ /dev/null
diff --git a/plugins/Referrers/lang/be.json b/plugins/Referrers/lang/be.json
index d0fe396c85..c8eecc341b 100644
--- a/plugins/Referrers/lang/be.json
+++ b/plugins/Referrers/lang/be.json
@@ -8,7 +8,6 @@
         "ColumnWebsite": "Вэб-сайт",
         "ColumnWebsitePage": "Старонка вэб-сайта",
         "DirectEntry": "Прамы ўваход",
-        "DirectEntryDocumentation": "Наведвальнік адчыніў URL у сваім браўзэры і пачаў праглядаць ваш вэб-сайт - ён зайшоў на сайт напрамую.",
         "Distinct": "Розныя спасыльнікі па тыпе",
         "DistinctCampaigns": "Розныя кампаніі",
         "DistinctKeywords": "Розныя ключавыя словы",
diff --git a/plugins/Referrers/lang/bg.json b/plugins/Referrers/lang/bg.json
index 1f370a5627..9c0547c1e9 100644
--- a/plugins/Referrers/lang/bg.json
+++ b/plugins/Referrers/lang/bg.json
@@ -9,7 +9,6 @@
         "ColumnWebsite": "Сайт",
         "ColumnWebsitePage": "Интернет страница",
         "DirectEntry": "Директни посещения",
-        "DirectEntryDocumentation": "Посетителят е въвел URL в браузъра си и е започнал да браузва вашия сайт - влязъл в уеб сайта директно.",
         "Distinct": "Отделни референции от Тип на референциите",
         "DistinctCampaigns": "отделни кампании",
         "DistinctKeywords": "отделни ключови думи",
diff --git a/plugins/Referrers/lang/ca.json b/plugins/Referrers/lang/ca.json
index c078203331..60162a139f 100644
--- a/plugins/Referrers/lang/ca.json
+++ b/plugins/Referrers/lang/ca.json
@@ -9,7 +9,6 @@
         "ColumnWebsite": "Lloc web",
         "ColumnWebsitePage": "Pàgina web",
         "DirectEntry": "Registre directe",
-        "DirectEntryDocumentation": "Un visitant ha entrar la URL al seu navegador i ha començat a navegar pel vostre lloc web. Ell ha entrar directament al lloc web.",
         "Distinct": "Referents diferents segons el tipus",
         "DistinctCampaigns": "campanyes diferents",
         "DistinctKeywords": "paraules clau diferents",
diff --git a/plugins/Referrers/lang/cs.json b/plugins/Referrers/lang/cs.json
index 53188d8daf..ea4fe4f878 100644
--- a/plugins/Referrers/lang/cs.json
+++ b/plugins/Referrers/lang/cs.json
@@ -10,7 +10,7 @@
         "ColumnWebsite": "Web",
         "ColumnWebsitePage": "Stránka webu",
         "DirectEntry": "Přímý vstup",
-        "DirectEntryDocumentation": "Návštěvník zadal URL vašich stránek do webového prohlížeče a začal s procházením zde - adresu zadal přímo.",
+        "DirectEntryDocumentation": "Návštěvník zadal URL do svého prohlížeče a začal procházet vaše stránky - návštěvník na ně přišel přímo.",
         "Distinct": "Jedineční refereři podle typu",
         "DistinctCampaigns": "jedinečné kampaně",
         "DistinctKeywords": "jedinečná klíčová slova",
diff --git a/plugins/Referrers/lang/da.json b/plugins/Referrers/lang/da.json
index 15b76d633d..2a1ceae825 100644
--- a/plugins/Referrers/lang/da.json
+++ b/plugins/Referrers/lang/da.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Hjemmeside",
         "ColumnWebsitePage": "Websted side",
         "DirectEntry": "Direkte træf",
-        "DirectEntryDocumentation": "En besøgende har indtastet URL-adressen i browseren og gik direkte til hjemmesiden. Den besøgende kom direkte ind på hjemmesiden.",
         "Distinct": "Forskellige kilder efter kildetype",
         "DistinctCampaigns": "forskellige kampagner",
         "DistinctKeywords": "forskellige søgeord",
diff --git a/plugins/Referrers/lang/de.json b/plugins/Referrers/lang/de.json
index 42b51f0711..3c93f4a373 100644
--- a/plugins/Referrers/lang/de.json
+++ b/plugins/Referrers/lang/de.json
@@ -10,7 +10,7 @@
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Seite",
         "DirectEntry": "Direkte Zugriffe",
-        "DirectEntryDocumentation": "Ein Besucher kam auf die Website, indem er die URL direkt in den Browser eingegeben hat.",
+        "DirectEntryDocumentation": "Ein Besucher kam auf die Webseite, indem er die URL direkt in den Browser eingegeben hat.",
         "Distinct": "Unterschiedliche Verweise nach Verweisart",
         "DistinctCampaigns": "verschiedene Kampagnen",
         "DistinctKeywords": "verschiedene Suchbegriffe",
diff --git a/plugins/Referrers/lang/el.json b/plugins/Referrers/lang/el.json
index a8c91905ea..19d10fcc96 100644
--- a/plugins/Referrers/lang/el.json
+++ b/plugins/Referrers/lang/el.json
@@ -10,7 +10,7 @@
         "ColumnWebsite": "Ιστοσελίδα",
         "ColumnWebsitePage": "Σελίδα Ιστοσελίδας",
         "DirectEntry": "Απευθείας είσοδος",
-        "DirectEntryDocumentation": "Ένας επισκέπτης εισήγαγε τη διεύθυνση στο φυλλομετρητή του και ξεκίνησε να περιηγείται στην ιστοσελίδα - εισήλθε στην ιστοσελίδα απευθείας.",
+        "DirectEntryDocumentation": "Ένας επισκέπτης εισήγαγε τη διεύθυνση URL στο πρόγραμμα πλοήγησής του και ξεκίνησε την πλοήγηση στον ιστοτόπο σας - επισκέφθηκε απευθείας τον ιστοτόπο.",
         "Distinct": "Διαχωρισμός Αναφορέων ανά Τύπο Αναφορέα",
         "DistinctCampaigns": "διαχωρισμός εκστρατειών",
         "DistinctKeywords": "διαχωρισμός λέξεων-κλειδιών",
diff --git a/plugins/Referrers/lang/es.json b/plugins/Referrers/lang/es.json
index 2e9bcc6403..3395e00086 100644
--- a/plugins/Referrers/lang/es.json
+++ b/plugins/Referrers/lang/es.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Sitio de internet",
         "ColumnWebsitePage": "Página de sitio de internet",
         "DirectEntry": "Entrada directa",
-        "DirectEntryDocumentation": "Un visitante ha ingresado la URL en su navegador y comenzó a navegar en su sitio - él ingresó directamente en su sitio de internet.",
         "Distinct": "Distintas referencias por tipo de referencia",
         "DistinctCampaigns": "campañas distintas",
         "DistinctKeywords": "palabras clave distintas",
diff --git a/plugins/Referrers/lang/fa.json b/plugins/Referrers/lang/fa.json
index 0a05f8a79f..39fc4d2dcb 100644
--- a/plugins/Referrers/lang/fa.json
+++ b/plugins/Referrers/lang/fa.json
@@ -7,7 +7,6 @@
         "ColumnWebsite": "وب سایت",
         "ColumnWebsitePage": "صفحه وب سایت",
         "DirectEntry": "ورود مستقیم",
-        "DirectEntryDocumentation": "تا به بازدید کننده، URL در مرورگر خود وارد و شروع به در حال دیدن سایت بر روی وب سایت خود را - که وارد وب سایت به طور مستقیم.",
         "Distinct": "معرف های متمایز براساس نوع ارجاع دهنده",
         "DistinctCampaigns": "متمایز مبارزات",
         "DistinctKeywords": "کلمات کلیدی قابل تشخیص",
diff --git a/plugins/Referrers/lang/fi.json b/plugins/Referrers/lang/fi.json
index 3f877a70ea..858fed0338 100644
--- a/plugins/Referrers/lang/fi.json
+++ b/plugins/Referrers/lang/fi.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Verkkosivu",
         "ColumnWebsitePage": "Verkkosivu",
         "DirectEntry": "Suoraan",
-        "DirectEntryDocumentation": "Kävijä kirjoitti sivusi osoitteen selaimeensa - hän tuli sivuille suoraan.",
         "Distinct": "Yksilöllisiä viittaajia viittaustyypin mukaan",
         "DistinctCampaigns": "yksilöllistä kampanjaa",
         "DistinctKeywords": "yksilöllistä hakusanaa",
diff --git a/plugins/Referrers/lang/fr.json b/plugins/Referrers/lang/fr.json
index 75a106ed02..4da0301f35 100644
--- a/plugins/Referrers/lang/fr.json
+++ b/plugins/Referrers/lang/fr.json
@@ -33,7 +33,7 @@
         "Socials": "Réseaux sociaux",
         "SocialsReportDocumentation": "Ce rapport affiche quels réseaux sociaux ont amené des visiteurs sur votre site web.<br \/>En cliquant sur une ligne du tableau, vous pouvez voir depuis quelles pages du réseau social les visiteur sont venus sur votre site web.",
         "SubmenuSearchEngines": "Moteurs de recherche et mots-clés",
-        "SubmenuWebsites": "Sites Internet",
+        "SubmenuWebsites": "Sites web & Réseaux sociaux",
         "Type": "Types d'acquisitions",
         "TypeCampaigns": "%s depuis des campagnes",
         "TypeDirectEntries": "%s entrées directes",
diff --git a/plugins/Referrers/lang/hi.json b/plugins/Referrers/lang/hi.json
index 8f23797a7c..dac0d93261 100644
--- a/plugins/Referrers/lang/hi.json
+++ b/plugins/Referrers/lang/hi.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "वेबसाइट",
         "ColumnWebsitePage": "वेबसाइट के पेज",
         "DirectEntry": "प्रत्यक्ष प्रवेश",
-        "DirectEntryDocumentation": "एक आगंतुक अपने ब्राउज़र में URL दर्ज किया है और आपकी वेबसाइट पर ब्राउज़िंग शुरू कर दी है - उन्होंने सीधे वेबसाइट में प्रवेश किया.",
         "Distinct": "संदर्भ प्रकार से अलग सन्दर्भदाता",
         "DistinctCampaigns": "विशिष्ट अभियानों",
         "DistinctKeywords": "विशिष्ट खोजशब्दों",
diff --git a/plugins/Referrers/lang/id.json b/plugins/Referrers/lang/id.json
index 707d85ce44..1c6f90f38d 100644
--- a/plugins/Referrers/lang/id.json
+++ b/plugins/Referrers/lang/id.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Situs",
         "ColumnWebsitePage": "Halaman Situs",
         "DirectEntry": "Masukan Langsung",
-        "DirectEntryDocumentation": "Pengunjung telah memasukkan URL di peramban dan mulai menjelajah ke situs Anda - pengunjung tersebut mengunjungi situs secara langsung.",
         "Distinct": "Pengarah Berbeda berdasarkan Jenis Pengarah",
         "DistinctCampaigns": "kampanye berbeda",
         "DistinctKeywords": "kata kunci berbeda",
diff --git a/plugins/Referrers/lang/it.json b/plugins/Referrers/lang/it.json
index ab9144217e..1dbc94738d 100644
--- a/plugins/Referrers/lang/it.json
+++ b/plugins/Referrers/lang/it.json
@@ -10,7 +10,7 @@
         "ColumnWebsite": "Sito:",
         "ColumnWebsitePage": "Pagina",
         "DirectEntry": "Ingressi Diretti",
-        "DirectEntryDocumentation": "Un visitatore ha inserito l'URL nel proprio browser e ha iniziato la navigazione sul tuo sito web - è entrato direttamente al sito.",
+        "DirectEntryDocumentation": "Un visitatore ha inserito l'URL nel suo browser e ha cominciato a navigare nel tuo sito web - è entrato direttamente nel sito.",
         "Distinct": "Referenti distinti per tipo",
         "DistinctCampaigns": "campagne distinte",
         "DistinctKeywords": "parole chiave distinte",
diff --git a/plugins/Referrers/lang/ja.json b/plugins/Referrers/lang/ja.json
index ac6dc845fa..6b86e56c81 100644
--- a/plugins/Referrers/lang/ja.json
+++ b/plugins/Referrers/lang/ja.json
@@ -10,7 +10,7 @@
         "ColumnWebsite": "ウェブサイト",
         "ColumnWebsitePage": "ウェブサイトページ",
         "DirectEntry": "直接アクセス",
-        "DirectEntryDocumentation": "ブラウザにURLを入力して、ウェブサイトの閲覧を開始したビジター - 直接ウェブサイトを見に来た。",
+        "DirectEntryDocumentation": "ビジターがブラウザに URL を入力し、ウェブサイトでブラウジングを開始しました。彼らはウェブサイトに直接訪問しました。",
         "Distinct": "参照元タイプごとの個別参照元",
         "DistinctCampaigns": "個別のキャンペーン",
         "DistinctKeywords": "個別のキーワード",
diff --git a/plugins/Referrers/lang/ko.json b/plugins/Referrers/lang/ko.json
index 5a133eb72e..34abf183b1 100644
--- a/plugins/Referrers/lang/ko.json
+++ b/plugins/Referrers/lang/ko.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "웹사이트",
         "ColumnWebsitePage": "웹사이트 페이지",
         "DirectEntry": "직접 입력",
-        "DirectEntryDocumentation": "브라우저에 URL을 입력하여 웹사이트 검색을 시작한 방문자 - 직접 입력하여 웹사이트를 방문했습다.",
         "Distinct": "리퍼러 타입에 의한 고유 리퍼러",
         "DistinctCampaigns": "고유 캠페인",
         "DistinctKeywords": "고유 검색어",
diff --git a/plugins/Referrers/lang/nl.json b/plugins/Referrers/lang/nl.json
index 61be153d4e..5a87307367 100644
--- a/plugins/Referrers/lang/nl.json
+++ b/plugins/Referrers/lang/nl.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Website pagina",
         "DirectEntry": "Direct bezoek",
-        "DirectEntryDocumentation": "Een bezoeker heeft de URL in zijn browser ingevoerd en is direct op uw website uitgekomen.",
         "Distinct": "Verschillende bezoekers volgens bezoekers herkomst",
         "DistinctCampaigns": "Verschillende campagnes",
         "DistinctKeywords": "Verschillende sleutelwoorden.",
diff --git a/plugins/Referrers/lang/pt-br.json b/plugins/Referrers/lang/pt-br.json
index 4d00d68971..a57d5cd39a 100644
--- a/plugins/Referrers/lang/pt-br.json
+++ b/plugins/Referrers/lang/pt-br.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Página da Web",
         "DirectEntry": "Entrada Direta",
-        "DirectEntryDocumentation": "Um visitante entrou a URL no seu navegador e começou a navegar em seu site - ele entrou no site diretamente.",
         "Distinct": "Referenciadores Distintos por Tipo de Referenciador",
         "DistinctCampaigns": "Campanhas distintas",
         "DistinctKeywords": "Palavras-chave distintas",
diff --git a/plugins/Referrers/lang/pt.json b/plugins/Referrers/lang/pt.json
index 6138f435f1..2151112bb7 100644
--- a/plugins/Referrers/lang/pt.json
+++ b/plugins/Referrers/lang/pt.json
@@ -8,7 +8,6 @@
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Página do Website",
         "DirectEntry": "Entrada Direta",
-        "DirectEntryDocumentation": "O visitante entrou directamente no seu website ao introduzir o endereço do website directamente no browser.",
         "Distinct": "Referentes Distintos por Tipo de Referente",
         "DistinctCampaigns": "campanhas distintas",
         "DistinctKeywords": "palavras-chave distintas",
diff --git a/plugins/Referrers/lang/ro.json b/plugins/Referrers/lang/ro.json
index 46106bb202..29f17d5408 100644
--- a/plugins/Referrers/lang/ro.json
+++ b/plugins/Referrers/lang/ro.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Pagina Site Web",
         "DirectEntry": "Intrare directă",
-        "DirectEntryDocumentation": "Un vizitator a intrat pe URL-ul din browser-ul său și a început sa navigheze pe site-ul tau - a introdus websitul direct .",
         "Distinct": "Districte de referali de tipul referal",
         "DistinctCampaigns": "campanii distincte",
         "DistinctKeywords": "cuvinte cheie distincte",
diff --git a/plugins/Referrers/lang/ru.json b/plugins/Referrers/lang/ru.json
index 681f9977a2..ffe176aafb 100644
--- a/plugins/Referrers/lang/ru.json
+++ b/plugins/Referrers/lang/ru.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Сайт",
         "ColumnWebsitePage": "Страница сайта",
         "DirectEntry": "Прямой вход",
-        "DirectEntryDocumentation": "Посетитель перешел на ваш сайт по ссылке, вбив ее в адресую строку браузера или по закладке, что называется прямым переходом.",
         "Distinct": "Различные источники по типу",
         "DistinctCampaigns": "Различные кампании",
         "DistinctKeywords": "Различные ключевые слова",
diff --git a/plugins/Referrers/lang/sq.json b/plugins/Referrers/lang/sq.json
index 2c63b1f9d5..044464abc1 100644
--- a/plugins/Referrers/lang/sq.json
+++ b/plugins/Referrers/lang/sq.json
@@ -10,7 +10,7 @@
         "ColumnWebsite": "Sajt",
         "ColumnWebsitePage": "Faqe Sajti",
         "DirectEntry": "Zë i Drejtpërdrejtë",
-        "DirectEntryDocumentation": "Një vizitor dha URL-në te shfletuesi i vet dhe filloi shfletimin e sajtit tuaj - sajtin e dha drejtpërdrejt.",
+        "DirectEntryDocumentation": "Një vizitor dha URL-në te shfletuesi i tij dhe filloi të shfletojë në sajtin tuaj - hyri drejtpërdrejt në sajtin tuaj.",
         "Distinct": "Sjellës të Dallueshëm sipas Llojit të Sjellësit",
         "DistinctCampaigns": "fushata të dallueshme",
         "DistinctKeywords": "fjalëkyçe të dallueshëm",
diff --git a/plugins/Referrers/lang/sr.json b/plugins/Referrers/lang/sr.json
index c6da870b58..7d061269eb 100644
--- a/plugins/Referrers/lang/sr.json
+++ b/plugins/Referrers/lang/sr.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Sajt",
         "ColumnWebsitePage": "Stranica sajta",
         "DirectEntry": "Direktni ulasci",
-        "DirectEntryDocumentation": "Korisnik je ukucao adresu u svoj brauzer i došao na vaš sajt - ušao je direktno na vaš sajt.",
         "Distinct": "Različite reference po tipu",
         "DistinctCampaigns": "različite kampanje",
         "DistinctKeywords": "različite ključne reči",
diff --git a/plugins/Referrers/lang/sv.json b/plugins/Referrers/lang/sv.json
index 771d1788b9..eefbc9e7a1 100644
--- a/plugins/Referrers/lang/sv.json
+++ b/plugins/Referrers/lang/sv.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Webbplats",
         "ColumnWebsitePage": "Webbplatsens sida",
         "DirectEntry": "Direkttrafik",
-        "DirectEntryDocumentation": "En besökare har skrivit in webbadressen i sin webbläsare och började surfa på din webbplats - han gick in på hemsidan direkt.",
         "Distinct": "Distinkta hänvisningar av den refererande typen",
         "DistinctCampaigns": "distinkta kampanjer",
         "DistinctKeywords": "distinkta nyckelord",
diff --git a/plugins/Referrers/lang/tl.json b/plugins/Referrers/lang/tl.json
index 9a54a489d4..c4ec7cdb11 100644
--- a/plugins/Referrers/lang/tl.json
+++ b/plugins/Referrers/lang/tl.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Pahina ng Website",
         "DirectEntry": "Direktang Entry",
-        "DirectEntryDocumentation": "Ang bisita ay nilagay ang URL sa kanyang browser ang nagsimulang maghanap sa loob ng iyong website - ito ay kanyang nilagay diretso sa url.",
         "Distinct": "Naka bukod na Referrers ayon sa uri ng Referrer.",
         "DistinctCampaigns": "natatanging mga campaing",
         "DistinctKeywords": "natatanging mga keyword",
diff --git a/plugins/Referrers/lang/tr.json b/plugins/Referrers/lang/tr.json
index 5d5604cd5f..407540591c 100644
--- a/plugins/Referrers/lang/tr.json
+++ b/plugins/Referrers/lang/tr.json
@@ -6,7 +6,6 @@
         "ColumnSocial": "Sosyal medya",
         "ColumnWebsite": "Web sayfası",
         "DirectEntry": "Doğrudan Giriş",
-        "DirectEntryDocumentation": "Ziyaretçiniz web adresini yazarak siteye doğrudan giriş yapmış.",
         "DistinctCampaigns": "farklı kampanyalar",
         "Keywords": "Anahtar Kelimeler",
         "Referrers": "Yönlendirmeler",
diff --git a/plugins/Referrers/lang/uk.json b/plugins/Referrers/lang/uk.json
index e23ca82bee..c9c03aa7ed 100644
--- a/plugins/Referrers/lang/uk.json
+++ b/plugins/Referrers/lang/uk.json
@@ -10,7 +10,7 @@
         "ColumnWebsite": "Сайт",
         "ColumnWebsitePage": "Сторінка сайту",
         "DirectEntry": "Прямий вхід",
-        "DirectEntryDocumentation": "Відвідувач перейшов на ваш сайт за посиланням, вбивши її в адресний рядок браузера або по закладці, що називається прямим переходом.",
+        "DirectEntryDocumentation": "Відвідувач ввів в URL в браузері і почав переглядати на своєму браузері - він увійшов на веб-сайт безпосередньо.",
         "Distinct": "Різні джерела по типу",
         "DistinctCampaigns": "Різні кампанії",
         "DistinctKeywords": "Різні ключові слова",
diff --git a/plugins/Referrers/lang/vi.json b/plugins/Referrers/lang/vi.json
index af32eac253..c9793c936f 100644
--- a/plugins/Referrers/lang/vi.json
+++ b/plugins/Referrers/lang/vi.json
@@ -10,7 +10,6 @@
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Trang web",
         "DirectEntry": "Nhập trực tiếp",
-        "DirectEntryDocumentation": "Một du khách đã nhập vào URL trong trình duyệt của mình và bắt đầu trình duyệt trên trang web của bạn - người đó đã vào trang web một cách trực tiếp.",
         "Distinct": "Các Referrer riêng biệt bởi kiểu Referrer",
         "DistinctCampaigns": "Chiến dịch riêng biệt",
         "DistinctKeywords": "Từ khóa riêng biệt",
diff --git a/plugins/Referrers/lang/zh-cn.json b/plugins/Referrers/lang/zh-cn.json
index 8657ceda11..97f3ee8020 100644
--- a/plugins/Referrers/lang/zh-cn.json
+++ b/plugins/Referrers/lang/zh-cn.json
@@ -5,12 +5,12 @@
         "CampaignsDocumentation": "广告活动带来的访客。%1$s 查看 %2$s 报表了解详情。",
         "CampaignsReportDocumentation": "本报表显示哪些广告活动带来了访客，%1$s 广告跟踪的详情，请看 %2$s piwik.org 上的广告活动文档 %3$s",
         "ColumnCampaign": "广告活动",
-        "ColumnSearchEngine": "搜索引擎名称",
+        "ColumnSearchEngine": "搜索引擎",
         "ColumnSocial": "社交网络",
         "ColumnWebsite": "网站",
         "ColumnWebsitePage": "网站页面",
         "DirectEntry": "直接链接",
-        "DirectEntryDocumentation": "访客在浏览器中输入网址来访问您的网站 - 直接访问网站。",
+        "DirectEntryDocumentation": "访客在浏览器输入网址然后开始访问你的网站——这样子被认为他们直接进入网站",
         "Distinct": "不同的来源类型",
         "DistinctCampaigns": "不同的广告活动",
         "DistinctKeywords": "不同的关键词",
diff --git a/plugins/Referrers/lang/zh-tw.json b/plugins/Referrers/lang/zh-tw.json
index 2fcd0841d5..0b6a953c7f 100644
--- a/plugins/Referrers/lang/zh-tw.json
+++ b/plugins/Referrers/lang/zh-tw.json
@@ -10,7 +10,7 @@
         "ColumnWebsite": "網站",
         "ColumnWebsitePage": "網站網頁",
         "DirectEntry": "直接流量",
-        "DirectEntryDocumentation": "訪客在瀏覽器輸入網址並訪問你的網站，直接進入你的網站。",
+        "DirectEntryDocumentation": "訪客在瀏覽器上輸入網址並瀏覽你的網站－他們是直接進入網站的。",
         "Distinct": "不同類型的參造連結",
         "DistinctCampaigns": "不同廣告活動",
         "DistinctKeywords": "不同關鍵字",
diff --git a/plugins/SEO/Metric/Alexa.php b/plugins/SEO/Metric/Alexa.php
index e8f7956241..ef9a73a5ec 100644
--- a/plugins/SEO/Metric/Alexa.php
+++ b/plugins/SEO/Metric/Alexa.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\SEO\Metric;
 
 use Piwik\Http;
 use Piwik\NumberFormatter;
-use Piwik\Plugins\Referrers\SearchEngine;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -43,7 +42,7 @@ class Alexa implements MetricsProvider
             $value = null;
         }
 
-        $logo = SearchEngine::getInstance()->getLogoFromUrl('http://alexa.com');
+        $logo = "plugins/SEO/images/alexa.com.png";
         $link = self::LINK . urlencode($domain);
 
         return array(
diff --git a/plugins/SEO/Metric/Bing.php b/plugins/SEO/Metric/Bing.php
index b0805548d4..325af69492 100644
--- a/plugins/SEO/Metric/Bing.php
+++ b/plugins/SEO/Metric/Bing.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\SEO\Metric;
 
 use Piwik\Http;
 use Piwik\NumberFormatter;
-use Piwik\Plugins\Referrers\SearchEngine;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -47,7 +46,7 @@ class Bing implements MetricsProvider
             $pageCount = null;
         }
 
-        $logo = SearchEngine::getInstance()->getLogoFromUrl('http://bing.com');
+        $logo = "plugins/SEO/images/bing.com.png";
 
         return array(
             new Metric('bing-index', 'SEO_Bing_IndexedPages', $pageCount, $logo, null, null, 'General_Pages')
diff --git a/plugins/SEO/Metric/Dmoz.php b/plugins/SEO/Metric/Dmoz.php
index 05e8e1a0e9..b1f3567f06 100644
--- a/plugins/SEO/Metric/Dmoz.php
+++ b/plugins/SEO/Metric/Dmoz.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\SEO\Metric;
 
 use Piwik\Http;
 use Piwik\NumberFormatter;
-use Piwik\Plugins\Referrers\SearchEngine;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -54,7 +53,7 @@ class Dmoz implements MetricsProvider
             $value = null;
         }
 
-        $logo = SearchEngine::getInstance()->getLogoFromUrl('http://dmoz.org');
+        $logo = "plugins/SEO/images/dmoz.org.png";
 
         return array(
             new Metric('dmoz', 'SEO_Dmoz', $value, $logo)
diff --git a/plugins/SEO/Metric/Google.php b/plugins/SEO/Metric/Google.php
index 4247ec138f..c96e7fbb16 100644
--- a/plugins/SEO/Metric/Google.php
+++ b/plugins/SEO/Metric/Google.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\SEO\Metric;
 
 use Piwik\Http;
 use Piwik\NumberFormatter;
-use Piwik\Plugins\Referrers\SearchEngine;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -37,7 +36,7 @@ class Google implements MetricsProvider
     {
         $pageCount = $this->fetchIndexedPagesCount($domain);
 
-        $logo = SearchEngine::getInstance()->getLogoFromUrl('http://google.com');
+        $logo = "plugins/SEO/images/google.com.png";
 
         return array(
             new Metric('google-index', 'SEO_Google_IndexedPages', $pageCount, $logo, null, null, 'General_Pages'),
diff --git a/plugins/SEO/images/alexa.com.png b/plugins/SEO/images/alexa.com.png
new file mode 100644
index 0000000000..0bc9c78887
--- /dev/null
+++ b/plugins/SEO/images/alexa.com.png
diff --git a/plugins/SEO/images/bing.com.png b/plugins/SEO/images/bing.com.png
new file mode 100644
index 0000000000..8c798c92ac
--- /dev/null
+++ b/plugins/SEO/images/bing.com.png
diff --git a/plugins/SEO/images/dmoz.com.png b/plugins/SEO/images/dmoz.com.png
new file mode 100644
index 0000000000..67349352de
--- /dev/null
+++ b/plugins/SEO/images/dmoz.com.png
diff --git a/plugins/SEO/images/google.com.png b/plugins/SEO/images/google.com.png
new file mode 100644
index 0000000000..f860e43207
--- /dev/null
+++ b/plugins/SEO/images/google.com.png
diff --git a/plugins/SEO/images/majesticseo.png b/plugins/SEO/images/majesticseo.png
deleted file mode 100644
index a42875c250..0000000000
--- a/plugins/SEO/images/majesticseo.png
+++ /dev/null
diff --git a/plugins/SEO/images/whois.png b/plugins/SEO/images/whois.png
index ac5957ad62..642c2a5c92 100644
--- a/plugins/SEO/images/whois.png
+++ b/plugins/SEO/images/whois.png
diff --git a/plugins/SEO/lang/et.json b/plugins/SEO/lang/et.json
index 10b0363e3c..25d84e1b10 100644
--- a/plugins/SEO/lang/et.json
+++ b/plugins/SEO/lang/et.json
@@ -2,6 +2,7 @@
     "SEO": {
         "AlexaRank": "Alexa reiting",
         "Bing_IndexedPages": "Bingi indekseeritud lehti",
+        "Dmoz": "DMOZ sissekanded",
         "DomainAge": "Domeeni vanus",
         "Google_IndexedPages": "Googles indekseeritud lehed",
         "Rank": "Reiting",
diff --git a/plugins/SEO/templates/getRank.twig b/plugins/SEO/templates/getRank.twig
index a00094e2df..08fd69e310 100644
--- a/plugins/SEO/templates/getRank.twig
+++ b/plugins/SEO/templates/getRank.twig
@@ -8,14 +8,14 @@
                 <input type="text" id="seoUrl" size="15" value="{{ urlToRank }}" class="textbox "/>
             </div>
             <div class="col s4">
-                <input type="submit" class="btn btn-small" id="rankbutton" value="{{ 'SEO_Rank'|translate }}"/>
+                <input type="submit" class="btn btn-small" style='margin-top: 2em' id="rankbutton" value="{{ 'SEO_Rank'|translate }}"/>
             </div>
         </div>
 
         {% import "ajaxMacros.twig" as ajax %}
         {{ ajax.LoadingDiv('ajaxLoadingSEO') }}
 
-        <div id="rankStats" align="left" style="margin-top:10px;margin-left: 5px;">
+        <div id="rankStats" align="left" style="margin-top:10px;margin-left: 5px;font-size:14px;">
             {% if ranks is empty %}
                 {{ 'General_Error'|translate }}
             {% else %}
@@ -23,23 +23,23 @@
                     <a href="http://{{ urlToRank }}" rel="noreferrer"  target="_blank">{{ urlToRank }}</a>
                 {% endset %}
                 {{ 'SEO_SEORankingsFor'|translate(cleanUrl)|raw }}
-                <table cellspacing="2" style="margin:auto;line-height:1.5em;padding-top:10px;">
+                <table cellspacing="2" style="margin:auto;line-height:3.5em !important;margin-top:20px;">
 
                     {% for rank in ranks %}
                         <tr>
-{% set seoLink %}{% if rank.logo_link is not empty %}<a class="linkContent" href="?module=Proxy&action=redirect&url={{ rank.logo_link|url_encode }}"
-                                                    target="_blank"
-                         {% if rank.logo_tooltip is not empty %}title="{{ rank.logo_tooltip }}"{% endif %}>{% endif %}{% endset %}
-                            <td>{% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}<img
-                                            style='vertical-align:middle;margin-right:6px;' src='{{ rank.logo }}' border='0'
-                                            alt="{{ rank.label }}">{% if rank.logo_link is not empty %}</a>{% endif %} {{ rank.label|raw }}
+                            {% set seoLink %}{% if rank.logo_link is not empty %}<a class="linkContent" href="?module=Proxy&action=redirect&url={{ rank.logo_link|url_encode }}"
+                                                                                    target="_blank"
+                                                                                    {% if rank.logo_tooltip is not empty %}title="{{ rank.logo_tooltip }}"{% endif %}>{% endif %}{% endset %}
+                                <td>{% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}<img width="24px" height="24px"
+                                                                                                         style='vertical-align:middle;margin-right:6px;' src='{{ rank.logo }}' border='0'
+                                                                                                         alt="{{ rank.label }}">{% if rank.logo_link is not empty %}</a>{% endif %} {{ rank.label|raw }}
                             </td>
                             <td>
                                 <div style="margin-left:15px;">
-                                {% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}
+                                    {% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}
                                     {% if rank.rank %}{{ rank.rank|raw }}{% else %}-{% endif %}
                                     {{ rank.rank_suffix }}
-                                {% if rank.logo_link is not empty %}</a>{% endif %}
+                                    {% if rank.logo_link is not empty %}</a>{% endif %}
                                 </div>
                             </td>
                         </tr>
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index 38a7923017..35b3f078b0 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -475,6 +475,7 @@ class API extends \Piwik\Plugin\API
         // init report renderer
         $reportRenderer->setIdSite($idSite);
         $reportRenderer->setLocale($language);
+        $reportRenderer->setReport($report);
 
         // render report
         $description = str_replace(array("\r", "\n"), ' ', $report['description']);
diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php
index 60d7d4fa08..53bf30c502 100644
--- a/plugins/ScheduledReports/ScheduledReports.php
+++ b/plugins/ScheduledReports/ScheduledReports.php
@@ -306,7 +306,6 @@ class ScheduledReports extends \Piwik\Plugin
         }
 
         $periods = self::getPeriodToFrequencyAsAdjective();
-        $message = Piwik::translate('ScheduledReports_EmailHello');
         $subject = Piwik::translate('General_Report') . ' ' . $reportTitle . " - " . $prettyDate;
 
         $mail = new Mail();
@@ -338,13 +337,7 @@ class ScheduledReports extends \Piwik\Plugin
 
                 // Needed when using images as attachment with cid
                 $mail->setType(Zend_Mime::MULTIPART_RELATED);
-                $message .= "<br/>$messageFindBelow<br/>$messageSentFrom";
-
-                if ($displaySegmentInfo) {
-                    $message .= " " . $segmentInfo;
-                }
-
-                $mail->setBodyHtml($message . "<br/><br/>" . $contents);
+                $mail->setBodyHtml($contents);
                 break;
 
             case 'csv':
diff --git a/plugins/ScheduledReports/lang/et.json b/plugins/ScheduledReports/lang/et.json
index 548a0a68fa..4e84a0d837 100644
--- a/plugins/ScheduledReports/lang/et.json
+++ b/plugins/ScheduledReports/lang/et.json
@@ -1,5 +1,6 @@
 {
     "ScheduledReports": {
+        "AggregateReportsFormat": "Kuvamise seaded",
         "AggregateReportsFormat_GraphsOnly": "Kuva ainult graafikud (tabelid puuduvad)",
         "AggregateReportsFormat_TablesAndGraphs": "Kuva tabelid ja graafikud kõikidele raportitele",
         "AggregateReportsFormat_TablesOnly": "(vaikimisi) Kuva raportite tabelid (ja olulistele mõõdikutele ka graafikud)",
diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig
index fee3178d63..d6b38c7c49 100644
--- a/plugins/ScheduledReports/templates/_listReports.twig
+++ b/plugins/ScheduledReports/templates/_listReports.twig
@@ -81,7 +81,7 @@
                             'format': (report.format in ['html', 'csv']) ? report.format : false
                        }) }}"
                    rel="noreferrer"  target="_blank" name="linkDownloadReport" id="{{ report.idreport }}" class="link_but withIcon">
-                    <img src='{{ reportFormatsByReportType[report.type][report.format] }}' border="0"/>
+                    <img src='{{ reportFormatsByReportType[report.type][report.format] }}' border="0" width="16px" height="16px"/>
                     {{ 'General_Download'|translate }}
                 </a>
             </td>
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index 88596ea184..5dc1cf1f80 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -7,6 +7,16 @@
 
 Segmentation = (function($) {
 
+  Mousetrap.bind('s', function(event) {
+    if (event.preventDefault) {
+        event.preventDefault();
+    } else {
+        event.returnValue = false; // IE
+    }
+    $('.segmentListContainer .segmentationContainer .title').trigger('click').focus();
+    });
+
+
     function preselectFirstMetricMatch(rowNode)
     {
         var matchValue = $(rowNode).find('.metricMatchBlock option:first').attr('value');
@@ -227,7 +237,7 @@ Segmentation = (function($) {
             var html = self.editorTemplate.find("> .listHtml").clone();
             var segment, injClass;
             var listHtml = '<li data-idsegment="" ' +
-                (self.currentSegmentStr == "" ? " class='segmentSelected' " : "")
+                (self.currentSegmentStr == "" ? " class='segmentSelected' tabindex='4' " : "")
                 + ' data-definition=""><span class="segname">' + self.translations['SegmentEditor_DefaultAllVisits']
                 + ' ' + self.translations['General_DefaultAppended']
                 + '</span></li> ';
@@ -276,7 +286,7 @@ Segmentation = (function($) {
                         injClass = 'class="segmentSelected"';
                     }
                     listHtml += '<li data-idsegment="'+segment.idsegment+'" data-definition="'+ (segment.definition).replace(/"/g, '&quot;') +'" '
-                        +injClass+' title="'+ getSegmentTooltipEnrichedWithUsername(segment) +'"><span class="segname">'+getSegmentName(segment)+'</span>';
+                        +injClass+' title="'+ getSegmentTooltipEnrichedWithUsername(segment) +'"><span class="segname" tabindex="4">'+getSegmentName(segment)+'</span>';
                     if(self.segmentAccess == "write") {
                         listHtml += '<span class="editSegment" title="'+ self.translations['General_Edit'].toLocaleLowerCase() +'"></span>';
                     }
@@ -1420,7 +1430,7 @@ $(document).ready(function() {
 
                     self.$element.find('a.close').click();
                     self.forceSegmentReload('');
-                    
+
                     $('.ui-dialog-content').dialog('close');
 
                     self.changeSegmentList(self.props.availableSegments);
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig
index 02bd362947..8a4ae950c8 100644
--- a/plugins/SegmentEditor/templates/_segmentSelector.twig
+++ b/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -3,7 +3,7 @@
         <a class="title" tabindex="4"><span class="icon icon-segment"></span><span class="segmentationTitle"></span></a>
         <div class="dropdown dropdown-body">
             <div class="segmentFilterContainer">
-                <input class="segmentFilter browser-default" type="text" value="{{ 'General_Search'|translate }}"/>
+                <input class="segmentFilter browser-default" type="text" tabindex="4" value="{{ 'General_Search'|translate }}"/>
                 <span/>
             </div>
             <ul class="submenu">
@@ -16,7 +16,7 @@
             </ul>
 
             {% if authorizedToCreateSegments %}
-                <a class="add_new_segment btn">{{ 'SegmentEditor_AddNewSegment'|translate }}</a>
+                <a tabindex="4" class="add_new_segment btn">{{ 'SegmentEditor_AddNewSegment'|translate }}</a>
             {% else %}
                 <hr/>
                 <ul class="submenu">
@@ -200,4 +200,4 @@
 
     <input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/SitesManager/lang/uk.json b/plugins/SitesManager/lang/uk.json
index f3a8b6daab..7d7073dbed 100644
--- a/plugins/SitesManager/lang/uk.json
+++ b/plugins/SitesManager/lang/uk.json
@@ -43,6 +43,7 @@
         "KeepURLFragmentsLong": "Зберігати додаткові фрагменти url при відстеженні сторінок",
         "ListOfIpsToBeExcludedOnAllWebsites": "IP адреси нижче будуть виключені з статистики і не будуть враховуватися при зборі даних на всіх сайтах.",
         "ListOfQueryParametersToBeExcludedOnAllWebsites": "Запити URL-параметрів нижче будуть виключені і не будуть враховуватися при зборі статистики на всіх сайтах.",
+        "ListOfQueryParametersToExclude": "Введіть список параметрів запиту URL, по одному в кожному рядку, щоб виключити зі звітів URL сторінки. Регулярні вирази, такі як %s підтримуються.",
         "MainDescription": "Для ведення статистики потрібно додати сайти. Додавайте, оновлюйте, видаляйте інформацію про сайти, а також перегляньте JavaScript-код для вставки на ваші сторінки.",
         "MenuManage": "Управління",
         "NotAnEcommerceSite": "Сайт без ел. комерції",
diff --git a/plugins/SitesManager/lang/zh-tw.json b/plugins/SitesManager/lang/zh-tw.json
index c6b0322fb8..7ddbbcb304 100644
--- a/plugins/SitesManager/lang/zh-tw.json
+++ b/plugins/SitesManager/lang/zh-tw.json
@@ -22,8 +22,8 @@
         "ExceptionInvalidCurrency": "貨幣「%1$s」無效。請輸入正確的貨幣符號（例如 %2$s）",
         "ExceptionInvalidIPFormat": "欲排除的 IP「%1$s」不符合有效的 IP 格式（例如 %2$s）。",
         "ExceptionInvalidTimezone": "時區「%s」無效。請輸入正確的時區。",
-        "ExceptionInvalidUrl": "網址「%s」並非有效的 URL。",
-        "ExceptionNoUrl": "你必須至少為此網站指定一個 URL 網址。",
+        "ExceptionInvalidUrl": "網址「%s」並非有效的網址。",
+        "ExceptionNoUrl": "你必須至少為此網站指定一個網址。",
         "ExcludedIps": "排除 IP",
         "ExcludedParameters": "排除參數",
         "ExcludedUserAgents": "排除 User Agent",
@@ -37,13 +37,13 @@
         "GlobalWebsitesSettings": "全域網站設定",
         "HelpExcludedIps": "輸入 IP 列表，一行一個，使 Piwik 不追蹤特定 IP 位址。你也可以使用萬用字元，例如 %1$s 或 %2$s",
         "JsTrackingTagHelp": "這是插入所有網頁的 JavaScript 追蹤程式碼",
-        "KeepURLFragments": "追蹤網頁 URL 片段",
+        "KeepURLFragments": "追蹤網頁網址片段",
         "KeepURLFragmentsHelp": "如果未勾選下方核取方塊，網頁片段（所有在 %1$s 後面的）將會在追蹤時被移除：%2$s 將只會追蹤 %3$s",
         "KeepURLFragmentsHelp2": "你也可以從個別的網站設定中覆蓋此設定。",
-        "KeepURLFragmentsLong": "追蹤網頁 URL 時保留網頁 URL 片段",
+        "KeepURLFragmentsLong": "追蹤網頁網址時保留網頁網址片段",
         "ListOfIpsToBeExcludedOnAllWebsites": "以下的 IP 位址將會被所有網站排除。",
         "ListOfQueryParametersToBeExcludedOnAllWebsites": "以下的網址查詢參數將會被所有網站排除。",
-        "ListOfQueryParametersToExclude": "輸入 URL 查詢參數列表，一行一個，將從網頁網址報表中被排除。支援正規表示式如 %s。",
+        "ListOfQueryParametersToExclude": "輸入網址查詢參數列表，一行一個，將從網頁網址報表中被排除。支援正規表示式如 %s。",
         "MainDescription": "你的網站分析報告需要網站！新增、更新或刪除網站，並顯示 JavaScript 追蹤程式碼插入在你的網頁之中。",
         "MenuManage": "管理",
         "NotAnEcommerceSite": "非電子商務網站",
@@ -76,12 +76,12 @@
         "Timezone": "時區",
         "TrackingSiteSearch": "追蹤站內搜尋",
         "TrackingTags": "%s 的追蹤程式碼",
-        "Urls": "URL 網址",
+        "Urls": "網站網址",
         "Type": "類型",
         "UTCTimeIs": "UTC 時間是 %s。",
-        "OnlyMatchedUrlsAllowed": "只追蹤發生在以上 URL 上的訪問和活動。",
-        "OnlyMatchedUrlsAllowedHelp": "當啟用時，Piwik 只會在網站 URL 為你所設定之一時追蹤動作。這可以預防其他人在其他網站中濫用你的分析程式碼。",
-        "OnlyMatchedUrlsAllowedHelpExamples": "域名和路徑必須完全相符，不同的子域名必須分別列出。例如 URL 網址為「http:\/\/example.com\/path」和「http:\/\/good.example.com」，來自「http:\/\/example.com\/otherpath」和「http:\/\/bad.example.com」的追蹤請求將會被忽略。",
+        "OnlyMatchedUrlsAllowed": "只追蹤發生在以上網站網址上的訪問和活動。",
+        "OnlyMatchedUrlsAllowedHelp": "當啟用時，Piwik 只會在網站網址為你所設定之一時才追蹤動作。這可以預防其他人在其他網站中濫用你的分析程式碼。",
+        "OnlyMatchedUrlsAllowedHelpExamples": "域名和路徑必須完全相符，不同的子域名必須分別列出。例如網站網址為「http:\/\/example.com\/path」和「http:\/\/good.example.com」，來自「http:\/\/example.com\/otherpath」和「http:\/\/bad.example.com」的追蹤請求將會被忽略。",
         "WebsitesManagement": "網站管理",
         "XManagement": "管理 %s",
         "ChooseMeasurableTypeHeadline": "你想要測量什麼？",
diff --git a/plugins/Transitions/lang/et.json b/plugins/Transitions/lang/et.json
index f67589adf8..3da772afd8 100644
--- a/plugins/Transitions/lang/et.json
+++ b/plugins/Transitions/lang/et.json
@@ -2,6 +2,7 @@
     "Transitions": {
         "BouncesInline": "%s põrget",
         "DirectEntries": "Otse sisenemisi",
+        "ErrorBack": "Mine tagasi eelmisele tegevusele",
         "ExitsInline": "%s väljumist",
         "FromCampaigns": "Tuldud kampaaniad",
         "FromPreviousPages": "Tuldud sisemised lehed",
diff --git a/plugins/UserCountry/lang/et.json b/plugins/UserCountry/lang/et.json
index 362ed4a635..cd8592b7f2 100644
--- a/plugins/UserCountry/lang/et.json
+++ b/plugins/UserCountry/lang/et.json
@@ -8,6 +8,7 @@
         "country_a2": "Satelliidi pakkuja",
         "country_cat": "Katalaani kommuunid",
         "country_o1": "Muu riik",
+        "country_ti": "Tiibet",
         "CurrentLocationIntro": "Antud pakkuja andmete alusel on sinu praegune asukoht",
         "DistinctCountries": "%s eri riigist",
         "DownloadingDb": "Laen alla %s",
@@ -30,5 +31,8 @@
         "SubmenuLocations": "Asukohad",
         "UpdaterWasLastRun": "Uuendaja käivitus viimati %s.",
         "WidgetLocation": "Külastajate asukohad"
+    },
+    "Intl": {
+        "Country_TI": "Tiibet"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserId/lang/et.json b/plugins/UserId/lang/et.json
index 0777e69781..f71047e8e5 100644
--- a/plugins/UserId/lang/et.json
+++ b/plugins/UserId/lang/et.json
@@ -1,5 +1,6 @@
 {
     "UserId": {
+        "UserId": "KasutajaID",
         "UserReportTitle": "Kasutajaid"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserId/lang/sk.json b/plugins/UserId/lang/sk.json
index be0f5fbf12..a28262cb4a 100644
--- a/plugins/UserId/lang/sk.json
+++ b/plugins/UserId/lang/sk.json
@@ -1,5 +1,7 @@
 {
     "UserId": {
-        "UserReportTitle": "Používatelia"
+        "UserId": "UserId",
+        "UserReportTitle": "Používatelia",
+        "PluginDescription": "Zobraziť reporty užívateľa"
     }
 }
\ No newline at end of file
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index e4c3673fa4..f22d2b63ed 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -190,5 +190,12 @@ class UsersManager extends \Piwik\Plugin
         $translationKeys[] = "UsersManager_ConfirmProhibitMySuperUserAccess";
         $translationKeys[] = "UsersManager_ExceptionUserHasViewAccessAlready";
         $translationKeys[] = "UsersManager_ExceptionNoValueForUsernameOrEmail";
+        $translationKeys[] = "UsersManager_GiveUserAccess";
+        $translationKeys[] = "UsersManager_PrivAdmin";
+        $translationKeys[] = "UsersManager_PrivView";
+        $translationKeys[] = "UsersManager_RemoveUserAccess";
+        $translationKeys[] = "UsersManager_UserHasPermission";
+        $translationKeys[] = "UsersManager_UserHasNoPermission";
+        $translationKeys[] = "UsersManager_PrivNone";
     }
 }
diff --git a/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js b/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
index 4ed851d68d..55d2f34b64 100644
--- a/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
+++ b/plugins/UsersManager/angularjs/manage-user-access/manage-user-access.controller.js
@@ -43,13 +43,32 @@
         };
 
         this.setAccess = function (login, access) {
-    
+          login=piwik.helper.escape(piwik.helper.htmlEntities(login));
+            if ( $('[data-login="' + login + '"]').find("#"+access).has('.accessGranted').length ){
+                return;
+            }
             // callback called when the ajax request Update the user permissions is successful
             function successCallback(response) {
                 var mainDiv = $('[data-login="' + login + '"]');
-                mainDiv.find('.accessGranted')
-                    .attr("src", "plugins/UsersManager/images/no-access.png")
+                var grantedDiv = mainDiv.find('.accessGranted');
+                var currentSite = $(".sites_autocomplete").attr("sitename");
+                currentSite = piwik.helper.escape(piwik.helper.htmlEntities(currentSite));
+
+                grantedDiv.attr("src", "plugins/UsersManager/images/no-access.png")
                     .attr("class", "updateAccess")
+                    .attr("title", function(){
+                      var access = grantedDiv.parents('[id]').attr('id');
+                      if (access =="noaccess"){
+                        return _pk_translate('UsersManager_RemoveUserAccess', [login,currentSite])
+                      }
+                      else if (access =="view") {
+                        return _pk_translate('UsersManager_GiveUserAccess', [login,_pk_translate('UsersManager_PrivView'),currentSite]);
+                      }
+                      else if (access =="admin") {
+                        return _pk_translate('UsersManager_GiveUserAccess', [login,_pk_translate('UsersManager_PrivAdmin'),currentSite]);
+                      }
+                    })
+                    .off('click')
                     .click(function () {
                         var access = $(this).parent().attr('id')
                         self.setAccess(login, access);
@@ -58,7 +77,14 @@
                 mainDiv.find('#' + access + ' img')
                     .attr('src', "plugins/UsersManager/images/ok.png")
                     .attr('class', "accessGranted")
-                ;
+                    .attr("title",function(){
+                      if(access=="noaccess"){
+                        return _pk_translate('UsersManager_UserHasNoPermission', [login,_pk_translate('UsersManager_PrivNone'),currentSite]);
+                      }else {
+                        return _pk_translate('UsersManager_UserHasPermission', [login,access,currentSite]);
+                      }}
+                  )
+                  ;
 
                 var UI = require('piwik/UI');
                 var notification = new UI.Notification();
@@ -93,4 +119,4 @@
             }
         }
     }
-})();
\ No newline at end of file
+})();
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index 3fdedcc01f..976cc83afd 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -36,6 +36,7 @@
         "ExceptionNoValueForUsernameOrEmail": "Please enter a username or email address.",
         "ExcludeVisitsViaCookie": "Exclude your visits using a cookie",
         "ForAnonymousUsersReportDateToLoadByDefault": "For anonymous users, report date to load by default",
+        "GiveUserAccess":"Give '%1$s' %2$s access for %3$s.",
         "GiveViewAccess": "Give view access for %1$s",
         "GiveViewAccessTitle": "Give an existing user access to view reports for %s",
         "GiveViewAccessInstructions": "To give an existing user view access for %s enter the username or email address of an existing user",
@@ -55,6 +56,7 @@
         "PrivAdmin": "Admin",
         "PrivNone": "No access",
         "PrivView": "View",
+        "RemoveUserAccess":"Remove access for '%1$s' for %2$s.",
         "ReportDateToLoadByDefault": "Report date to load by default",
         "ReportToLoadByDefault": "Report to load by default",
         "SuperUserAccessManagement": "Manage Super User access",
@@ -63,12 +65,14 @@
         "TheLoginScreen": "The login screen",
         "ThereAreCurrentlyNRegisteredUsers": "There are currently %s registered users.",
         "TokenAuth": "API Authentication Token",
-        "TokenRegenerateConfirm": "Changing the API authentication token will invalidate the user's current token. If the user is currently logged in, he may be required to log in again. Do you really want to continue?",
+        "TokenRegenerateConfirm": "Changing the API authentication token will invalidate the user's current token. If the user is currently logged in, they may be required to log in again. Do you really want to continue?",
         "TokenRegenerateConfirmSelf": "Changing the API authentication token will invalidate your own token. You may be required to log in again if you proceed. Do you really want to change your authentication token?",
         "TokenRegenerateLogoutWarning": "When you re-generate your token you will be logged out and need to log in again.",
         "TokenRegenerateTitle": "Regenerate",
         "TypeYourPasswordAgain": "Type your new password again.",
         "User": "User",
+        "UserHasPermission":"%1$s currently has %2$s access for %3$s.",
+        "UserHasNoPermission":"%1$s currently has %2$s to %3$s",
         "UsersManagement": "Users Management",
         "UsersManagementMainDescription": "Create new users or update the existing users. You can then set their permissions above.",
         "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "When users are not logged in and visit Piwik, they should access",
@@ -76,4 +80,4 @@
         "YourVisitsAreIgnoredOnDomain": "%1$sYour visits are ignored by Piwik on %2$s %3$s (the Piwik ignore cookie was found in your browser).",
         "YourVisitsAreNotIgnored": "%1$sYour visits are not ignored by Piwik%2$s (the Piwik ignore cookie was not found in your browser)."
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/UsersManager/lang/et.json b/plugins/UsersManager/lang/et.json
index dfad50ee8e..eb81f77c62 100644
--- a/plugins/UsersManager/lang/et.json
+++ b/plugins/UsersManager/lang/et.json
@@ -3,6 +3,7 @@
         "AddUser": "Lisa uus kasutaja",
         "Alias": "Alias",
         "AllWebsites": "Kõik veebilehed",
+        "AnonymousUser": "Anonüümne kasutaja",
         "ApplyToAllWebsites": "Laienda kõigile veebilehtedele",
         "ClickHereToSetTheCookieOnDomain": "Vajuta siia, et käesolevasse veebisirvikusse tekitada küpsis, mis ei lase sinu külastusi arvestada veebilehel %s",
         "DeleteConfirm": "Kas oled kindel, et soovid %s kustutada?",
diff --git a/plugins/UsersManager/lang/uk.json b/plugins/UsersManager/lang/uk.json
index b5206ff070..af8fa1b298 100644
--- a/plugins/UsersManager/lang/uk.json
+++ b/plugins/UsersManager/lang/uk.json
@@ -62,6 +62,11 @@
         "SuperUserAccessManagementMainDescription": "Суперкористувачі мають найвищі дозволи. Вони можуть виконувати всі адміністративні завдання, такі як додавання нових сайтів для моніторингу, додавання користувачів, зміна прав доступу користувачів, активація і деактивація плагінів і навіть встановлення нових плагінів з Маркету.",
         "TheLoginScreen": "Сторінка входу",
         "ThereAreCurrentlyNRegisteredUsers": "Зараз налічується %s зареєстрованих користувачів.",
+        "TokenAuth": "API перевірка автентичності Токенів",
+        "TokenRegenerateConfirm": "Зміна токену аутентифікації API анулює поточний маркер користувача. Якщо користувач в даний час увійшов в систему, йому може знадобитися знову увійти в систему. Ви дійсно хочете продовжити?",
+        "TokenRegenerateConfirmSelf": "Зміна токену аутентифікації API анулює свій власний маркер. Можливо, вам буде потрібно знову увійти в систему, якщо ви продовжите. Ви дійсно хочете змінити свій маркер аутентифікації?",
+        "TokenRegenerateLogoutWarning": "Коли ви повторно згенерували токен, ви будете виведені із системи і вам необхідно знову увійти в систему.",
+        "TokenRegenerateTitle": "Регенерувати",
         "TypeYourPasswordAgain": "Введіть ваш новий пароль знову.",
         "User": "Користувач",
         "UsersManagement": "Керування користувачами",
diff --git a/plugins/UsersManager/stylesheets/usersManager.less b/plugins/UsersManager/stylesheets/usersManager.less
index f4b22ced4a..11294a2f84 100644
--- a/plugins/UsersManager/stylesheets/usersManager.less
+++ b/plugins/UsersManager/stylesheets/usersManager.less
@@ -11,6 +11,27 @@
     cursor: pointer;
 }
 
+#manageUserAccess .icon-help,
+#super_user_access .icon-help {
+  color: @theme-color-text-contrast;
+}
+
+#manageUserAccess .icon-help:hover,
+#super_user_access .icon-help:hover {
+  color: @theme-color-text;
+  text-decoration: none;
+}
+
+#manageUserAccess .helpLink,
+#super_user_access .helpLink {
+  outline: none;
+}
+
+#manageUserAccess .helpLink:hover,
+#super_user_access .helpLink:hover {
+  text-decoration: none;
+}
+
 #users .addNewUserRow td {
   padding: 0 16px;
 }
@@ -68,4 +89,4 @@
   #user_invite {
     min-width: 300px;
   }
-}
\ No newline at end of file
+}
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 4b232c63e5..cad99a0436 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -54,16 +54,28 @@
             <th class='first'>{{ 'UsersManager_User'|translate }}</th>
             <th>{{ 'UsersManager_Alias'|translate }}</th>
             <th>{{ 'UsersManager_PrivNone'|translate }}</th>
-            <th>{{ 'UsersManager_PrivView'|translate }}</th>
-            <th>{{ 'UsersManager_PrivAdmin'|translate }}</th>
+            <th>{{ 'UsersManager_PrivView'|translate }} <a href="https://piwik.org/faq/general/faq_70/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
+            <th>{{ 'UsersManager_PrivAdmin'|translate }} <a href="https://piwik.org/faq/general/faq_69/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
         </tr>
         </thead>
 
         <tbody>
-        {% set accesValid %}<img src='plugins/UsersManager/images/ok.png' class='accessGranted' />{% endset %}
-        {% set superUserAccess %}<span title="{{ 'UsersManager_ExceptionSuperUserAccess'|translate }}">N/A</span>{% endset %}
 
         {% for login,access in usersAccessByWebsite %}
+
+            {% set accesValid %}
+              <img src='plugins/UsersManager/images/ok.png' class='accessGranted'
+                {% if access == 'noaccess' %}
+                title="{{'UsersManager_UserHasNoPermission'|translate(login,'UsersManager_PrivNone'|translate,defaultReportSiteName)}}"
+                {% elseif access == 'view' %}
+                title="{{'UsersManager_UserHasPermission'|translate(login,'UsersManager_PrivView'|translate,defaultReportSiteName)}}"
+                {% elseif access == 'admin' %}
+                title="{{'UsersManager_UserHasPermission'|translate(login,'UsersManager_PrivAdmin'|translate,defaultReportSiteName)}}"
+                {% endif %}
+              />
+            {% endset %}
+            {% set superUserAccess %}<span title="{{ 'UsersManager_ExceptionSuperUserAccess'|translate }}">N/A</span>{% endset %}
+
             {% if userIsSuperUser or (hasOnlyAdminAccess and (access!='noaccess' or idSiteSelected == 'all'))  %}
             <tr data-login="{{ login|e('html_attr') }}">
                 <td id='login'>{{ login }}</td>
@@ -76,6 +88,7 @@
                     {% else %}
                         <img src='plugins/UsersManager/images/no-access.png' class='updateAccess'
                              ng-click='manageUserAccess.setAccess({{ login|json_encode}}, "noaccess")'
+                             title="{{'UsersManager_RemoveUserAccess'|translate(login,defaultReportSiteName)|e('html_attr')}}"
                         />
                     {% endif %}&nbsp;</td>
                 <td id='view'>
@@ -86,6 +99,7 @@
                     {% else %}
                         <img src='plugins/UsersManager/images/no-access.png' class='updateAccess'
                              ng-click='manageUserAccess.setAccess({{ login|json_encode}}, "view")'
+                             title="{{'UsersManager_GiveUserAccess'|translate(login,'UsersManager_PrivView'|translate,defaultReportSiteName)|e('html_attr')}}"
                         />
                     {% endif %}&nbsp;</td>
                 <td id='admin'>
@@ -99,6 +113,7 @@
                         {% else %}
                             <img src='plugins/UsersManager/images/no-access.png' class='updateAccess'
                                  ng-click='manageUserAccess.setAccess({{ login|json_encode}}, "admin")'
+                                 title="{{'UsersManager_GiveUserAccess'|translate(login,'UsersManager_PrivAdmin'|translate,defaultReportSiteName)|e('html_attr')}}"
                             />
                         {% endif %}&nbsp;
                     {% endif %}
@@ -247,7 +262,7 @@
             <tr>
                 <th class='first'>{{ 'UsersManager_User'|translate }}</th>
                 <th>{{ 'UsersManager_Alias'|translate }}</th>
-                <th>{{ 'Installation_SuperUser'|translate }}</th>
+                <th>{{ 'Installation_SuperUser'|translate }} <a href="https://piwik.org/faq/general/faq_35/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
             </tr>
             </thead>
 
diff --git a/plugins/VisitFrequency/lang/sk.json b/plugins/VisitFrequency/lang/sk.json
index ea8c6df76e..d33cc79167 100644
--- a/plugins/VisitFrequency/lang/sk.json
+++ b/plugins/VisitFrequency/lang/sk.json
@@ -3,8 +3,22 @@
         "ColumnActionsByReturningVisits": "Akcie vracajúcich sa návštevníkov",
         "ColumnAverageVisitDurationForReturningVisitors": "Avg. Navštívte Čas pre návštevníkov vracať (v sekundách)",
         "ColumnAvgActionsPerReturningVisit": "Priemerný čas pre vracajúcich sa návštevníkov (v sekundách)",
+        "ColumnBounceCountForReturningVisits": "Počet odskočení vracajúcich sa návštev",
         "ColumnBounceRateForReturningVisits": "Miera odskočení vracajúcich sa návštev",
+        "ColumnMaxActionsInReturningVisit": "Maximum akcií počas jednej vracajúcej sa návštevy",
+        "ColumnNbReturningVisitsConverted": "Počet skonvertovaných vracajúcich sa návštev",
         "ColumnReturningVisits": "Vracajúce sa návštevy",
+        "ColumnSumVisitLengthReturning": "Celkový čas strávený návštevníkmi (v sekundách)",
+        "ColumnUniqueReturningVisitors": "Unikátny vracajúci sa návštevníci",
+        "ColumnReturningUsers": "Vracajúci sa užívatelia",
+        "PluginDescription": "Metriky prehľadov o prvých nových návštevníkoch a vracajúcich sa návštevníkoch.",
+        "ReturnActions": "akcie vracajúcich sa návštevníkov",
+        "ReturnAverageVisitDuration": "priemerná dĺžka návštevy u vracajúcich sa návštevníkov",
+        "ReturnAvgActions": "akcie pre vracajúcu sa návštevu",
+        "ReturnBounceRate": "vracajúce sa návštevy odskočili (odišli po zobrazení jednej stránky)",
+        "ReturningVisitDocumentation": "Vracajúca sa návšteva je (ako opak novej návštevy) vykonaná niekým, kto už webovú stránku navštívil aspoň raz pred tým.",
+        "ReturningVisitsDocumentation": "Toto je prehľad vracajúcich sa návštev.",
+        "ReturnVisits": "vracajúce sa návštevy",
         "SubmenuFrequency": "Frekvencia",
         "WidgetGraphReturning": "Graf vracajúcich sa",
         "WidgetOverview": "Prehľad frekvencií"
diff --git a/plugins/VisitorInterest/lang/sk.json b/plugins/VisitorInterest/lang/sk.json
index afd1d8b3e9..7d9a232baa 100644
--- a/plugins/VisitorInterest/lang/sk.json
+++ b/plugins/VisitorInterest/lang/sk.json
@@ -7,9 +7,13 @@
         "Engagement": "Záujem",
         "NPages": "%s stránok",
         "OnePage": "1 stránka",
+        "VisitNum": "Číslo návštevy",
+        "VisitsByDaysSinceLast": "Návštevy v dňoch od poslednej návštevy",
+        "visitsByVisitCount": "Návštevy podľa Čísla Návštevy",
         "VisitsPerDuration": "Návštevy podľa dĺžky trvania návštevy",
         "VisitsPerNbOfPages": "Návštevy na počet stránok",
         "WidgetLengths": "Trvanie návštev",
-        "WidgetPages": "Strany na návštevu"
+        "WidgetPages": "Strany na návštevu",
+        "WidgetVisitsByDaysSinceLast": "Návštevy v dňoch od poslednej návštevy"
     }
 }
\ No newline at end of file
diff --git a/plugins/VisitsSummary/lang/et.json b/plugins/VisitsSummary/lang/et.json
index b4242ea2a7..8898ac72a8 100644
--- a/plugins/VisitsSummary/lang/et.json
+++ b/plugins/VisitsSummary/lang/et.json
@@ -1,8 +1,11 @@
 {
     "VisitsSummary": {
+        "AverageGenerationTime": "Keskmine genereerimise aeg",
+        "AverageVisitDuration": "keskmine külastuse kestus",
         "GenerateQueries": "%s katkestatud päringut",
         "GenerateTime": "Lehe genereerimiseks kulus %s sekundit",
         "NbActionsDescription": "%s tegevust",
+        "NbDownloadsDescription": "allalaadimised",
         "VisitsSummary": "Külastuste kokkuvõte",
         "VisitsSummaryDocumentation": "See on külastuste muutuse ajas ülevaade.",
         "WidgetLastVisits": "Viimaste külastuste graafik",
diff --git a/plugins/VisitsSummary/lang/sk.json b/plugins/VisitsSummary/lang/sk.json
index a497b6d976..79c0da1dc6 100644
--- a/plugins/VisitsSummary/lang/sk.json
+++ b/plugins/VisitsSummary/lang/sk.json
@@ -1,11 +1,29 @@
 {
     "VisitsSummary": {
+        "AverageGenerationTime": "priem. čas generovania",
+        "AverageVisitDuration": "priemerné trvanie návštevy",
         "GenerateQueries": "spustené požiadavky: %s",
         "GenerateTime": "%s sekúnd na vygenerovanie strany",
-        "NbActionsDescription": "%s akcie (zobrazenie stránok, sťahovanie a odkazujúce odkazy)",
+        "MaxNbActions": "max. akcií na jednu návštevu",
+        "NbActionsDescription": "%s akcie",
+        "NbActionsPerVisit": "akcie (zobrazenie stránok, sťahovanie a odkazujúce odkazy) za návštevu",
+        "NbDownloadsDescription": "sťahovania",
+        "NbKeywordsDescription": "unikátne kľúčové slová",
+        "NbOutlinksDescription": "vonkajšie odkazy",
+        "NbPageviewsDescription": "zobrazené stránky",
+        "NbSearchesDescription": "celkový počet vyhľadávaní na Vašej webstránke",
+        "NbUniqueDownloadsDescription": "jedinečné sťahovania",
+        "NbUniqueOutlinksDescription": "unikátne vonkajšie odkazy",
+        "NbUniquePageviewsDescription": "unikátne zobrazenia stránok",
+        "NbUniqueVisitors": "unikátny návštevníci",
+        "NbUsersDescription": "používatelia",
+        "NbVisitsDescription": "návštevy",
+        "NbVisitsBounced": "návštev odskočilo (odišli po zobrazení jednej stránky)",
+        "PluginDescription": "Reportuje obecnú analýzu metrík: návštevy, unikátny návštevníci, počet akcií, mieru odskočenia, atď.",
         "VisitsSummary": "Všetky návštevy",
-        "WidgetLastVisits": "Graf posledných návštev",
-        "WidgetOverviewGraph": "Prehľad s grafom",
+        "VisitsSummaryDocumentation": "Toto je prehľad vývoja návštev..",
+        "WidgetLastVisits": "Návštevy v priebehu času",
+        "WidgetOverviewGraph": "Prehľad návštev (s grafom)",
         "WidgetVisits": "Prehľad návštevníkov"
     }
 }
\ No newline at end of file
diff --git a/plugins/WebsiteMeasurable/lang/et.json b/plugins/WebsiteMeasurable/lang/et.json
new file mode 100644
index 0000000000..2036de4fea
--- /dev/null
+++ b/plugins/WebsiteMeasurable/lang/et.json
@@ -0,0 +1,6 @@
+{
+    "WebsiteMeasurable": {
+        "Website": "Veebileht",
+        "Websites": "Veebisaidid"
+    }
+}
\ No newline at end of file
diff --git a/plugins/WebsiteMeasurable/lang/sk.json b/plugins/WebsiteMeasurable/lang/sk.json
index 2a00fb072a..dabe350074 100644
--- a/plugins/WebsiteMeasurable/lang/sk.json
+++ b/plugins/WebsiteMeasurable/lang/sk.json
@@ -1,5 +1,6 @@
 {
     "WebsiteMeasurable": {
-        "Website": "Web stránka"
+        "Website": "Web stránka",
+        "Websites": "Webstránky"
     }
 }
\ No newline at end of file