diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b4b43ec..9b440295 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [3.3.2](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.3.1...v3.3.2) - 2021-08-24
+### Changed
+- Reverted Shopware code review changes.
+
 ## [3.3.1](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.3.0...v3.3.1) - 2021-08-23
 **BREAKING CHANGES**
 ### Changed
diff --git a/src/BusinessLogic/Brand/DTO/BrandConfiguration.php b/src/BusinessLogic/Brand/DTO/BrandConfiguration.php
index 9f2d5a0d..4098f862 100644
--- a/src/BusinessLogic/Brand/DTO/BrandConfiguration.php
+++ b/src/BusinessLogic/Brand/DTO/BrandConfiguration.php
@@ -71,7 +71,7 @@ public function toArray()
      */
     public static function fromArray(array $data)
     {
-        $result = new self();
+        $result = new static();
 
         $result->platformCode = $data['platform_code'];
         $result->shippingServiceSource = $data['shipping_service_source'];
diff --git a/src/BusinessLogic/Controllers/DTO/DashboardStatus.php b/src/BusinessLogic/Controllers/DTO/DashboardStatus.php
index 7655d12e..fcbbc3ce 100644
--- a/src/BusinessLogic/Controllers/DTO/DashboardStatus.php
+++ b/src/BusinessLogic/Controllers/DTO/DashboardStatus.php
@@ -54,18 +54,4 @@ class DashboardStatus extends FrontDto
         'isWarehouseSet',
         'isOrderStatusMappingsSet',
     );
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/src/BusinessLogic/Controllers/DTO/ModuleState.php b/src/BusinessLogic/Controllers/DTO/ModuleState.php
index d7158978..32c3f0c6 100644
--- a/src/BusinessLogic/Controllers/DTO/ModuleState.php
+++ b/src/BusinessLogic/Controllers/DTO/ModuleState.php
@@ -44,18 +44,4 @@ class ModuleState extends FrontDto
     protected static $fields = array(
         'state',
     );
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/src/BusinessLogic/Controllers/DTO/OnboardingState.php b/src/BusinessLogic/Controllers/DTO/OnboardingState.php
index e1670773..c298865e 100644
--- a/src/BusinessLogic/Controllers/DTO/OnboardingState.php
+++ b/src/BusinessLogic/Controllers/DTO/OnboardingState.php
@@ -33,18 +33,4 @@ class OnboardingState extends FrontDto
     protected static $fields = array(
         'state',
     );
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/src/BusinessLogic/Controllers/DTO/RegistrationResponse.php b/src/BusinessLogic/Controllers/DTO/RegistrationResponse.php
index 25bd8f69..d549f9a8 100644
--- a/src/BusinessLogic/Controllers/DTO/RegistrationResponse.php
+++ b/src/BusinessLogic/Controllers/DTO/RegistrationResponse.php
@@ -54,18 +54,4 @@ class RegistrationResponse extends FrontDto
         'termsAndConditionsUrl',
         'privacyPolicyUrl',
     );
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/src/BusinessLogic/Controllers/DTO/ShippingMethodConfiguration.php b/src/BusinessLogic/Controllers/DTO/ShippingMethodConfiguration.php
index c95e4e3c..72760e38 100644
--- a/src/BusinessLogic/Controllers/DTO/ShippingMethodConfiguration.php
+++ b/src/BusinessLogic/Controllers/DTO/ShippingMethodConfiguration.php
@@ -121,7 +121,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $result = new self();
+        $result = new static();
 
         $result->id = $raw['id'];
         $result->activated = (bool)static::getDataValue($raw, 'activated', false);
diff --git a/src/BusinessLogic/Country/Country.php b/src/BusinessLogic/Country/Country.php
index 4676c156..bc665244 100644
--- a/src/BusinessLogic/Country/Country.php
+++ b/src/BusinessLogic/Country/Country.php
@@ -60,20 +60,6 @@ class Country extends FrontDto
         'postal_code',
     );
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Transforms raw array data to its DTO.
      *
diff --git a/src/BusinessLogic/Country/CountryService.php b/src/BusinessLogic/Country/CountryService.php
index e7a22bb1..c921c044 100644
--- a/src/BusinessLogic/Country/CountryService.php
+++ b/src/BusinessLogic/Country/CountryService.php
@@ -34,18 +34,6 @@ class CountryService extends BaseService
      */
     protected $brandConfigurationService;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Returns a list of supported country DTOs.
      *
diff --git a/src/BusinessLogic/Country/WarehouseCountryService.php b/src/BusinessLogic/Country/WarehouseCountryService.php
index cdb12889..e71f25ec 100644
--- a/src/BusinessLogic/Country/WarehouseCountryService.php
+++ b/src/BusinessLogic/Country/WarehouseCountryService.php
@@ -23,18 +23,6 @@ class WarehouseCountryService extends CountryService
      */
     protected static $instance;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Returns a list of supported country DTOs.
      *
