diff --git a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp
index 015a1dd89a..b4252d87ce 100644
--- a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp
+++ b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp
@@ -203,7 +203,7 @@ void MSWindowsClientTaskBarReceiver::primaryAction()
   showStatus();
 }
 
-const IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const
 {
   return static_cast<Icon>(m_icon[getStatus()]);
 }
diff --git a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h
index d6a00d63ce..7989ce3b23 100644
--- a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h
+++ b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h
@@ -37,7 +37,7 @@ public:
   virtual void showStatus();
   virtual void runMenu(int x, int y);
   virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  virtual Icon getIcon() const;
   void cleanup();
 
 protected:
diff --git a/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp b/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp
index baaae04454..dc8512c1c7 100644
--- a/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp
+++ b/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp
@@ -50,7 +50,7 @@ void OSXClientTaskBarReceiver::primaryAction()
   // do nothing
 }
 
-const IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const
 {
   return NULL;
 }
diff --git a/src/cmd/deskflowc/OSXClientTaskBarReceiver.h b/src/cmd/deskflowc/OSXClientTaskBarReceiver.h
index 0a2e9f2923..9fd02bd5cd 100644
--- a/src/cmd/deskflowc/OSXClientTaskBarReceiver.h
+++ b/src/cmd/deskflowc/OSXClientTaskBarReceiver.h
@@ -34,5 +34,5 @@ public:
   virtual void showStatus();
   virtual void runMenu(int x, int y);
   virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  virtual Icon getIcon() const;
 };
diff --git a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp
index 84e3638c9d..bb2d4e731a 100644
--- a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp
+++ b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp
@@ -50,7 +50,7 @@ void CXWindowsClientTaskBarReceiver::primaryAction()
   // do nothing
 }
 
-const IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const
 {
   return NULL;
 }
diff --git a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h
index afdd01372f..eeff2b5ad1 100644
--- a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h
+++ b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h
@@ -39,5 +39,5 @@ public:
   virtual void showStatus();
   virtual void runMenu(int x, int y);
   virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  virtual Icon getIcon() const;
 };
diff --git a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp
index 17ee86615a..eb6ee5c0d5 100644
--- a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp
@@ -229,7 +229,7 @@ void MSWindowsServerTaskBarReceiver::primaryAction()
   showStatus();
 }
 
-const IArchTaskBarReceiver::Icon MSWindowsServerTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon MSWindowsServerTaskBarReceiver::getIcon() const
 {
   return static_cast<Icon>(m_icon[getStatus()]);
 }
diff --git a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h
index 0906b5e2bb..7c13dc9822 100644
--- a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h
+++ b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h
@@ -37,7 +37,7 @@ public:
   virtual void showStatus();
   virtual void runMenu(int x, int y);
   virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  virtual Icon getIcon() const;
   void cleanup();
 
 protected:
diff --git a/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp b/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp
index 004fab1c36..c3233bab24 100644
--- a/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp
+++ b/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp
@@ -50,7 +50,7 @@ void OSXServerTaskBarReceiver::primaryAction()
   // do nothing
 }
 
-const IArchTaskBarReceiver::Icon OSXServerTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon OSXServerTaskBarReceiver::getIcon() const
 {
   return NULL;
 }
diff --git a/src/cmd/deskflows/OSXServerTaskBarReceiver.h b/src/cmd/deskflows/OSXServerTaskBarReceiver.h
index 69eeaf2268..41121c40f5 100644
--- a/src/cmd/deskflows/OSXServerTaskBarReceiver.h
+++ b/src/cmd/deskflows/OSXServerTaskBarReceiver.h
@@ -33,5 +33,5 @@ public:
   virtual void showStatus();
   virtual void runMenu(int x, int y);
   virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  virtual Icon getIcon() const;
 };
diff --git a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp
index 4857df2da2..6e18ad94f8 100644
--- a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp
@@ -50,7 +50,7 @@ void CXWindowsServerTaskBarReceiver::primaryAction()
   // do nothing
 }
 
-const IArchTaskBarReceiver::Icon CXWindowsServerTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon CXWindowsServerTaskBarReceiver::getIcon() const
 {
   return NULL;
 }
diff --git a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h
index 7cab6ea2f4..fa43256406 100644
--- a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h
+++ b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h
@@ -39,5 +39,5 @@ public:
   virtual void showStatus();
   virtual void runMenu(int x, int y);
   virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  virtual Icon getIcon() const;
 };
diff --git a/src/lib/arch/IArchTaskBarReceiver.h b/src/lib/arch/IArchTaskBarReceiver.h
index 110b08507f..2635378fa1 100644
--- a/src/lib/arch/IArchTaskBarReceiver.h
+++ b/src/lib/arch/IArchTaskBarReceiver.h
@@ -81,7 +81,7 @@ public:
   to set the icon is left to subclasses.  Getting and setting
   the icon must be thread safe.
   */
-  virtual const Icon getIcon() const = 0;
+  virtual Icon getIcon() const = 0;
 
   //! Get tooltip
   /*!
diff --git a/src/lib/deskflow/ClientTaskBarReceiver.h b/src/lib/deskflow/ClientTaskBarReceiver.h
index afaa7107cf..e090245403 100644
--- a/src/lib/deskflow/ClientTaskBarReceiver.h
+++ b/src/lib/deskflow/ClientTaskBarReceiver.h
@@ -54,7 +54,7 @@ public:
   virtual void primaryAction() = 0;
   virtual void lock() const;
   virtual void unlock() const;
-  virtual const Icon getIcon() const = 0;
+  virtual Icon getIcon() const = 0;
   virtual std::string getToolTip() const;
   virtual void cleanup()
   {
diff --git a/src/lib/deskflow/ServerTaskBarReceiver.h b/src/lib/deskflow/ServerTaskBarReceiver.h
index 34f760dd2e..30e289d2b7 100644
--- a/src/lib/deskflow/ServerTaskBarReceiver.h
+++ b/src/lib/deskflow/ServerTaskBarReceiver.h
@@ -57,7 +57,7 @@ public:
   virtual void primaryAction() = 0;
   virtual void lock() const;
   virtual void unlock() const;
-  virtual const Icon getIcon() const = 0;
+  virtual Icon getIcon() const = 0;
   virtual std::string getToolTip() const;
 
 protected: