diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
index 9157d54c3..dd36b82a7 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
@@ -971,7 +971,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt)
             }
         });
 
-//        toolBar.add(imageButton);
+        toolBar.add(imageButton);
 
         buttonGroup.add(polygonButton);
         polygonButton.setToolTipText(Resources.getString("polygon"));
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java
index 0f9d98d3b..bc7325688 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java
@@ -78,9 +78,9 @@ public WhiteboardShapeImage (   String id,
         this.whiteboardPoint = p;
         this.width = width;
         this.height = height;
-        ImageIcon ii = new ImageIcon (bytes);
+        this.bytes = Base64.decode(bytes);
+        ImageIcon ii = new ImageIcon (this.bytes);
         this.image = ii.getImage ();
-        this.bytes = bytes;
 
         this.recalculateSelectionPoints();
     }
@@ -302,9 +302,9 @@ public void setWhiteboardPoint (WhiteboardPoint whiteboardPoint)
      * displayed as the object background.
      */
     public void setBackgroundImage (byte[] background)
-    {
-        this.bytes = background;
-        ImageIcon ii = new ImageIcon (bytes);
+    {       
+        this.bytes = Base64.decode(background);
+        ImageIcon ii = new ImageIcon (this.bytes);
         this.image = ii.getImage ();
     }