diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino-feature/build.properties
index b3a611b5c93..93357407399 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/build.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/build.properties
@@ -1,2 +1,17 @@
+###############################################################################
+# Copyright (c) 2015-2020 QNX Software Systems and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
+###############################################################################
+
 bin.includes = feature.xml,\
                feature.properties
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.properties b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.properties
index 61426790cad..4cd3859751c 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2015 QNX Software Systems and others
+# Copyright (c) 2015-2020 QNX Software Systems and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
 #
 # Contributors:
 #     QNX Software Systems - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
 ###############################################################################
 # features.properties
 # contains externalized strings for feature.xml
@@ -18,7 +19,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Arduino C++ Tools
+featureName=C/C++ Arduino Tools
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
@@ -28,7 +29,7 @@ description=Extensions to support Arduino C++ projects in Eclipse
 
 # copyright
 copyright=\
-Copyright (c) 2015 QNX Software Systems and others.\n\
+Copyright (c) 2015-2020 QNX Software Systems and others.\n\
 This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License 2.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
index 6d1e9759b40..42778c25378 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
+++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2015-2020 QNX Software Systems and others
+
+	This program and the accompanying materials are made available under the
+	terms of the Eclipse Public License 2.0 which is available at
+	https://www.eclipse.org/legal/epl-2.0/.
+
+	SPDX-License-Identifier: EPL-2.0
+
+	Contributors:
+		QNX Software Systems - initial API and implementation
+		Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
+-->
 <feature
       id="org.eclipse.cdt.arduino"
       label="%featureName"
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/META-INF/MANIFEST.MF b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/META-INF/MANIFEST.MF
index a81f9539799..1c8235e0c7f 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/META-INF/MANIFEST.MF
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.cdt.arduino.core.tests
-Bundle-Vendor: Eclipse CDT
-Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Version: 1.0.100.qualifier
 Fragment-Host: org.eclipse.cdt.arduino.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0"
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/OSGI-INF/l10n/bundle.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 00000000000..2f9105ccf51
--- /dev/null
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,18 @@
+#Properties file for org.eclipse.cdt.arduino.core.tests
+###############################################################################
+# Copyright (c) 2015-2020 QNX Software Systems and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
+###############################################################################
+
+Bundle-Vendor = Eclipse CDT
+Bundle-Name = C/C++ Arduino Tests
\ No newline at end of file
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/build.properties
index 9cbab3c135e..d3a102f70f3 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/build.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/build.properties
@@ -1,6 +1,22 @@
+###############################################################################
+# Copyright (c) 2015-2020 QNX Software Systems and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
+###############################################################################
+
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               OSGI-INF/,\
                about.html
 src.includes = about.html
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties
index 3b6cc63ded6..1a2c7ede3c8 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties
@@ -1,3 +1,18 @@
+###############################################################################
+# Copyright (c) 2015-2020 QNX Software Systems and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
+###############################################################################
+
 source.. = src/
 bin.includes = META-INF/,\
                .,\
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
index 722cf64af6f..4950b170491 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2015 QNX Software Systems and others.
+# Copyright (c) 2015-2020 QNX Software Systems and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -10,8 +10,10 @@
 #
 # Contributors:
 #     QNX Software Systems - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
 ###############################################################################
-pluginName=Arduino C++ Core
+
+pluginName=C/C++ Arduino Core
 providerName=Eclipse CDT
 ArduinoBuilder.name=Arduino Builder
 arduinonature.name=Arduino Nature
\ No newline at end of file
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF b/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF
index 0b8d8958dfe..9656501b8e0 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.arduino.ui;singleton:=true
-Bundle-Version: 2.1.400.qualifier
+Bundle-Version: 2.1.500.qualifier
 Bundle-Activator: org.eclipse.cdt.arduino.ui.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties
index 1bf1db9f601..18900cdf5f3 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties
@@ -1,8 +1,24 @@
+###############################################################################
+# Copyright (c) 2015-2020 QNX Software Systems and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     QNX Software Systems - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
+###############################################################################
+
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
                about.html,\
-               plugin.properties
+               plugin.properties,\
+               cdt_logo_icon32.png
 source.. = src/
 src.includes = about.html
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/cdt_logo_icon32.png b/toolchains/arduino/org.eclipse.cdt.arduino.ui/cdt_logo_icon32.png
new file mode 100644
index 00000000000..470ca81b327
Binary files /dev/null and b/toolchains/arduino/org.eclipse.cdt.arduino.ui/cdt_logo_icon32.png differ
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties b/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties
index 9a391e73fb5..be5a59fd496 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2015 QNX Software Systems and others.
+# Copyright (c) 2015-2020 QNX Software Systems and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -10,8 +10,10 @@
 #
 # Contributors:
 #     QNX Software Systems - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - ongoing support
 ###############################################################################
-pluginName=Arduino C++ UI
+
+pluginName=C/C++ Arduino UI
 providerName=Eclipse CDT
 preferencePage.name=Arduino