diff --git a/src/BusinessLogic/DTO/BaseDto.php b/src/BusinessLogic/DTO/BaseDto.php
index 14510487..857fb5cc 100644
--- a/src/BusinessLogic/DTO/BaseDto.php
+++ b/src/BusinessLogic/DTO/BaseDto.php
@@ -29,7 +29,9 @@ abstract public function toArray();
      */
     public static function fromArray(array $raw)
     {
-        return null;
+        throw new \BadMethodCallException(
+            'Method "fromArray" not implemented! Given array: ' . print_r($raw, true)
+        );
     }
 
     /**
diff --git a/src/BusinessLogic/DTO/FrontDto.php b/src/BusinessLogic/DTO/FrontDto.php
index df052ceb..785fea97 100644
--- a/src/BusinessLogic/DTO/FrontDto.php
+++ b/src/BusinessLogic/DTO/FrontDto.php
@@ -30,20 +30,6 @@ abstract class FrontDto extends DataTransferObject
      */
     protected static $requiredFields = array();
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return null;
-    }
-
     /**
      * Transforms raw array data to its DTO.
      *
@@ -57,7 +43,7 @@ public static function fromArray(array $raw)
     {
         static::validate($raw);
 
-        $result = static::create($raw);
+        $result = new static();
         foreach ($raw as $field => $value) {
             if (property_exists(static::CLASS_NAME, $field)) {
                 $result->$field = $value;
diff --git a/src/BusinessLogic/DTO/ValidationError.php b/src/BusinessLogic/DTO/ValidationError.php
index edc287bd..f90c18d7 100644
--- a/src/BusinessLogic/DTO/ValidationError.php
+++ b/src/BusinessLogic/DTO/ValidationError.php
@@ -47,18 +47,4 @@ class ValidationError extends FrontDto
      * @var array
      */
     protected static $fields = array('code', 'field', 'message');
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/src/BusinessLogic/Http/DTO/Package.php b/src/BusinessLogic/Http/DTO/Package.php
index 2d49ee4c..6f06bebd 100644
--- a/src/BusinessLogic/Http/DTO/Package.php
+++ b/src/BusinessLogic/Http/DTO/Package.php
@@ -59,7 +59,7 @@ public function __construct($weight = 0.0, $width = 0.0, $height = 0.0, $length
      */
     public static function defaultPackage()
     {
-        return new self(1, 10, 10, 10);
+        return new static(1, 10, 10, 10);
     }
 
     /**
@@ -71,7 +71,7 @@ public static function defaultPackage()
      */
     public static function fromArray(array $raw)
     {
-        $instance = new self();
+        $instance = new static();
         $instance->weight = static::getDataValue($raw, 'weight', 0.0);
         $instance->length = static::getDataValue($raw, 'length', 0.0);
         $instance->height = static::getDataValue($raw, 'height', 0.0);
diff --git a/src/BusinessLogic/Http/DTO/ParcelInfo.php b/src/BusinessLogic/Http/DTO/ParcelInfo.php
index 856fb792..19e2ec15 100644
--- a/src/BusinessLogic/Http/DTO/ParcelInfo.php
+++ b/src/BusinessLogic/Http/DTO/ParcelInfo.php
@@ -98,20 +98,6 @@ public static function defaultParcel()
         );
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Generates validation errors for the payload.
      *
diff --git a/src/BusinessLogic/Http/DTO/PostalCode.php b/src/BusinessLogic/Http/DTO/PostalCode.php
index 968255bb..2a4bb9ff 100644
--- a/src/BusinessLogic/Http/DTO/PostalCode.php
+++ b/src/BusinessLogic/Http/DTO/PostalCode.php
@@ -51,7 +51,7 @@ class PostalCode extends DataTransferObject
      */
     public static function fromArray(array $raw)
     {
-        $instance = new self();
+        $instance = new static();
 
         $instance->zipcode = !empty($raw['zipcode']) ? $raw['zipcode'] : '';
         $instance->city = !empty($raw['city']['name']) ? $raw['city']['name'] : '';
diff --git a/src/BusinessLogic/Http/DTO/PostalZone.php b/src/BusinessLogic/Http/DTO/PostalZone.php
index e72dcc40..6923ba9b 100644
--- a/src/BusinessLogic/Http/DTO/PostalZone.php
+++ b/src/BusinessLogic/Http/DTO/PostalZone.php
@@ -51,7 +51,7 @@ class PostalZone extends DataTransferObject
      */
     public static function fromArray(array $raw)
     {
-        $instance = new self();
+        $instance = new static();
 
         $instance->id = static::getDataValue($raw, 'id');
         $instance->name = static::getDataValue($raw, 'name');
diff --git a/src/BusinessLogic/Http/DTO/Shipment.php b/src/BusinessLogic/Http/DTO/Shipment.php
index 6db420d7..25572c44 100644
--- a/src/BusinessLogic/Http/DTO/Shipment.php
+++ b/src/BusinessLogic/Http/DTO/Shipment.php
@@ -118,7 +118,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $shipment = new self();
+        $shipment = new static();
         $date = static::getDataValue($raw, 'order_date');
         if ($date) {
             $shipment->orderDate = \DateTime::createFromFormat('Y-m-d', $date);
diff --git a/src/BusinessLogic/Http/DTO/ShipmentLabel.php b/src/BusinessLogic/Http/DTO/ShipmentLabel.php
index b3f432b6..28e28969 100644
--- a/src/BusinessLogic/Http/DTO/ShipmentLabel.php
+++ b/src/BusinessLogic/Http/DTO/ShipmentLabel.php
@@ -58,7 +58,7 @@ public function __construct($link, $printed = false, $createTimestamp = 0)
      */
     public static function fromArray(array $batchRaw)
     {
-        return new self(
+        return new static(
             static::getDataValue($batchRaw, 'link'),
             static::getDataValue($batchRaw, 'printed', false),
             static::getDataValue($batchRaw, 'createTime', 0)
diff --git a/src/BusinessLogic/Http/DTO/ShippingService.php b/src/BusinessLogic/Http/DTO/ShippingService.php
index c909a97b..5a9bafd7 100644
--- a/src/BusinessLogic/Http/DTO/ShippingService.php
+++ b/src/BusinessLogic/Http/DTO/ShippingService.php
@@ -89,7 +89,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $instance = new self();
+        $instance = new static();
 
         $instance->id = (int)self::getDataValue($raw, 'service_id');
         $instance->enabled = (bool)self::getDataValue($raw, 'enabled');
diff --git a/src/BusinessLogic/Http/DTO/ShippingServiceDetails.php b/src/BusinessLogic/Http/DTO/ShippingServiceDetails.php
index 8d771e83..291d61c6 100644
--- a/src/BusinessLogic/Http/DTO/ShippingServiceDetails.php
+++ b/src/BusinessLogic/Http/DTO/ShippingServiceDetails.php
@@ -175,7 +175,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $instance = new self();
+        $instance = new static();
 
         $instance->id = self::getDataValue($raw, 'id');
         $instance->carrierName = self::getDataValue($raw, 'carrier_name');
diff --git a/src/BusinessLogic/Http/DTO/ShippingServiceSearch.php b/src/BusinessLogic/Http/DTO/ShippingServiceSearch.php
index 37a065b3..a3fd16f4 100644
--- a/src/BusinessLogic/Http/DTO/ShippingServiceSearch.php
+++ b/src/BusinessLogic/Http/DTO/ShippingServiceSearch.php
@@ -119,7 +119,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $instance = new self();
+        $instance = new static();
 
         $instance->serviceId = self::getDataValue($raw, 'service_id', null);
         $instance->fromCountry = self::getDataValue($raw, 'from[country]');
diff --git a/src/BusinessLogic/Http/DTO/SystemInfo.php b/src/BusinessLogic/Http/DTO/SystemInfo.php
index 0504ea9b..caf49d3a 100644
--- a/src/BusinessLogic/Http/DTO/SystemInfo.php
+++ b/src/BusinessLogic/Http/DTO/SystemInfo.php
@@ -45,7 +45,7 @@ class SystemInfo extends DataTransferObject
      */
     public static function fromArray(array $raw)
     {
-        $instance = new self();
+        $instance = new static();
 
         $instance->systemId = !empty($raw['system_id']) ? $raw['system_id'] : null;
         $instance->systemName = !empty($raw['system_name']) ? $raw['system_name'] : '';
diff --git a/src/BusinessLogic/Http/DTO/Tracking.php b/src/BusinessLogic/Http/DTO/Tracking.php
index 3d2bf4f4..10d7897d 100644
--- a/src/BusinessLogic/Http/DTO/Tracking.php
+++ b/src/BusinessLogic/Http/DTO/Tracking.php
@@ -53,7 +53,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $tracking = new self();
+        $tracking = new static();
         $tracking->timestamp = static::getDataValue($raw, 'timestamp');
         $tracking->description = static::getDataValue($raw, 'description');
         $tracking->city = static::getDataValue($raw, 'city');
diff --git a/src/BusinessLogic/Http/DTO/User.php b/src/BusinessLogic/Http/DTO/User.php
index a2a6ce7f..0eb8e796 100644
--- a/src/BusinessLogic/Http/DTO/User.php
+++ b/src/BusinessLogic/Http/DTO/User.php
@@ -60,7 +60,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $user = new self();
+        $user = new static();
 
         $user->firstName = static::getDataValue($raw, 'name');
         $user->lastName = static::getDataValue($raw, 'surname');
diff --git a/src/BusinessLogic/Location/LocationService.php b/src/BusinessLogic/Location/LocationService.php
index a23e53f5..3609011d 100644
--- a/src/BusinessLogic/Location/LocationService.php
+++ b/src/BusinessLogic/Location/LocationService.php
@@ -63,18 +63,6 @@ protected function __construct()
         $this->configuration = ServiceRegister::getService(Configuration::CLASS_NAME);
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Returns array of locations for this shipping method.
      *
diff --git a/src/BusinessLogic/Order/Objects/TrackingHistory.php b/src/BusinessLogic/Order/Objects/TrackingHistory.php
index 7c398c23..9121b966 100644
--- a/src/BusinessLogic/Order/Objects/TrackingHistory.php
+++ b/src/BusinessLogic/Order/Objects/TrackingHistory.php
@@ -37,7 +37,7 @@ class TrackingHistory
      */
     public static function fromArray(array $raw)
     {
-        $result = new self();
+        $result = new static();
         $result->setCity($raw['city']);
         $result->setDescription($raw['description']);
         $result->setTimestamp($raw['timestamp']);
diff --git a/src/BusinessLogic/Order/OrderService.php b/src/BusinessLogic/Order/OrderService.php
index a52b9407..f925b305 100644
--- a/src/BusinessLogic/Order/OrderService.php
+++ b/src/BusinessLogic/Order/OrderService.php
@@ -67,18 +67,6 @@ protected function __construct()
         $this->configuration = ServiceRegister::getService(Configuration::CLASS_NAME);
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Prepares shipment draft object for order with provided unique identifier.
      *
diff --git a/src/BusinessLogic/OrderShipmentDetails/Models/OrderShipmentDetails.php b/src/BusinessLogic/OrderShipmentDetails/Models/OrderShipmentDetails.php
index c16a73a3..1b5fd498 100644
--- a/src/BusinessLogic/OrderShipmentDetails/Models/OrderShipmentDetails.php
+++ b/src/BusinessLogic/OrderShipmentDetails/Models/OrderShipmentDetails.php
@@ -113,20 +113,6 @@ class OrderShipmentDetails extends Entity
      */
     private $deleted = false;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Returns entity configuration object.
      *
diff --git a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
index 26bae334..c300cf1b 100644
--- a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
+++ b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
@@ -45,18 +45,6 @@ public function __construct()
         $this->repository = new OrderShipmentDetailsRepository();
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Retrieves order shipment details.
      *
diff --git a/src/BusinessLogic/Registration/RegistrationLegalPolicy.php b/src/BusinessLogic/Registration/RegistrationLegalPolicy.php
index 89722407..f0d72041 100644
--- a/src/BusinessLogic/Registration/RegistrationLegalPolicy.php
+++ b/src/BusinessLogic/Registration/RegistrationLegalPolicy.php
@@ -68,20 +68,6 @@ class RegistrationLegalPolicy extends FrontDto
         'marketing_calls',
     );
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Transforms raw array data to its DTO.
      *
diff --git a/src/BusinessLogic/Registration/RegistrationRequest.php b/src/BusinessLogic/Registration/RegistrationRequest.php
index 2ab2de5d..9805e1cd 100644
--- a/src/BusinessLogic/Registration/RegistrationRequest.php
+++ b/src/BusinessLogic/Registration/RegistrationRequest.php
@@ -164,20 +164,6 @@ class RegistrationRequest extends FrontDto
         'UN',
     );
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Transforms raw array data to its DTO.
      *
diff --git a/src/BusinessLogic/Registration/RegistrationService.php b/src/BusinessLogic/Registration/RegistrationService.php
index cca59843..e999dc06 100644
--- a/src/BusinessLogic/Registration/RegistrationService.php
+++ b/src/BusinessLogic/Registration/RegistrationService.php
@@ -26,18 +26,6 @@ class RegistrationService extends BaseService
      */
     protected static $instance;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Registers a new user on Packlink PRO.
      *
diff --git a/src/BusinessLogic/Resources/LocationPicker/css/locationPicker.css b/src/BusinessLogic/Resources/LocationPicker/css/locationPicker.css
index 4fe73f3a..b8eb0f1e 100644
--- a/src/BusinessLogic/Resources/LocationPicker/css/locationPicker.css
+++ b/src/BusinessLogic/Resources/LocationPicker/css/locationPicker.css
@@ -136,9 +136,7 @@
     top: 16px;
     left: 15px;
     text-transform: uppercase;
-    font-weight: bold;
-    font-size: 16px;
-    font-family: Roboto, Arial, sans-serif;
+    font: bold 16px Roboto, Arial, sans-serif;
     color: #9b9b9b;
     pointer-events: none;
     white-space: nowrap;
@@ -154,9 +152,7 @@
     top: 12px;
     left: 15px;
     text-transform: uppercase;
-    font-weight: bold;
-    font-size: 12px;
-    font-family: Roboto, Arial, sans-serif;
+    font: bold 12px Roboto, Arial, sans-serif;
     color: #5d5d5d;
     pointer-events: none;
     transition: all .25s ease-in;
@@ -188,7 +184,6 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    pointer-events: none;
 }
 
 .lp-location-wrapper > *:not(.street) {
@@ -204,6 +199,10 @@
     width: 100%;
 }
 
+.lp-location-wrapper > * {
+    pointer-events: none;
+}
+
 .lp-location-wrapper .excluded {
     pointer-events: all !important;
 }
diff --git a/src/BusinessLogic/Resources/css/app.css b/src/BusinessLogic/Resources/css/app.css
index 639b736e..ff5ac497 100644
--- a/src/BusinessLogic/Resources/css/app.css
+++ b/src/BusinessLogic/Resources/css/app.css
@@ -402,7 +402,7 @@
   min-width: 24px;
   margin: 0;
 }
-#pl-page .pl-icon-button span {
+#pl-page .pl-icon-button i {
   font-size: 20px;
   width: auto;
   color: #2095f2;
@@ -413,7 +413,7 @@
 #pl-page .pl-icon-button:hover {
   cursor: pointer;
 }
-#pl-page .pl-icon-button:hover span {
+#pl-page .pl-icon-button:hover i {
   color: #fff;
 }
 #pl-page section {
@@ -449,12 +449,9 @@
 }
 #pl-page .pl-button-group {
   flex-direction: row;
-  padding-right: 10px;
 }
 #pl-page .pl-button-group button {
   border-radius: 0;
-  height: 56px;
-  min-width: 110px;
 }
 #pl-page .pl-button-group button:first-child {
   border-radius: 4px 0 0 4px;
