Merge branch 'next_release' into 4.x-dev

55 files changed, 137 insertions, 183 deletions

diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 6fc2070cdf..3747500fdd 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -192,7 +192,6 @@ class CoreHome extends \Piwik\Plugin
         $jsFiles[] = "plugins/CoreHome/javascripts/numberFormatter.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/zen-mode.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/noreferrer.js";
-        $jsFiles[] = "plugins/CoreHome/javascripts/refresh-button.js";
 
         $jsFiles[] = "plugins/CoreHome/angularjs/piwikApp.config.js";
 
@@ -381,6 +380,7 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'CoreHome_ShortcutCalendar';
         $translationKeys[] = 'CoreHome_ShortcutSearch';
         $translationKeys[] = 'CoreHome_ShortcutHelp';
+        $translationKeys[] = 'CoreHome_ShortcutRefresh';
         $translationKeys[] = 'CoreHome_StandardReport';
         $translationKeys[] = 'CoreHome_ReportWithMetadata';
         $translationKeys[] = 'CoreHome_ReportType';
@@ -412,6 +412,5 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'CoreHome_StartDate';
         $translationKeys[] = 'CoreHome_EndDate';
         $translationKeys[] = 'CoreHome_DataForThisReportHasBeenDisabled';
-        $translationKeys[] = 'CoreHome_ShortcutRefresh';
     }
 }
diff --git a/plugins/CoreHome/javascripts/refresh-button.js b/plugins/CoreHome/javascripts/refresh-button.js
deleted file mode 100644
index de364d2a3e..0000000000
--- a/plugins/CoreHome/javascripts/refresh-button.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link http://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-$(function () {
-  var iconRefresh = $('.top_controls .icon-reload');
-
-  function refresh() {
-    var Matomo = window.CoreHome.Matomo;
-    var hashParsed = window.CoreHome.MatomoUrl.hashParsed.value;
-
-    Matomo.postEvent('loadPage', hashParsed.category, hashParsed.subcategory);
-  }
-
-  function isCoreHomeModuleActive() {
-    var search = window.CoreHome.MatomoUrl.parse(window.location.search.slice(1));
-    return search.module === 'CoreHome';
-  }
-
-  if (isCoreHomeModuleActive()) {
-    iconRefresh.removeClass('hidden');
-
-    iconRefresh.on('click', function (e) {
-      e.preventDefault();
-      refresh();
-    });
-
-    piwikHelper.registerShortcut('r', _pk_translate('CoreHome_ShortcutRefresh'), function (event) {
-      if (event.altKey) {
-        return;
-      }
-      if (event.preventDefault) {
-        event.preventDefault();
-      } else {
-        event.returnValue = false; // IE
-      }
-
-      refresh();
-    });
-  }
-});
diff --git a/plugins/CoreHome/javascripts/top_controls.js b/plugins/CoreHome/javascripts/top_controls.js
index f4a793b4b5..66dee03260 100644
--- a/plugins/CoreHome/javascripts/top_controls.js
+++ b/plugins/CoreHome/javascripts/top_controls.js
@@ -108,3 +108,22 @@ function blockPropegation(){
         e.stopPropagation();
     })
 }
+
+//refresh page short cut 'r'
+$(function () {
+  piwikHelper.registerShortcut('r', _pk_translate('CoreHome_ShortcutRefresh'), function (event) {
+    if (event.altKey) {
+      return;
+    }
+    if (event.preventDefault) {
+      event.preventDefault();
+    } else {
+      event.returnValue = false; // IE
+    }
+
+    var Matomo = window.CoreHome.Matomo;
+    var hashParsed = window.CoreHome.MatomoUrl.hashParsed.value;
+
+    Matomo.postEvent('loadPage', hashParsed.category, hashParsed.subcategory);
+  });
+});
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/de.json b/plugins/CoreHome/lang/de.json
index 07107b6006..bbffdaa0a8 100644
--- a/plugins/CoreHome/lang/de.json
+++ b/plugins/CoreHome/lang/de.json
@@ -90,7 +90,6 @@
         "ShortcutCalendar": "um den Kalender zu öffnen (d steht für Datum)",
         "ShortcutHelp": "um diese Hilfe anzuzeigen",
         "ShortcutSearch": "um diese Suche zu öffnen (f steht für Find)",
