diff --git a/mqtt-mapping-service/pom.xml b/mqtt-mapping-service/pom.xml
index d0ec2f6a..bec8a549 100644
--- a/mqtt-mapping-service/pom.xml
+++ b/mqtt-mapping-service/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
         </dependency>
 
         <dependency>
diff --git a/mqtt-mapping-service/src/main/java/mqtt/mapping/rest/MQTTMappingRestController.java b/mqtt-mapping-service/src/main/java/mqtt/mapping/rest/MQTTMappingRestController.java
index 5b9d7d0d..281cf562 100644
--- a/mqtt-mapping-service/src/main/java/mqtt/mapping/rest/MQTTMappingRestController.java
+++ b/mqtt-mapping-service/src/main/java/mqtt/mapping/rest/MQTTMappingRestController.java
@@ -389,7 +389,7 @@ public ResponseEntity<Extension> deleteProcessorExtension(@PathVariable String e
     }
 
     private boolean userHasMQTTMappingAdminRole() {
-        return !userRolesEnabled || (userRolesEnabled && roleService.getUserRoles().contains(mqttMappingCreateRole));
+        return !userRolesEnabled || (userRolesEnabled && roleService.getUserRoles().contains(mqttMappingAdminRole));
     }
 
     private boolean userHasMQTTMappingCreateRole() {
diff --git a/mqtt-mapping-ui/mqtt-mapping/package.json b/mqtt-mapping-ui/mqtt-mapping/package.json
index 7786496d..40ebf96c 100644
--- a/mqtt-mapping-ui/mqtt-mapping/package.json
+++ b/mqtt-mapping-ui/mqtt-mapping/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "start": "c8ycli server",
-    "start:admin": "npm start -- --shell administration-1017 ",
+    "start:admin": "npm start -- --shell administration",
     "build": "c8ycli build",
     "deploy": "c8ycli deploy",
     "postinstall": "ngcc"
diff --git a/pom.xml b/pom.xml
index 65297e9b..8bf2cf61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,9 @@
   ~ @authors Christof Strack, Stefan Witschel
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.softwareag.c8y.mqtt</groupId>
@@ -68,7 +70,7 @@
                 <artifactId>jackson-datatype-joda</artifactId>
                 <version>2.12.7</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>
diff --git a/resources/image/Generic_MQTT_AddMapping.png b/resources/image/Generic_MQTT_AddMapping.png
index 236a9211..5a58bdf1 100644
Binary files a/resources/image/Generic_MQTT_AddMapping.png and b/resources/image/Generic_MQTT_AddMapping.png differ
diff --git a/resources/image/Generic_MQTT_EnableSnooping.png b/resources/image/Generic_MQTT_EnableSnooping.png
index 8dbfb47d..9c5c23d4 100644
Binary files a/resources/image/Generic_MQTT_EnableSnooping.png and b/resources/image/Generic_MQTT_EnableSnooping.png differ
diff --git a/resources/image/Generic_MQTT_MappingTable.png b/resources/image/Generic_MQTT_MappingTable.png
index a6fc75a6..320d1a3f 100644
Binary files a/resources/image/Generic_MQTT_MappingTable.png and b/resources/image/Generic_MQTT_MappingTable.png differ
diff --git a/resources/image/Generic_MQTT_MappingTable_annotated.png b/resources/image/Generic_MQTT_MappingTable_annotated.png
index d521bf6e..3c8be1ab 100644
Binary files a/resources/image/Generic_MQTT_MappingTable_annotated.png and b/resources/image/Generic_MQTT_MappingTable_annotated.png differ
diff --git a/resources/image/Generic_MQTT_MappingTemplate.png b/resources/image/Generic_MQTT_MappingTemplate.png
index 80bb0260..4555d1bf 100644
Binary files a/resources/image/Generic_MQTT_MappingTemplate.png and b/resources/image/Generic_MQTT_MappingTemplate.png differ
diff --git a/resources/image/Generic_MQTT_MappingTemplate_Outbound_subscription.png b/resources/image/Generic_MQTT_MappingTemplate_Outbound_subscription.png
index 1179bedb..b40b035b 100644
Binary files a/resources/image/Generic_MQTT_MappingTemplate_Outbound_subscription.png and b/resources/image/Generic_MQTT_MappingTemplate_Outbound_subscription.png differ
diff --git a/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage.png b/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage.png
index 57271112..0e0e4dbf 100644
Binary files a/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage.png and b/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage.png differ
diff --git a/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage_annnotated.png b/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage_annnotated.png
index 36a956e8..db43d4cb 100644
Binary files a/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage_annnotated.png and b/resources/image/Generic_MQTT_MappingTemplate_ProtobufMessage_annnotated.png differ
diff --git a/resources/image/Generic_MQTT_MappingTemplate_SchemaValidation_annnotated.png b/resources/image/Generic_MQTT_MappingTemplate_SchemaValidation_annnotated.png
index 97a4d606..49e3811c 100644
Binary files a/resources/image/Generic_MQTT_MappingTemplate_SchemaValidation_annnotated.png and b/resources/image/Generic_MQTT_MappingTemplate_SchemaValidation_annnotated.png differ
diff --git a/resources/image/Generic_MQTT_MappingTemplate_Snooping_annnotated.png b/resources/image/Generic_MQTT_MappingTemplate_Snooping_annnotated.png
index 629f15d3..31776b6d 100644
Binary files a/resources/image/Generic_MQTT_MappingTemplate_Snooping_annnotated.png and b/resources/image/Generic_MQTT_MappingTemplate_Snooping_annnotated.png differ
diff --git a/resources/image/Generic_MQTT_MappingTemplate_annnotated.png b/resources/image/Generic_MQTT_MappingTemplate_annnotated.png
index 5eca9cc9..d09cef69 100644
Binary files a/resources/image/Generic_MQTT_MappingTemplate_annnotated.png and b/resources/image/Generic_MQTT_MappingTemplate_annnotated.png differ
diff --git a/resources/image/Generic_MQTT_SendTestMessageToCumulocity.png b/resources/image/Generic_MQTT_SendTestMessageToCumulocity.png
index ced089c0..b64dbdcf 100644
Binary files a/resources/image/Generic_MQTT_SendTestMessageToCumulocity.png and b/resources/image/Generic_MQTT_SendTestMessageToCumulocity.png differ
diff --git a/resources/image/Generic_MQTT_TestTransformation.png b/resources/image/Generic_MQTT_TestTransformation.png
index 7b72345d..99380b22 100644
Binary files a/resources/image/Generic_MQTT_TestTransformation.png and b/resources/image/Generic_MQTT_TestTransformation.png differ
diff --git a/resources/image/Generic_MQTT_TopicDefinition.png b/resources/image/Generic_MQTT_TopicDefinition.png
index e01f2b49..b816bf36 100644
Binary files a/resources/image/Generic_MQTT_TopicDefinition.png and b/resources/image/Generic_MQTT_TopicDefinition.png differ
diff --git a/resources/image/Generic_MQTT_TopicDefinition_Outbound.png b/resources/image/Generic_MQTT_TopicDefinition_Outbound.png
index 6519f3e4..659f3aae 100644
Binary files a/resources/image/Generic_MQTT_TopicDefinition_Outbound.png and b/resources/image/Generic_MQTT_TopicDefinition_Outbound.png differ
diff --git a/resources/image/Generic_MQTT_TopicDefinition_ReadOnly.png b/resources/image/Generic_MQTT_TopicDefinition_ReadOnly.png
index 1225783e..3afc9739 100644
Binary files a/resources/image/Generic_MQTT_TopicDefinition_ReadOnly.png and b/resources/image/Generic_MQTT_TopicDefinition_ReadOnly.png differ
diff --git a/resources/image/Generic_MQTT_UI_AdminRole_Tabs.png b/resources/image/Generic_MQTT_UI_AdminRole_Tabs.png
index 589953e3..bed1c223 100644
Binary files a/resources/image/Generic_MQTT_UI_AdminRole_Tabs.png and b/resources/image/Generic_MQTT_UI_AdminRole_Tabs.png differ
diff --git a/resources/image/Generic_MQTT_UI_CreateRole_Tabs.png b/resources/image/Generic_MQTT_UI_CreateRole_Tabs.png
index cbf0491b..58e2ec0a 100644
Binary files a/resources/image/Generic_MQTT_UI_CreateRole_Tabs.png and b/resources/image/Generic_MQTT_UI_CreateRole_Tabs.png differ