diff --git a/USERGUIDE.md b/USERGUIDE.md
index 5f75a2a5..ec0393b1 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -66,7 +66,7 @@ The settings for the Kafka connector can be seen on the following screenshot:
 When you add or change a connection configuration it happens very often that the parameter are incorrect and the connection fails. In this case the connection to the MQTT broker cannot be established and the reason is not known. To identify the incorrect parameter you can follows the error messages in the connections logs on the same UI:
 
 <p align="center">
-<img src="resources/image/Dynamic_Mapper_Connector_Monitoring.png"  style="width: 70%;" />
+<img src="resources/image/Dynamic_Mapper_Connector_Details.png"  style="width: 70%;" />
 </p>
 <br/>
 
diff --git a/dynamic-mapping-ui/src/mapping-tree/tree.component.html b/dynamic-mapping-ui/src/mapping-tree/tree.component.html
index a205c05f..15300d7d 100644
--- a/dynamic-mapping-ui/src/mapping-tree/tree.component.html
+++ b/dynamic-mapping-ui/src/mapping-tree/tree.component.html
@@ -19,7 +19,7 @@
   ~ @authors Christof Strack
   -->
 
-<c8y-title>Hierachy mapping</c8y-title>
+<c8y-title>Hierarchy mapping</c8y-title>
 <c8y-action-bar-item placement="right">
   <button
     class="btn btn-link"
diff --git a/resources/image/Dynamic_Mapper_Configuration_Configuration.png b/resources/image/Dynamic_Mapper_Configuration_Configuration.png
index 9d3681dc..0031b16c 100644
Binary files a/resources/image/Dynamic_Mapper_Configuration_Configuration.png and b/resources/image/Dynamic_Mapper_Configuration_Configuration.png differ
diff --git a/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource.png b/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource.png
index ca95f49e..bd8f5736 100644
Binary files a/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource.png and b/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource.png differ
diff --git a/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource_Plugin_Installed.png b/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource_Plugin_Installed.png
index 83d6b417..13c074b0 100644
Binary files a/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource_Plugin_Installed.png and b/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource_Plugin_Installed.png differ
diff --git a/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource_Upload.png b/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource_Upload.png
index a9164bf9..b922cf8d 100644
Binary files a/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource_Upload.png and b/resources/image/Dynamic_Mapper_Configuration_ProcessorExtensionSource_Upload.png differ
diff --git a/resources/image/Dynamic_Mapper_Connector_Details.png b/resources/image/Dynamic_Mapper_Connector_Details.png
new file mode 100644
index 00000000..2dfe3135
Binary files /dev/null and b/resources/image/Dynamic_Mapper_Connector_Details.png differ
diff --git a/resources/image/Dynamic_Mapper_Connector_Monitoring.png b/resources/image/Dynamic_Mapper_Connector_Monitoring.png
deleted file mode 100644
index ea5f1267..00000000
Binary files a/resources/image/Dynamic_Mapper_Connector_Monitoring.png and /dev/null differ
diff --git a/resources/image/Dynamic_Mapper_Connector_Overview.png b/resources/image/Dynamic_Mapper_Connector_Overview.png
index 613ba258..ee8eae03 100644
Binary files a/resources/image/Dynamic_Mapper_Connector_Overview.png and b/resources/image/Dynamic_Mapper_Connector_Overview.png differ
diff --git a/resources/image/Dynamic_Mapper_Mapping_Stepper_Topic_ReadOnly.png b/resources/image/Dynamic_Mapper_Mapping_Stepper_Topic_ReadOnly.png
index 1e03a66a..03b6716b 100644
Binary files a/resources/image/Dynamic_Mapper_Mapping_Stepper_Topic_ReadOnly.png and b/resources/image/Dynamic_Mapper_Mapping_Stepper_Topic_ReadOnly.png differ
diff --git a/resources/image/Dynamic_Mapper_Mapping_Table.png b/resources/image/Dynamic_Mapper_Mapping_Table.png
index ac49a5cf..449ac749 100644
Binary files a/resources/image/Dynamic_Mapper_Mapping_Table.png and b/resources/image/Dynamic_Mapper_Mapping_Table.png differ
diff --git a/resources/image/Dynamic_Mapper_Mapping_Table_Annotated.png b/resources/image/Dynamic_Mapper_Mapping_Table_Annotated.png
index 42520fbe..7564e032 100644
Binary files a/resources/image/Dynamic_Mapper_Mapping_Table_Annotated.png and b/resources/image/Dynamic_Mapper_Mapping_Table_Annotated.png differ
diff --git a/resources/image/Dynamic_Mapper_Mapping_Table_Filter.png b/resources/image/Dynamic_Mapper_Mapping_Table_Filter.png
index b37d37c0..2d3e910d 100644
Binary files a/resources/image/Dynamic_Mapper_Mapping_Table_Filter.png and b/resources/image/Dynamic_Mapper_Mapping_Table_Filter.png differ
diff --git a/resources/image/Dynamic_Mapper_Mapping_Table_Filter_Detail.png b/resources/image/Dynamic_Mapper_Mapping_Table_Filter_Detail.png
index 37e3bbc1..1e37da6a 100644
Binary files a/resources/image/Dynamic_Mapper_Mapping_Table_Filter_Detail.png and b/resources/image/Dynamic_Mapper_Mapping_Table_Filter_Detail.png differ
diff --git a/resources/image/Dynamic_Mapper_Mapping_Table_Import.png b/resources/image/Dynamic_Mapper_Mapping_Table_Import.png
index a330623a..ea2ed062 100644
Binary files a/resources/image/Dynamic_Mapper_Mapping_Table_Import.png and b/resources/image/Dynamic_Mapper_Mapping_Table_Import.png differ
diff --git a/resources/image/Dynamic_Mapper_Mapping_Table_Snooping_Enable.png b/resources/image/Dynamic_Mapper_Mapping_Table_Snooping_Enable.png
index 00db7499..5a498d01 100644
Binary files a/resources/image/Dynamic_Mapper_Mapping_Table_Snooping_Enable.png and b/resources/image/Dynamic_Mapper_Mapping_Table_Snooping_Enable.png differ
diff --git a/resources/image/Dynamic_Mapper_Monitoring.png b/resources/image/Dynamic_Mapper_Monitoring.png
index 1954f24e..93f14009 100644
Binary files a/resources/image/Dynamic_Mapper_Monitoring.png and b/resources/image/Dynamic_Mapper_Monitoring.png differ
diff --git a/resources/image/Dynamic_Mapper_Monitoring_Chart.png b/resources/image/Dynamic_Mapper_Monitoring_Chart.png
index 4b88edf7..8d8ec8cc 100644
Binary files a/resources/image/Dynamic_Mapper_Monitoring_Chart.png and b/resources/image/Dynamic_Mapper_Monitoring_Chart.png differ
diff --git a/resources/image/Dynamic_Mapper_Monitoring_TestDevices.png b/resources/image/Dynamic_Mapper_Monitoring_TestDevices.png
index e6eddfa3..270394a3 100644
Binary files a/resources/image/Dynamic_Mapper_Monitoring_TestDevices.png and b/resources/image/Dynamic_Mapper_Monitoring_TestDevices.png differ
diff --git a/resources/image/Dynamic_Mapper_Monitoring_Tree.png b/resources/image/Dynamic_Mapper_Monitoring_Tree.png
index 649d82af..7b816954 100644
Binary files a/resources/image/Dynamic_Mapper_Monitoring_Tree.png and b/resources/image/Dynamic_Mapper_Monitoring_Tree.png differ