-        "ShortcutRefresh": "um die aktuelle Ansicht zu aktualisieren",
         "ShortcutSegmentSelector": "um den Segment Selektor zu öffnen",
         "ShortcutWebsiteSelector": "um den Webseiten Selektor zu öffnen",
         "ShortcutZenMode": "für Zen Modus",
@@ -128,7 +127,6 @@
         "VisitorsOverviewHelp": "Die Besucherübersicht hilft Ihnen, die Popularität Ihrer Website zu verstehen. Dazu stellt sie Diagramme bereit, die zeigen, wie viele Besuche Ihre Website über einen ausgewählten Zeitraum erhält und wie hoch das durchschnittliche Engagement für wichtige Funktionen wie Suchen und Downloads ist.",
         "WebAnalyticsReports": "Webanalytik-Berichte",
         "YouAreUsingTheLatestVersion": "Sie verwenden die aktuelle Version von Matomo!",
-        "YourDonationWillHelp": "Ihre Spende wird direkt dafür eingesetzt, neue Features und Erweiterungen für diese Open-Source Analyse-Plattform zu finanzieren. Das bedeutet, die Community wird immer von einem Tool profitieren, welches Privatsphäre beschützt und Ihnen erlaubt, die Kontrolle Ihrer Daten zu bewahren.",
-        "Refresh": "Aktualisieren"
+        "YourDonationWillHelp": "Ihre Spende wird direkt dafür eingesetzt, neue Features und Erweiterungen für diese Open-Source Analyse-Plattform zu finanzieren. Das bedeutet, die Community wird immer von einem Tool profitieren, welches Privatsphäre beschützt und Ihnen erlaubt, die Kontrolle Ihrer Daten zu bewahren."
     }
 }
diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
index 843fc1510b..805be8faca 100644
--- a/plugins/CoreHome/lang/en.json
+++ b/plugins/CoreHome/lang/en.json
@@ -63,7 +63,7 @@
         "ShortcutWebsiteSelector": "to open Website selector",
         "ShortcutCalendar": "to open calendar (d stands for Date)",
         "ShortcutSearch": "to open the search (f stands for Find)",
-        "ShortcutRefresh": "to refresh the current view",
+        "ShortcutRefresh": "to refresh the content",
         "ShortcutHelp": "to show this help",
         "ShowJSCode": "Show the JavaScript code to insert",
         "SkipToContent": "Skip to content",
@@ -128,7 +128,6 @@
         "EngagementSubcategoryHelp2": "This can help you to optimise for frequency and high-interaction visits in addition to maximising your reach.",
         "PeriodHasOnlyRawData": "It looks like reports for this period have not been processed yet. Do you want to see what's happening now? Check out the %1$sVisits log%2$s or choose a different date period until the reports are generated.",
         "StartDate": "Start Date",
-        "EndDate": "End Date",
-        "Refresh": "Refresh"
+        "EndDate": "End Date"
     }
 }
diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less
index 4841b4f2bf..61a115fdac 100644
--- a/plugins/CoreHome/stylesheets/layout.less
+++ b/plugins/CoreHome/stylesheets/layout.less
@@ -131,9 +131,9 @@ nav {
     margin-left: 224px;
   }
 
-  &>.top_controls {
-    &> .icon-arrowup:before, &> .icon-arrowdown:before, &> .icon-reload:before {
-      padding: 17px 0 0 0;
+    &>.top_controls {
+      .icon-arrowup:before, .icon-arrowdown:before {
+      padding: 17px 0 0 0px;
       display: inline-block;
       cursor: pointer;
 
@@ -141,11 +141,6 @@ nav {
         display: none;
       }
     }
-
-    &> .icon-reload:before {
-      padding-right: 10px;
-      font-weight: lighter;
-    }
   }
 
   @media only screen and (min-width: 993px) {
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig
index efa5a9de5d..8fb6ec2e9e 100644
--- a/plugins/CoreHome/templates/_headerMessage.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
@@ -10,9 +10,7 @@
     </span>
 {% endset %}
 
-{% set showVersionInfo = (latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous and showUpdateNotificationToUser) or (isSuperUser and isAdminArea is defined and isAdminArea) %}
-
-{% if showVersionInfo %}
+{% if (latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous and showUpdateNotificationToUser) or (isSuperUser and isAdminArea is defined and isAdminArea) %}
 <div piwik-expand-on-hover
      id="header_message"
      class="piwikSelector borderedControl {% if not latest_version_available %}header_info{% else %}{% endif %} piwikTopControl {% if latest_version_available %}update_available{% endif %}"
@@ -60,11 +58,8 @@
     </div>
 </div>
 
-{% endif %}
-
-<span class="icon icon-reload hidden" title="{{ 'CoreHome_Refresh'|translate }}"></span>
 <span class="icon icon-arrowup"></span>
-
-{% if showVersionInfo %}
 <div style="clear:right"></div>
+{% else %}
+<span class="icon icon-arrowup"></span>
 {% endif %}
diff --git a/plugins/CoreUpdater/Diagnostic/HttpsUpdateCheck.php b/plugins/CoreUpdater/Diagnostic/HttpsUpdateCheck.php
index b90f9115c7..52dff9ab16 100644
--- a/plugins/CoreUpdater/Diagnostic/HttpsUpdateCheck.php
+++ b/plugins/CoreUpdater/Diagnostic/HttpsUpdateCheck.php
@@ -5,6 +5,7 @@
  * @link https://matomo.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
 namespace Piwik\Plugins\CoreUpdater\Diagnostic;
 
 use Piwik\Config\GeneralConfig;
@@ -30,20 +31,23 @@ class HttpsUpdateCheck implements Diagnostic
 
     public function execute()
     {
+        $faqLinks = [
+          '<a href="https://matomo.org/faq/faq-how-to-disable-https-for-matomo-org-and-api-matomo-org-requests" rel="noreferrer noopener" target="_blank">',
+          '</a>'
+        ];
         $label = $this->translator->translate('Installation_SystemCheckUpdateHttps');
 
-        if (GeneralConfig::getConfigValue('force_matomo_ssl_request') === 0) {
-            //if config is off, show info
-            $comment = $this->translator->translate('Installation_MatomoSslRequestConfigInfo');;
+        if (GeneralConfig::getConfigValue('force_matomo_http_request') == 1) {
+            //if config is on, show info
+            $comment = $this->translator->translate('Installation_MatomoHttpRequestConfigInfo', $faqLinks);
             return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_INFORMATIONAL, $comment));
-        } elseif (Http::isUpdatingOverHttps()) {
+        } elseif (!Http::isUpdatingOverHttps()) {
+            // failed to request over https
+            $warning = 'We will soon switch to HTTPS by default. Please make sure that HTTPS works on your environment or turn on `force_matomo_http_request`, otherwise it could cause Matomo updates to fail in the future. For more details please read our <a href="https://matomo.org/faq/faq-how-to-disable-https-for-matomo-org-and-api-matomo-org-requests" rel="noreferrer noopener" target="_blank">FAQ</a>.';
+            return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $warning));
+        } else {
             // successful using https
             return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK));
-        } else {
-            // failed to request over https
-            $comment = $this->translator->translate('Installation_SystemCheckUpdateHttpsNotSupported');
-            return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $comment));
         }
-
     }
 }
diff --git a/plugins/CoreUpdater/Updater.php b/plugins/CoreUpdater/Updater.php
index cfaed0a672..2549e42191 100644
--- a/plugins/CoreUpdater/Updater.php
+++ b/plugins/CoreUpdater/Updater.php
@@ -12,6 +12,7 @@ use Exception;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\CliMulti;
 use Piwik\Common;
+use Piwik\Config\GeneralConfig;
 use Piwik\Container\StaticContainer;
 use Piwik\Filechecks;
 use Piwik\Filesystem;
@@ -353,7 +354,7 @@ class Updater
         $channel = $this->releaseChannels->getActiveReleaseChannel();
         $url = $channel->getDownloadUrlWithoutScheme($version);
 