@@ -514,7 +511,7 @@
 #pl-page .pl-form-group select {
   -moz-padding-start: 11px;
 }
-#pl-page .pl-form-group span {
+#pl-page .pl-form-group i {
   position: absolute;
   right: 10px;
   top: 28px;
@@ -523,7 +520,7 @@
   width: 24px;
   height: 24px;
 }
-#pl-page .pl-form-group select + span {
+#pl-page .pl-form-group select + i {
   cursor: default;
   pointer-events: none;
 }
@@ -572,7 +569,7 @@
   color: #fff;
   content: '\2713';
   margin: 0;
-  font: bold 20px/24px pl-proxima-nova, sans-serif;
+  font: bold 20px/24px pl-proxima-nova;
   width: 20px;
   min-width: 20px;
   height: 20px;
@@ -605,7 +602,7 @@
 #pl-page .pl-alert .pl-alert-text {
   color: inherit;
 }
-#pl-page .pl-alert span {
+#pl-page .pl-alert i {
   color: inherit;
   margin-left: 20px;
 }
@@ -701,7 +698,7 @@
   cursor: pointer;
   z-index: 1;
 }
-#pl-page .pl-modal-mask .pl-modal .pl-modal-close-button span {
+#pl-page .pl-modal-mask .pl-modal .pl-modal-close-button i {
   color: #2095f2;
   font-weight: bold;
 }
@@ -745,7 +742,7 @@
 #pl-page .pl-error input, #pl-page .pl-error select {
   border: 1px solid #e63f3f !important;
 }
-#pl-page .pl-error label, #pl-page .pl-error span {
+#pl-page .pl-error label, #pl-page .pl-error i {
   color: #e63f3f;
 }
 #pl-page .pl-error .pl-error-message {
@@ -856,6 +853,13 @@
 #pl-page .pl-shipping-services-list-item .pl-service-buttons .pl-button:not(.pl-hidden) + .pl-button {
   margin-left: 10px;
 }
+#pl-page .pl-button-group {
+  padding-right: 10px;
+}
+#pl-page .pl-button-group button {
+  height: 56px;
+  min-width: 110px;
+}
 #pl-page pre {
   white-space: normal;
 }
@@ -908,8 +912,10 @@
     padding: 10px;
   }
 }
+@media (min-width: 769px) and (max-width: 1280px) {
+}
 #pl-page .material-icons {
-  font-family: 'Material Icons Outlined', sans-serif;
+  font-family: 'Material Icons Outlined';
   font-weight: normal;
   font-style: normal;
   font-size: 24px;
@@ -938,7 +944,7 @@
   align-items: center;
   padding-bottom: 20px;
 }
-#pl-page .pl-onboarding-overview-list .pl-list-item span {
+#pl-page .pl-onboarding-overview-list .pl-list-item i {
   margin-right: 10px;
 }
 #pl-page .pl-onboarding-overview-list .pl-list-item + .pl-list-item {
@@ -1023,7 +1029,7 @@
   margin-right: -20px;
   font-weight: bold;
 }
-#pl-page .pl-configuration-menu span {
+#pl-page .pl-configuration-menu i {
   margin-left: 10px;
 }
 #pl-page .pl-configuration-page {
@@ -1273,3 +1279,5 @@
     display: flex;
   }
 }
+@media (min-width: 769px) and (max-width: 1280px) {
+}
diff --git a/src/BusinessLogic/Resources/js/DefaultWarehouseController.js b/src/BusinessLogic/Resources/js/DefaultWarehouseController.js
index 56fb6603..18b33c4a 100644
--- a/src/BusinessLogic/Resources/js/DefaultWarehouseController.js
+++ b/src/BusinessLogic/Resources/js/DefaultWarehouseController.js
@@ -174,7 +174,7 @@ if (!window.Packlink) {
                 }
             }, true);
 
