diff --git a/src/net/java/sip/communicator/impl/gui/main/history/HistoryMenu.java b/src/net/java/sip/communicator/impl/gui/main/history/HistoryMenu.java
index 29faa9e6f..5a75b4f34 100644
--- a/src/net/java/sip/communicator/impl/gui/main/history/HistoryMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/history/HistoryMenu.java
@@ -1,3 +1,10 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
 package net.java.sip.communicator.impl.gui.main.history;
 
 import java.awt.Graphics;
diff --git a/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java
index 93e6c93a6..91353a55c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java
@@ -1,3 +1,10 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
 package net.java.sip.communicator.impl.gui.main.history;
 
 import java.awt.BorderLayout;
@@ -12,6 +19,7 @@
 import net.java.sip.communicator.impl.gui.main.ContactItem;
 import net.java.sip.communicator.impl.gui.main.i18n.Messages;
 import net.java.sip.communicator.impl.gui.main.utils.Constants;
+import net.java.sip.communicator.impl.gui.main.utils.ImageLoader;
 
 public class HistoryWindow extends JFrame {	
 	
@@ -44,7 +52,7 @@ public HistoryWindow(){
 		this.setSize(Constants.HISTORY_WINDOW_WIDTH, 
 					Constants.HISTORY_WINDOW_HEIGHT);	
 		
-		this.setIconImage(Constants.SIP_LOGO);
+		this.setIconImage(ImageLoader.getImage(ImageLoader.SIP_LOGO));
 		
 		this.init();
 	}
diff --git a/src/net/java/sip/communicator/impl/gui/main/history/NavigationPanel.java b/src/net/java/sip/communicator/impl/gui/main/history/NavigationPanel.java
index 672bb1c34..28e281a47 100644
--- a/src/net/java/sip/communicator/impl/gui/main/history/NavigationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/history/NavigationPanel.java
@@ -1,3 +1,10 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
 package net.java.sip.communicator.impl.gui.main.history;
 
 import java.awt.FlowLayout;
diff --git a/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java b/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java
index a28247204..f45f92185 100644
--- a/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java
@@ -1,3 +1,10 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
 package net.java.sip.communicator.impl.gui.main.history;
 
 import java.awt.BorderLayout;
@@ -21,12 +28,13 @@
 import net.java.sip.communicator.impl.gui.main.i18n.Messages;
 import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager;
 import net.java.sip.communicator.impl.gui.main.utils.Constants;
+import net.java.sip.communicator.impl.gui.main.utils.ImageLoader;
 
 public class SearchPanel extends JPanel implements ActionListener {
 
 	private JButton searchButton 
 				= new JButton(Messages.getString("search"),
-							  new ImageIcon(Constants.QUICK_MENU_SEARCH_ICON));
+							  new ImageIcon(ImageLoader.getImage(ImageLoader.QUICK_MENU_SEARCH_ICON)));
 	
 	private JLabel searchLabel = new JLabel(Messages.getString("search") + ": ");