-        if (Http::isUpdatingOverHttps() && $https) {
+        if (Http::isUpdatingOverHttps() && $https && GeneralConfig::getConfigValue('force_matomo_http_request') == 0) {
             $url = 'https' . $url;
         } else {
             $url = 'http' . $url;
diff --git a/plugins/CoreUpdater/tests/Integration/ReleaseChannelTest.php b/plugins/CoreUpdater/tests/Integration/ReleaseChannelTest.php
index ea56a09e2e..476b4e0e5c 100644
--- a/plugins/CoreUpdater/tests/Integration/ReleaseChannelTest.php
+++ b/plugins/CoreUpdater/tests/Integration/ReleaseChannelTest.php
@@ -60,7 +60,7 @@ class ReleaseChannelTest extends IntegrationTestCase
 
         $urlToCheck = $this->channel->getUrlToCheckForLatestAvailableVersion();
 
-        $this->assertStringStartsWith("https://api.matomo.org/1.0/getLatestVersion/?piwik_version=$version&php_version=$phpVersion&mysql_version=$mysqlVersion&release_channel=my_channel&url=$url&trigger=&timezone=", $urlToCheck);
+        $this->assertStringStartsWith("http://api.matomo.org/1.0/getLatestVersion/?piwik_version=$version&php_version=$phpVersion&mysql_version=$mysqlVersion&release_channel=my_channel&url=$url&trigger=&timezone=", $urlToCheck);
     }
 
     public function test_doesPreferStable()
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
index d05625967c..ce27088fd1 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05e2913dde1aac9bd030382a0a9ca0814cc962ee80d22d447d4d8f278a89107d
-size 299375
+oid sha256:86402b32e55753a093278fd35f58402b31b230bd48fb924cfcf79ddb81eab4a5
+size 298745
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png
index 07802deb51..534ba53556 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f131d50b97283a69fd2aa18ab51031c3a63d40b6323eadca5dbcce2c9da9aed8
-size 53535
+oid sha256:0a1140ff2faa63fd1a5bc117e752efb78dc144f8e60f2fb9d57d6db4ed396786
+size 52945
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
index 9376854030..e80dfe23c5 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52a2b717f752dd894932bfed962c18b61de72ddb5fe339537ba48f3ad009eeb4
-size 502449
+oid sha256:6e234398c56cf368363035bd511ef455386a1a4f19e886419c3a1e68491d9b29
+size 501925
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png
index 23cdc0da1c..92d12781dc 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60e2f731195d062eae727f0d2cce3c2fa6ca2b32f563ccf49bed285c84d43ada
-size 240126
+oid sha256:3bacb35a00aa2ba327d2736d50fa85e03ceb1274e82f8284b772bfe957067b61
+size 239399
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
index 76da6664ba..3b87b989ce 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a7e154ca398a72cf9a9f4ee0451078ae242e8aa51001d40cb33885fccc53db9
-size 67092
+oid sha256:a535b81c408e49784d121e8b747e2d7a534486bae714ca4c3d158e004c78f7c6
+size 66491
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
index fe8ba6b3e5..aa07fca5b4 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:423ae1750f7030b4050e381bf498fa96acd44ffe43f1e995d6036b57dcfd0984
-size 79275
+oid sha256:2fdbb845abe10929aaae52fbf33bfeb3745638dc1fadf5417382df1411b000ff
+size 78674
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png
index bbdb943472..28297ab72c 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2124f5c728bbca6fee0107fb6fbdfc6e9a51eff0f1dc3536c3e02365c969d84
-size 87537
+oid sha256:bf3647306de8d285a7ad73e75fedfc5461e372236be391c63f254e40548e9770
+size 86846
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png
index 4990dcd5a7..4141a001a1 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:565a8d413aee9cb0e4a0aaaa818f86eb2263ee6b5f474fadc047925d6766f76c
-size 103474
+oid sha256:2006060508df201ef1daa22ca08d7795a0663bd0986122cccb0d0de681070f15
+size 102804
diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json
index cb1d1f5c36..353745e027 100644
--- a/plugins/Installation/lang/en.json
+++ b/plugins/Installation/lang/en.json
@@ -136,7 +136,6 @@
         "SystemCheckCronArchiveProcessCLI": "Managing processes via CLI",
         "SystemCheckPhpSetting": "Set up your php.ini file like this to prevent critical errors: %s",
         "SystemCheckUpdateHttps": "Update over HTTPS",
-        "SystemCheckUpdateHttpsNotSupported": "Matomo cannot use HTTPS to update, it will fall back to the insecure HTTP update. Check that CURL or allow_url_fopen is supported and that the OpenSSL PHP-extension is installed: https:\/\/matomo.org\/faq\/troubleshooting\/faq_177\/. If you like to disable HTTPS please set force_matomo_ssl_request to 0 under general config.",
         "PhpBinaryCheck" : "64-bit PHP Binary",
         "PhpBinaryCheckHelp": "32-bit <p>Upgrade to a 64-bit PHP binary by January 2026 to prevent bugs.</p>",
         "NotSupported": "not supported",
@@ -159,6 +158,6 @@
         "EmailPrivacyNotice": "Your email address will only be used to send you the newsletter. It is shared with Mad Mimi to do so, but the third-party provider may change. We will not share your email with anyone else or use your it for any other purpose. Unsubscribe at any time. The %1$sprivacy policy%2$s has more info.",
         "PerformanceSettingsDesc1": "Your Matomo is set up and ready to track and report on your website's traffic. Set up %1$sCLI archiving%2$s if you find it to be slow. This generates reports in the background, rather than on demand.",
         "PerformanceSettingsDesc2": "This requires adding a Matomo command to Cron which can't be done automatically by the installer. %1$sRead our FAQ to learn to set it up yourself.%2$s",
-        "MatomoSslRequestConfigInfo": "The force_matomo_ssl_request in the general config is turned off, we highly recommend switching it on"
+        "MatomoHttpRequestConfigInfo": "The option force_matomo_http_request in the general config is turned on, we highly recommend switching it off for security reasons. For more details please read our %1$sFAQ%2$s"
     }
 }