-            postalCodeInput.parentElement.querySelector('span').addEventListener('click', (event) => {
+            postalCodeInput.parentElement.querySelector('i').addEventListener('click', (event) => {
                 event.stopPropagation();
                 postalCodeInput.focus();
             });
diff --git a/src/BusinessLogic/Resources/js/EditServiceController.js b/src/BusinessLogic/Resources/js/EditServiceController.js
index b1861e91..c3c4338f 100644
--- a/src/BusinessLogic/Resources/js/EditServiceController.js
+++ b/src/BusinessLogic/Resources/js/EditServiceController.js
@@ -322,20 +322,16 @@ if (!window.Packlink) {
             }
 
             for (let systemId in pricePolicyControllers) {
-                if (pricePolicyControllers.hasOwnProperty(systemId)) {
-                    let fieldName = pricePolicyControllers[systemId].getExcludedFieldForValidation();
-                    if (fieldName !== null) {
-                        excludedElementNames.push(fieldName);
-                    }
+                let fieldName = pricePolicyControllers[systemId].getExcludedFieldForValidation();
+                if (fieldName !== null) {
+                    excludedElementNames.push(fieldName);
                 }
             }
 
             if (validationService.validateForm(form, excludedElementNames) && validateMiconfiguredPolicies()) {
                 let pricingPolicies = [];
                 for (let systemId in pricePolicyControllers) {
-                    if (pricePolicyControllers.hasOwnProperty(systemId)) {
-                        pricingPolicies = pricingPolicies.concat(pricePolicyControllers[systemId].getSystemPricingPolicies());
-                    }
+                    pricingPolicies = pricingPolicies.concat(pricePolicyControllers[systemId].getSystemPricingPolicies());
                 }
 
                 serviceModel.activated = true;
diff --git a/src/BusinessLogic/Resources/js/OnboardingOverviewController.js b/src/BusinessLogic/Resources/js/OnboardingOverviewController.js
index cd1376a0..c66afbe7 100644
--- a/src/BusinessLogic/Resources/js/OnboardingOverviewController.js
+++ b/src/BusinessLogic/Resources/js/OnboardingOverviewController.js
@@ -60,7 +60,7 @@ if (!window.Packlink) {
         }
 
         const populateSegment = (segment, data, editState, infoProvider) => {
-            const icon = segment.querySelector('span');
+            const icon = segment.querySelector('i');
             const button = segment.querySelector('button');
             const details = segment.querySelector('.pl-item-details');
 
diff --git a/src/BusinessLogic/Resources/js/OrderStatusMappingController.js b/src/BusinessLogic/Resources/js/OrderStatusMappingController.js
index eca79902..def57b8b 100644
--- a/src/BusinessLogic/Resources/js/OrderStatusMappingController.js
+++ b/src/BusinessLogic/Resources/js/OrderStatusMappingController.js
@@ -88,9 +88,7 @@ if (!window.Packlink) {
 
             mappings = response.mappings;
             for (const status in statuses) {
-                if (statuses.hasOwnProperty(status)) {
-                    mappingsDiv.appendChild(injectStatus(status, statuses[status], mappings[status], response.orderStatuses));
-                }
+                mappingsDiv.appendChild(injectStatus(status, statuses[status], mappings[status], response.orderStatuses));
             }
 
             btn.addEventListener('click', saveOrderStatusMappings, true);
diff --git a/src/BusinessLogic/Resources/scss/app.scss b/src/BusinessLogic/Resources/scss/app.scss
index 3c76ea32..b780e9f9 100644
--- a/src/BusinessLogic/Resources/scss/app.scss
+++ b/src/BusinessLogic/Resources/scss/app.scss
@@ -23,7 +23,7 @@
       align-items: center;
       padding-bottom: 20px;
 
-      span {
+      i {
         margin-right: 10px;
       }
 
@@ -128,7 +128,7 @@
     margin-right: -20px;
     font-weight: bold;
 
-    span {
+    i {
       margin-left: 10px;
     }
   }
@@ -464,4 +464,10 @@
       }
     }
   }
+}
+
+// tablet rules
+@media (min-width: 769px) and (max-width: 1280px) {
+  #pl-page {
+  }
 }
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/scss/icons.scss b/src/BusinessLogic/Resources/scss/icons.scss
index 59c266b8..25e42f64 100644
--- a/src/BusinessLogic/Resources/scss/icons.scss
+++ b/src/BusinessLogic/Resources/scss/icons.scss
@@ -2,7 +2,7 @@
 
 //noinspection CssNoGenericFontName
 #pl-page .material-icons {
-  font-family: 'Material Icons Outlined', sans-serif;
+  font-family: 'Material Icons Outlined';
   font-weight: normal;
   font-style: normal;
   font-size: 24px;
diff --git a/src/BusinessLogic/Resources/scss/ui-controls.scss b/src/BusinessLogic/Resources/scss/ui-controls.scss
index ceed7dc3..7038927e 100644
--- a/src/BusinessLogic/Resources/scss/ui-controls.scss
+++ b/src/BusinessLogic/Resources/scss/ui-controls.scss
@@ -113,7 +113,7 @@
     min-width: $icon-button-size;
     margin: 0;
 
-    span {
+    i {
       font-size: 20px;
       width: auto;
       color: $color-blue;
@@ -126,7 +126,7 @@
     &:hover {
       cursor: pointer;
 
-      span {
+      i {
         color: $color-white;
       }
     }
@@ -173,12 +173,9 @@
 
   .pl-button-group {
     flex-direction: row;
-    padding-right: 10px;
 
     button {
       border-radius: 0;
-      height: $input-height;
-      min-width: 110px;
 
       &:first-child {
         border-radius: 4px 0 0 4px;
@@ -250,7 +247,7 @@
       -moz-padding-start: 11px;
     }
 
-    span {
+    i {
       position: absolute;
       right: 10px;
       top: $input-height/2;
@@ -260,7 +257,7 @@
       height: $icon-button-size;
     }
 
-    select + span {
+    select + i {
       cursor: default;
       pointer-events: none;
     }
@@ -316,7 +313,7 @@
         color: $color-white;
         content: '\2713';
         margin: 0;
-        font: bold 20px/24px pl-proxima-nova, sans-serif;
+        font: bold 20px/24px pl-proxima-nova;
         width: $checkbox-size;
         min-width: $checkbox-size;
         height: $checkbox-size;
@@ -356,7 +353,7 @@
       color: inherit;
     }
 
-    span {
+    i {
       color: inherit;
       margin-left: 20px;
     }
@@ -469,7 +466,7 @@
         cursor: pointer;
         z-index: 1;
 
-        span {
+        i {
           color: $color-blue;
           font-weight: bold;
         }
@@ -526,7 +523,7 @@
       border: 1px solid $color-red !important;
     }
 
-    label, span {
+    label, i {
       color: $color-red;
     }
 
@@ -664,6 +661,15 @@
     }
   }
 
+  .pl-button-group {
+    padding-right: 10px;
+
+    button {
+      height: $input-height;
+      min-width: 110px;
+    }
+  }
+
   pre {
     white-space: normal;
   }
@@ -745,3 +751,9 @@
     }
   }
 }
+
+// tablet rules
+@media (min-width: 769px) and (max-width: 1280px) {
+  #pl-page {
+  }
+}
diff --git a/src/BusinessLogic/Resources/templates/configuration.html b/src/BusinessLogic/Resources/templates/configuration.html
index a7c9ac2f..00657bb3 100644
--- a/src/BusinessLogic/Resources/templates/configuration.html
+++ b/src/BusinessLogic/Resources/templates/configuration.html
@@ -2,17 +2,17 @@
     <div class="pl-flex-expand">
         <header class="pl-sub-header">
             <button id="pl-back-button" class="pl-icon-button">
-                <span class="material-icons">keyboard_backspace</span>
+                <i class="material-icons">keyboard_backspace</i>
             </button>
             <h1>{$configuration.menu}</h1>
         </header>
         <div class="pl-flex-left pl-config-list">
             <div class="pl-config-list-item" id="pl-navigate-order-status">
-                <span class="material-icons pl-icon-text">fact_check</span>
+                <i class="material-icons pl-icon-text">fact_check</i>
                 <div class="pl-flex-expand pl-left-separate">
                     {$configuration.orderStatus}
                 </div>
-                <span class="material-icons pl-no-margin pl-icon-text">chevron_right</span>
+                <i class="material-icons pl-no-margin pl-icon-text">chevron_right</i>
             </div>
             <div class="pl-config-list-item" id="pl-navigate-warehouse">
                 <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="#2095f2">
@@ -21,7 +21,7 @@ <h1>{$configuration.menu}</h1>
                 <div class="pl-flex-expand pl-left-separate">
                     {$configuration.warehouse}
                 </div>
-                <span class="material-icons pl-no-margin pl-icon-text">chevron_right</span>
+                <i class="material-icons pl-no-margin pl-icon-text">chevron_right</i>
             </div>
             <div class="pl-config-list-item" id="pl-navigate-parcel">
                 <svg xmlns="http://www.w3.org/2000/svg" width="23" height="22" fill="#2095f2" fill-rule="evenodd"
@@ -33,15 +33,15 @@ <h1>{$configuration.menu}</h1>
                 <div class="pl-flex-expand pl-left-separate">
                     {$configuration.parcel}
                 </div>
-                <span class="material-icons pl-no-margin pl-icon-text">chevron_right</span>
+                <i class="material-icons pl-no-margin pl-icon-text">chevron_right</i>
             </div>
             <div class="pl-config-list-item">
                 <a target="_blank" id="pl-navigate-help">
-                    <span class="material-icons pl-icon-text">help_outline</span>
+                    <i class="material-icons pl-icon-text">help_outline</i>
                     <div class="pl-flex-expand pl-left-separate">
                         {$configuration.help}
                     </div>
-                    <span class="material-icons pl-no-margin pl-icon-text">chevron_right</span>
+                    <i class="material-icons pl-no-margin pl-icon-text">chevron_right</i>
                 </a>
             </div>
         </div>
diff --git a/src/BusinessLogic/Resources/templates/countries-selection-modal.html b/src/BusinessLogic/Resources/templates/countries-selection-modal.html
index b6f41e8f..a7c267e4 100644
--- a/src/BusinessLogic/Resources/templates/countries-selection-modal.html
+++ b/src/BusinessLogic/Resources/templates/countries-selection-modal.html
@@ -5,7 +5,7 @@
             <div class="pl-alert-wrapper" id="pl-countries-alert-wrapper">
                 <div class="pl-alert pl-alert-danger">
                     <span class="pl-alert-text">{$shippingServices.atLeastOneCountry}</span>
-                    <span class="material-icons">close</span>
+                    <i class="material-icons">close</i>
                 </div>
             </div>
         </section>
diff --git a/src/BusinessLogic/Resources/templates/default-parcel.html b/src/BusinessLogic/Resources/templates/default-parcel.html
index dea72c21..f4ff6852 100644
--- a/src/BusinessLogic/Resources/templates/default-parcel.html
+++ b/src/BusinessLogic/Resources/templates/default-parcel.html
@@ -1,7 +1,7 @@
 <div class="pl-default-parcel-page pl-full-width">
     <header class="pl-sub-header">
         <button id="pl-back-button" class="pl-icon-button">
-            <span class="material-icons">keyboard_backspace</span>
+            <i class="material-icons">keyboard_backspace</i>
         </button>
         <h1 id="pl-page-title" class="pl-text-center pl-full-width"></h1>
     </header>
diff --git a/src/BusinessLogic/Resources/templates/default-warehouse.html b/src/BusinessLogic/Resources/templates/default-warehouse.html
index 8b2ceee1..4899c44d 100644
--- a/src/BusinessLogic/Resources/templates/default-warehouse.html
+++ b/src/BusinessLogic/Resources/templates/default-warehouse.html
@@ -1,7 +1,7 @@
 <div class="pl-default-warehouse-page pl-full-width">
     <header class="pl-sub-header">
         <button id="pl-back-button" class="pl-icon-button">
-            <span class="material-icons">keyboard_backspace</span>
+            <i class="material-icons">keyboard_backspace</i>
         </button>
         <h1 id="pl-page-title" class="pl-text-center pl-full-width">
         </h1>
@@ -37,7 +37,7 @@ <h1 id="pl-page-title" class="pl-text-center pl-full-width">
                 <div class="pl-form-group">
                     <select id="pl-default-warehouse-country" name="country" data-required="true">
                     </select>
-                    <span class="material-icons">expand_more</span>
+                    <i class="material-icons">expand_more</i>
                     <label for="pl-default-warehouse-country">{$defaultWarehouse.country}</label>
                 </div>
                 <div class="pl-form-group">
@@ -46,7 +46,7 @@ <h1 id="pl-page-title" class="pl-text-center pl-full-width">
                            data-required="true"
                            autocomplete="no"/>
                     <label for="pl-default-warehouse-postal_code">{$defaultWarehouse.postal_code}</label>
-                    <span class="material-icons">search</span>
+                    <i class="material-icons">search</i>
                 </div>
                 <div class="pl-form-group">
                     <input type="text" id="pl-default-warehouse-address" name="address"
diff --git a/src/BusinessLogic/Resources/templates/edit-shipping-service.html b/src/BusinessLogic/Resources/templates/edit-shipping-service.html
index f0fcef81..de12ce82 100644
--- a/src/BusinessLogic/Resources/templates/edit-shipping-service.html
+++ b/src/BusinessLogic/Resources/templates/edit-shipping-service.html
@@ -1,7 +1,7 @@
 <div class="pl-pick-shipping-services-page pl-page-config">
     <header class="pl-sub-header">
         <button id="pl-back-button" class="pl-icon-button">
-            <span class="material-icons">keyboard_backspace</span>
+            <i class="material-icons">keyboard_backspace</i>
         </button>
         <h1>{$shippingServices.configureService}</h1>
     </header>
@@ -34,7 +34,7 @@ <h1>{$shippingServices.configureService}</h1>
                     <div class="pl-form-group">
                         <select name="scope" id="pl-scope-select">
                         </select>
-                        <span class="material-icons">expand_more</span>
+                        <i class="material-icons">expand_more</i>
                         <label for="pl-scope-select" class="pl-text-input-label">
                             {$shippingServices.scope}
                         </label>
@@ -72,8 +72,8 @@ <h1>{$shippingServices.configureService}</h1>
                             <strong>{$shippingServices.configurePricePolicy}</strong>
                         </label>
                         <div class="pl-switch-button" id="pl-configure-prices-button">
-                            <span class="pl-switch-on material-icons">toggle_on</span>
-                            <span class="pl-switch-off material-icons">toggle_off</span>
+                            <i class="pl-switch-on material-icons">toggle_on</i>
+                            <i class="pl-switch-off material-icons">toggle_off</i>
                         </div>
                     </div>
                     <div id="pl-pricing-policies">
@@ -100,7 +100,7 @@ <h1>{$shippingServices.configureService}</h1>
                 <div class="pl-form-group">
                     <select name="tax" id="pl-tax-class-select" data-required="true">
                     </select>
-                    <span class="material-icons">expand_more</span>
+                    <i class="material-icons">expand_more</i>
                     <label for="pl-tax-class-select" class="pl-text-input-label">
                         {$shippingServices.tax}
                     </label>
diff --git a/src/BusinessLogic/Resources/templates/onboarding-overview.html b/src/BusinessLogic/Resources/templates/onboarding-overview.html
index bc845339..01c226fe 100644
--- a/src/BusinessLogic/Resources/templates/onboarding-overview.html
+++ b/src/BusinessLogic/Resources/templates/onboarding-overview.html
@@ -7,7 +7,7 @@ <h1 class="pl-text-center">
         </div>
         <div class="pl-onboarding-overview-list">
             <div class="pl-list-item">
-                <span class="material-icons">check</span>
+                <i class="material-icons">check</i>
                 <div class="pl-row-orientation pl-flex-expand pl-flex-left">
                     <div class="pl-flex-expand">
                         <div class="pl-onboarding-list-title">{$onboardingOverview.parcelDetails}</div>
@@ -19,7 +19,7 @@ <h1 class="pl-text-center">
                 </div>
             </div>
             <div class="pl-list-item">
-                <span class="material-icons">check</span>
+                <i class="material-icons">check</i>
                 <div class="pl-row-orientation pl-flex-expand pl-flex-left">
                     <div class="pl-flex-expand">
                         <div class="pl-onboarding-list-title">{$onboardingOverview.senderAddress}</div>
diff --git a/src/BusinessLogic/Resources/templates/order-status-mapping.html b/src/BusinessLogic/Resources/templates/order-status-mapping.html
index 850e0b79..4f46b3e5 100644
--- a/src/BusinessLogic/Resources/templates/order-status-mapping.html
+++ b/src/BusinessLogic/Resources/templates/order-status-mapping.html
@@ -1,7 +1,7 @@
 <div class="pl-order-status-mapping-page pl-page-config">
     <header class="pl-sub-header">
         <button id="pl-back-button" class="pl-icon-button">
-            <span class="material-icons">keyboard_backspace</span>
+            <i class="material-icons">keyboard_backspace</i>
         </button>
         <h1>{$orderStatusMapping.title}</h1>
     </header>
@@ -32,11 +32,11 @@ <h1>{$orderStatusMapping.title}</h1>
     <div class="pl-status-mapping">
         <div class="pl-half-width">
             <span class="pl-flex-expand pl-packlink-status pl-all-caps"></span>
-            <span class="material-icons pl-separation-indicator">chevron_right</span>
+            <i class="material-icons pl-separation-indicator">chevron_right</i>
         </div>
         <div class="pl-half-width pl-form-group">
             <select class="pl-all-caps compact"></select>
-            <span class="material-icons">expand_more</span>
+            <i class="material-icons">expand_more</i>
         </div>
     </div>
 </template>
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/templates/pick-shipping-services.html b/src/BusinessLogic/Resources/templates/pick-shipping-services.html
index b762e1e3..98b4ecbc 100644
--- a/src/BusinessLogic/Resources/templates/pick-shipping-services.html
+++ b/src/BusinessLogic/Resources/templates/pick-shipping-services.html
@@ -1,12 +1,12 @@
 <div class="pl-pick-shipping-services-page pl-page-config">
     <header class="pl-sub-header">
         <button id="pl-back-button" class="pl-icon-button">
-            <span class="material-icons">keyboard_backspace</span>
+            <i class="material-icons">keyboard_backspace</i>
         </button>
         <div class="pl-row-orientation pl-separate-content pl-full-width">
             <h1>{$shippingServices.pickShippingService}</h1>
             <button id="pl-open-filter-button" class="pl-icon-button">
-                <span class="material-icons">filter_alt</span>
+                <i class="material-icons">filter_alt</i>
             </button>
         </div>
     </header>
diff --git a/src/BusinessLogic/Resources/templates/pricing-policy-modal.html b/src/BusinessLogic/Resources/templates/pricing-policy-modal.html
index 15fb44b7..afb17037 100644
--- a/src/BusinessLogic/Resources/templates/pricing-policy-modal.html
+++ b/src/BusinessLogic/Resources/templates/pricing-policy-modal.html
@@ -11,7 +11,7 @@
                     <option value="1">{$shippingServices.weightRange}</option>
                     <option value="2">{$shippingServices.weightAndPriceRange}</option>
                 </select>
-                <span class="material-icons">expand_more</span>
+                <i class="material-icons">expand_more</i>
                 <label for="pl-range-type-select" class="pl-text-input-label">
                     {$shippingServices.rangeType}
                 </label>
@@ -57,7 +57,7 @@
                     <option value="1">{$shippingServices.percentagePacklinkPrices}</option>
                     <option value="2">{$shippingServices.fixedPrices}</option>
                 </select>
-                <span class="material-icons">expand_more</span>
+                <i class="material-icons">expand_more</i>
                 <label for="pl-pricing-policy-select" class="pl-text-input-label">
                     {$shippingServices.pricePolicy}
                 </label>
diff --git a/src/BusinessLogic/Resources/templates/register-modal.html b/src/BusinessLogic/Resources/templates/register-modal.html
index 0d0ba103..e0cdf2ac 100644
--- a/src/BusinessLogic/Resources/templates/register-modal.html
+++ b/src/BusinessLogic/Resources/templates/register-modal.html
@@ -1,7 +1,7 @@
 <div class="pl-form-group">
     <input id="pl-country-filter" placeholder="{$register.searchCountry}" type="text" class="form-control compact"
            name="countryFilter" autocomplete="no">
-    <span class="material-icons">search</span>
+    <i class="material-icons">search</i>
 </div>
 <div class="pl-register-country-list-wrapper pl-page-content">
     <template id="country-template">
diff --git a/src/BusinessLogic/Resources/templates/register.html b/src/BusinessLogic/Resources/templates/register.html
index 567a950a..d8b78621 100644
--- a/src/BusinessLogic/Resources/templates/register.html
+++ b/src/BusinessLogic/Resources/templates/register.html
@@ -40,7 +40,7 @@ <h1 class="pl-text-center">
                         <option value="101 - 200">101 - 200</option>
                         <option value="> 200">> 200</option>
                     </select>
-                    <span class="material-icons">expand_more</span>
+                    <i class="material-icons">expand_more</i>
                     <label for="pl-register-shipment-volume" class="pl-text-input-label">
                         {$register.monthlyShipmentVolume}
                     </label>
diff --git a/src/BusinessLogic/Resources/templates/shipping-services-header.html b/src/BusinessLogic/Resources/templates/shipping-services-header.html
index c53a5e2d..e9b67737 100644
--- a/src/BusinessLogic/Resources/templates/shipping-services-header.html
+++ b/src/BusinessLogic/Resources/templates/shipping-services-header.html
@@ -1,4 +1,4 @@
 <button class="pl-button pl-button-primary pl-add-service-button">{$shippingServices.addNewService}</button>
 <div class="pl-row-orientation pl-configuration-menu pl-clickable">
-    {$configuration.menu} <span class="material-icons pl-icon-text">settings</span>
+    {$configuration.menu} <i class="material-icons pl-icon-text">settings</i>
 </div>
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/templates/shipping-services-table.html b/src/BusinessLogic/Resources/templates/shipping-services-table.html
index 699798a7..11e1a17e 100644
--- a/src/BusinessLogic/Resources/templates/shipping-services-table.html
+++ b/src/BusinessLogic/Resources/templates/shipping-services-table.html
@@ -1,25 +1,25 @@
-<table class="pl-shipping-services-table" aria-describedby="description">
+<table class="pl-shipping-services-table">
     <thead>
     <tr>
-        <th id="pl-carrier">
+        <th>
             {$shippingServices.carrier}
         </th>
-        <th id="pl-service-title">
+        <th>
             {$shippingServices.serviceTitle}
         </th>
-        <th id="pl-transit-time">
+        <th>
             {$shippingServices.transitTime}
         </th>
-        <th id="pl-type">
+        <th>
             {$shippingServices.type}
         </th>
-        <th class="pl-text-center" id="pl-origin">
+        <th class="pl-text-center">
             {$shippingServices.origin}
         </th>
-        <th class="pl-text-center" id="pl-destination">
+        <th class="pl-text-center">
             {$shippingServices.destination}
         </th>
-        <th class="pl-small" id="pl-button-column"></th>
+        <th class="pl-small"></th>
     </tr>
     </thead>
     <tbody>
diff --git a/src/BusinessLogic/Scheduler/Models/Schedule.php b/src/BusinessLogic/Scheduler/Models/Schedule.php
index 87214233..c36b754f 100644
--- a/src/BusinessLogic/Scheduler/Models/Schedule.php
+++ b/src/BusinessLogic/Scheduler/Models/Schedule.php
@@ -103,20 +103,6 @@ public function __construct(Task $task = null, $queueName = null, $context = '')
         $this->context = $context;
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Transforms raw array data to this entity instance.
      *
diff --git a/src/BusinessLogic/Scheduler/ScheduleCheckTask.php b/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
index 031de409..3f46c58b 100644
--- a/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
+++ b/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
@@ -36,7 +36,7 @@ class ScheduleCheckTask extends Task
      */
     public static function fromArray(array $array)
     {
-        return new self();
+        return new static();
     }
 
     /**
diff --git a/src/BusinessLogic/ShipmentDraft/Models/OrderSendDraftTaskMap.php b/src/BusinessLogic/ShipmentDraft/Models/OrderSendDraftTaskMap.php
index 1291b518..22c782f5 100644
--- a/src/BusinessLogic/ShipmentDraft/Models/OrderSendDraftTaskMap.php
+++ b/src/BusinessLogic/ShipmentDraft/Models/OrderSendDraftTaskMap.php
@@ -40,20 +40,6 @@ class OrderSendDraftTaskMap extends Entity
      */
     protected $executionId;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * @inheritDoc
      */
diff --git a/src/BusinessLogic/ShipmentDraft/Objects/ShipmentDraftStatus.php b/src/BusinessLogic/ShipmentDraft/Objects/ShipmentDraftStatus.php
index e3c97b73..6fd5acef 100644
--- a/src/BusinessLogic/ShipmentDraft/Objects/ShipmentDraftStatus.php
+++ b/src/BusinessLogic/ShipmentDraft/Objects/ShipmentDraftStatus.php
@@ -41,7 +41,7 @@ class ShipmentDraftStatus extends DataTransferObject
      */
     public static function fromArray(array $raw)
     {
-        $me = new self();
+        $me = new static();
         $me->status = static::getDataValue($raw, 'status');
         $me->message = static::getDataValue($raw, 'message');
 
diff --git a/src/BusinessLogic/ShipmentDraft/OrderSendDraftTaskMapService.php b/src/BusinessLogic/ShipmentDraft/OrderSendDraftTaskMapService.php
index 9ef0a5ef..84daa291 100644
--- a/src/BusinessLogic/ShipmentDraft/OrderSendDraftTaskMapService.php
+++ b/src/BusinessLogic/ShipmentDraft/OrderSendDraftTaskMapService.php
@@ -45,18 +45,6 @@ public function __construct()
         $this->repository = new OrderSendDraftTaskRepository();
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Retrieves Order - SendDraftTask map instance.
      *
diff --git a/src/BusinessLogic/ShipmentDraft/ShipmentDraftService.php b/src/BusinessLogic/ShipmentDraft/ShipmentDraftService.php
index 19bdf5e6..82572c34 100644
--- a/src/BusinessLogic/ShipmentDraft/ShipmentDraftService.php
+++ b/src/BusinessLogic/ShipmentDraft/ShipmentDraftService.php
@@ -33,18 +33,6 @@ class ShipmentDraftService extends BaseService
      */
     protected static $instance;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Enqueues the task for creating shipment draft for provided order id.
      * Ensures proper mapping between the order and the created task are persisted.
diff --git a/src/BusinessLogic/ShippingMethod/Models/ShippingMethod.php b/src/BusinessLogic/ShippingMethod/Models/ShippingMethod.php
index 016e9197..8b5bdd04 100644
--- a/src/BusinessLogic/ShippingMethod/Models/ShippingMethod.php
+++ b/src/BusinessLogic/ShippingMethod/Models/ShippingMethod.php
@@ -168,20 +168,6 @@ class ShippingMethod extends Entity
      */
     public $systemDefaults;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Transforms raw array data to this entity instance.
      *
diff --git a/src/BusinessLogic/ShippingMethod/Models/ShippingPricePolicy.php b/src/BusinessLogic/ShippingMethod/Models/ShippingPricePolicy.php
index 9a909ddb..480b0898 100644
--- a/src/BusinessLogic/ShippingMethod/Models/ShippingPricePolicy.php
+++ b/src/BusinessLogic/ShippingMethod/Models/ShippingPricePolicy.php
@@ -113,20 +113,6 @@ class ShippingPricePolicy extends FrontDto
         'increase',
     );
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Transforms raw array data to this entity instance.
      *
diff --git a/src/BusinessLogic/ShippingMethod/Models/ShippingService.php b/src/BusinessLogic/ShippingMethod/Models/ShippingService.php
index 23af356a..0f10c872 100644
--- a/src/BusinessLogic/ShippingMethod/Models/ShippingService.php
+++ b/src/BusinessLogic/ShippingMethod/Models/ShippingService.php
@@ -93,7 +93,7 @@ public function __construct(
      */
     public static function fromArray($data)
     {
-        return new self(
+        return new static(
             $data['serviceId'],
             $data['serviceName'],
             $data['departure'],
@@ -113,7 +113,7 @@ public static function fromArray($data)
      */
     public static function fromServiceDetails(ShippingServiceDetails $shippingServiceDetails)
     {
-        return new self(
+        return new static(
             $shippingServiceDetails->id,
             $shippingServiceDetails->serviceName,
             $shippingServiceDetails->departureCountry,
diff --git a/src/BusinessLogic/ShippingMethod/PackageTransformer.php b/src/BusinessLogic/ShippingMethod/PackageTransformer.php
index b2da6e9a..1f666847 100644
--- a/src/BusinessLogic/ShippingMethod/PackageTransformer.php
+++ b/src/BusinessLogic/ShippingMethod/PackageTransformer.php
@@ -42,18 +42,6 @@ protected function __construct()
         $this->configuration = ServiceRegister::getService(Configuration::CLASS_NAME);
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Transforms array of packages into one grouped package.
      *
diff --git a/src/BusinessLogic/ShippingMethod/ShippingMethodService.php b/src/BusinessLogic/ShippingMethod/ShippingMethodService.php
index c2928d3e..728688ac 100644
--- a/src/BusinessLogic/ShippingMethod/ShippingMethodService.php
+++ b/src/BusinessLogic/ShippingMethod/ShippingMethodService.php
@@ -59,18 +59,6 @@ protected function __construct()
         $this->shippingMethodRepository = $this->getRepository(ShippingMethod::CLASS_NAME);
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Returns all shipping methods for current user.
      *
diff --git a/src/BusinessLogic/Tasks/BatchTaskCleanupTask.php b/src/BusinessLogic/Tasks/BatchTaskCleanupTask.php
index 31124391..978ad6d3 100644
--- a/src/BusinessLogic/Tasks/BatchTaskCleanupTask.php
+++ b/src/BusinessLogic/Tasks/BatchTaskCleanupTask.php
@@ -84,7 +84,7 @@ public function toArray()
      */
     public static function fromArray(array $array)
     {
-        return new self($array['taskStatuses'], $array['taskTypes']);
+        return new static($array['taskStatuses'], $array['taskTypes']);
     }
 
     /**
diff --git a/src/BusinessLogic/Tasks/GetDefaultParcelAndWarehouseTask.php b/src/BusinessLogic/Tasks/GetDefaultParcelAndWarehouseTask.php
index 987505bb..da69f38f 100644
--- a/src/BusinessLogic/Tasks/GetDefaultParcelAndWarehouseTask.php
+++ b/src/BusinessLogic/Tasks/GetDefaultParcelAndWarehouseTask.php
@@ -22,7 +22,7 @@ class GetDefaultParcelAndWarehouseTask extends Task
      */
     public static function fromArray(array $array)
     {
-        return new self();
+        return new static();
     }
 
     /**
diff --git a/src/BusinessLogic/Tasks/SendDraftTask.php b/src/BusinessLogic/Tasks/SendDraftTask.php
index 00b1aa63..89de2557 100644
--- a/src/BusinessLogic/Tasks/SendDraftTask.php
+++ b/src/BusinessLogic/Tasks/SendDraftTask.php
@@ -67,7 +67,7 @@ public function __construct($orderId)
      */
     public static function fromArray(array $array)
     {
-        return new self($array['order_id']);
+        return new static($array['order_id']);
     }
 
     /**
diff --git a/src/BusinessLogic/Tasks/TaskCleanupTask.php b/src/BusinessLogic/Tasks/TaskCleanupTask.php
index 5c94e3f1..b472d386 100644
--- a/src/BusinessLogic/Tasks/TaskCleanupTask.php
+++ b/src/BusinessLogic/Tasks/TaskCleanupTask.php
@@ -69,7 +69,7 @@ public function __construct($taskType, array $taskStatuses, $taskAge)
      */
     public static function fromArray(array $array)
     {
-        return new self(
+        return new static(
             $array['task_type'],
             !empty($array['task_statuses']) ? $array['task_statuses'] : array(),
             $array['task_age']
diff --git a/src/BusinessLogic/Tasks/UpdateShipmentDataTask.php b/src/BusinessLogic/Tasks/UpdateShipmentDataTask.php
index 8e191d5b..c050cc11 100644
--- a/src/BusinessLogic/Tasks/UpdateShipmentDataTask.php
+++ b/src/BusinessLogic/Tasks/UpdateShipmentDataTask.php
@@ -88,7 +88,7 @@ public function __construct(array $orderStatuses = array())
      */
     public static function fromArray(array $array)
     {
-        $entity = new self();
+        $entity = new static();
 
         $entity->progress = $array['progress'];
         $entity->progressStep = $array['progress_step'];
diff --git a/src/BusinessLogic/Tasks/UpdateShippingServicesTask.php b/src/BusinessLogic/Tasks/UpdateShippingServicesTask.php
index ecc5fc97..5c60bb7e 100644
--- a/src/BusinessLogic/Tasks/UpdateShippingServicesTask.php
+++ b/src/BusinessLogic/Tasks/UpdateShippingServicesTask.php
@@ -37,7 +37,7 @@ class UpdateShippingServicesTask extends Task
      */
     public static function fromArray(array $array)
     {
-        return new self();
+        return new static();
     }
 
     /**
diff --git a/src/BusinessLogic/Tax/TaxClass.php b/src/BusinessLogic/Tax/TaxClass.php
index d2e1115b..aff907e4 100644
--- a/src/BusinessLogic/Tax/TaxClass.php
+++ b/src/BusinessLogic/Tax/TaxClass.php
@@ -43,18 +43,4 @@ class TaxClass extends FrontDto
      * @var array
      */
     protected static $requiredFields = array('label', 'value');
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/src/BusinessLogic/User/UserAccountService.php b/src/BusinessLogic/User/UserAccountService.php
index 89b34f05..60173890 100644
--- a/src/BusinessLogic/User/UserAccountService.php
+++ b/src/BusinessLogic/User/UserAccountService.php
@@ -56,18 +56,6 @@ class UserAccountService extends BaseService
      */
     private $brandConfigurationService;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Validates provided API key and initializes user's data.
      *
diff --git a/src/BusinessLogic/Warehouse/Warehouse.php b/src/BusinessLogic/Warehouse/Warehouse.php
index 15b1b57c..814071a9 100644
--- a/src/BusinessLogic/Warehouse/Warehouse.php
+++ b/src/BusinessLogic/Warehouse/Warehouse.php
@@ -127,20 +127,6 @@ class Warehouse extends FrontDto
         'email',
     );
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Transforms raw array data to its DTO.
      *
diff --git a/src/BusinessLogic/Warehouse/WarehouseService.php b/src/BusinessLogic/Warehouse/WarehouseService.php
index 67d02da1..cc60bb61 100644
--- a/src/BusinessLogic/Warehouse/WarehouseService.php
+++ b/src/BusinessLogic/Warehouse/WarehouseService.php
@@ -30,18 +30,6 @@ class WarehouseService extends BaseService
      */
     protected static $instance;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Gets a warehouse.
      *
diff --git a/src/BusinessLogic/WebHook/WebHookEventHandler.php b/src/BusinessLogic/WebHook/WebHookEventHandler.php
index b3af0c04..e319692b 100644
--- a/src/BusinessLogic/WebHook/WebHookEventHandler.php
+++ b/src/BusinessLogic/WebHook/WebHookEventHandler.php
@@ -38,18 +38,6 @@ class WebHookEventHandler extends BaseService
         'shipment.delivered',
     );
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Validates input and handles Packlink webhook event.
      *
diff --git a/src/DemoUI/src/Services/BusinessLogic/ConfigurationService.php b/src/DemoUI/src/Services/BusinessLogic/ConfigurationService.php
index 940e636e..1c889621 100644
--- a/src/DemoUI/src/Services/BusinessLogic/ConfigurationService.php
+++ b/src/DemoUI/src/Services/BusinessLogic/ConfigurationService.php
@@ -28,18 +28,6 @@ class ConfigurationService extends Configuration
      */
     protected static $instance;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Gets max inactivity period for a task in seconds.
      * After inactivity period is passed, system will fail such task as expired.
diff --git a/src/Infrastructure/AutoTest/AutoTestLogger.php b/src/Infrastructure/AutoTest/AutoTestLogger.php
index a2727220..5ead78ed 100644
--- a/src/Infrastructure/AutoTest/AutoTestLogger.php
+++ b/src/Infrastructure/AutoTest/AutoTestLogger.php
@@ -21,18 +21,6 @@ class AutoTestLogger extends Singleton implements ShopLoggerAdapter
      */
     protected static $instance;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Logs a message in system.
      *
diff --git a/src/Infrastructure/AutoTest/AutoTestTask.php b/src/Infrastructure/AutoTest/AutoTestTask.php
index 103dc5d2..78a42f19 100644
--- a/src/Infrastructure/AutoTest/AutoTestTask.php
+++ b/src/Infrastructure/AutoTest/AutoTestTask.php
@@ -40,7 +40,7 @@ public function __construct($data)
      */
     public static function fromArray(array $array)
     {
-        return new self($array['data']);
+        return new static($array['data']);
     }
 
     /**
diff --git a/src/Infrastructure/Configuration/ConfigEntity.php b/src/Infrastructure/Configuration/ConfigEntity.php
index 27aa5f56..e2c74a5e 100644
--- a/src/Infrastructure/Configuration/ConfigEntity.php
+++ b/src/Infrastructure/Configuration/ConfigEntity.php
@@ -42,20 +42,6 @@ class ConfigEntity extends Entity
      */
     protected $fields = array('id', 'name', 'value', 'systemId');
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Returns entity configuration object.
      *
diff --git a/src/Infrastructure/Data/DataTransferObject.php b/src/Infrastructure/Data/DataTransferObject.php
index 4f0819a5..44410ebd 100644
--- a/src/Infrastructure/Data/DataTransferObject.php
+++ b/src/Infrastructure/Data/DataTransferObject.php
@@ -22,7 +22,7 @@ abstract class DataTransferObject
      */
     public static function fromArray(array $data)
     {
-        return null;
+        throw new RuntimeException('Method from array not implemented');
     }
 
     /**
diff --git a/src/Infrastructure/Http/CurlHttpClient.php b/src/Infrastructure/Http/CurlHttpClient.php
index cb0fa954..6b2ff3c8 100644
--- a/src/Infrastructure/Http/CurlHttpClient.php
+++ b/src/Infrastructure/Http/CurlHttpClient.php
@@ -89,6 +89,8 @@ protected function sendHttpRequest($method, $url, $headers = array(), $body = ''
      *     request body is '1' to ensure minimal request data in case of POST, PUT, PATCH methods. This will ensure
      *     that we have the upload progress and enable the async request termination as soon as the upload is finished
      *     without waiting for a response (without downloading a body or relaying on a fixed request timeout).
+     *
+     * @return bool|string
      */
     protected function sendHttpRequestAsync($method, $url, $headers = array(), $body = '1')
     {
@@ -96,7 +98,7 @@ protected function sendHttpRequestAsync($method, $url, $headers = array(), $body
         $this->setCurlSessionOptionsForAsynchronousRequest();
         $this->setCurlOptions();
 
-        $this->executeAsynchronousRequest();
+        return $this->executeAsynchronousRequest();
     }
 
     /**
diff --git a/src/Infrastructure/Http/DTO/Options.php b/src/Infrastructure/Http/DTO/Options.php
index 5aaeae75..89a5131e 100644
--- a/src/Infrastructure/Http/DTO/Options.php
+++ b/src/Infrastructure/Http/DTO/Options.php
@@ -78,6 +78,6 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        return new self($raw['name'], $raw['value']);
+        return new static($raw['name'], $raw['value']);
     }
 }
diff --git a/src/Infrastructure/Logger/LogData.php b/src/Infrastructure/Logger/LogData.php
index 57f03a67..bc2985cb 100644
--- a/src/Infrastructure/Logger/LogData.php
+++ b/src/Infrastructure/Logger/LogData.php
@@ -94,20 +94,6 @@ public function __construct(
         }
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Returns entity configuration object.
      *
diff --git a/src/Infrastructure/Logger/Logger.php b/src/Infrastructure/Logger/Logger.php
index 5b9b1d23..a18c25ff 100644
--- a/src/Infrastructure/Logger/Logger.php
+++ b/src/Infrastructure/Logger/Logger.php
@@ -61,18 +61,6 @@ protected function __construct()
         $this->timeProvider = ServiceRegister::getService(TimeProvider::CLASS_NAME);
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Logs error message.
      *
diff --git a/src/Infrastructure/Logger/LoggerConfiguration.php b/src/Infrastructure/Logger/LoggerConfiguration.php
index 8196a084..5a687c77 100644
--- a/src/Infrastructure/Logger/LoggerConfiguration.php
+++ b/src/Infrastructure/Logger/LoggerConfiguration.php
@@ -52,18 +52,6 @@ class LoggerConfiguration extends Singleton
      */
     private $integrationName;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Set default logger status (turning on/off).
      *
diff --git a/src/Infrastructure/ORM/Entity.php b/src/Infrastructure/ORM/Entity.php
index 9eb09294..cc11d5b8 100644
--- a/src/Infrastructure/ORM/Entity.php
+++ b/src/Infrastructure/ORM/Entity.php
@@ -30,20 +30,6 @@ abstract class Entity extends DataTransferObject
      */
     protected $fields = array('id');
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return null;
-    }
-
     /**
      * Returns full class name.
      *
@@ -63,7 +49,7 @@ public static function getClassName()
      */
     public static function fromArray(array $data)
     {
-        $instance = static::create($data);
+        $instance = new static();
         $instance->inflate($data);
 
         return $instance;
diff --git a/src/Infrastructure/Singleton.php b/src/Infrastructure/Singleton.php
index ec0bb3a8..929c3b75 100644
--- a/src/Infrastructure/Singleton.php
+++ b/src/Infrastructure/Singleton.php
@@ -2,8 +2,6 @@
 
 namespace Logeecom\Infrastructure;
 
-use RuntimeException;
-
 /**
  * Base class for all singleton implementations.
  * Every class that extends this class MUST have its own protected static field $instance!
@@ -12,13 +10,6 @@
  */
 abstract class Singleton
 {
-    /**
-     * Singleton instance of this class.
-     *
-     * @var static
-     */
-    protected static $instance;
-
     /**
      * Hidden constructor.
      */
@@ -34,28 +25,16 @@ protected function __construct()
     public static function getInstance()
     {
         if (static::$instance === null) {
-            static::$instance = static::create();
+            static::$instance = new static();
         }
 
         if (!(static::$instance instanceof static)) {
-            throw new RuntimeException('Wrong static instance of a singleton class.');
+            throw new \RuntimeException('Wrong static instance of a singleton class.');
         }
 
         return static::$instance;
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return null;
-    }
-
     /**
      * Resets singleton instance. Required for proper tests.
      */
diff --git a/src/Infrastructure/TaskExecution/AsyncProcessStarterService.php b/src/Infrastructure/TaskExecution/AsyncProcessStarterService.php
index 67a74f84..36da14b9 100644
--- a/src/Infrastructure/TaskExecution/AsyncProcessStarterService.php
+++ b/src/Infrastructure/TaskExecution/AsyncProcessStarterService.php
@@ -68,18 +68,6 @@ protected function __construct()
         $this->processRepository = RepositoryRegistry::getRepository(Process::CLASS_NAME);
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Starts given runner asynchronously (in new process/web request or similar).
      *
diff --git a/src/Infrastructure/TaskExecution/CompositeTask.php b/src/Infrastructure/TaskExecution/CompositeTask.php
index c27d4c06..46b264eb 100644
--- a/src/Infrastructure/TaskExecution/CompositeTask.php
+++ b/src/Infrastructure/TaskExecution/CompositeTask.php
@@ -62,19 +62,6 @@ public function __construct(array $subTasks, $initialProgress = 0)
         }
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $subTasks
-     * @param $initialProgress
-     *
-     * @return CompositeTask
-     */
-    public static function create(array $subTasks, $initialProgress)
-    {
-        return null;
-    }
-
     /**
      * Transforms array into an serializable object,
      *
@@ -91,7 +78,7 @@ public static function fromArray(array $array)
             $tasks[] = Serializer::unserialize($task);
         }
 
-        $entity = static::create($tasks, $array['initial_progress']);
+        $entity = new static($tasks, $array['initial_progress']);
         $entity->taskProgressMap = $array['task_progress_map'];
         $entity->tasksProgressShare = $array['tasks_progress_share'];
 
diff --git a/src/Infrastructure/TaskExecution/Process.php b/src/Infrastructure/TaskExecution/Process.php
index 0cdfd8b3..f84be06c 100644
--- a/src/Infrastructure/TaskExecution/Process.php
+++ b/src/Infrastructure/TaskExecution/Process.php
@@ -31,20 +31,6 @@ class Process extends Entity
      */
     protected $runner;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * Sets raw array data to this entity instance properties.
      *
diff --git a/src/Infrastructure/TaskExecution/QueueItem.php b/src/Infrastructure/TaskExecution/QueueItem.php
index 800bb1cc..8e0b4297 100644
--- a/src/Infrastructure/TaskExecution/QueueItem.php
+++ b/src/Infrastructure/TaskExecution/QueueItem.php
@@ -184,20 +184,6 @@ class QueueItem extends Entity
      */
     private $timeProvider;
 
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
-
     /**
      * QueueItem constructor.
      *
diff --git a/src/Infrastructure/TaskExecution/QueueItemStarter.php b/src/Infrastructure/TaskExecution/QueueItemStarter.php
index 402f70c3..b856e299 100644
--- a/src/Infrastructure/TaskExecution/QueueItemStarter.php
+++ b/src/Infrastructure/TaskExecution/QueueItemStarter.php
@@ -54,7 +54,7 @@ public function __construct($queueItemId)
      */
     public static function fromArray(array $array)
     {
-        return new self($array['queue_item_id']);
+        return new static($array['queue_item_id']);
     }
 
     /**
diff --git a/src/Infrastructure/TaskExecution/TaskRunnerStarter.php b/src/Infrastructure/TaskExecution/TaskRunnerStarter.php
index 3c78ae13..563c2ec2 100644
--- a/src/Infrastructure/TaskExecution/TaskRunnerStarter.php
+++ b/src/Infrastructure/TaskExecution/TaskRunnerStarter.php
@@ -65,7 +65,7 @@ public function __construct($guid)
      */
     public static function fromArray(array $array)
     {
-        return new self($array['guid']);
+        return new static($array['guid']);
     }
 
     /**
diff --git a/src/Infrastructure/Utility/Events/EventBus.php b/src/Infrastructure/Utility/Events/EventBus.php
index 25c49df5..74a71f64 100644
--- a/src/Infrastructure/Utility/Events/EventBus.php
+++ b/src/Infrastructure/Utility/Events/EventBus.php
@@ -34,7 +34,7 @@ private function __construct()
     public static function getInstance()
     {
         if (static::$instance === null) {
-            static::$instance = new self();
+            static::$instance = new static();
         }
 
         return static::$instance;
diff --git a/src/Infrastructure/Utility/GuidProvider.php b/src/Infrastructure/Utility/GuidProvider.php
index a36c82b6..94a76c1e 100644
--- a/src/Infrastructure/Utility/GuidProvider.php
+++ b/src/Infrastructure/Utility/GuidProvider.php
@@ -36,7 +36,7 @@ private function __construct()
     public static function getInstance()
     {
         if (static::$instance === null) {
-            static::$instance = new self();
+            static::$instance = new static();
         }
 
         return static::$instance;
diff --git a/src/Infrastructure/Utility/TimeProvider.php b/src/Infrastructure/Utility/TimeProvider.php
index 14e7d225..518edc33 100644
--- a/src/Infrastructure/Utility/TimeProvider.php
+++ b/src/Infrastructure/Utility/TimeProvider.php
@@ -37,7 +37,7 @@ private function __construct()
     public static function getInstance()
     {
         if (static::$instance === null) {
-            static::$instance = new self();
+            static::$instance = new static();
         }
 
         return static::$instance;
@@ -96,7 +96,7 @@ public function getMicroTimestamp()
      */
     public function sleep($sleepTime)
     {
-        usleep($sleepTime * 1000);
+        sleep($sleepTime);
     }
 
     /**
diff --git a/tests/BusinessLogic/Common/TestComponents/Dto/EmptyFrontDto.php b/tests/BusinessLogic/Common/TestComponents/Dto/EmptyFrontDto.php
index d3bf2ba8..e700e38c 100644
--- a/tests/BusinessLogic/Common/TestComponents/Dto/EmptyFrontDto.php
+++ b/tests/BusinessLogic/Common/TestComponents/Dto/EmptyFrontDto.php
@@ -11,17 +11,4 @@
  */
 class EmptyFrontDto extends FrontDto
 {
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/tests/BusinessLogic/Common/TestComponents/Dto/FooDto.php b/tests/BusinessLogic/Common/TestComponents/Dto/FooDto.php
index e87cfafa..0a8d0242 100644
--- a/tests/BusinessLogic/Common/TestComponents/Dto/FooDto.php
+++ b/tests/BusinessLogic/Common/TestComponents/Dto/FooDto.php
@@ -35,18 +35,4 @@ class FooDto extends FrontDto
      * @var array
      */
     protected static $requiredFields = array('foo', 'bar');
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/tests/BusinessLogic/Common/TestComponents/Dto/TestCountry.php b/tests/BusinessLogic/Common/TestComponents/Dto/TestCountry.php
index 680cc3ae..2e1fd90d 100644
--- a/tests/BusinessLogic/Common/TestComponents/Dto/TestCountry.php
+++ b/tests/BusinessLogic/Common/TestComponents/Dto/TestCountry.php
@@ -22,18 +22,4 @@ public function __construct()
         $this->code = 'MU';
         $this->postalCode = '42602';
     }
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/tests/BusinessLogic/Common/TestComponents/Dto/TestWarehouse.php b/tests/BusinessLogic/Common/TestComponents/Dto/TestWarehouse.php
index 776fef63..c8fc03a5 100644
--- a/tests/BusinessLogic/Common/TestComponents/Dto/TestWarehouse.php
+++ b/tests/BusinessLogic/Common/TestComponents/Dto/TestWarehouse.php
@@ -28,18 +28,4 @@ public function __construct()
         $this->email = 'default@default.com';
         $this->default = true;
     }
-
-    /**
-     * Creates instance of this class.
-     *
-     * @param array $data
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create(array $data)
-    {
-        return new self();
-    }
 }
diff --git a/tests/BusinessLogic/Common/TestComponents/Locations/MockLocationService.php b/tests/BusinessLogic/Common/TestComponents/Locations/MockLocationService.php
index 46c1a759..84243d04 100644
--- a/tests/BusinessLogic/Common/TestComponents/Locations/MockLocationService.php
+++ b/tests/BusinessLogic/Common/TestComponents/Locations/MockLocationService.php
@@ -13,18 +13,6 @@ class MockLocationService extends LocationService
     public $callHistory = array();
     public $searchLocationsResult = array();
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     public function searchLocations($country, $query)
     {
         $this->callHistory[] = array('searchLocations' => array($country, $query));
diff --git a/tests/BusinessLogic/Common/TestComponents/Registration/MockCountryService.php b/tests/BusinessLogic/Common/TestComponents/Registration/MockCountryService.php
index 93dbb34c..feb7427e 100644
--- a/tests/BusinessLogic/Common/TestComponents/Registration/MockCountryService.php
+++ b/tests/BusinessLogic/Common/TestComponents/Registration/MockCountryService.php
@@ -11,18 +11,6 @@ class MockCountryService extends CountryService
     public $callHistory = array();
     public static $supportedCountries = array();
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     public function getSupportedCountries($associative = true)
     {
         $this->callHistory[] = array('getSupportedCountries' => array($associative));
diff --git a/tests/BusinessLogic/Common/TestComponents/TestShopConfiguration.php b/tests/BusinessLogic/Common/TestComponents/TestShopConfiguration.php
index 9b2ffb6b..73a2374c 100644
--- a/tests/BusinessLogic/Common/TestComponents/TestShopConfiguration.php
+++ b/tests/BusinessLogic/Common/TestComponents/TestShopConfiguration.php
@@ -22,18 +22,6 @@ public function __construct()
         static::$instance = $this;
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Returns current system identifier.
      *
diff --git a/tests/BusinessLogic/Common/TestComponents/Warehouse/MockWarehouseService.php b/tests/BusinessLogic/Common/TestComponents/Warehouse/MockWarehouseService.php
index b1c5d91e..c8f39b61 100644
--- a/tests/BusinessLogic/Common/TestComponents/Warehouse/MockWarehouseService.php
+++ b/tests/BusinessLogic/Common/TestComponents/Warehouse/MockWarehouseService.php
@@ -19,18 +19,6 @@ public function getWarehouse($createIfNotExist = true)
         return $this->getWarehouseResult;
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     public function updateWarehouseData(array $payload)
     {
         $this->callHistory[] = array('updateWarehouseData' => array($payload));
diff --git a/tests/BusinessLogic/Dto/BaseDtoTest.php b/tests/BusinessLogic/Dto/BaseDtoTest.php
index 735ae926..363e35ba 100644
--- a/tests/BusinessLogic/Dto/BaseDtoTest.php
+++ b/tests/BusinessLogic/Dto/BaseDtoTest.php
@@ -31,10 +31,11 @@ protected function tearDown()
         TestFrontDtoFactory::reset();
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
     public function testFromArrayNotImplemented()
     {
-        $dto = Address::fromArray(array());
-
-        self::assertNull($dto);
+        Address::fromArray(array());
     }
 }
diff --git a/tests/Infrastructure/Common/TestComponents/TestShopConfiguration.php b/tests/Infrastructure/Common/TestComponents/TestShopConfiguration.php
index 3b50d8a8..7be8581f 100644
--- a/tests/Infrastructure/Common/TestComponents/TestShopConfiguration.php
+++ b/tests/Infrastructure/Common/TestComponents/TestShopConfiguration.php
@@ -23,18 +23,6 @@ public function __construct()
         static::$instance = $this;
     }
 
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Returns current system identifier.
      *
diff --git a/tests/Infrastructure/Common/TestComponents/Utility/TestGuidProvider.php b/tests/Infrastructure/Common/TestComponents/Utility/TestGuidProvider.php
index 792ebb6b..1c6b6ee4 100644
--- a/tests/Infrastructure/Common/TestComponents/Utility/TestGuidProvider.php
+++ b/tests/Infrastructure/Common/TestComponents/Utility/TestGuidProvider.php
@@ -8,24 +8,6 @@ class TestGuidProvider extends GuidProvider
 {
     private $guid = '';
 
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns singleton instance of GuidProvider.
-     *
-     * @return GuidProvider Instance of GuidProvider class.
-     */
-    public static function getInstance()
-    {
-        if (static::$instance === null) {
-            static::$instance = new self();
-        }
-
-        return static::$instance;
-    }
-
     public function generateGuid()
     {
         if (empty($this->guid)) {
diff --git a/tests/Infrastructure/Singleton/TestAutoTestLogger.php b/tests/Infrastructure/Singleton/TestAutoTestLogger.php
index 3598a04a..f659a781 100644
--- a/tests/Infrastructure/Singleton/TestAutoTestLogger.php
+++ b/tests/Infrastructure/Singleton/TestAutoTestLogger.php
@@ -11,15 +11,4 @@
  */
 class TestAutoTestLogger extends AutoTestLogger
 {
-    /**
-     * Creates instance of this class.
-     *
-     * @return static
-     *
-     * @noinspection PhpDocSignatureInspection
-     */
-    public static function create()
-    {
-        return new self();
-    }
 }
\ No newline at end of file