diff --git a/clients/tde/src/app/Makefile.am b/clients/tde/src/app/Makefile.am
index 39cfe4c..e62de97 100644
--- a/clients/tde/src/app/Makefile.am
+++ b/clients/tde/src/app/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = views
 INCLUDES = $(all_includes) -I$(top_srcdir)/src  -I$(top_builddir)/src $(KDE_INCLUDES)/tde
 METASOURCES = AUTO
 
+KDE_ICON = remote_laboratory_client
+
 # Application
 bin_PROGRAMS = remote_laboratory_client
 remote_laboratory_client_SOURCES = main.cpp remotemdi.cpp
diff --git a/clients/tde/src/app/hi16-app-remote_laboratory_client.png b/clients/tde/src/app/hi16-app-remote_laboratory_client.png
new file mode 100644
index 0000000..e954b71
Binary files /dev/null and b/clients/tde/src/app/hi16-app-remote_laboratory_client.png differ
diff --git a/clients/tde/src/app/hi32-app-remote_laboratory_client.png b/clients/tde/src/app/hi32-app-remote_laboratory_client.png
new file mode 100644
index 0000000..09e4c58
Binary files /dev/null and b/clients/tde/src/app/hi32-app-remote_laboratory_client.png differ
diff --git a/clients/tde/src/app/remotemdi.cpp b/clients/tde/src/app/remotemdi.cpp
index 0ae6680..88b3edc 100644
--- a/clients/tde/src/app/remotemdi.cpp
+++ b/clients/tde/src/app/remotemdi.cpp
@@ -33,6 +33,7 @@ RemoteMDI::RemoteMDI()
     : KMdiMainFrm(0, "RemoteMDI", KMdi::ChildframeMode), m_children(0), m_rsvSvrSocket(NULL), connToServerConnecting(false), connToServerState(-1), connToServerTimeoutTimer(NULL)
 {
 	setXMLFile("remotelabui.rc");
+	setIcon(SmallIcon("remote_laboratory_client"));
 
 	// Create some actions
 	KStdAction::close(this, SLOT(closeCurrent()), actionCollection());
diff --git a/clients/tde/src/app/views/instrumentview.cpp b/clients/tde/src/app/views/instrumentview.cpp
index 494b947..3182bc1 100644
--- a/clients/tde/src/app/views/instrumentview.cpp
+++ b/clients/tde/src/app/views/instrumentview.cpp
@@ -6,6 +6,7 @@
 #include <tqtimer.h>
 
 #include <klibloader.h>
+#include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
@@ -46,6 +47,7 @@ void InstrumentView::init() {
 	}
 	else {
 		m_instrumentPart = (InstrumentPart *)factory->create(TQT_TQOBJECT(this), "part", "KParts::RemoteInstrumentPart");
+		setIcon(SmallIcon(m_libraryName));
 		connect(m_instrumentPart, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(setStatusMessage(const TQString&)));
 		connect(m_instrumentPart, SIGNAL(usingFixedSizeChanged(bool)), this, SLOT(setUsingFixedSize(bool)));
 		TQWidget *childPartWidget = m_instrumentPart->widget();