diff --git a/plugins/Marketplace/Api/Client.php b/plugins/Marketplace/Api/Client.php
index 5e81b6c982..7e6404c0f7 100644
--- a/plugins/Marketplace/Api/Client.php
+++ b/plugins/Marketplace/Api/Client.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
+
 namespace Piwik\Plugins\Marketplace\Api;
 
 use Exception as PhpException;
@@ -168,7 +169,7 @@ class Client
             $pluginName = $plugin->getPluginName();
             if (!$this->pluginManager->isPluginBundledWithCore($pluginName)) {
                 $isActivated = $this->pluginManager->isPluginActivated($pluginName);
-                $params[] = array('name' => $plugin->getPluginName(), 'version' => $plugin->getVersion(), 'activated' => (int) $isActivated);
+                $params[] = array('name' => $plugin->getPluginName(), 'version' => $plugin->getVersion(), 'activated' => (int)$isActivated);
             }
         }
 
@@ -189,7 +190,7 @@ class Client
     }
 
     /**
-     * @param  \Piwik\Plugin[] $plugins
+     * @param \Piwik\Plugin[] $plugins
      * @return array
      */
     public function getInfoOfPluginsHavingUpdate($plugins)
@@ -214,7 +215,6 @@ class Client
                 $plugin['repositoryChangelogUrl'] = $pluginHavingUpdate['repositoryChangelogUrl'];
                 $pluginDetails[] = $plugin;
             }
-
         }
 
         return $pluginDetails;
@@ -268,7 +268,7 @@ class Client
             $params['release_channel'] = $releaseChannel;
         }
 
-        $params['prefer_stable'] = (int) $this->environment->doesPreferStable();
+        $params['prefer_stable'] = (int)$this->environment->doesPreferStable();
         $params['piwik'] = $this->environment->getPiwikVersion();
         $params['php'] = $this->environment->getPhpVersion();
         $params['mysql'] = $this->environment->getMySQLVersion();
