diff --git a/org.fortiss.af3.platform.raspberry.ui/trunk/META-INF/MANIFEST.MF b/org.fortiss.af3.platform.raspberry.ui/trunk/META-INF/MANIFEST.MF
index 671a91fa1d96bcdce84340fb9610e50e1e037574..bfe680f5d9f002e911d33a4a198af5c52969dc3a 100644
--- a/org.fortiss.af3.platform.raspberry.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.af3.platform.raspberry.ui/trunk/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Version: 2.9.0.qualifier
 Bundle-Activator: org.fortiss.af3.platform.raspberry.ui.AF3PlatformRaspberryUIActivator
 Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0";visibility:=reexport,
  org.fortiss.af3.project.ui;bundle-version="1.0.0";visibility:=reexport,
- org.fortiss.tooling.base.ui;bundle-version="1.0.0";visibility:=reexport
+ org.fortiss.tooling.base.ui;bundle-version="1.0.0";visibility:=reexport,
+ org.fortiss.af3.platform.ui
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: fortiss GmbH
diff --git a/org.fortiss.af3.platform.raspberry.ui/trunk/icons/can-logo.jpeg b/org.fortiss.af3.platform.raspberry.ui/trunk/icons/can-logo.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..c2be90bc4a910a5e6b459905286c5fcbe4edbd4c
Binary files /dev/null and b/org.fortiss.af3.platform.raspberry.ui/trunk/icons/can-logo.jpeg differ
diff --git a/org.fortiss.af3.platform.raspberry.ui/trunk/icons/raspberry-pi-logo.png b/org.fortiss.af3.platform.raspberry.ui/trunk/icons/raspberry-pi-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..faa554e617fb40bb60ab411dbcb13a9db8f88d0b
Binary files /dev/null and b/org.fortiss.af3.platform.raspberry.ui/trunk/icons/raspberry-pi-logo.png differ
diff --git a/org.fortiss.af3.platform.raspberry.ui/trunk/plugin.xml b/org.fortiss.af3.platform.raspberry.ui/trunk/plugin.xml
index 812ee1c76eb4f19e585c0da3d7ab4b74170ac7d7..a1ce77dae232f5e888473d00119b6abf0fac2ebf 100644
--- a/org.fortiss.af3.platform.raspberry.ui/trunk/plugin.xml
+++ b/org.fortiss.af3.platform.raspberry.ui/trunk/plugin.xml
@@ -141,4 +141,19 @@
          </modelElementClass>
       </modelEditorBinding>
       </extension>
+       <extension
+             point="org.fortiss.tooling.kernel.ui.modelElementHandler">
+          <modelElementHandler
+                handler="org.fortiss.af3.platform.raspberry.ui.handler.RaspberryPI3Handler">
+             <modelElementClass
+                   modelElementClass="org.fortiss.af3.platform.raspberry.model.RaspberryPi3">
+             </modelElementClass>
+          </modelElementHandler>
+          <modelElementHandler
+                handler="org.fortiss.af3.platform.raspberry.ui.handler.CANBusHandler">
+             <modelElementClass
+                   modelElementClass="org.fortiss.af3.platform.raspberry.model.CANBus">
+             </modelElementClass>
+          </modelElementHandler>
+       </extension>
 </plugin>
diff --git a/org.fortiss.af3.platform.raspberry.ui/trunk/src/org/fortiss/af3/platform/raspberry/ui/handler/CANBusHandler.java b/org.fortiss.af3.platform.raspberry.ui/trunk/src/org/fortiss/af3/platform/raspberry/ui/handler/CANBusHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..cb5b50bbb079af341a55072bb33aa8b6af54c670
--- /dev/null
+++ b/org.fortiss.af3.platform.raspberry.ui/trunk/src/org/fortiss/af3/platform/raspberry/ui/handler/CANBusHandler.java
@@ -0,0 +1,38 @@
+/*--------------------------------------------------------------------------+
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
+|                                                                          |
+| Copyright 2017 fortiss GmbH                     |
+|                                                                          |
+| Licensed under the Apache License, Version 2.0 (the "License");          |
+| you may not use this file except in compliance with the License.         |
+| You may obtain a copy of the License at                                  |
+|                                                                          |
+|    http://www.apache.org/licenses/LICENSE-2.0                            |
+|                                                                          |
+| Unless required by applicable law or agreed to in writing, software      |
+| distributed under the License is distributed on an "AS IS" BASIS,        |
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
+| See the License for the specific language governing permissions and      |
+| limitations under the License.                                           |
++--------------------------------------------------------------------------*/
+package org.fortiss.af3.platform.raspberry.ui.handler;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.fortiss.af3.platform.raspberry.model.CANBus;
+import org.fortiss.af3.platform.raspberry.ui.AF3PlatformRaspberryUIActivator;
+import org.fortiss.af3.platform.ui.handler.hierarchical.TransmissionUnitHandler;
+
+/**
+ * 
+ * @author eder
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
+ */
+public class CANBusHandler extends TransmissionUnitHandler<CANBus> {
+	/** {@inheritDoc} */
+	@Override
+	public ImageDescriptor getIconImageDescriptor() {
+		return AF3PlatformRaspberryUIActivator.getImageDescriptor("icons/can-logo.jpeg");
+	}
+}
diff --git a/org.fortiss.af3.platform.raspberry.ui/trunk/src/org/fortiss/af3/platform/raspberry/ui/handler/RaspberryPI3Handler.java b/org.fortiss.af3.platform.raspberry.ui/trunk/src/org/fortiss/af3/platform/raspberry/ui/handler/RaspberryPI3Handler.java
new file mode 100644
index 0000000000000000000000000000000000000000..f3633ca1e519d736ad20ea929c4886090808c97c
--- /dev/null
+++ b/org.fortiss.af3.platform.raspberry.ui/trunk/src/org/fortiss/af3/platform/raspberry/ui/handler/RaspberryPI3Handler.java
@@ -0,0 +1,39 @@
+/*--------------------------------------------------------------------------+
+$Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
+|                                                                          |
+| Copyright 2017 fortiss GmbH                     |
+|                                                                          |
+| Licensed under the Apache License, Version 2.0 (the "License");          |
+| you may not use this file except in compliance with the License.         |
+| You may obtain a copy of the License at                                  |
+|                                                                          |
+|    http://www.apache.org/licenses/LICENSE-2.0                            |
+|                                                                          |
+| Unless required by applicable law or agreed to in writing, software      |
+| distributed under the License is distributed on an "AS IS" BASIS,        |
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
+| See the License for the specific language governing permissions and      |
+| limitations under the License.                                           |
++--------------------------------------------------------------------------*/
+package org.fortiss.af3.platform.raspberry.ui.handler;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.fortiss.af3.platform.raspberry.model.RaspberryPi3;
+import org.fortiss.af3.platform.raspberry.ui.AF3PlatformRaspberryUIActivator;
+import org.fortiss.af3.platform.ui.handler.hierarchical.GenericPlatformUnitHandler;
+
+/**
+ * 
+ * @author eder
+ * @author $Author: hoelzl $
+ * @version $Rev: 18709 $
+ * @ConQAT.Rating RED Hash:
+ */
+public class RaspberryPI3Handler extends GenericPlatformUnitHandler<RaspberryPi3> {
+
+	/** {@inheritDoc} */
+	@Override
+	public ImageDescriptor getIconImageDescriptor() {
+		return AF3PlatformRaspberryUIActivator.getImageDescriptor("icons/raspberry-pi-logo.png");
+	}
+}