diff --git a/CHANGELOG.md b/CHANGELOG.md
index 999388087dce76b047506472088ccbfda64e26be..2fa668aead3c13403b30bf4206d83bf1f10efa57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
 * The API method `UserSettings.getOS` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getOsVersions` instead
 * The API method `UserSettings.getMobileVsDesktop` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getType` instead
 * The API method `UserSettings.getBrowserType` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserEngines` instead
-* The API method `UserSettings.getWideScreen` is deprecated and will be removed from May 1st 2015. Use `UserSettings.getScreenType` instead
+* The API method `UserSettings.getWideScreen` has been removed
 
 ## Piwik 2.9.1
 
diff --git a/core/API/Request.php b/core/API/Request.php
index 979f1299d0bd1a4d807366291b1d2f0f53c05ac7..23677e45fb0686163b051f9fa0da20ab73950979 100644
--- a/core/API/Request.php
+++ b/core/API/Request.php
@@ -46,7 +46,7 @@ use Piwik\Log;
  *
  * **Basic Usage**
  *
- *     $request = new Request('method=UserSettings.getWideScreen&idSite=1&date=yesterday&period=week'
+ *     $request = new Request('method=UserSettings.getLanguage&idSite=1&date=yesterday&period=week'
  *                          . '&format=xml&filter_limit=5&filter_offset=0')
  *     $result = $request->process();
  *     echo $result;
@@ -54,7 +54,7 @@ use Piwik\Log;
  * **Getting a unrendered DataTable**
  *
  *     // use the convenience method 'processRequest'
- *     $dataTable = Request::processRequest('UserSettings.getWideScreen', array(
+ *     $dataTable = Request::processRequest('UserSettings.getLanguage', array(
  *         'idSite' => 1,
  *         'date' => 'yesterday',
  *         'period' => 'week',
@@ -78,7 +78,7 @@ class Request
      * forwarded to request array before it is returned.
      *
      * @param string|array $request The base request string or array, eg,
-     *                              `'module=UserSettings&action=getWidescreen'`.
+     *                              `'module=UserSettings&action=getLanguage'`.
      * @param array $defaultRequest Default query parameters. If a query parameter is absent in `$request`, it will be loaded
      *                              from this. Defaults to `$_GET + $_POST`.
      * @return array
@@ -125,7 +125,7 @@ class Request
      * Constructor.
      *
      * @param string|array $request Query string that defines the API call (must at least contain a **method** parameter),
-     *                              eg, `'method=UserSettings.getWideScreen&idSite=1&date=yesterday&period=week&format=xml'`
+     *                              eg, `'method=UserSettings.getLanguage&idSite=1&date=yesterday&period=week&format=xml'`
      *                              If a request is not provided, then we use the values in the `$_GET` and `$_POST`
      *                              superglobals.
      * @param array $defaultRequest Default query parameters. If a query parameter is absent in `$request`, it will be loaded
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 6c8c8875f004be5e413c7113ccd54d952953a8e6..7b62e398c20705bced1dcca8867da337beb65b1b 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
@@ -77,9 +77,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -177,9 +175,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
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 6c8c8875f004be5e413c7113ccd54d952953a8e6..7b62e398c20705bced1dcca8867da337beb65b1b 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
@@ -77,9 +77,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -177,9 +175,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
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 6c8c8875f004be5e413c7113ccd54d952953a8e6..7b62e398c20705bced1dcca8867da337beb65b1b 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
@@ -77,9 +77,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -177,9 +175,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
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 6c8c8875f004be5e413c7113ccd54d952953a8e6..7b62e398c20705bced1dcca8867da337beb65b1b 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
@@ -77,9 +77,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -177,9 +175,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
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 6c8c8875f004be5e413c7113ccd54d952953a8e6..7b62e398c20705bced1dcca8867da337beb65b1b 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
@@ -77,9 +77,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -177,9 +175,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index ac59e4ff2bea6020af8e63f425c723308ed49397..996074334815b6908ccd7eab3ec2cedef1ff2dc7 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -67,7 +67,7 @@ DataTable.registerFooterIconHandler = function (id, handler) {
 /**
  * Returns the first datatable div displaying a specific report.
  *
- * @param {string} report  The report, eg, UserSettings.getWideScreen
+ * @param {string} report  The report, eg, UserSettings.getLanguage
  * @return {Element} The datatable div displaying the report, or undefined if
  *                   it cannot be found.
  */
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 1fbae717c6e70e67c874ff61ce50ff3acf4dff57..da580cc910c8c2813c1da76dacb5d96ea3280535 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
@@ -150,9 +150,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index cf0460501a5e4da4ba2fb24ae7087c9ed7735231..c355b700f1db38c49eae6e8d3de6c94ba758d59b 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -36,7 +36,7 @@
         {% endif %}
         {% if visitor.getColumn('operatingSystemIcon') %}&nbsp;
         <img src="{{ visitor.getColumn('operatingSystemIcon') }}"
-             title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }} ({{ visitor.getColumn('screenType') }})"/>{% endif %}
+             title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }}"/>{% endif %}
         {% if visitor.getColumn('visitorTypeIcon') %}
             {% if visitor.getColumn('visitorTypeIcon') %}&nbsp;-
             <img src="{{ visitor.getColumn('visitorTypeIcon') }}"
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 28d224cbdfec39d08e9abb6c7d708b06749c7a43..1a80da3e9f84f9fba1d8bf65edf779eaeb591188 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -106,22 +106,6 @@ class API extends \Piwik\Plugin\API
         return $this->getDevicesDetectorApi()->getBrowserEngines($idSite, $period, $date, $segment);
     }
 
-    /**
-     * @deprecated since 2.10.0   Use {@link getScreenType} instead.
-     */
-    public function getWideScreen($idSite, $period, $date, $segment = false)
-    {
-        return $this->getScreenType($idSite, $period, $date, $segment);
-    }
-
-    public function getScreenType($idSite, $period, $date, $segment = false)
-    {
-        $dataTable = $this->getDataTable(Archiver::SCREEN_TYPE_RECORD_NAME, $idSite, $period, $date, $segment);
-        $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getScreensLogo'));
-        $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
-        return $dataTable;
-    }
-
     public function getPlugin($idSite, $period, $date, $segment = false)
     {
         // fetch all archive data required
diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php
index fed904de7d9661eb4173a91570dc3dace08d29e0..740e5d4d94569aee38bb18ed2d0fb10c08e567c1 100644
--- a/plugins/UserSettings/Archiver.php
+++ b/plugins/UserSettings/Archiver.php
@@ -26,7 +26,6 @@ class Archiver extends \Piwik\Plugin\Archiver
 {
     const LANGUAGE_RECORD_NAME = 'UserSettings_language';
     const PLUGIN_RECORD_NAME = 'UserSettings_plugin';
-    const SCREEN_TYPE_RECORD_NAME = 'UserSettings_wideScreen';
     const RESOLUTION_RECORD_NAME = 'UserSettings_resolution';
     const CONFIGURATION_RECORD_NAME = 'UserSettings_configuration';
 
@@ -41,7 +40,7 @@ class Archiver extends \Piwik\Plugin\Archiver
     public function aggregateDayReport()
     {
         $this->aggregateByConfiguration();
-        $this->aggregateByResolutionAndScreenType();
+        $this->aggregateByResolution();
         $this->aggregateByPlugin();
         $this->aggregateByLanguage();
     }
@@ -54,7 +53,6 @@ class Archiver extends \Piwik\Plugin\Archiver
         $dataTableRecords = array(
             self::CONFIGURATION_RECORD_NAME,
             self::RESOLUTION_RECORD_NAME,
-            self::SCREEN_TYPE_RECORD_NAME,
             self::PLUGIN_RECORD_NAME,
             self::LANGUAGE_RECORD_NAME,
         );
@@ -67,12 +65,6 @@ class Archiver extends \Piwik\Plugin\Archiver
         $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics);
     }
 
-    protected function aggregateByResolutionAndScreenType()
-    {
-        $resolutions = $this->aggregateByResolution();
-        $this->aggregateByScreenType($resolutions);
-    }
-
     protected function aggregateByResolution()
     {
         $table = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::RESOLUTION_DIMENSION)->asDataTable();
@@ -83,12 +75,6 @@ class Archiver extends \Piwik\Plugin\Archiver
         return $table;
     }
 
-    protected function aggregateByScreenType(DataTable $resolutions)
-    {
-        $resolutions->filter('GroupBy', array('label', __NAMESPACE__ . '\getScreenTypeFromResolution'));
-        $this->insertTable(self::SCREEN_TYPE_RECORD_NAME, $resolutions);
-    }
-
     protected function aggregateByPlugin()
     {
         $selects = array(
diff --git a/plugins/UserSettings/Columns/TypeOfScreen.php b/plugins/UserSettings/Columns/TypeOfScreen.php
deleted file mode 100644
index cdbc796ab244ee386269ab58252d3c7223ce652b..0000000000000000000000000000000000000000
--- a/plugins/UserSettings/Columns/TypeOfScreen.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Columns\Dimension;
-use Piwik\Piwik;
-
-class TypeOfScreen extends Dimension
-{
-    public function getName()
-    {
-        return Piwik::translate('UserSettings_ColumnTypeOfScreen');
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index 5334ee20b26936230e3d2e43397de5b45e0392c9..a6154b5f29fa52eb900ef07635280afb98dbcea0 100644
--- a/plugins/UserSettings/Controller.php
+++ b/plugins/UserSettings/Controller.php
@@ -12,7 +12,6 @@ use Piwik\Plugins\UserSettings\Reports\GetConfiguration;
 use Piwik\Plugins\UserSettings\Reports\GetLanguage;
 use Piwik\Plugins\UserSettings\Reports\GetPlugin;
 use Piwik\Plugins\UserSettings\Reports\GetResolution;
-use Piwik\Plugins\UserSettings\Reports\GetScreenType;
 use Piwik\View;
 
 /**
@@ -27,7 +26,6 @@ class Controller extends \Piwik\Plugin\Controller
         $view->dataTablePlugin = $this->renderReport(new GetPlugin());
         $view->dataTableResolution = $this->renderReport(new GetResolution());
         $view->dataTableConfiguration = $this->renderReport(new GetConfiguration());
-        $view->dataTableScreenType = $this->renderReport(new GetScreenType());
         $view->dataTableBrowserLanguage = $this->renderReport(new GetLanguage());
 
         return $view->render();
diff --git a/plugins/UserSettings/Reports/GetScreenType.php b/plugins/UserSettings/Reports/GetScreenType.php
deleted file mode 100644
index 1b33d0dc4ca18598b9b9501315f910f1911d343d..0000000000000000000000000000000000000000
--- a/plugins/UserSettings/Reports/GetScreenType.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserSettings\Columns\TypeOfScreen;
-
-class GetScreenType extends Base
-{
-    protected function init()
-    {
-        parent::init();
-        $this->dimension     = new TypeOfScreen();
-        $this->name          = Piwik::translate('UserSettings_WidgetWidescreen');
-        $this->documentation = ''; // TODO
-        $this->order = 5;
-        $this->widgetTitle  = 'UserSettings_WidgetWidescreen';
-    }
-
-    public function configureView(ViewDataTable $view)
-    {
-        $this->getBasicUserSettingsDisplayProperties($view);
-
-        $view->config->title = Piwik::translate('UserSettings_ColumnTypeOfScreen');
-        $view->config->show_offset_information = false;
-        $view->config->show_pagination_control = false;
-        $view->config->show_limit_control      = false;
-        $view->config->addTranslation('label', $this->dimension->getName());
-    }
-}
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index d36ce093b6f566d49d988c90e9e5b04eaf8058bd..81584705449c317ddd381d17acf02aae64217a49 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -52,19 +52,13 @@ class UserSettings extends \Piwik\Plugin
             $module = 'DevicesDetection';
             $action = $movedMethods[$action];
         }
-        
-        if ($module == 'UserSettings' && $action == 'getWideScreen') {
-            $action = 'getScreenType';
-        }
     }
 
     public function extendVisitorDetails(&$visitor, $details)
     {
         $instance = new Visitor($details);
 
-        $visitor['screenType']               = $instance->getScreenType();
         $visitor['resolution']               = $instance->getResolution();
-        $visitor['screenTypeIcon']           = $instance->getScreenTypeIcon();
         $visitor['plugins']                  = $instance->getPlugins();
         $visitor['pluginsIcons']             = $instance->getPluginIcons();
     }
diff --git a/plugins/UserSettings/Visitor.php b/plugins/UserSettings/Visitor.php
index 03e2bd958a1d902d71d4eeac6d92f7b98f7bb30a..33f3528487be8af92b2ca7384108dda5ffae1ff2 100644
--- a/plugins/UserSettings/Visitor.php
+++ b/plugins/UserSettings/Visitor.php
@@ -63,15 +63,6 @@ class Visitor
         return null;
     }
 
-    function getScreenType()
-    {
-        if (!array_key_exists('config_resolution', $this->details)) {
-            return null;
-        }
-
-        return getScreenTypeFromResolution($this->details['config_resolution']);
-    }
-
     function getResolution()
     {
         if (!array_key_exists('config_resolution', $this->details)) {
@@ -80,16 +71,4 @@ class Visitor
 
         return $this->details['config_resolution'];
     }
-
-    function getScreenTypeIcon()
-    {
-        $type = $this->getScreenType();
-
-        if (empty($type)) {
-            return null;
-        }
-
-        return getScreensLogo($type);
-    }
-
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index e367ff8bc981f131cfb38dc3d2b0dd488fd982f5..eaab5557c7c7f1325046539cacdf84d112a490a3 100644
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -37,43 +37,6 @@ function getConfigurationLabel($str)
     return $os . " / " . $browser . " / " . $resolution;
 }
 
-function getLogoImageFromId($dir, $id)
-{
-    $path = $dir . '/' . $id . '.gif';
-    if (file_exists(PIWIK_INCLUDE_PATH . '/' . $path)) {
-        return $path;
-    } else {
-        return $dir . '/UNK.gif';
-    }
-}
-
-function getScreensLogo($label)
-{
-    return 'plugins/UserSettings/images/screens/' . $label . '.gif';
-}
-
-function getScreenTypeFromResolution($resolution)
-{
-    if ($resolution === Request::UNKNOWN_RESOLUTION) {
-        return $resolution;
-    }
-
-    $width = intval(substr($resolution, 0, strpos($resolution, 'x')));
-    $height = intval(substr($resolution, strpos($resolution, 'x') + 1));
-    $ratio = Piwik::secureDiv($width, $height);
-
-    if ($width < 640) {
-        $name = 'mobile';
-    } elseif ($ratio < 1.4) {
-        $name = 'normal';
-    } else if ($ratio < 2) {
-        $name = 'wide';
-    } else {
-        $name = 'dual';
-    }
-    return $name;
-}
-
 /**
  * Returns the given language code to translated language name
  *
diff --git a/plugins/UserSettings/lang/am.json b/plugins/UserSettings/lang/am.json
index b3e6ceefe55682a8bdbbea58cfdbed50322f6505..50942cf0323556a85d4b022c7dae8abf3243bd73 100644
--- a/plugins/UserSettings/lang/am.json
+++ b/plugins/UserSettings/lang/am.json
@@ -169,7 +169,6 @@
         "WidgetGlobalVisitors": "የሁሉም ጎብኚዎች ውቅረት",
         "WidgetOperatingSystems": "ስርዓተ ክወናዎች",
         "WidgetPlugins": "የተሰኪዎች ዝርዝር",
-        "WidgetResolutions": "የማያ ጥራቶች",
-        "WidgetWidescreen": "የተለመደ \/ ሰፊ ማያ"
+        "WidgetResolutions": "የማያ ጥራቶች"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ar.json b/plugins/UserSettings/lang/ar.json
index 9709b1ed09cec780fd05e861e0393e1abb38daa9..8eeeac62a4067cc9b71456d1336996b3079ff341 100644
--- a/plugins/UserSettings/lang/ar.json
+++ b/plugins/UserSettings/lang/ar.json
@@ -202,7 +202,6 @@
         "WidgetGlobalVisitors": "الإعدادات العامة للزوار",
         "WidgetOperatingSystems": "أنظمة التشغيل",
         "WidgetPlugins": "قائمة الإضافات",
-        "WidgetResolutions": "كثافات الشاشة النقطية",
-        "WidgetWidescreen": "عادية \/ عريضة"
+        "WidgetResolutions": "كثافات الشاشة النقطية"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/be.json b/plugins/UserSettings/lang/be.json
index afe7fdc13e0802b464e9d283244dcc2f4f1f1dd3..20c273bcefb57777aba6ba3e5fe1d50af6ce927d 100644
--- a/plugins/UserSettings/lang/be.json
+++ b/plugins/UserSettings/lang/be.json
@@ -136,7 +136,6 @@
         "WidgetOperatingSystems": "Аперацыйныя сістэмы",
         "WidgetPlugins": "Спіс плагінаў",
         "WidgetPluginsDocumentation": "Гэтая справаздача паказвае, якія плагіны были ўключаны ў браўзэраў Вашых наведвальнікаў. Гэтая інфармацыя можа мець важнае значэнне для выбару правільнага спосабу дастаўкі кантэнту.",
-        "WidgetResolutions": "Дазвол манітораў",
-        "WidgetWidescreen": "Звычайны \/ Шырокаэкранны"
+        "WidgetResolutions": "Дазвол манітораў"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/bg.json b/plugins/UserSettings/lang/bg.json
index 6f37689f603615b17112693a5e5baa0336fd3239..bd08b3b48cfffccbad88725ddcf021b15d361235 100644
--- a/plugins/UserSettings/lang/bg.json
+++ b/plugins/UserSettings/lang/bg.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Операционни системи",
         "WidgetPlugins": "Добавки",
         "WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра са използвали вашите посетители. Тази информация може да е важна, за да изберете правилния начин за доставяне на вашето съдържание.",
-        "WidgetResolutions": "Разделителна способност",
-        "WidgetWidescreen": "Нормален\/Широкоекранен"
+        "WidgetResolutions": "Разделителна способност"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ca.json b/plugins/UserSettings/lang/ca.json
index a9b19df9d0cb4e83d26ab762ced190adc7a07cbb..abbcac1a970cc7659c87495735963744ce0afe2a 100644
--- a/plugins/UserSettings/lang/ca.json
+++ b/plugins/UserSettings/lang/ca.json
@@ -208,7 +208,6 @@
         "WidgetOperatingSystems": "Sistemes operatius",
         "WidgetPlugins": "Llistat de connectors",
         "WidgetPluginsDocumentation": "Aquest informe mostra quines extensions tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut.",
-        "WidgetResolutions": "Resolucions",
-        "WidgetWidescreen": "Normal \/ panoràmica"
+        "WidgetResolutions": "Resolucions"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/cs.json b/plugins/UserSettings/lang/cs.json
index 933fde9132217d6c0900c8f7a6930e3dd21ef1c1..f05e89bd8398c7fd39858cbd75645025a39a3e2e 100644
--- a/plugins/UserSettings/lang/cs.json
+++ b/plugins/UserSettings/lang/cs.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Operační systémy",
         "WidgetPlugins": "Seznam zásuvných modulů",
         "WidgetPluginsDocumentation": "Toto hlášení zobrazuje zásuvné moduly, které měli vaši návštěvníci povoleny. Tato informace může být důležitá při rozhodování o tom, jakým způsobem prezentovat obsah.",
-        "WidgetResolutions": "Rozlišení obrazovky",
-        "WidgetWidescreen": "Normální \/ Širokoúhlá"
+        "WidgetResolutions": "Rozlišení obrazovky"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/da.json b/plugins/UserSettings/lang/da.json
index a0e18f69c6ac99d2c0ea8d1fd886644ba72dbdc8..bc8cbd084cb95c3bdd6ec93f9f6b02b2e6982e9e 100644
--- a/plugins/UserSettings/lang/da.json
+++ b/plugins/UserSettings/lang/da.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Operativsystem",
         "WidgetPlugins": "Udvidelsesmoduler",
         "WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på.",
-        "WidgetResolutions": "Skærmopløsninger",
-        "WidgetWidescreen": "Normal \/ bredformat"
+        "WidgetResolutions": "Skærmopløsninger"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/de.json b/plugins/UserSettings/lang/de.json
index 9113d2b41bb2951d6824cb279744d62458b077c3..5e7a5ea12b1b691271ad2d8ced462fb515044b79 100644
--- a/plugins/UserSettings/lang/de.json
+++ b/plugins/UserSettings/lang/de.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Betriebssysteme",
         "WidgetPlugins": "Liste der Plugins",
         "WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern.",
-        "WidgetResolutions": "Bildschirmauflösungen",
-        "WidgetWidescreen": "Normal \/ Breitbild"
+        "WidgetResolutions": "Bildschirmauflösungen"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/el.json b/plugins/UserSettings/lang/el.json
index 4189b0b336e0370755c56385511ac754440ec2d6..ccf27a0639475718c460c77c17a88ac61ce0af6e 100644
--- a/plugins/UserSettings/lang/el.json
+++ b/plugins/UserSettings/lang/el.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Λειτουργικά συστήματα",
         "WidgetPlugins": "Λίστα προσθέτων",
         "WidgetPluginsDocumentation": "Αυτή η αναφορά δείχνει ποια πρόσθετα φυλλομετρητή έχουν ενεργά οι επισκέπτες σας. Αυτή η πληροφορία ίσως είναι σημαντική για την επιλογή του πιο σωστού τρόπου απόδοσης του περιεχομένου σας.",
-        "WidgetResolutions": "Αναλύσεις οθόνης",
-        "WidgetWidescreen": "Κανονική \/ Ευρεία οθόνη"
+        "WidgetResolutions": "Αναλύσεις οθόνης"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json
index 0057f454e93eb6c55437abb192f736ec06dba695..e271613dd20bc5e1a7c82c9a37e037c180346f9a 100644
--- a/plugins/UserSettings/lang/en.json
+++ b/plugins/UserSettings/lang/en.json
@@ -10,7 +10,6 @@
         "ColumnOperatingSystem": "Operating system",
         "ColumnResolution": "Resolution",
         "ColumnTypeOfScreen": "Type of screen",
-        "ScreenTypes": "Screen types",
         "Configurations": "Configurations",
         "GamingConsole": "Gaming Console",
         "Language_aa": "Afar",
@@ -212,7 +211,6 @@
         "WidgetOperatingSystems": "Operating System",
         "WidgetPlugins": "Browser Plugins",
         "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.",
-        "WidgetResolutions": "Screen Resolution",
-        "WidgetWidescreen": "Normal \/ Widescreen"
+        "WidgetResolutions": "Screen Resolution"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/es.json b/plugins/UserSettings/lang/es.json
index 151c54cae042ad8a3c6b60e1c91f14df6c2ab6a8..669f9a17ee3a7dd8f22befb6cbd2cef56679705c 100644
--- a/plugins/UserSettings/lang/es.json
+++ b/plugins/UserSettings/lang/es.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Sistemas operativos",
         "WidgetPlugins": "Lista de Plugins",
         "WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido.",
-        "WidgetResolutions": "Resoluciones de pantalla",
-        "WidgetWidescreen": "Normal \/ Panorámica"
+        "WidgetResolutions": "Resoluciones de pantalla"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/et.json b/plugins/UserSettings/lang/et.json
index f2c9d38bf6d560098d15f5cb58fcdf27100cf337..4f70f02b2f8381c24281c18a9404d6f9ef71b2b8 100644
--- a/plugins/UserSettings/lang/et.json
+++ b/plugins/UserSettings/lang/et.json
@@ -205,7 +205,6 @@
         "WidgetGlobalVisitors": "Kohalike külastajate seaded",
         "WidgetOperatingSystems": "Operatsioonisüsteemid",
         "WidgetPlugins": "Sirviku lisatarkvarad",
-        "WidgetResolutions": "Ekraani resolutsioonid",
-        "WidgetWidescreen": "Normaal \/ Laiekraan"
+        "WidgetResolutions": "Ekraani resolutsioonid"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/eu.json b/plugins/UserSettings/lang/eu.json
index 7fc63dc70099e0940f611f91376d6295df1c9193..3f140ae7231c83aa3c72e50ef129ac0c9742adac 100644
--- a/plugins/UserSettings/lang/eu.json
+++ b/plugins/UserSettings/lang/eu.json
@@ -162,7 +162,6 @@
         "WidgetGlobalVisitors": "Bisitarien konfigurazioa",
         "WidgetOperatingSystems": "Sistema eragileak",
         "WidgetPlugins": "Pluginen zerrenda",
-        "WidgetResolutions": "Pantailaren bereizmenak",
-        "WidgetWidescreen": "Normala \/ Panoramikoa"
+        "WidgetResolutions": "Pantailaren bereizmenak"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fa.json b/plugins/UserSettings/lang/fa.json
index 04c0c954234985f4ec33a42cfd32fea00fa99427..6728d12b8dbc4c50c694e27c2d167592d9258fd5 100644
--- a/plugins/UserSettings/lang/fa.json
+++ b/plugins/UserSettings/lang/fa.json
@@ -210,7 +210,6 @@
         "WidgetOperatingSystems": "سیستم عامل ها",
         "WidgetPlugins": "لیست افزونه ها",
         "WidgetPluginsDocumentation": "این گزارش نشان می دهد که پلاگین مرورگر بازدید کننده خود را فعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه محتوای خود را.",
-        "WidgetResolutions": "رزلوشن نمایشگر",
-        "WidgetWidescreen": "معمولی \/ صفحه عریض"
+        "WidgetResolutions": "رزلوشن نمایشگر"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fi.json b/plugins/UserSettings/lang/fi.json
index 3de8453929b37bd12ab1ddee4d4406508c997258..cba8e6d38244d3752d45eb966c79de7447d45e8d 100644
--- a/plugins/UserSettings/lang/fi.json
+++ b/plugins/UserSettings/lang/fi.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Käyttöjärjestelmät",
         "WidgetPlugins": "Lista lisäosista",
         "WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille.",
-        "WidgetResolutions": "Näytön resoluutio",
-        "WidgetWidescreen": "Normaali \/ laajakuva"
+        "WidgetResolutions": "Näytön resoluutio"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fr.json b/plugins/UserSettings/lang/fr.json
index 7697f2a1e2b0f76f2ccdeafe69985400bed93b94..885bcf14655ac21ce2cb470818e95ea41ba8c28b 100644
--- a/plugins/UserSettings/lang/fr.json
+++ b/plugins/UserSettings/lang/fr.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Systèmes d'exploitation",
         "WidgetPlugins": "Liste de Plugins",
         "WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu.",
-        "WidgetResolutions": "Résolutions d'écran",
-        "WidgetWidescreen": "Normal \/ Écran large"
+        "WidgetResolutions": "Résolutions d'écran"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/gl.json b/plugins/UserSettings/lang/gl.json
index 8f3822ca548c5d939c51711b06c68e670cba5835..f28e20627e68cea16cbc48991e5f1c8d96c68a51 100644
--- a/plugins/UserSettings/lang/gl.json
+++ b/plugins/UserSettings/lang/gl.json
@@ -157,7 +157,6 @@
         "WidgetGlobalVisitors": "Configuración global de visitantes",
         "WidgetOperatingSystems": "Sistemas Operativos",
         "WidgetPlugins": "Lista de plugins",
-        "WidgetResolutions": "Resolucións de pantalla",
-        "WidgetWidescreen": "Normal \/ Panorámica"
+        "WidgetResolutions": "Resolucións de pantalla"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/hu.json b/plugins/UserSettings/lang/hu.json
index e9d1e42105c2c1e09d38307844bba88ab4ef8a9d..796028af09de2b0d0d6d7ce8fb826efd71388d5b 100644
--- a/plugins/UserSettings/lang/hu.json
+++ b/plugins/UserSettings/lang/hu.json
@@ -203,7 +203,6 @@
         "WidgetGlobalVisitors": "Globális látogatói beállítások",
         "WidgetOperatingSystems": "Operációs rendszerek",
         "WidgetPlugins": "Bővítmények listája",
-        "WidgetResolutions": "Képernyőfelbontások",
-        "WidgetWidescreen": "Normál\/szélesvásznú"
+        "WidgetResolutions": "Képernyőfelbontások"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/id.json b/plugins/UserSettings/lang/id.json
index f877d25b00f019b158c207d74b130d9c2d910ed0..e51070d533392ffee170b50f206ddb408f7101ba 100644
--- a/plugins/UserSettings/lang/id.json
+++ b/plugins/UserSettings/lang/id.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Sistem Operasi",
         "WidgetPlugins": "Daftar Pengaya",
         "WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda.",
-        "WidgetResolutions": "Resolusi layar",
-        "WidgetWidescreen": "Normal \/ LayarLebar"
+        "WidgetResolutions": "Resolusi layar"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/is.json b/plugins/UserSettings/lang/is.json
index 88618b0ef999d0d3ba5d49832e38b23e8162419d..3e2e8228526b095781170a8ddfddfec499769992 100644
--- a/plugins/UserSettings/lang/is.json
+++ b/plugins/UserSettings/lang/is.json
@@ -203,7 +203,6 @@
         "WidgetGlobalVisitors": "Altæk gestastilling",
         "WidgetOperatingSystems": "Stýrikerfi",
         "WidgetPlugins": "Listi yfir íbætur",
-        "WidgetResolutions": "Skjáupplausnir",
-        "WidgetWidescreen": "Normal\/Breiðtjald"
+        "WidgetResolutions": "Skjáupplausnir"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/it.json b/plugins/UserSettings/lang/it.json
index f9e7d8601ea459f79478f4401bc428466b674019..3f5a470f7ee4770f87ebd381951ef477ad989bc3 100644
--- a/plugins/UserSettings/lang/it.json
+++ b/plugins/UserSettings/lang/it.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Sistemi Operativi",
         "WidgetPlugins": "Lista dei Plugin",
         "WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti.",
-        "WidgetResolutions": "Risoluzione schermo",
-        "WidgetWidescreen": "Normale \/ Schermo Panoramico"
+        "WidgetResolutions": "Risoluzione schermo"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ja.json b/plugins/UserSettings/lang/ja.json
index 38b1667c0e76fc95077ab9c95439f2c4b5b1b13a..289ab6af2a092784c6d09ffab41d310285126906 100644
--- a/plugins/UserSettings/lang/ja.json
+++ b/plugins/UserSettings/lang/ja.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "オペレーティングシステム",
         "WidgetPlugins": "プラグイン一覧",
         "WidgetPluginsDocumentation": "ビジターが利用しているブラウザのプラグインについてのリポートです。コンテンツの最適な表示方法を選択するために重要な情報です。",
-        "WidgetResolutions": "画面解像度",
-        "WidgetWidescreen": "ノーマル \/ ワイド画面"
+        "WidgetResolutions": "画面解像度"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ka.json b/plugins/UserSettings/lang/ka.json
index 7823afc29f7229d5b8fa5003da58ecaa43adb525..ba4e21f84b917e5105397c19e1f34093c024c289 100644
--- a/plugins/UserSettings/lang/ka.json
+++ b/plugins/UserSettings/lang/ka.json
@@ -176,7 +176,6 @@
         "WidgetGlobalVisitors": "ვიზიტორების გლობალური კონფიგურაცია",
         "WidgetOperatingSystems": "ოპერაციული სისტემები",
         "WidgetPlugins": "პლაგინების სია",
-        "WidgetResolutions": "ეკრანის რეზოლუვიები",
-        "WidgetWidescreen": "ნორმალური \/ ფართოეკრანიანი"
+        "WidgetResolutions": "ეკრანის რეზოლუვიები"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ko.json b/plugins/UserSettings/lang/ko.json
index b633b52cda50bcbac3b73c030d943db127898baf..4716189f4c9366bbfa0bb5884fa5787439cb4012 100644
--- a/plugins/UserSettings/lang/ko.json
+++ b/plugins/UserSettings/lang/ko.json
@@ -209,7 +209,6 @@
         "WidgetOperatingSystems": "운영체제",
         "WidgetPlugins": "플러그인 목록",
         "WidgetPluginsDocumentation": "방문자가 사용하는 브라우저의 플러그인에 대한 보고서입니다. 컨텐츠에 대한 최적의 표시 방법을 선택하는 데 중요한 정보입니다.",
-        "WidgetResolutions": "스크린 해상도",
-        "WidgetWidescreen": "보통 \/ 와이드 스크린"
+        "WidgetResolutions": "스크린 해상도"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/lt.json b/plugins/UserSettings/lang/lt.json
index 8fbc5a92aa0dc0f5b53598cead3644111bfc0089..d04c838bac75c5feb07cbc00c00221d5c6d586b8 100644
--- a/plugins/UserSettings/lang/lt.json
+++ b/plugins/UserSettings/lang/lt.json
@@ -203,7 +203,6 @@
         "WidgetGlobalVisitors": "Bendri lankytojų nustatymai",
         "WidgetOperatingSystems": "OperacinÄ—s sistemos",
         "WidgetPlugins": "Papildinių sąrašas",
-        "WidgetResolutions": "Ekrano raiška",
-        "WidgetWidescreen": "Normalus \/ Plačiaekranis"
+        "WidgetResolutions": "Ekrano raiška"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/lv.json b/plugins/UserSettings/lang/lv.json
index 65e783596c791b47de4ab31e62f392b55d04b216..c8c91b7640526bfdae59ab551bf3b98ce76fecc0 100644
--- a/plugins/UserSettings/lang/lv.json
+++ b/plugins/UserSettings/lang/lv.json
@@ -206,7 +206,6 @@
         "WidgetOperatingSystems": "Operētājsistēmas",
         "WidgetPlugins": "Spraudņu saraksts",
         "WidgetPluginsDocumentation": "Šajā atskaitē ir redzami pārlūku spraudņi, kuri bija ieslēgti apmeklētāju pārlūkos. Šī informācija ir svarīga, lai izvēlētos vislabāko veidu kā piegādāt saturu apmeklētājiem.",
-        "WidgetResolutions": "Ekrāna izšķirtspējas",
-        "WidgetWidescreen": "Normāls \/ platekrāns"
+        "WidgetResolutions": "Ekrāna izšķirtspējas"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nb.json b/plugins/UserSettings/lang/nb.json
index 248c25fc80bf03e758190c2c87259ef87eb734c6..4fe2867f421d8a64bc17fa020da0d6551236d364 100644
--- a/plugins/UserSettings/lang/nb.json
+++ b/plugins/UserSettings/lang/nb.json
@@ -202,7 +202,6 @@
         "WidgetGlobalVisitors": "Besøkendes konfigurasjon",
         "WidgetOperatingSystems": "Operativsystemer",
         "WidgetPlugins": "Liste over tillegg",
-        "WidgetResolutions": "Skjermoppløsninger",
-        "WidgetWidescreen": "Normal \/ Widescreen"
+        "WidgetResolutions": "Skjermoppløsninger"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nl.json b/plugins/UserSettings/lang/nl.json
index 4ffd7a5e9ada43928a986a33431cd68c27e14d9c..686d77ccfc0a558e02811d0aa120a2703d07ba42 100644
--- a/plugins/UserSettings/lang/nl.json
+++ b/plugins/UserSettings/lang/nl.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Besturings systemen",
         "WidgetPlugins": "Geïnstalleerde plugins",
         "WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden.",
-        "WidgetResolutions": "Schermresoluties",
-        "WidgetWidescreen": "Normaal\/Breedbeeld"
+        "WidgetResolutions": "Schermresoluties"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nn.json b/plugins/UserSettings/lang/nn.json
index 72645a61a3b0530e599929281dce45b22c56975b..8f82b4d176d5311211a2701cea3623903262470f 100644
--- a/plugins/UserSettings/lang/nn.json
+++ b/plugins/UserSettings/lang/nn.json
@@ -203,7 +203,6 @@
         "WidgetGlobalVisitors": "Global vitjarkonfigurasjon",
         "WidgetOperatingSystems": "Operativsystem",
         "WidgetPlugins": "Liste over innstikk",
-        "WidgetResolutions": "Skjermoppløysing",
-        "WidgetWidescreen": "Vanleg \/ Breiskjerm"
+        "WidgetResolutions": "Skjermoppløysing"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pl.json b/plugins/UserSettings/lang/pl.json
index adbbdee582ebc2f49f37d0553d2bdbecb0205059..aa555d7593f71fd41cf1f0dd4db41495b69ba5c6 100644
--- a/plugins/UserSettings/lang/pl.json
+++ b/plugins/UserSettings/lang/pl.json
@@ -206,7 +206,6 @@
         "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających",
         "WidgetOperatingSystems": "Systemy operacyjne",
         "WidgetPlugins": "Lista wtyczek",
-        "WidgetResolutions": "Rozdzielczość ekranu",
-        "WidgetWidescreen": "Monitory klasyczne \/ panoramicznie"
+        "WidgetResolutions": "Rozdzielczość ekranu"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pt-br.json b/plugins/UserSettings/lang/pt-br.json
index e8f1c8a5370c5482f034c006b30fdbd1cff826cc..f7a6bfd62ab2b2bab530d9e22953a233b036a683 100644
--- a/plugins/UserSettings/lang/pt-br.json
+++ b/plugins/UserSettings/lang/pt-br.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Sistemas Operacionais",
         "WidgetPlugins": "Lista de Plugins",
         "WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo.",
-        "WidgetResolutions": "Resoluções de Tela",
-        "WidgetWidescreen": "Normal \/ Widescreen"
+        "WidgetResolutions": "Resoluções de Tela"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pt.json b/plugins/UserSettings/lang/pt.json
index 693af9b8dbdd4bc86563c62187fb26d3ec16bda3..926fb573c3bae76ac45b77e4ee1f7ea6b7d816b9 100644
--- a/plugins/UserSettings/lang/pt.json
+++ b/plugins/UserSettings/lang/pt.json
@@ -206,7 +206,6 @@
         "WidgetOperatingSystems": "Sistemas operativos",
         "WidgetPlugins": "Lista de Plugins",
         "WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo.",
-        "WidgetResolutions": "Resoluções de Ecrã",
-        "WidgetWidescreen": "Normal \/ Ecrã panorâmico"
+        "WidgetResolutions": "Resoluções de Ecrã"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ro.json b/plugins/UserSettings/lang/ro.json
index 9418cd1fd80f066478e02590f9bd8caf09c1a680..faed64a013f890a2d36a06733e4e6dc130c9755c 100644
--- a/plugins/UserSettings/lang/ro.json
+++ b/plugins/UserSettings/lang/ro.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Sisteme operare",
         "WidgetPlugins": "Lista pluginurilor",
         "WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut.",
-        "WidgetResolutions": "Rezolutii ecran",
-        "WidgetWidescreen": "Normal \/ Ecran extins"
+        "WidgetResolutions": "Rezolutii ecran"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ru.json b/plugins/UserSettings/lang/ru.json
index f1a5c1e1c3ae4b7045ed96f43f7720ed6f51bbe2..a90bf07e5fbda13251fbe8bbca113211be3c9cd6 100644
--- a/plugins/UserSettings/lang/ru.json
+++ b/plugins/UserSettings/lang/ru.json
@@ -209,7 +209,6 @@
         "WidgetOperatingSystems": "Операционные системы",
         "WidgetPlugins": "Список плагинов",
         "WidgetPluginsDocumentation": "Этот отчет показывается какие плагины посетители используют в своих браузерах. Эта информация может быть важна для того, чтобы посетители смогли видеть ваш контент должным образом.",
-        "WidgetResolutions": "По разрешению мониторов",
-        "WidgetWidescreen": "Нормальный \/ Широкоэкранный"
+        "WidgetResolutions": "По разрешению мониторов"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sk.json b/plugins/UserSettings/lang/sk.json
index eb66969c7a4010faea54c48a54997c8dfded639e..91b92d81f2a8dcbec55243fef1ee8ed5b3dca37a 100644
--- a/plugins/UserSettings/lang/sk.json
+++ b/plugins/UserSettings/lang/sk.json
@@ -203,7 +203,6 @@
         "WidgetGlobalVisitors": "Globálne konfigurácie návštevníkov",
         "WidgetOperatingSystems": "Operačné systémy",
         "WidgetPlugins": "Zoznam modulov",
-        "WidgetResolutions": "Rozlíšenie obrazovky",
-        "WidgetWidescreen": "Bežný\/Širokouhlý"
+        "WidgetResolutions": "Rozlíšenie obrazovky"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sq.json b/plugins/UserSettings/lang/sq.json
index 6e457c2a6feb3ebdb44678b540ac9275ccf3d3c6..e9d32fa65ae27051f3dc0e990ceb48ba838ccf32 100644
--- a/plugins/UserSettings/lang/sq.json
+++ b/plugins/UserSettings/lang/sq.json
@@ -123,7 +123,6 @@
         "WidgetOperatingSystems": "Sisteme operativë",
         "WidgetPlugins": "Listë e Shtojcave",
         "WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj.",
-        "WidgetResolutions": "Qartësi ekrani",
-        "WidgetWidescreen": "Normal \/ Ekran së gjeri"
+        "WidgetResolutions": "Qartësi ekrani"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sr.json b/plugins/UserSettings/lang/sr.json
index 2f2d0cfbf6caefae960a70df58ec6b1ebe82670a..b472e210d7210569950beb7a743dc6d2dc8748ff 100644
--- a/plugins/UserSettings/lang/sr.json
+++ b/plugins/UserSettings/lang/sr.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Operativni sistemi",
         "WidgetPlugins": "Lista dodataka",
         "WidgetPluginsDocumentation": "Ovaj izveštaj prikazuje koje dodatke za brauzere vaši posetioci imaju uključene. Ova informacija može biti od značaja prilikom odabira pravog načina prikaza sadržaja na vašem sajtu.",
-        "WidgetResolutions": "Rezolucije ekrana",
-        "WidgetWidescreen": "Standardan \/ Å irok ekran"
+        "WidgetResolutions": "Rezolucije ekrana"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sv.json b/plugins/UserSettings/lang/sv.json
index 3d59030ee14de21906cdcc7a5f89205aadaf88e8..e62e076977c1b4c55cc936708388c3006390981f 100644
--- a/plugins/UserSettings/lang/sv.json
+++ b/plugins/UserSettings/lang/sv.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Operativsystem",
         "WidgetPlugins": "Lista över plugins",
         "WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll.",
-        "WidgetResolutions": "Skärmupplösning",
-        "WidgetWidescreen": "Normal \/ Widescreen"
+        "WidgetResolutions": "Skärmupplösning"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/th.json b/plugins/UserSettings/lang/th.json
index 2813976ca8966dcc91c59d970b156fa9e63ae2ee..e6c968db2b5e6fad72dc4cfe83285d1fc00f1d8e 100644
--- a/plugins/UserSettings/lang/th.json
+++ b/plugins/UserSettings/lang/th.json
@@ -203,7 +203,6 @@
         "WidgetGlobalVisitors": "การตั้งค่าผู้เข้าชมโดยรวม",
         "WidgetOperatingSystems": "ระบบปฎิบัติการ",
         "WidgetPlugins": "รายการปลั้กอิน",
-        "WidgetResolutions": "ความละเอียดจอภาพ",
-        "WidgetWidescreen": "จอปกติ\/จอแบบกว้าง"
+        "WidgetResolutions": "ความละเอียดจอภาพ"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/tl.json b/plugins/UserSettings/lang/tl.json
index f7f2d6f9ebf356975403a0542c352f2370b2965a..084b22f727600670a8b362e4d741fba53e94d33f 100644
--- a/plugins/UserSettings/lang/tl.json
+++ b/plugins/UserSettings/lang/tl.json
@@ -209,7 +209,6 @@
         "WidgetOperatingSystems": "Operating System",
         "WidgetPlugins": "Browser Plugins",
         "WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito.",
-        "WidgetResolutions": "Screen Resolution",
-        "WidgetWidescreen": "Normal \/ Widescreen"
+        "WidgetResolutions": "Screen Resolution"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/tr.json b/plugins/UserSettings/lang/tr.json
index 7d33de6d4f80c35ba81923b096bfae58ef1ac295..67a230087ab16a2fd6cb0d7228dfb93c6cdac146 100644
--- a/plugins/UserSettings/lang/tr.json
+++ b/plugins/UserSettings/lang/tr.json
@@ -203,7 +203,6 @@
         "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu",
         "WidgetOperatingSystems": "Ä°ÅŸletim sistemleri",
         "WidgetPlugins": "Eklenti Listesi",
-        "WidgetResolutions": "Ekran çözünürlükleri",
-        "WidgetWidescreen": "Normal \/ GeniÅŸ ekran"
+        "WidgetResolutions": "Ekran çözünürlükleri"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/uk.json b/plugins/UserSettings/lang/uk.json
index 32c3420a8623e19432ef45145f9bc5396e1f8aa7..ba1442069350452fc4dac515a20e4258460b336d 100644
--- a/plugins/UserSettings/lang/uk.json
+++ b/plugins/UserSettings/lang/uk.json
@@ -203,7 +203,6 @@
         "WidgetGlobalVisitors": "Загальна конфігурація відвідувачів",
         "WidgetOperatingSystems": "Операційні системи",
         "WidgetPlugins": "Список плагінів",
-        "WidgetResolutions": "Роздільні здатності",
-        "WidgetWidescreen": "Нормальний \/ Широкоформатний"
+        "WidgetResolutions": "Роздільні здатності"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/vi.json b/plugins/UserSettings/lang/vi.json
index 3e96fdfcf180273837bac3383c09e222c2bfb777..98d66346bfe0a406b5894a4d79db1ee4be9e8828 100644
--- a/plugins/UserSettings/lang/vi.json
+++ b/plugins/UserSettings/lang/vi.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "Hệ điều hành",
         "WidgetPlugins": "Các Plugin trình duyệt",
         "WidgetPluginsDocumentation": "Báo cáo này cho thấy các plugin trình duyệt mà khách truy cập của bạn đã kích hoạt. Thông tin này có thể là quan trọng cho việc lựa chọn cách đúng để cung cấp nội dung của bạn.",
-        "WidgetResolutions": "Độ phân giải màn hình",
-        "WidgetWidescreen": "Loại thường\/ màn ảnh rộng"
+        "WidgetResolutions": "Độ phân giải màn hình"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/zh-cn.json b/plugins/UserSettings/lang/zh-cn.json
index 1cb6b20a1882f1460abddcd74154ebfe24873d3d..968d7b30b5db409550a17d4becf75ba8a2be9673 100644
--- a/plugins/UserSettings/lang/zh-cn.json
+++ b/plugins/UserSettings/lang/zh-cn.json
@@ -211,7 +211,6 @@
         "WidgetOperatingSystems": "操作系统",
         "WidgetPlugins": "浏览器插件清单",
         "WidgetPluginsDocumentation": "本报表显示访客使用的浏览器插件，这可能对如何发布您的内容很重要。",
-        "WidgetResolutions": "画面分辨率",
-        "WidgetWidescreen": "传统屏幕 \/ 宽屏幕"
+        "WidgetResolutions": "画面分辨率"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/zh-tw.json b/plugins/UserSettings/lang/zh-tw.json
index ad0493589cfa00fcdce49dbded368e2659adb896..74b1c8736fb92dfad657c6ea2f919ad36783fec9 100644
--- a/plugins/UserSettings/lang/zh-tw.json
+++ b/plugins/UserSettings/lang/zh-tw.json
@@ -206,7 +206,6 @@
         "WidgetGlobalVisitorsDocumentation": "此報表列出貴站訪客最常見的設定配置。設定配置包含作業系統、瀏覽器、螢幕解析度等資訊。",
         "WidgetOperatingSystems": "作業系統",
         "WidgetPlugins": "瀏覽器外掛清單",
-        "WidgetResolutions": "畫面解析度",
-        "WidgetWidescreen": "傳統螢幕 \/ 寬螢幕"
+        "WidgetResolutions": "畫面解析度"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig
index 7b6d236d47f72e6d5d11ef3913ab496aa1df59d0..abf96de9e103ca93991ec58e939d0420ed65a926 100644
--- a/plugins/UserSettings/templates/index.twig
+++ b/plugins/UserSettings/templates/index.twig
@@ -11,9 +11,6 @@
     <h2 piwik-enriched-headline>{{ 'UserSettings_Resolutions'|translate }}</h2>
     {{ dataTableResolution|raw }}
 
-    <h2 piwik-enriched-headline>{{ 'UserSettings_ScreenTypes'|translate }}</h2>
-    {{ dataTableScreenType|raw }}
-
     <h2 piwik-enriched-headline>{{ 'UserSettings_Configurations'|translate }}</h2>
     {{ dataTableConfiguration|raw }}
 </div>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
index 0ef089e70cccbc6640d121fdd9f45bf665aaa4dd..6140bf8214577a11d910e697b4cba7d97d51077b 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
@@ -84,10 +84,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -180,10 +178,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -276,10 +272,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -372,10 +366,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -468,10 +460,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -564,10 +554,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -660,10 +648,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -756,10 +742,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
-		<screenType>unknown</screenType>
 		<deviceType>Smartphone</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -852,10 +836,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
index 7bc0f5a0987ca7a3ef8c1c9ea70a3f9a09ef0c66..896b4d503fbc400e1b52ef1f756e287cd92c5904 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
@@ -193,10 +193,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion>UNK</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -307,10 +305,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>6.0</browserVersion>
-		<screenType>normal</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -416,10 +412,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -539,10 +533,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -651,10 +643,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -751,10 +741,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion>UNK</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -857,10 +845,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -947,10 +933,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion>UNK</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -1053,10 +1037,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
-		<screenType>unknown</screenType>
 		<deviceType>Smartphone</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
@@ -1153,10 +1135,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<screenType>unknown</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 58c15349b31e2656f4aa38bc67cbbee052d645e3..8e3799fa9eeedb3c495ab4f914468279b7fa76f4 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -56,9 +56,7 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -204,9 +202,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -329,9 +325,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -468,9 +462,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -593,9 +585,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -749,9 +739,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -874,9 +862,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1013,9 +999,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1138,9 +1122,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1294,9 +1276,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1419,9 +1399,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1558,9 +1536,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1697,9 +1673,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1814,9 +1788,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1939,9 +1911,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -2095,9 +2065,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -2251,9 +2219,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -2368,9 +2334,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -2493,9 +2457,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -2632,9 +2594,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -2771,9 +2731,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -2910,9 +2868,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -3041,9 +2997,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -3166,9 +3120,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -3291,9 +3243,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -3416,9 +3366,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -3541,9 +3489,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -3697,9 +3643,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -3853,9 +3797,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -4009,9 +3951,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -4157,9 +4097,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -4282,9 +4220,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -4407,9 +4343,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -4532,9 +4466,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -4657,9 +4589,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index cabb71c501ed434301bdaaea5beab283004ab9e5..a45e6b00b5f9502ee57fde3f0fc051387ab9654b 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -79,9 +79,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -181,9 +179,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -351,9 +347,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -453,9 +447,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -790,9 +782,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -892,9 +882,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
@@ -990,9 +978,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
@@ -1156,9 +1142,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
@@ -1254,9 +1238,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
@@ -1587,9 +1569,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index cabb71c501ed434301bdaaea5beab283004ab9e5..a45e6b00b5f9502ee57fde3f0fc051387ab9654b 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -79,9 +79,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -181,9 +179,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -351,9 +347,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -453,9 +447,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -790,9 +782,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -892,9 +882,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
@@ -990,9 +978,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
@@ -1156,9 +1142,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
@@ -1254,9 +1238,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
@@ -1587,9 +1569,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 23cef7562db331cfb76d30ae8e580eebbffa1248..93c0819d6cf324f382406089a718d158f7db978a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -95,9 +95,7 @@
 		<location>Raleigh, North Carolina, United States</location>
 		<latitude>35.771999</latitude>
 		<longitude>-78.639000</longitude>
-		<screenType>wide</screenType>
 		<resolution>1366x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -233,9 +231,7 @@
 		<location>Lake Forest, California, United States</location>
 		<latitude>33.645000</latitude>
 		<longitude>-117.679001</longitude>
-		<screenType>wide</screenType>
 		<resolution>1536x864</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>17:33:27</visitLocalTime>
@@ -346,9 +342,7 @@
 		<location>Germany</location>
 		<latitude>51</latitude>
 		<longitude>9</longitude>
-		<screenType>wide</screenType>
 		<resolution>1920x1200</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java, quicktime, silverlight</plugins>
 		<pluginsIcons>
 			<row>
@@ -492,9 +486,7 @@
 		<location>United States</location>
 		<latitude>38</latitude>
 		<longitude>-97</longitude>
-		<screenType>wide</screenType>
 		<resolution>2880x1800</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java, quicktime</plugins>
 		<pluginsIcons>
 			<row>
@@ -607,9 +599,7 @@
 		<location>Maaseik, Limburg, Belgium</location>
 		<latitude>51.099998</latitude>
 		<longitude>5.800000</longitude>
-		<screenType>wide</screenType>
 		<resolution>1920x1080</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java, silverlight</plugins>
 		<pluginsIcons>
 			<row>
@@ -733,9 +723,7 @@
 		<location>San Francisco, California, United States</location>
 		<latitude>37.792000</latitude>
 		<longitude>-122.408997</longitude>
-		<screenType>wide</screenType>
 		<resolution>1360x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins>
 		<pluginsIcons>
 			<row>
@@ -866,9 +854,7 @@
 		<location>Nihon'odori, Kanagawa, Japan</location>
 		<latitude>35.450001</latitude>
 		<longitude>139.649994</longitude>
-		<screenType>wide</screenType>
 		<resolution>2560x1440</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, java, quicktime</plugins>
 		<pluginsIcons>
 			<row>
@@ -988,9 +974,7 @@
 		<location>Weilerswist, Nordrhein-Westfalen, Germany</location>
 		<latitude>50.766998</latitude>
 		<longitude>6.833000</longitude>
-		<screenType>mobile</screenType>
 		<resolution>360x640</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/mobile.gif</screenTypeIcon>
 		<plugins>flash</plugins>
 		<pluginsIcons>
 			<row>
@@ -1102,9 +1086,7 @@
 		<location>Mainz, Rheinland-Pfalz, Germany</location>
 		<latitude>50</latitude>
 		<longitude>8.271000</longitude>
-		<screenType>wide</screenType>
 		<resolution>2560x1440</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins>
 		<pluginsIcons>
 			<row>
@@ -1271,9 +1253,7 @@
 		<location>Moscow, Moscow City, Russian Federation</location>
 		<latitude>55.751999</latitude>
 		<longitude>37.616001</longitude>
-		<screenType>wide</screenType>
 		<resolution>1920x1080</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1389,9 +1369,7 @@
 		<location>Esentepe, Rize, Turkey</location>
 		<latitude>40.979000</latitude>
 		<longitude>40.415001</longitude>
-		<screenType>wide</screenType>
 		<resolution>1366x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java, silverlight</plugins>
 		<pluginsIcons>
 			<row>
@@ -1515,9 +1493,7 @@
 		<location>Maaseik, Limburg, Belgium</location>
 		<latitude>51.099998</latitude>
 		<longitude>5.800000</longitude>
-		<screenType>wide</screenType>
 		<resolution>1920x1080</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java, silverlight</plugins>
 		<pluginsIcons>
 			<row>
@@ -1799,9 +1775,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>08:10:38</visitLocalTime>
@@ -1915,9 +1889,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -2032,9 +2004,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>wide</screenType>
 		<resolution>1280x800</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon>
 		<plugins>pdf, flash, java, director, windowsmedia, gears</plugins>
 		<pluginsIcons>
 			<row>
@@ -2165,9 +2135,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>20:15:41</visitLocalTime>
@@ -2290,9 +2258,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>19:12:40</visitLocalTime>
@@ -2422,9 +2388,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>18:10:38</visitLocalTime>
@@ -2530,9 +2494,7 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>17:48:08</visitLocalTime>
@@ -2638,9 +2600,7 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>17:48:07</visitLocalTime>
@@ -2736,9 +2696,7 @@
 		<location>Australia</location>
 		<latitude>-27</latitude>
 		<longitude>133</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>17:46:03</visitLocalTime>
@@ -2844,9 +2802,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>16:11:30</visitLocalTime>
@@ -2952,9 +2908,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>16:10:38</visitLocalTime>
@@ -3056,9 +3010,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>15:31:05</visitLocalTime>
@@ -3160,9 +3112,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>13:49:46</visitLocalTime>
@@ -3264,9 +3214,7 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>20:22:08</visitLocalTime>
@@ -3368,9 +3316,7 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>20:21:28</visitLocalTime>
@@ -3472,9 +3418,7 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>20:21:03</visitLocalTime>
@@ -3576,9 +3520,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>20:01:17</visitLocalTime>
@@ -3680,9 +3622,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>19:59:50</visitLocalTime>
@@ -3784,9 +3724,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>18:03:40</visitLocalTime>
@@ -3888,9 +3826,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>21:00:42</visitLocalTime>
@@ -3992,9 +3928,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>20:56:45</visitLocalTime>
@@ -4096,9 +4030,7 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>13:49:48</visitLocalTime>
@@ -4200,9 +4132,7 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>13:48:20</visitLocalTime>
@@ -4304,9 +4234,7 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>13:48:07</visitLocalTime>
@@ -4408,9 +4336,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>08:12:03</visitLocalTime>
@@ -4512,9 +4438,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>08:11:56</visitLocalTime>
@@ -4616,9 +4540,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>08:11:30</visitLocalTime>
@@ -4720,9 +4642,7 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>08:10:38</visitLocalTime>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml
deleted file mode 100644
index 2048a44e64de79d3bbec7b411fc9d318573ec7c5..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>Unknown</label>
-		<nb_visits>25</nb_visits>
-		<nb_actions>28</nb_actions>
-		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>23</bounce_count>
-		<nb_visits_converted>23</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/screens/unknown.gif</logo>
-	</row>
-	<row>
-		<label>Normal</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/screens/normal.gif</logo>
-	</row>
-	<row>
-		<label>Wide</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/screens/wide.gif</logo>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
deleted file mode 100644
index 2048a44e64de79d3bbec7b411fc9d318573ec7c5..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>Unknown</label>
-		<nb_visits>25</nb_visits>
-		<nb_actions>28</nb_actions>
-		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>23</bounce_count>
-		<nb_visits_converted>23</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/screens/unknown.gif</logo>
-	</row>
-	<row>
-		<label>Normal</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/screens/normal.gif</logo>
-	</row>
-	<row>
-		<label>Wide</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/screens/wide.gif</logo>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
index 5f234ed9c577ba71f7cf7497fccb1302a0013310..0879f6fb5b842c36e9abab231b14d7012112274d 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
@@ -102,10 +102,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
-		<screenType>normal</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -225,10 +223,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
-		<screenType>normal</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -348,10 +344,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
-		<screenType>normal</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -471,10 +465,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
-		<screenType>normal</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -625,10 +617,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
-		<screenType>normal</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -779,10 +769,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
-		<screenType>normal</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -925,10 +913,8 @@
 		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion>UNK</browserVersion>
-		<screenType>normal</screenType>
 		<deviceType>Desktop</deviceType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index 8e034ec05932c101f9abcaa4e62b462a7bf42058..d252d03f5d2622d73f459a9665c230efb0286df8 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
@@ -66,9 +66,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -220,9 +218,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -343,9 +339,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -497,9 +491,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -620,9 +612,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -774,9 +764,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -889,9 +877,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index c6ff4bfdff21aa125fe6ae39e210140e98434a6e..2975b07bcb9130a86d41f69db929294eb8ea5460 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -56,9 +56,7 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -204,9 +202,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -329,9 +325,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -468,9 +462,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -593,9 +585,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -749,9 +739,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -874,9 +862,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index 9c5c5cc080b01fc63efdd525f9e86d935da69fc9..759645d39df54a656052c9b7a4aee8e9fe121bce 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
@@ -97,9 +97,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -222,9 +220,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -378,9 +374,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -517,9 +511,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -642,9 +634,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -767,9 +757,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -882,9 +870,7 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index c6ff4bfdff21aa125fe6ae39e210140e98434a6e..2975b07bcb9130a86d41f69db929294eb8ea5460 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -56,9 +56,7 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -204,9 +202,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -329,9 +325,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -468,9 +462,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -593,9 +585,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -749,9 +739,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -874,9 +862,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index 6bc6d4b5aa3a84b5da6eb6c140f45eeb6f37c542..bd23daaa0429b62de553f3bb30db73b6f8e726b5 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -56,9 +56,7 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -204,9 +202,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -329,9 +325,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -468,9 +462,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -593,9 +585,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -749,9 +739,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -874,9 +862,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1013,9 +999,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1138,9 +1122,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -1294,9 +1276,7 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml
deleted file mode 100644
index f1acb38cb949dc9c0f8185389a7edd5488ce1b86..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>Normal</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_visits>2</nb_visits>
-		<nb_actions>8</nb_actions>
-		<max_actions>7</max_actions>
-		<sum_visit_length>1621</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/screens/normal.gif</logo>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
deleted file mode 100644
index f1acb38cb949dc9c0f8185389a7edd5488ce1b86..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>Normal</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_visits>2</nb_visits>
-		<nb_actions>8</nb_actions>
-		<max_actions>7</max_actions>
-		<sum_visit_length>1621</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/screens/normal.gif</logo>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 849af36fed07bc77b58fa3b2c06581103985d53e..6649f123d99f5e39d7f983ccbb1b9bc2741d76d5 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -85,9 +85,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -273,9 +271,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml
deleted file mode 100644
index 1aa955af66ab8f9f97f767eead0a8a3910701714..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>Normal</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_visits>2</nb_visits>
-		<nb_actions>9</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>8</max_actions>
-		<sum_visit_length>1621</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/screens/normal.gif</logo>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
deleted file mode 100644
index 1aa955af66ab8f9f97f767eead0a8a3910701714..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>Normal</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_visits>2</nb_visits>
-		<nb_actions>9</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>8</max_actions>
-		<sum_visit_length>1621</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/screens/normal.gif</logo>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index 8173b172510ed5c43b9eaa9a16cee3c2e0752fe9..9b0149ac2a0d47c75b8b363a629bcac3c7bc443c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
@@ -74,9 +74,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -181,9 +179,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index dfaee585ef39f64f3bd2080839cb6efbf40eb697..4eb429a7633131ad521b257930ba1619f18bd51d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -79,9 +79,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>10:00:00</visitLocalTime>
@@ -172,9 +170,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>11:00:00</visitLocalTime>
@@ -265,9 +261,7 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<screenType>unknown</screenType>
 		<resolution>unknown</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
 		<plugins />
 		<pluginsIcons />
 		<visitLocalTime>12:00:00</visitLocalTime>
diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index e0516433ba80460aa2d03a7071d348051d912b24..17d9192ba422cc3aa77bb288ccf81c31518a0361 100644
--- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -74,9 +74,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index 560e7ebe33a888f0f28c1eeec0ff8d445af24407..8ca1417d42f5b16f957a7366870249d66706cc94 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -53,11 +53,6 @@
                 <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser Plugins
                 </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);">
-                    Normal / Widescreen
-                </a>
             </li>
                     <li>
                 <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
@@ -2124,99 +2119,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;">
-    Normal / Widescreen
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,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"
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Type of screen&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/dual.gif'>
-                                        &nbsp;
-                                                                                                            Dual                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                9
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                41
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.56
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:13:21
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                11.11%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/normal.gif'>
-                                        &nbsp;
-                                                                                                            Normal                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
     Visitor Configuration
 </h2>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 345438918049666ea77bfebce4535ae0abd984d0..1023f2402f215f9cdcc4a9ad5c55ec3429d2e5b8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -53,11 +53,6 @@
                 <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser Plugins
                 </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);">
-                    Normal / Widescreen
-                </a>
             </li>
                     <li>
                 <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
@@ -2107,93 +2102,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;">
-    Normal / Widescreen
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Type of screen&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/dual.gif'>
-                                        &nbsp;
-                                                                                                            Dual                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                9
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                41
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.6
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:13:21
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                11%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/normal.gif'>
-                                        &nbsp;
-                                                                                                            Normal                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
     Visitor Configuration
 </h2>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 72a5b780f30450e12c212fc9e5deebc88dfb6531..eff0ec8836cdfbcf67f50844a6b897875ae5f077 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -237,34 +237,6 @@
 		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getPlugin&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
 		<uniqueId>UserSettings_getPlugin</uniqueId>
 	</row>
-	<row>
-		<category>Visitor Settings</category>
-		<name>Normal / Widescreen</name>
-		<module>UserSettings</module>
-		<action>getScreenType</action>
-		<dimension>Type of screen</dimension>
-		<metrics>
-			<nb_visits>Visits</nb_visits>
-			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
-			<nb_actions>Actions</nb_actions>
-			<nb_users>Users</nb_users>
-		</metrics>
-		<metricsDocumentation>
-			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
-			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
-			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
-			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
-		</metricsDocumentation>
-		<processedMetrics>
-			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
-			<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
-			<bounce_rate>Bounce Rate</bounce_rate>
-			<conversion_rate>Conversion Rate</conversion_rate>
-		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getScreenType&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getScreenType&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getScreenType</uniqueId>
-	</row>
 	<row>
 		<category>Visitor Settings</category>
 		<name>Visitor Configuration</name>
diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index 27a8a409e0ca14971fed9c4754f549a38e991539..346c1542dbf3c6c843ee17754e575ec5c71d7ca7 100644
Binary files a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv and b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv differ
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index a6103ff86224011600e71ad537991c9c5c40ec8d..76d48bc7b6e95c2460ff65f2a273c31e6543d057 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -112,9 +112,7 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -323,9 +321,7 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index de1db7a777a08b806669e87248b0bb3f4cd41b19..5ff6e58fbae68f83283f4537564934bc9ba61a2f 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -188,9 +188,7 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -518,9 +516,7 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -734,9 +730,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>normal</screenType>
 		<resolution>1024x768</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index 7861e2ab4e02e738bec805061667e72e8a598e9e..dd359fb284ae509e2d31aea7325d1b99c2d0bce6 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -53,11 +53,6 @@
                 <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser Plugins
                 </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);">
-                    Normal / Widescreen
-                </a>
             </li>
                     <li>
                 <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
@@ -2161,74 +2156,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;">
-    Normal / Widescreen
-</h2>
-
-            <img alt=""
-                                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAJSUlEQVR4nO3dy25cBxnA8TP38dzsJLVjx42iyG0DNBKIpiosYNEHQOIBWLFHYsOCB0DseAKegi2PQFYQQGpN2jS2c3EcZzy+zuWwMHJdx7G/ENtnPPP7LaKZOWeiz7FOzt/nMs6laZoAAJwmn/UAAMDlIBoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaPifhYWFY1889vWT3wUAI0k0nGJxcTG+VEMAMMKKWQ9wQf7w578deeX3v753+Oni4uLCwsLhCDjyFADG3LhEwxfftLvd7sHTUqm0tLQ0Pz9/6htfL4mDx0c6Y3/RwQr7Sw+v/G5fAQBkbFyiIUmSra2tg8eTk5PLy8uRaDjshIBIjmsIxy0AGCWuafjW4WMDkX38W0WAYgDgshMNb2G/KoJXO77VygAw/Mbo9EStVnv3v2T/gMF+CgQPRQRXBoAhNy7R8MvPF5aXlk5d7eAMReROy/ghh8Q1DQBcfuMSDb/4+a0kufWOf8lb7fhVAgAjZlyi4Uy8fhflsTdQvGnlixkSAM5JLk3TrGcAAC4Bd08AACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBkFD4R0gcvwpCzkcKlcPhDjY9d4dJHw5Ff8eA3PsCwsZHCpRDZNp2eAM6XRIDhF6z5S3+kAQB4d5HTiKIBuAinnisFshU5jSgagItw8B+Qaxrg8nJNAwAQIhqA83X4RClwqeXSNM16hnflFnAYcjZSGH6R7XQUogEAuABOTwAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgJDRiYb79+9nPQJwEhspDLlTN9LRiQYA4FyJBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQUsx6gLP0+OlG1iMAb7T6qmsj5cK8f72Z9QgjaKSi4Td//GvWIwAn+stK1hMwLv70u89vzU1mPcWocXoCAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACCkmPUAR6Vpuv+g2+0OBmm31+v3ev1+r91ur796maS52dnZ6enpQqGQJEkul8t0WAAYI0MXDRsbnY2trc3tvbWNTmdzc2N9ffX5s263UE06xVIxn88/e/bkk0/uXb16TTEAwEUaumj4+z//1d7affxio7M3SJKkVi5Nvzd3fWqiViuXSvm1tbVnT59/9dXDer1RrVazHhYAxkgG0bCwsLC4uPimpU+WV67M3nyx1dkpTbVajckrtYUbkx9eL+aSXpIkzWZxbe3pN4+/np+/OTs7e4FTA8C4+zYaFhYWkiQ5vDs/ee9+Trp726ViIS23dorXqpVGrlaqNuqdwaBe2Elye9V6vlqvfPWfJ6svVqenp4vFoTtSAsDw2N+1HXbx+7VRMnQ73WKx2O/tTVRLK1vd3HZ/e6/YTXNJkmz28mlS2M3VK5WZ9vbykyerH37QFw0AnEwlnKHv7HQXFxePPbpwuNQO1jn488iig8dH3hv8ts3Oznb7u82JyvaLre1c7Vq9vL6ZTBTKg16v2y8mSVK4Mt+Y6bTb7Z2dnWq18nZfLgDw/zr9J/UjGbEfAYdfPNwHrz8+dukJJqcmHz1ealYbSbK7vpOsdNKHq3u9frmUyyf9fpIk3W7SrBaXVpaePn06NTUZ/1IBGENHfrjNcJIRcDQa3nSw4fXVzmmgyeZkkiw1SpVSrrux013u5Msr3Y1eeaqcVga7lbSX627XqsUXaff56vM7dz46pzEAGAFH9laZXKs3So450hDshqDXL0I5WaPZLBcre0l3Itfd66y1k/JqmpbSYq+Sryd79WS3u7m+s9muT1QazeaZTAgARJzvhYRHTlhE3lIsFguFfLrdnirsXBtsN5PafL7S2n5V3Ortbr16vvZ0MNidnn7vB9/7/kcfzJ/n7ADAdxwfDUeucLxI5XJ5ZmZy8evlD2ca9UpSTbuF/staPlfK53ql3sud9tTVKz/97NNbt25XKhOZTAjAZeF8xNk6/UjDCbdIvO17IyqVcqtxdbv979W1R3u7vXKlePP9uZmZ6X6/v77+amdvNp/L1SZqtYmJfN7HSANwktd3YRkOMwK+jYYj/5SHnwYXHfv49e/Qqd+z6Znpj+9+/OUXX37z+HG1XKw3Gv1BsrW90+v3m43G6osXy8vLc3NzPkYagFMJhTM0jB+OVK1W73x0Z2Z65sGDfwwGg1arWSiUC4VCbaLaLm++bK/l8/n933IJAFyYfNYDHK9UKrVarbm5GxO1Zr3erNVqrVZrkOaWl5YKxYm5ublSqZT1jAAwXobxSMO+arV6/frs89WVBw8e93q9TqfT6XQajcZPPrs3N3cj6+kAYOwMbzQkSXLlytSPfvjpo0dfP3my0pyaunF99ubN91utlsMMAHDxhi4acrnv3BPRajXv3r179+7drOYBAPYN6TUNAMCwEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAIQUsx7gLP32V/eyHgF4o4cPH96+fTvrKRgXt+Ymsx5hBI1UNPzsxzezHgF4o1r67BMbKVxmTk8AACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACE5NI0zXoGAOAScKQBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAh/wXWOrLZRow6vAAAAABJRU5ErkJggg=="
-                                height="200"
-                width="700"/>
-    
-            <br/>
-        <br/>
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Type of screen&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/normal.gif'>
-                                        &nbsp;
-                                                                                                            Normal                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
     Visitor Configuration
 </h2>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 9bcbc710283c8fcc7a6706dcfe1e3e49d010e50c..b47e49d44ca06c125844e5d38857d0ec54f42b41 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -53,11 +53,6 @@
                 <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
                     Browser Plugins
                 </a>
-            </li>
-                    <li>
-                <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);">
-                    Normal / Widescreen
-                </a>
             </li>
                     <li>
                 <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
@@ -2144,68 +2139,6 @@
     <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;">
-    Normal / Widescreen
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Type of screen&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/screens/normal.gif'>
-                                        &nbsp;
-                                                                                                            Normal                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                16
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.2
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:22:49
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
 <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
     Visitor Configuration
 </h2>
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml
deleted file mode 100644
index 106f23f16bb7dddc98ac7def1dd2c59d64a48127..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result date="2009-01-04" />
-	<result date="2009-01-05" />
-	<result date="2009-01-06" />
-	<result date="2009-01-07" />
-	<result date="2009-01-08" />
-	<result date="2009-01-09" />
-	<result date="2009-01-10" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml
deleted file mode 100644
index 5cfb246edc18a6da402cb45044dfaf1ad20e25bc..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result date="From 2008-12-29 to 2009-01-04" />
-	<result date="From 2009-01-05 to 2009-01-11" />
-	<result date="From 2009-01-12 to 2009-01-18" />
-	<result date="From 2009-01-19 to 2009-01-25" />
-	<result date="From 2009-01-26 to 2009-02-01" />
-	<result date="From 2009-02-02 to 2009-02-08" />
-	<result date="From 2009-02-09 to 2009-02-15" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml
deleted file mode 100644
index 106f23f16bb7dddc98ac7def1dd2c59d64a48127..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result date="2009-01-04" />
-	<result date="2009-01-05" />
-	<result date="2009-01-06" />
-	<result date="2009-01-07" />
-	<result date="2009-01-08" />
-	<result date="2009-01-09" />
-	<result date="2009-01-10" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml
deleted file mode 100644
index 5cfb246edc18a6da402cb45044dfaf1ad20e25bc..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result date="From 2008-12-29 to 2009-01-04" />
-	<result date="From 2009-01-05 to 2009-01-11" />
-	<result date="From 2009-01-12 to 2009-01-18" />
-	<result date="From 2009-01-19 to 2009-01-25" />
-	<result date="From 2009-01-26 to 2009-02-01" />
-	<result date="From 2009-02-02 to 2009-02-08" />
-	<result date="From 2009-02-09 to 2009-02-15" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml
deleted file mode 100644
index c234bed59e963e268d7a9bc05348d941758c4aa9..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml
deleted file mode 100644
index c234bed59e963e268d7a9bc05348d941758c4aa9..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
index a4a21e48af021b1a9f0546d684ada0bedb73aa13..b48064a09c9980a724ac7fcf19c71d1489c36c06 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
@@ -82,9 +82,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -197,9 +195,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -372,9 +368,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index a4a21e48af021b1a9f0546d684ada0bedb73aa13..b48064a09c9980a724ac7fcf19c71d1489c36c06 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -82,9 +82,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -197,9 +195,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
@@ -372,9 +368,7 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
-		<screenType>dual</screenType>
 		<resolution>1111x222</resolution>
-		<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index b1e550645e218426c35df6cf32362757a1597978..60e389c7ab0ff2cc2260d333e97ba925fac322f3 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -125,9 +125,7 @@
 			<location>France</location>
 			<latitude />
 			<longitude />
-			<screenType>dual</screenType>
 			<resolution>1111x222</resolution>
-			<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
@@ -241,9 +239,7 @@
 			<location>France</location>
 			<latitude />
 			<longitude />
-			<screenType>dual</screenType>
 			<resolution>1111x222</resolution>
-			<screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon>
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
index 7b5bad19d8c111b48635dd2e000e9a598c973418..ff6884e62b0a856156e78075b5083ea06eb8f2aa 100644
--- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
@@ -62,7 +62,6 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
         $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getOSFamily', $validTill);
         $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowserType', $validTill);
         $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getMobileVsDesktop', $validTill);
-        $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getWideScreen', $validTill);
         $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\UserSettings', 'mapDeprecatedActions', $validTill);
 
         $this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add');