@@ -309,8 +309,8 @@ class Client
 
     /**
      * @param  $pluginOrThemeName
-     * @throws Exception
      * @return string
+     * @throws Exception
      */
     public function getDownloadUrl($pluginOrThemeName)
     {
@@ -332,12 +332,7 @@ class Client
      */
     public static function getApiServiceUrl()
     {
-        $url = GeneralConfig::getConfigValue('api_service_url');
-        if (!GeneralConfig::getConfigValue('force_matomo_ssl_request')) {
-            $url = str_replace('https', 'http', $url);
-        }
-
-        return $url;
+        return GeneralConfig::getConfigValue('api_service_url');
     }
 
 }
diff --git a/plugins/Marketplace/config/config.php b/plugins/Marketplace/config/config.php
index 1ebe26f698..0cfce1bb5d 100644
--- a/plugins/Marketplace/config/config.php
+++ b/plugins/Marketplace/config/config.php
@@ -1,19 +1,12 @@
 <?php
 
-use Piwik\Config\GeneralConfig;
 use Piwik\Plugins\Marketplace\Api\Service;
 use Piwik\Plugins\Marketplace\LicenseKey;
 use Psr\Container\ContainerInterface;
 
 return array(
     'MarketplaceEndpoint' => function (ContainerInterface $c) {
-        $domain = 'https://plugins.matomo.org';
-
-        if (GeneralConfig::getConfigValue('force_matomo_ssl_request') === 0) {
-            $domain = str_replace('https://', 'http://', $domain);
-        }
-
-        return $domain;
+        return 'http://plugins.matomo.org';
     },
     'Piwik\Plugins\Marketplace\Api\Service' => function (ContainerInterface $c) {
         /** @var \Piwik\Plugins\Marketplace\Api\Service $previous */
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
index 98ed34ef97..f3d3c4d5fe 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7b962e21b83262b9f071da707dcf99883239a00aef690cb3a9728b12a75016e
-size 56228
+oid sha256:f854b441cb8492fff6e3aff1ceae3cc516c858f0b81a953aa3f94f94b4ae8501
+size 56570
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
index 98ed34ef97..f3d3c4d5fe 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7b962e21b83262b9f071da707dcf99883239a00aef690cb3a9728b12a75016e
-size 56228
+oid sha256:f854b441cb8492fff6e3aff1ceae3cc516c858f0b81a953aa3f94f94b4ae8501
+size 56570
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
index 30fc2ac132..0384a5fda4 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed2d7cd62d9e6e32477756124df7155a5e6e682ba06639604478c48fcea4988d
-size 65469
+oid sha256:261822d8f71fd4845b39dad33bca14c32f19e29be70395037ba82381a2f031c0
+size 65807
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
index 30fc2ac132..0384a5fda4 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed2d7cd62d9e6e32477756124df7155a5e6e682ba06639604478c48fcea4988d
-size 65469
+oid sha256:261822d8f71fd4845b39dad33bca14c32f19e29be70395037ba82381a2f031c0
+size 65807
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
index eaf6c692ac..bc928afcb1 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42c4a75028c228db7e08ab9942cfcb83da26e9b8c144a9cf0b04ed6ba24bf914
-size 66783
+oid sha256:9d1d21ca974ef07cb551d1b69b1a92e442eb3ac91971d7c948dd178ef4f7c188
+size 67144
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
index b1c5f838ac..d3f137ea33 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ae653825869011af8da4691ad7e29d5848f153a248c9d146d33d32f4e2feab2
-size 66882
+oid sha256:2e4cebe6fb6eb9dfd2ee4ae3bfcabc2f1707f3a0cbc876f68973c572ec20349f
+size 67231
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
index 087941d9c9..19837d8750 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b3a87ad7dd6d416b7b2e368016ddb9494781e381adfe2597d0edbf7789f9599
-size 823436
+oid sha256:526b13fa9e37aa0a7bcc0c6d75a95af0bf583daa05fd28adff5898c4bb168952
+size 823683
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
index 5c30ccc3e4..071b211e9a 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9274a1fd72ec7562b807d1820e42a0024c11bbe50ff938d68ca0f31596fc976
-size 849857
+oid sha256:3370194d2128ad48d713421c0cc2c85ca61b396a0ed55658112b3ea55577688f
+size 850082
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
index 8108d2f3b9..c506b33d2a 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d765922d6d4b7dc83027a28b0d887cdd745038521507dee7daa9060fa55e949
-size 841322
+oid sha256:e9ed03963b75a88875b8d798419f7e7c388583bdde03e647471b0a49407ca2a9
+size 841435
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
index 90ba410bf0..7538956159 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6df29c4584f2a504ccacb5fb41ffd500457ad6ec02d6138a398556d8e66dbba3
-size 835965
+oid sha256:64e862542aefb884ac325b1ee79373139dd74e89e49d30c0871a72a486468536
+size 836133
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
index 0eb4ec5a23..61aabd845f 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:518f897c8a30a9533abb9c193cd35bd397c6c626389b2aaf8cc78362df28fe40
-size 845122
+oid sha256:31f9465d3808597861484d80fa8a89d37bcbec916c6cab1e0f74f46231e15b25
+size 845317
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
index 5c78442ebc..7ebe22d0d6 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8672f349e163b774a2e391e31d70a2abc751f18c70071361120b2282dca47092
-size 164466
+oid sha256:d52ed812139539ce64ca3235506c958c85a15e9d914363f332ba8d4ea0706117
+size 164081
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
index 722d331f3c..60594944a2 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:786bea8d1726b113e8595e28c77bdad43a93f40b92962a69c343d888d748b2d2
-size 161520
+oid sha256:1bccd2f10cb85e27e4e86eb26d27e2b81469545ccfdda6ec2ac3b2f36acb1f94
+size 161072
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png
index 8db6e3e5b0..ea1bde6728 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02174b4e806d581d5edba4a5d841f032501fd8da5e6240667c0a80444a6a1ac7
-size 15827
+oid sha256:f1cb9ea7f124cb10bfbc3f36a62955bb0a0c57057ead29b9a2ce2956e463fec4
+size 15224
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png
index 8405fa6d62..02f6078410 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71ac60106fdfe5307aa3cc70219f2451ba222e15612010eb08cd310da66f3542
-size 36277
+oid sha256:f1af531786856e6064f1d5eee92cfcf6ff4bb55f8350425c9e6782b422609746
+size 35679
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png
index 370071d0e2..efa680e625 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7dac88e1d04b1f8ee76ddab50d2f5f1767e1955855f950138acf3eb0dd9b0d0a
-size 36787
+oid sha256:925e595dae3a1788bf5c186f3f095cc3a30a86e17b0d135c3a51584013fbdb2e
+size 36194
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png
index f3ffcff593..d09882fd5b 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3103219b4ab5353bbdee44b47202b7de189b6f8e8679dd2605b806e8d783b25c
-size 32727
+oid sha256:ec2fad0f9a7066854d9d7f6ee2e9355040be0383ec5e8e6be36803c0e077f832
+size 32105
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png
index 84a52ef774..b21b22ed55 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04df251c6ac6b1d6731e8bf81ac8aa4fcb8f34c2d982aad496e33de0fb97f2dd
-size 47120
+oid sha256:10a54070979f44fbd99d8b187d1a1b05f56cb7af64a7d8db0bdf0601b44bc7f1
+size 46579
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png
index 16e4c169da..aa6c1c075e 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ec5d3abac4df33db36f6a4a74ba62caa7f6c7f40ac31f54794e063ac94cbc94
-size 37188
+oid sha256:94a882f9f53d2c3b42c68a7a83eda6c3be1e3db752786cca402157b5577c7dc9
+size 36648
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_capitalized.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_capitalized.png
index 397bbf35a7..f7a02f7322 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_capitalized.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_capitalized.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:294d8d610e72b60fab652a3acd9f5764ab365830df14392f985b15a6278db825
-size 57046
+oid sha256:0af86f4f8e303eb36954d87820a0f7c4a4c04a2849878be22c3f3e12ae937f0b
+size 56450
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_lowercase.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_lowercase.png
index 22051f3c69..76673eef25 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_lowercase.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_lowercase.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdeb85f25ddeda230b4b86d320e2c56a07a95721f84b33cd27112af5912e7329
-size 57055
+oid sha256:4c7e57c4d0af0d887fba637b215dd5f6fc74f444c422159959cfc61176068e07
+size 56458
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_uppercase.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_uppercase.png
index 89ea6b70ca..ca0b64269c 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_uppercase.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_autocomplete_uppercase.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c5a186ca3cf0b7dcc4f3adfa3846473d0552c9763616fd41898ae1882b5fdd9
-size 57090
+oid sha256:2606467e0ead882358c5fadfc11e6408d0a169110f469a9166a6759a1cabe605
+size 56489
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
index 4832d62ac3..47f3c484f6 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e40a3bcbf9960b0f02fb9cd1aff9e96e59cf54eba3cefd0d90fa11978388fbbe
-size 362176
+oid sha256:c2194f731fb9141d2ef8fa88800957b23963185d31f8a6e8ef69ede4c306b803
+size 361530
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png
index 8db6e3e5b0..ea1bde6728 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02174b4e806d581d5edba4a5d841f032501fd8da5e6240667c0a80444a6a1ac7
-size 15827
+oid sha256:f1cb9ea7f124cb10bfbc3f36a62955bb0a0c57057ead29b9a2ce2956e463fec4
+size 15224
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png
index 8a0bebe153..0ddfb54d2c 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:726ebd31ef2c1acddc1780035c9472501d14f1c0463daac2a72384a21f62c953
-size 32057
+oid sha256:513ff434840a18cd7d82f522b8248eb24f901289db1426b445d971d2afbe7e06
+size 31521
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png
index 5ab67e4c96..e8568f2aa5 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cefbffd2de0480ed2d210a6bf291aa1b829e81ce1bd44525bc2b8034b353d09
-size 46785
+oid sha256:0d3ede82d7d001ee700275ed89b065f6306a31a61228105e2da6e07f64bdd49c
+size 46251
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png
index efabad9c14..b3f4b3877e 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7835b3bbe132663f4ef09201f0e3aba65610afbd8b3a15928741af256420088
-size 36788
+oid sha256:4204d09e0ac02d269be1bb5bba981593cadb18dc68b3f96306c80140ec7c887e
+size 36277
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png
index 739448f27b..647bb78d44 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a810ffb2f8c4700c33ac093f568928988f3a7b4585e79ff2fa9fbef881a2269
-size 29955
+oid sha256:fa9d1073467701e4755ba3496592b2fdb6ab0d49e21b23aa22878e8c1c12a568
+size 29349
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments_saved.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments_saved.png
index de54e75ac1..0ffb486a39 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments_saved.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments_saved.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e71603dd7c91c2d6186d5e2e5d5f407d6b7578133f0b4553be380e636405a0ad
-size 20691
+oid sha256:aa78bbd9964683cb66588f231ad36130af914fd1ac7393fd311eca9eeafe084a
+size 20327
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png
index 2c5e3bd00a..1e74dc4bae 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdfa74c0ca33199188fab0d49c26084b1d306322a8c259153184efda4f71dfc5
-size 17499
+oid sha256:4bdeee6b38ede68d746155e915407ee73d990ad5d635e0610c6d75282f54acb7
+size 16939
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png
index a9fe0c564b..ef30bc3f15 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c5c00a180d0567d573527c65af602c55a7003eef3606d6a4b240626de03f8fb
-size 49347
+oid sha256:a169e356afc2a3921ec670773062b224386d9df64fd3ec49702433d9a8080646
+size 48665
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png
index ea9be92c2d..fb135e75b0 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d288fdcef4c3f60ff96776e2133e6ac34b674db45e1ccbed5e277527b3905e8f
-size 58498
+oid sha256:f123753378ce7a80459a436eff08e5bf9345b86d1246733451c8e2e314bb6f42
+size 57881
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png
index 24fe8f3ac3..c6a82194b4 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16f278f86bf9fd145adf8a47ff3f83f72106374ea9a9eca5a4f2a23b74dbbed9
-size 17803
+oid sha256:0086fd12679dc046d93b36371375cf9e838b1590ca5013a94c410145413919d7
+size 17277
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png
index 655518a99b..b1b06dfb5d 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc5ce79d442c1a6e44f2914d74596571523fa3737e5d18e35d6de666f164efbb
-size 51104
+oid sha256:631a35ae3210434be7156d4721b13be49e724d97f0308867f37019d75fb6f23a
+size 50485