Jira-ID: CRNT-24135

1)Removed duplicate icons from admin-portal , business-control-center, process-portal which were present in views-common project. 2)Moved all other icons from above 3 projects to views-common. 3)Changed the icon name of images which were different from 3rd party icons names in views-common project. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54585 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
author: Sidharth Singh 2012-03-15 11:19:03 (EDT)
committer: Manik Kishore 2012-06-19 07:21:33 (EDT)
commit: 6cda125620f78e77662e4e7306e7b7dc1ed63a4c (patch) (side-by-side diff)
tree: df65fc4c74a79e068ffaad6572c27d8d5dd968c1
parent: 50a91c57a9c011d7705c04821857edc38f8a047d (diff)
download: org.eclipse.stardust.ui.web-6cda125620f78e77662e4e7306e7b7dc1ed63a4c.zip
org.eclipse.stardust.ui.web-6cda125620f78e77662e4e7306e7b7dc1ed63a4c.tar.gz
org.eclipse.stardust.ui.web-6cda125620f78e77662e4e7306e7b7dc1ed63a4c.tar.bz2
331 files changed, 429 insertions, 429 deletions
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/ParticipantUserObject.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/ParticipantUserObject.java
index 2dec4d5..748fff4 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/ParticipantUserObject.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/ParticipantUserObject.java
@@ -46,31 +46,31 @@ public class ParticipantUserObject extends IceUserObject
 
    private static final String DEFAULT_DEPARTMENT_SUFFIX = " - Default";
 
-   private static final String ICON_PARTICIPANT_ROOT = "/plugins/admin-portal/images/icons/realm.png";
+   private static final String ICON_PARTICIPANT_ROOT = "/plugins/views-common/images/icons/world.png";
 
-   private static final String ICON_MODEL = "/plugins/admin-portal/images/icons/model.gif";
+   private static final String ICON_MODEL = "/plugins/views-common/images/icons/model.gif";
 
-   private static final String ICON_ORGANIZATION_UNSCOPED = "/plugins/admin-portal/images/icons/organization.png";
+   private static final String ICON_ORGANIZATION_UNSCOPED = "/plugins/views-common/images/icons/chart_organisation.png";
 
-   private static final String ICON_ORGANIZATION_SCOPED_EXPLICIT = "/plugins/admin-portal/images/icons/organization_scoped.png";
+   private static final String ICON_ORGANIZATION_SCOPED_EXPLICIT = "/plugins/views-common/images/icons/organization_scoped.png";
 
-   private static final String ICON_ORGANIZATION_SCOPED_IMPLICIT = "/plugins/admin-portal/images/icons/organization_scoped.png";
+   private static final String ICON_ORGANIZATION_SCOPED_IMPLICIT = "/plugins/views-common/images/icons/organization_scoped.png";
 
-   private static final String ICON_ROLE_UNSCOPED = "/plugins/admin-portal/images/icons/role.png";
+   private static final String ICON_ROLE_UNSCOPED = "/plugins/views-common/images/icons/role.png";
 
-   private static final String ICON_ROLE_SCOPED = "/plugins/admin-portal/images/icons/role_scoped.png";
+   private static final String ICON_ROLE_SCOPED = "/plugins/views-common/images/icons/role_scoped.png";
 
-   private static final String ICON_ROLE_TEAMLEAD_UNSCOPED = "/plugins/admin-portal/images/icons/role_teamlead.png";
+   private static final String ICON_ROLE_TEAMLEAD_UNSCOPED = "/plugins/views-common/images/icons/role_teamlead.png";
 
-   private static final String ICON_ROLE_TEAMLEAD_SCOPED = "/plugins/admin-portal/images/icons/role_teamlead_scoped.png";
+   private static final String ICON_ROLE_TEAMLEAD_SCOPED = "/plugins/views-common/images/icons/role_teamlead_scoped.png";
 
-   private static final String ICON_DEPARTMENT = "/plugins/admin-portal/images/icons/department.png";
+   private static final String ICON_DEPARTMENT = "/plugins/views-common/images/icons/group_link.png";
 
-   private static final String ICON_DEPARTMENT_DEFAULT = "/plugins/admin-portal/images/icons/department_default.png";
+   private static final String ICON_DEPARTMENT_DEFAULT = "/plugins/views-common/images/icons/group_error.png";
 
-   private static final String ICON_USERGROUP = "/plugins/admin-portal/images/icons/group.png";
+   private static final String ICON_USERGROUP = "/plugins/views-common/images/icons/group.png";
 
-   private static final String ICON_USER = "/plugins/admin-portal/images/icons/user.png";
+   private static final String ICON_USER = "/plugins/views-common/images/icons/user.png";
    
    private static final String HIGHLIGHT_USER_STYLE_PREFIX = "participant-tree-highlight-style-common participant-tree-highlight-style";
 
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java
index 096c028..b0e0585 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java
@@ -466,7 +466,7 @@ public class UserManagementBean extends PopupUIComponentBean
       FilterToolbarItem filterToolbarItem = new FilterToolbarItem("0", SHOW_INVALIDATED_USERS,
             "views.participantMgmt.filters.invalidatedUsers.showUser",
             "views.participantMgmt.filters.invalidatedUsers.hideUser",
-            "/plugins/admin-portal/images/icons/user-invalidated.png");
+            "/plugins/views-common/images/icons/user-invalidated.png");
       filterToolbarItem.setActive(true);
       userMgmtFilterToolbarItems.add(filterToolbarItem);
    }
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelConfigurationUserObject.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelConfigurationUserObject.java
index d68afa3..bf2cf06 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelConfigurationUserObject.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelConfigurationUserObject.java
@@ -30,7 +30,7 @@ import org.eclipse.stardust.ui.web.viewscommon.utils.I18nUtils;
 public class ModelConfigurationUserObject extends NodeUserObject
 {
     private static final String MODEL_IMAGE_PATH = "/plugins/views-common/images/icons/model.gif";
-    private static final String BLANK_IMAGE_PATH = "/plugins/admin-portal/images/t.gif";
+    private static final String BLANK_IMAGE_PATH = "/plugins/views-common/images/t.gif";
     private static final long serialVersionUID = 1L;
     private ModelConfigurationTreeItem treeItem = null;
     private boolean activeModelVersion;
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java
index 547430b..03a2794 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementBean.java
@@ -441,26 +441,26 @@ public class ModelManagementBean extends UIComponentBean implements ViewEventHan
 
       FilterToolbarItem versionTool = new FilterToolbarItem(ModelManagementTreeItem.Type.MODEL_VERSION.name(),
             ModelManagementTreeItem.Type.MODEL_VERSION.name(), "version",
-            "/plugins/admin-portal/images/icons/book_open.png");
+            "/plugins/views-common/images/icons/book_open.png");
       versionTool.setActive(false);
       filterToolbarItems.add(versionTool);
 
       FilterToolbarItem consumerTool = new FilterToolbarItem(
             ModelManagementTreeItem.Type.MODEL_VERSION_PROVIDER.name(),
             ModelManagementTreeItem.Type.MODEL_VERSION_PROVIDER.name(), "provider",
-            "/plugins/admin-portal/images/icons/resultset_next.png");
+            "/plugins/views-common/images/icons/resultset_next.png");
       filterToolbarItems.add(consumerTool);
 
       FilterToolbarItem providerTool = new FilterToolbarItem(
             ModelManagementTreeItem.Type.MODEL_VERSION_CONSUMER.name(),
             ModelManagementTreeItem.Type.MODEL_VERSION_CONSUMER.name(), "consumer",
-            "/plugins/admin-portal/images/icons/resultset_previous.png");
+            "/plugins/views-common/images/icons/resultset_previous.png");
       filterToolbarItems.add(providerTool);
 
       FilterToolbarItem primaryInterfaceTool = new FilterToolbarItem(
             ModelManagementTreeItem.Type.PRIMARY_INTERFACE.name(),
             ModelManagementTreeItem.Type.PRIMARY_INTERFACE.name(), "primaryinterface",
-            "/plugins/admin-portal/images/icons/cog.png");
+            "/plugins/views-common/images/icons/cog.png");
       filterToolbarItems.add(primaryInterfaceTool);
 
       Collections.unmodifiableCollection(filterToolbarItems);
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementTreeItem.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementTreeItem.java
index 2d41fc1..a89a601 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementTreeItem.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/ModelManagementTreeItem.java
@@ -21,11 +21,11 @@ public class ModelManagementTreeItem
 {
 
    private static final String MODEL_IMAGE_PATH = "/plugins/views-common/images/icons/model.gif";
-   private static final String MODEL_VERSION_IMAGE_PATH = "/plugins/admin-portal/images/icons/book_open.png";
-   private static final String MODEL_VERSION_CONSUMER_IMAGE_PATH = "/plugins/admin-portal/images/icons/resultset_previous.png";
-   private static final String MODEL_VERSION_PROVIDER_IMAGE_PATH = "/plugins/admin-portal/images/icons/resultset_next.png";
-   private static final String PRIMARY_INTERFACE_IMAGE_PATH = "/plugins/admin-portal/images/icons/cog.png";
-   private static final String BLANK_IMAGE_PATH = "/plugins/admin-portal/images/t.gif";
+   private static final String MODEL_VERSION_IMAGE_PATH = "/plugins/views-common/images/icons/book_open.png";
+   private static final String MODEL_VERSION_CONSUMER_IMAGE_PATH = "/plugins/views-common/images/icons/resultset_previous.png";
+   private static final String MODEL_VERSION_PROVIDER_IMAGE_PATH = "/plugins/views-common/images/icons/resultset_next.png";
+   private static final String PRIMARY_INTERFACE_IMAGE_PATH = "/plugins/views-common/images/icons/cog.png";
+   private static final String BLANK_IMAGE_PATH = "/plugins/views-common/images/t.gif";
 
    private List<ModelManagementTreeItem> children = new ArrayList<ModelManagementTreeItem>();
    private Date validFrom;
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/dialog/ErrorWarningUserObject.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/dialog/ErrorWarningUserObject.java
index 9347b27..cc2cc4b 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/dialog/ErrorWarningUserObject.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/model/dialog/ErrorWarningUserObject.java
@@ -29,7 +29,7 @@ public class ErrorWarningUserObject extends NodeUserObject
    private static final long serialVersionUID = 1L;
    private static final String ERROR_IMAGE_PATH = "/plugins/views-common/images/icons/cancel.png";
    private static final String WARNING_IMAGE_PATH = "/plugins/views-common/images/icons/warning.png";
-   private static final String NONE_IMAGE_PATH = "/plugins/admin-portal/images/t.gif";
+   private static final String NONE_IMAGE_PATH = "/plugins/views-common/images/t.gif";
    private ErrorWarningTreeItem treeItem;
 
    public ErrorWarningUserObject(TreeTable treeTable, TreeTableNode node, TreeTableBean treeBeanPointer,
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/qualityassurance/QualityAssuranceActivityTableEntry.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/qualityassurance/QualityAssuranceActivityTableEntry.java
index a5cb4fe..fce522f 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/qualityassurance/QualityAssuranceActivityTableEntry.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/qualityassurance/QualityAssuranceActivityTableEntry.java
@@ -32,11 +32,11 @@ import org.eclipse.stardust.ui.web.viewscommon.utils.QualityAssuranceUtils;
 public class QualityAssuranceActivityTableEntry extends DefaultRowModel
 {
    private static final long serialVersionUID = 5119025123905804704L;
-   private static final String ICON_ORGANIZATION_UNSCOPED = "/plugins/admin-portal/images/icons/organization.png";
-   private static final String ICON_ORGANIZATION_SCOPED_EXPLICIT = "/plugins/admin-portal/images/icons/organization_scoped.png";
-   private static final String ICON_ORGANIZATION_SCOPED_IMPLICIT = "/plugins/admin-portal/images/icons/organization_scoped.png";
-   private static final String ICON_ROLE_UNSCOPED = "/plugins/admin-portal/images/icons/role.png";
-   private static final String ICON_ROLE_SCOPED = "/plugins/admin-portal/images/icons/role_scoped.png";
+   private static final String ICON_ORGANIZATION_UNSCOPED = "/plugins/views-common/images/icons/chart_organisation.png";
+   private static final String ICON_ORGANIZATION_SCOPED_EXPLICIT = "/plugins/views-common/images/icons/organization_scoped.png";
+   private static final String ICON_ORGANIZATION_SCOPED_IMPLICIT = "/plugins/views-common/images/icons/organization_scoped.png";
+   private static final String ICON_ROLE_UNSCOPED = "/plugins/views-common/images/icons/role.png";
+   private static final String ICON_ROLE_SCOPED = "/plugins/views-common/images/icons/role_scoped.png";
 
    private Activity activity;
    private String modelName;
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/activityViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/activityViewToolbar.xhtml
index 63a535f..ad5b87b 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/activityViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/activityViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{ippAdmActivityView.messages['update']}" 
 	            action="#{ippAdmActivityView.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-ADM-ActivityView-Refresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/configurationVariablesViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/configurationVariablesViewToolbar.xhtml
index 7e698df..db0cb7d 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/configurationVariablesViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/configurationVariablesViewToolbar.xhtml
@@ -12,7 +12,7 @@
 			<pc:automationTag value="auto-ADM-ConfigVariable-ToolbarRefresh"
 				standAlone="false" />
 			<ice:graphicImage
-				value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+				value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" title="#{messages_admin['common.refresh']}" />
 		</ice:commandLink>
 	
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/daemonsToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/daemonsToolbar.xhtml
index 233c637..40b2aa8 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/daemonsToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/daemonsToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{daemonsBean.messages['update']}" 
 	            action="#{daemonsBean.initialize}" partialSubmit="true">
 	        <pc:automationTag value="auto-ADM-Daemon-Refresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/modelManagementViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/modelManagementViewToolbar.xhtml
index f892789..2fbd809 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/modelManagementViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/modelManagementViewToolbar.xhtml
@@ -12,7 +12,7 @@
 			<pc:automationTag value="auto-ADM-ModelMgmt-ToolbarRefresh"
 				standAlone="false" />
 			<ice:graphicImage
-				value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+				value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>		
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/overviewViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/overviewViewToolbar.xhtml
index e4ed1b1..b8da6d1 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/overviewViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/overviewViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{overviewBean.messages['update']}" 
 	            action="#{overviewBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-ADM-Overview-Refresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/participantMgmtViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/participantMgmtViewToolbar.xhtml
index 9ad07f3..3a67ec1 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/participantMgmtViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/participantMgmtViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{participantMgmtBean.messages['update']}" 
 	            action="#{participantMgmtBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-PP-PartMgmt-ToolbarRefresh" standAlone="false" />
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/processViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/processViewToolbar.xhtml
index 3a13a3e..28c2c78 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/processViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/processViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{processViewBean.messages['update']}" 
 	            action="#{processViewBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-ADM-ProcView-Refresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/qualityAssuranceActivityTableToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/qualityAssuranceActivityTableToolbar.xhtml
index ac44f56..cd43f3a 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/qualityAssuranceActivityTableToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/qualityAssuranceActivityTableToolbar.xhtml
@@ -12,7 +12,7 @@
 				value="auto-ADM-QAMgmt-Activity-Toolbar-ShowHideABSActivities"
 				standAlone="false" />
 			<h:graphicImage
-				value="/plugins/admin-portal/images/icons/book_open.png"
+				value="/plugins/views-common/images/icons/book_open.png"
 				style="border: none;"
 				title="#{messages_admin['views.qaManagementView.toolbar.showHideAbsActivites.title']}"
 				styleClass="#{!(qaManagementBean.showAbsoleteActivities) ? 'iceCmdBtn-dis' : ''}" />
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/realmMgmtToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/realmMgmtToolbar.xhtml
index 4922c1d..93b917d 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/realmMgmtToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/realmMgmtToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{realmMgmtBean.messages['update']}" 
 	            action="#{realmMgmtBean.initialize}" partialSubmit="true">
 	        <pc:automationTag value="auto-ADM-RealmMgmt-Refresh" standAlone="false" />
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/repositoryViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/repositoryViewToolbar.xhtml
index 263b9be..55349ee 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/repositoryViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/repositoryViewToolbar.xhtml
@@ -8,7 +8,7 @@
 	<ice:panelGrid columns="1">
 		<ice:commandLink title="#{overviewBean.messages['update']}" 
 	            action="#{repositoryTree.update}" partialSubmit="true">
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceMgmtViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceMgmtViewToolbar.xhtml
index 61f6e22..ca0c5f7 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceMgmtViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceMgmtViewToolbar.xhtml
@@ -8,7 +8,7 @@
 	<ice:panelGrid columns="1">
 		<ice:commandLink title="#{overviewBean.messages['update']}" 
 	            action="#{resManagementBean.update}" partialSubmit="true">
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/userGroupMgmtViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/userGroupMgmtViewToolbar.xhtml
index 325388a..b1800d5 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/userGroupMgmtViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/extensions/toolbar/userGroupMgmtViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{userGroupMgmtBean.messages['update']}" 
 	            action="#{userGroupMgmtBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-ADM-UserGrpMgmt-Refresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/abort_process.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/abort_process.png
deleted file mode 100644
index a14f9be..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/abort_process.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/abort.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/abort.png
deleted file mode 100644
index 1514d51..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/abort.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/arrow_down.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/arrow_down.gif
deleted file mode 100644
index 388dace..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/arrow_down.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/arrow_up.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/arrow_up.gif
deleted file mode 100644
index ce25770..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/arrow_up.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/cross_add.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/cross_add.gif
deleted file mode 100644
index f80f16a..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/cross_add.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/cross_delete.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/cross_delete.gif
deleted file mode 100644
index 67a605c..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/active/cross_delete.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/ajax_loader.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/ajax_loader.gif
deleted file mode 100644
index d84f653..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/ajax_loader.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/book_open.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/book_open.png
deleted file mode 100644
index 7d863f9..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/book_open.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/cancel.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/cancel.gif
deleted file mode 100644
index 1d2ffeb..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/cancel.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/arrow_down.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/arrow_down.gif
deleted file mode 100644
index 44406d9..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/arrow_down.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/arrow_up.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/arrow_up.gif
deleted file mode 100644
index 2f92259..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/arrow_up.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/cross_add.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/cross_add.gif
deleted file mode 100644
index 945b6c4..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/cross_add.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/cross_delete.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/cross_delete.gif
deleted file mode 100644
index 60728cf..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/disabled/cross_delete.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/group_delete.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/group_delete.png
deleted file mode 100644
index 4489ca2..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/group_delete.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/model.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/model.gif
deleted file mode 100644
index 045f495..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/model.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/ok.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/ok.gif
deleted file mode 100644
index f78213c..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/ok.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/realm_add.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/realm_add.png
deleted file mode 100644
index 6d0d7f7..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/realm_add.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/report.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/report.png
deleted file mode 100644
index 779ad58..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/report.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/resultset_next.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/resultset_next.png
deleted file mode 100644
index e252606..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/resultset_next.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/resultset_previous.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/resultset_previous.png
deleted file mode 100644
index 18f9cc1..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/resultset_previous.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/start_timer.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/start_timer.gif
deleted file mode 100644
index 4b74b20..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/start_timer.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/stop_timer.gif b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/stop_timer.gif
deleted file mode 100644
index 43e2f71..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/stop_timer.gif
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/vCard-User.png b/admin-portal/src/main/resources/META-INF/xhtml/images/icons/vCard-User.png
deleted file mode 100644
index e1c1e65..0000000
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/vCard-User.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/daemonsViewColumns.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/daemonsViewColumns.xhtml
index 873918c..1ccc217 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/daemonsViewColumns.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/daemonsViewColumns.xhtml
@@ -11,7 +11,7 @@
 			<ice:panelGroup rendered="#{not row.running}" style="text-align: center;">
 				<ice:commandLink actionListener="#{daemonsBean.startDaemon}" disabled="#{not daemonsBean.authorizedForDaemonAction}">
 					<pc:automationTag value="auto-ADM-Daemon-ActionsStart" standAlone="false"/>
-					<h:graphicImage value="/plugins/admin-portal/images/icons/control_play.png"
+					<h:graphicImage value="/plugins/views-common/images/icons/control_play.png"
 						style="border: none;" title="#{daemonsBean.messages['startDaemon']}" />
 					<f:attribute name="daemon" value="#{row.daemon}" />
 				</ice:commandLink>
@@ -19,7 +19,7 @@
 			<ice:panelGroup rendered="#{row.running}" style="text-align: center;">
 				<ice:commandLink actionListener="#{daemonsBean.stopDaemon}" disabled="#{not daemonsBean.authorizedForDaemonAction}">
 					<pc:automationTag value="auto-ADM-Daemon-ActionsStop" standAlone="false"/>
-					<h:graphicImage value="/plugins/admin-portal/images/icons/control_stop.png"
+					<h:graphicImage value="/plugins/views-common/images/icons/control_stop.png"
 						style="border: none;" title="#{daemonsBean.messages['stopDaemon']}" />
 					<f:attribute name="daemon" value="#{row.daemon}" />
 				</ice:commandLink>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/model/_deployModelTableColumns.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/model/_deployModelTableColumns.xhtml
index d9a76fb..094d549 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/model/_deployModelTableColumns.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/model/_deployModelTableColumns.xhtml
@@ -12,7 +12,7 @@
 			style="text-align: center">
 
 			<ice:panelGrid columns="2">
-				<h:graphicImage url="/plugins/admin-portal/images/icons/model.gif" />
+				<h:graphicImage url="/plugins/views-common/images/icons/model.gif" />
 				<ice:outputLabel value="#{row.fileName}" />
 			</ice:panelGrid>
 
@@ -42,7 +42,7 @@
 				<pc:automationTag
 					value="auto-ADM-ModelDeployDlg-DeployModelTbl-RemFile" standAlone="false" />
 				<h:graphicImage
-					value="/plugins/processportal/images/delete.png"
+					value="/plugins/views-common/images/icons/delete.png"
 					style="border: none;" />
 				<f:attribute name="row" value="#{row}" />
 			</ice:commandLink>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/model/configurationVariablesTableColumns.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/model/configurationVariablesTableColumns.xhtml
index 562e78d..55c9834 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/model/configurationVariablesTableColumns.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/model/configurationVariablesTableColumns.xhtml
@@ -22,7 +22,7 @@
 		</ice:panelGroup>
 
 		<ice:graphicImage style="display:inline; "
-			url="/plugins/admin-portal/images/t.gif" rendered="#{not row.edited}" />
+			url="/plugins/views-common/images/t.gif" rendered="#{not row.edited}" />
 
 	</ice:panelGroup>
 
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/model/modelManagementTableColumns.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/model/modelManagementTableColumns.xhtml
index 87f86ff..8d64119 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/model/modelManagementTableColumns.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/model/modelManagementTableColumns.xhtml
@@ -54,7 +54,7 @@
 			styleClass="modelMenuBar" immediate="false"
 			rendered="#{row.type=='MODEL_VERSION' and row.actionAllowed }">
 			<ice:menuItem id="menuPopup" styleClass=""
-				icon="/plugins/admin-portal/images/icons/wrench_closed.png"
+				icon="/plugins/views-common/images/icons/wrench_closed.png"
 				 value="">
 				<ice:menuItem icon="/plugins/views-common/images/icons/cross.png" styleClass="modelMnuItm"
 					value="#{modelManagementBean.messages['actions.delete']}"
@@ -65,7 +65,7 @@
 					<f:attribute name="type" value="DELETE" />
 				</ice:menuItem>
 				<ice:menuItem
-					icon="/plugins/admin-portal/images/icons/server_go.png" styleClass="modelMnuItm"
+					icon="/plugins/views-common/images/icons/server_go.png" styleClass="modelMnuItm"
 					value="#{modelManagementBean.messages['actions.overwrite']}"
 					actionListener="#{modelManagementBean.popUpActionListener}">
 					<pc:automationTag
@@ -84,7 +84,7 @@
 					<f:attribute name="row" value="#{row}" />
 					<f:attribute name="type" value="EXPORT" />
 				</ice:menuItem>
-				<ice:menuItem icon="/plugins/admin-portal/images/icons/report.png" styleClass="modelMnuItm"
+				<ice:menuItem icon="/plugins/views-common/images/icons/mime-types/report.png" styleClass="modelMnuItm"
 					value="#{modelManagementBean.messages['actions.runreport']}"
 					actionListener="#{modelManagementBean.popUpActionListener}">
 					<pc:automationTag
@@ -104,7 +104,7 @@
 				<pc:automationTag value="auto-ADM-ModelMgmt-ModelTreeTbl-EditImpl"
 					standAlone="false" />
 			<h:graphicImage
-				value="/plugins/admin-portal/images/icons/cog_edit.png"
+				value="/plugins/views-common/images/icons/cog_edit.png"
 				style="border: none;"
 				title="#{modelManagementBean.messages['primaryinterface.modify']}" />
 			<f:attribute name="row" value="#{row}" />
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/model/modelManagementToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/model/modelManagementToolbar.xhtml
index 45a216a..a09cf86 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/model/modelManagementToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/model/modelManagementToolbar.xhtml
@@ -28,7 +28,7 @@
 					<ice:graphicImage
 						rendered="#{not filterToolbarItem.visible and not filterToolbarItem.neverVisible}"
 						style="border: none; padding-right: 10px;"
-						value="/plugins/common/images/t.gif" width="15px" height="15px" />
+						value="/plugins/views-common/images/t.gif" width="15px" height="15px" />
 				</ui:repeat>
 			</ice:panelGroup>
 			<ice:panelGroup	styleClass="genericTableUserToolbar" style="padding-top: 1px;padding-left: 3px;">
@@ -72,7 +72,7 @@
 						standAlone="false" />
 					<h:graphicImage
 					   
-						value="/plugins/admin-portal/images/icons/report.png"
+						value="/plugins/views-common/images/icons/mime-types/report.png"
 						style="border: none;"
 						title="#{modelManagementBean.messages['report']}" />
 				</ice:commandLink>
@@ -85,7 +85,7 @@
 						value="auto-ADM-ModelMgmt-ModelTreeTbl-ToolbarDeployRpt"
 						standAlone="false" />
 					<h:graphicImage
-						value="/plugins/admin-portal/images/icons/server_go.png"
+						value="/plugins/views-common/images/icons/server_go.png"
 						style="border: none;"
 						title="#{modelManagementBean.messages['deploymodel']}" />
 				</ice:commandLink>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/participantTree.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/participantTree.xhtml
index 54f2f19..7858dd8 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/participantTree.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/participantTree.xhtml
@@ -121,7 +121,7 @@
 
 					<ice:menuPopup id="participantTreeMenuPopup" hideOn="mouseout">
 						<ice:menuItem id="createUser"
-							icon="/plugins/admin-portal/images/icons/user_add.png"
+							icon="/plugins/views-common/images/icons/user_add.png"
 							value="#{participantMgmtBean.messages['participantTree.contextMenu.createUser']}"
 							actionListener="#{item.userObject.createUser}">
 							<pc:automationTag
@@ -238,7 +238,7 @@
 									value="#{item.userObject.uuid}" />
 							</ice:menuItem>
 							<ice:menuItem id="createUser"
-								icon="/plugins/admin-portal/images/icons/user_add.png"
+								icon="/plugins/views-common/images/icons/user_add.png"
 								value="#{participantMgmtBean.messages['participantTree.contextMenu.createUser']}"
 								actionListener="#{item.userObject.createUser}">
 								<pc:automationTag
@@ -258,7 +258,7 @@
 						<ice:menuPopup id="menuPopupUser"
 							hideOn="mouseout">
 							<ice:menuItem id="removeUser" 
-								icon="/plugins/admin-portal/images/icons/user_delete.png"
+								icon="/plugins/views-common/images/icons/user_delete.png"
 								value="#{participantMgmtBean.messages['participantTree.contextMenu.removeUserGrant']}"
 								action="#{participantTree.removeUserFromParticipant}">
 								<pc:automationTag
@@ -317,7 +317,7 @@
 									value="#{item.userObject.uuid}" />
 							</ice:menuItem>
 							<ice:menuItem id="createUser"
-								icon="/plugins/admin-portal/images/icons/user_add.png"
+								icon="/plugins/views-common/images/icons/user_add.png"
 								value="#{participantMgmtBean.messages['participantTree.contextMenu.createUser']}"
 								actionListener="#{item.userObject.createUser}">
 							</ice:menuItem>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml
index c1fbbad..a2f81dd 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceActivityTableColumns.xhtml
@@ -17,10 +17,10 @@
 		<ice:panelGroup rendered="#{col.columnName == 'modelName'}" style="display:inline;" panelTooltip="procToolTip">
 			<ice:outputText style="display: inline;" value="#{row.modelName}">
 				<h:graphicImage rendered="#{row.oldModel}"
-					value="/plugins/admin-portal/images/icons/model.gif"
+					value="/plugins/views-common/images/icons/model.gif"
 					style="vertical-align: middle; margin-right:5px; opacity: 0.3;filter: alpha(opacity=30);  display: inline;" />
 				<h:graphicImage rendered="#{!row.oldModel}"
-					value="/plugins/admin-portal/images/icons/model.gif"
+					value="/plugins/views-common/images/icons/model.gif"
 					style="vertical-align: middle; margin-right:5px;  display: inline;" />
 			</ice:outputText>
 
@@ -59,7 +59,7 @@
 		<ice:panelGroup rendered="#{col.columnName == 'activityName'}">
 			<ice:outputText value="#{row.activityName}">
 				<h:graphicImage
-					value="/plugins/common/images/icons/process-history/active/activity_manual.png"
+					value="/plugins/views-common/images/icons/process-history/activity_manual.png"
 					style="vertical-align: middle; margin-right:5px" />
 			</ice:outputText>
 		</ice:panelGroup>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceDepartmentTableColumns.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceDepartmentTableColumns.xhtml
index 2f667fd..fcce009 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceDepartmentTableColumns.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/qualityAssuranceDepartmentTableColumns.xhtml
@@ -34,7 +34,7 @@
 		<ice:panelGroup rendered="#{col.columnName == 'deptName'}">
 			<ice:outputText value="#{row.deptName}">
 				<h:graphicImage
-					value="/plugins/admin-portal/images/icons/department.png"
+					value="/plugins/views-common/images/icons/group_link.png"
 					style="vertical-align: middle; margin-right:5px" />
 			</ice:outputText>
 		</ice:panelGroup>
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/realmMgmtViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/realmMgmtViewToolbar.xhtml
index 0e6f528..18637ff 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/realmMgmtViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/realmMgmtViewToolbar.xhtml
@@ -9,12 +9,12 @@
 	<ice:panelGrid columns="2">
 		<ice:commandLink action="#{realmMgmtBean.openPopup}">
 			<pc:automationTag value="auto-ADM-RealmMgmt-ToolbarCreate" standAlone="false" />
-			<h:graphicImage value="/plugins/admin-portal/images/icons/realm_add.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/world_add.png"
 				style="border: none;" title="#{messages_admin['common.create']}" />
 		</ice:commandLink>	
 		<ice:commandLink panelConfirmation="deleteRealm" action="#{realmMgmtBean.deleteUserRealm}" disabled="#{realmMgmtBean.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-ADM-RealmMgmt-ToolbarDel" standAlone="false" />
-			<h:graphicImage value="/plugins/admin-portal/images/icons/realm_delete.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/world_delete.png"
 				style="vertical-align:top; border:none;"
 				styleClass="#{realmMgmtBean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
 				title="#{messages_admin['common.delete']}" />
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/userGroupMgmtViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/userGroupMgmtViewToolbar.xhtml
index 8328f12..ff7f7e3 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/userGroupMgmtViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/userGroupMgmtViewToolbar.xhtml
@@ -9,14 +9,14 @@
 	<ice:panelGrid columns="2">
 		<ice:commandLink actionListener="#{createOrModifyUserGroupBean.openUserGroupDialog}">
 			<pc:automationTag value="auto-ADM-UserGrpMgmt-ToolbarCreateUserGrp" standAlone="false"/>
-			<h:graphicImage value="/plugins/admin-portal/images/icons/group_add.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/group_add.png"
 				style="border: none;" title="#{messages_admin['common.create']}" />
 			<f:attribute name="editable" value="all" />
 		</ice:commandLink>	
 
 		<ice:commandLink actionListener="#{userGroupMgmtBean.invalidateUserGroup}" disabled="#{userGroupMgmtBean.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-ADM-UserGrpMgmt-ToolbarInvalidateUserGrp" standAlone="false"/>
-			<h:graphicImage value="/plugins/admin-portal/images/icons/group_delete.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/group_delete.png"
 				style="border: none;" 
 				styleClass="#{userGroupMgmtBean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
 				title="#{userGroupMgmtBean.messages['invalidateUserGroup.tooltip.title']}" />
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/userMgmtViewColumns.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/userMgmtViewColumns.xhtml
index ac64465..ad03e0a 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/userMgmtViewColumns.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/userMgmtViewColumns.xhtml
@@ -14,7 +14,7 @@
 			dragListener="#{participantTree.dragObjectListener}"
 			rendered="#{col.columnName == 'Name'}">
 			<ice:graphicImage
-				value="/plugins/admin-portal/images/icons/grippy.png"
+				value="/plugins/views-common/images/icons/grippy.png"
 				style="float: left; margin-right: 5px; cursor: move;" />
 			<ice:commandLink onclick="Event.stop(event);"
 				actionListener="#{userMgmtBean.openModifyUserDialog}"
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/userMgmtViewToolbar.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/userMgmtViewToolbar.xhtml
index 67e4ce7..2be7a97 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/userMgmtViewToolbar.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/userMgmtViewToolbar.xhtml
@@ -9,7 +9,7 @@
 	<ice:panelGrid columns="5">
 		<ice:commandLink actionListener="#{userMgmtBean.openCreateUserDialog}">
 			<pc:automationTag value="auto-ADM-PartMgmt-ToolbarCreateUser" standAlone="false"/>
-			<h:graphicImage value="/plugins/admin-portal/images/icons/user_add.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/user_add.png"
 				style="border: none;" title="#{messages_admin['common.create']}" />
 		</ice:commandLink>
 
@@ -17,14 +17,14 @@
 			disabled="#{!(userMgmtBean.selectedItemCount eq 1)}">
 			<pc:automationTag value="auto-ADM-PartMgmt-ToolbarCopyUser" standAlone="false"/>
 			<h:graphicImage
-				value="/plugins/admin-portal/images/icons/user_go.png"
+				value="/plugins/views-common/images/icons/user_go.png"
 				style="border: none;" title="#{messages_admin['common.copy']}"
 				styleClass="#{!(userMgmtBean.selectedItemCount eq 1) ? 'iceCmdBtn-dis' : ''}"/>
 		</ice:commandLink>
 
 		<ice:commandLink actionListener="#{userMgmtBean.invalidateUser}" disabled="#{userMgmtBean.selectedItemCount eq 0}">
 			<pc:automationTag value="auto-ADM-PartMgmt-ToolbarInvalidateUser" standAlone="false"/>
-			<h:graphicImage value="/plugins/admin-portal/images/icons/user_delete.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/user_delete.png"
 				style="border: none;" 
 				styleClass="#{userMgmtBean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
 				title="#{userMgmtBean.messages['invalidateUser.title']}" />
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/CategoryTree.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/CategoryTree.java
index c37d07c..04985c9 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/CategoryTree.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/CategoryTree.java
@@ -46,7 +46,7 @@ public class CategoryTree extends UIViewComponentBean
    private static final String PRE_NODE = "views.categoryTree.tree.";
    private static final String PRE_LEAF = "views.";
    private static final String POST_LEAF = ".label";
-   public static final String IMAGE_BASE_PATH = "/plugins/business-control-center/images/icons/";
+   public static final String IMAGE_BASE_PATH = "/plugins/views-common/images/icons/";
    private static final Map<String, String> iconMap;
    
    private GenericCategory userArchivedReportsCategory;
@@ -58,15 +58,15 @@ public class CategoryTree extends UIViewComponentBean
    {
       iconMap = new LinkedHashMap<String, String>();
       iconMap.put("processOverviewView", "process_manager.png");
-      iconMap.put("processSearchView", "gear_find.png");
+      iconMap.put("processSearchView", "cog_search.png");
       iconMap.put("trafficLightView", "traffic_light.png");
       iconMap.put("activityCriticalityManagerView", "criticality_manager.png");
       iconMap.put("pendingActivities", "pending_activities.png");
-      iconMap.put("completedActivities", "/plugins/common/images/icons/process-history/active/activity_completed.png");
+      iconMap.put("completedActivities", "/plugins/views-common/images/icons/process-history/activity_completed.png");
       iconMap.put("postponedActivities", "activity_postponed.png");
       iconMap.put("strandedActivities", "activity_stranded.png");
-      iconMap.put("resourceAvailabilityView", "/plugins/admin-portal/images/icons/group.png");
-      iconMap.put("roleAssignmentView", "/plugins/admin-portal/images/icons/role.png");
+      iconMap.put("resourceAvailabilityView", "group.png");
+      iconMap.put("roleAssignmentView", "role.png");
       iconMap.put("resourceLoginView", "resource_login.png");
       iconMap.put("resourcePerformance", "chart-up.png");
       iconMap.put("performanceTeamleader", "chart-up-color.png");
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java
index bfcb682..631c4d1 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java
@@ -36,17 +36,17 @@ public class AggregateActivityColumnItem implements IColumnItem
 
    private static final String DEFAULT_STATE_CALCULATOR = "org.eclipse.stardust.ui.web.bcc.legacy.traffic.TerminationTimeBasedCalculator";
 
-   private final static String TRAFFIC_LIGHT_GREEN = "/plugins/business-control-center/images/icons/traffic_light_green.png";
+   private final static String TRAFFIC_LIGHT_GREEN = "/plugins/views-common/images/icons/traffic-light/traffic_light_green.png";
 
-   private final static String TRAFFIC_LIGHT_AMBER = "/plugins/business-control-center/images/icons/traffic_light_yellow.png";
+   private final static String TRAFFIC_LIGHT_AMBER = "/plugins/views-common/images/icons/traffic-light/traffic_light_yellow.png";
 
-   private final static String TRAFFIC_LIGHT_RED = "/plugins/business-control-center/images/icons/traffic_light_red.png";
+   private final static String TRAFFIC_LIGHT_RED = "/plugins/views-common/images/icons/traffic-light/traffic_light_red.png";
 
-   private final static String TRAFFIC_LIGHT_GREY = "/plugins/business-control-center/images/icons/traffic_light_grey.png";
+   private final static String TRAFFIC_LIGHT_GREY = "/plugins/views-common/images/icons/traffic-light/traffic_light_grey.png";
 
-   private final static String TRAFFIC_LIGHT_COMPLETED = "/plugins/business-control-center/images/icons/traffic_light_complete.gif";
+   private final static String TRAFFIC_LIGHT_COMPLETED = "/plugins/views-common/images/icons/traffic-light/traffic_light_complete.gif";
 
-   private final static String TRAFFIC_LIGHT_COMPLETED_TRANS = "/plugins/business-control-center/images/icons/traffic_light_complete_trans.gif";
+   private final static String TRAFFIC_LIGHT_COMPLETED_TRANS = "/plugins/views-common/images/icons/traffic-light/traffic_light_complete_trans.gif";
 
    //public final static String PROCESSES_PASSED_AI = "aggregateActivityColumnItem/processesPassedAI";
 
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ModelTreeItemUserObject.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ModelTreeItemUserObject.java
index 2e8ec3e..6c59a09 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ModelTreeItemUserObject.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/ModelTreeItemUserObject.java
@@ -43,7 +43,7 @@ public class ModelTreeItemUserObject extends NodeUserObject
    {
       super(treeTable, node, treeBeanPointer, componenttype);
       this.modelTreeItem = modelTreeItem;
-      String imagePath = "/plugins/common/images/icons/process-history/active/process.png";
+      String imagePath = "/plugins/views-common/images/icons/process.png";
 
       setLeafIcon(imagePath);
       setBranchContractedIcon(imagePath);
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/PriorityOverviewUserObject.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/PriorityOverviewUserObject.java
index 3cc9b7c..6cee7a3 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/PriorityOverviewUserObject.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/PriorityOverviewUserObject.java
@@ -58,7 +58,7 @@ public class PriorityOverviewUserObject extends NodeUserObject
       String tooltip = null;
       if (prioOverviewEntry instanceof ModelWithPrio)
       {
-         imagePath = "/plugins/admin-portal/images/icons/model.gif";
+         imagePath = "/plugins/views-common/images/icons/model.gif";
          tooltip = ((ModelWithPrio) prioOverviewEntry).getDescription();
       }
       else if (prioOverviewEntry instanceof ProcessDefinitionWithPrio)
@@ -70,7 +70,7 @@ public class PriorityOverviewUserObject extends NodeUserObject
          }
          else
          {
-            imagePath = "/plugins/common/images/icons/process-history/active/process.png";
+            imagePath = "/plugins/views-common/images/icons/process.png";
          }
          ProcessDefinition pd = ((ProcessDefinitionWithPrio) prioOverviewEntry).getProcessDefinition();
          tooltip = I18nUtils.getDescriptionAsHtml(pd, pd.getDescription());
diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/CriticalityOverviewNodeObject.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/CriticalityOverviewNodeObject.java
index 8ed195a..96c04d5 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/CriticalityOverviewNodeObject.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/criticalityManager/CriticalityOverviewNodeObject.java
@@ -55,7 +55,7 @@ public class CriticalityOverviewNodeObject extends NodeUserObject
 
       if (criticalityOverviewEntry instanceof ModelDefCriticalityMgrTableEntry)
       {
-         imagePath = "/plugins/admin-portal/images/icons/model.gif";
+         imagePath = "/plugins/views-common/images/icons/model.gif";
          tooltip = ((ModelDefCriticalityMgrTableEntry) criticalityOverviewEntry).getDescription();
          
       }
@@ -68,7 +68,7 @@ public class CriticalityOverviewNodeObject extends NodeUserObject
          }
          else
          {
-            imagePath = "/plugins/common/images/icons/process-history/active/process.png";
+            imagePath = "/plugins/views-common/images/icons/process.png";
          }
          tooltip = ((ProcessDefCriticalityMgrTableEntry) criticalityOverviewEntry).getDescription();
       }
diff --git a/business-control-center/src/main/resources/META-INF/spring/businessControlCenterUi-context.xml b/business-control-center/src/main/resources/META-INF/spring/businessControlCenterUi-context.xml
index 6ac21f0..94f2ab8 100644
--- a/business-control-center/src/main/resources/META-INF/spring/businessControlCenterUi-context.xml
+++ b/business-control-center/src/main/resources/META-INF/spring/businessControlCenterUi-context.xml
@@ -102,33 +102,33 @@ http://infinity.com/bpm/portal/common/uiDefinition http://infinity.com/bpm/porta
 	   	<ippui:view name="userManagerDetailView" include="/plugins/business-control-center/views/userManagerDetailView.xhtml" controller="userManagerDetail"
 	   		identityParams="userOid" />
 	   	
-	   	<ippui:view name="processOverviewView" include="/plugins/business-control-center/views/processOverviewView.xhtml" controller="businessProcessManager">
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/process_manager.png" />
-			</ippui:preferences>
-	   	</ippui:view>
+	   	<ippui:view name="processOverviewView" include="/plugins/business-control-center/views/processOverviewView.xhtml" controller="businessProcessManager">
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/process_manager.png" />
+			</ippui:preferences>
+	   	</ippui:view>
 	   		
 	   	<ippui:view name="processSearchView" include="/plugins/business-control-center/views/processSearchView.xhtml" controller="processSearchBean">
 			<ippui:preferences>
 				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/gear_find.png" />
+					include="/plugins/views-common/images/icons/cog_search.png" />
 			</ippui:preferences>
 	    </ippui:view>
 	   	
-	   	<ippui:view name="pendingActivities" include="/plugins/business-control-center/views/pendingActivities.xhtml" controller="openActivitiesBean">
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/pending_activities.png" />
-			</ippui:preferences>
-	   	</ippui:view>
-	   	<ippui:view name="completedActivities" include="/plugins/business-control-center/views/completedActivities.xhtml" controller="completedActivitiesBean">
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/common/images/icons/process-history/active/activity_completed.png" />
-			</ippui:preferences>
-	   	</ippui:view>
-	   	<ippui:view name="postponedActivities" include="/plugins/business-control-center/views/postponedActivities.xhtml" controller="postponedActivities">
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/activity_postponed.png" />
-			</ippui:preferences>
-	   	</ippui:view>
-	   	<ippui:view name="strandedActivities" include="/plugins/business-control-center/views/strandedActivitiesView.xhtml" controller="strandedActivitiesBean">
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/activity_stranded.png" />
-			</ippui:preferences>
-	   	</ippui:view>
+	   	<ippui:view name="pendingActivities" include="/plugins/business-control-center/views/pendingActivities.xhtml" controller="openActivitiesBean">
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/pending_activities.png" />
+			</ippui:preferences>
+	   	</ippui:view>
+	   	<ippui:view name="completedActivities" include="/plugins/business-control-center/views/completedActivities.xhtml" controller="completedActivitiesBean">
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/process-history/activity_completed.png" />
+			</ippui:preferences>
+	   	</ippui:view>
+	   	<ippui:view name="postponedActivities" include="/plugins/business-control-center/views/postponedActivities.xhtml" controller="postponedActivities">
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/activity_postponed.png" />
+			</ippui:preferences>
+	   	</ippui:view>
+	   	<ippui:view name="strandedActivities" include="/plugins/business-control-center/views/strandedActivitiesView.xhtml" controller="strandedActivitiesBean">
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/activity_stranded.png" />
+			</ippui:preferences>
+	   	</ippui:view>
 	   	
-	   	<ippui:view name="resourceAvailabilityView" include="/plugins/business-control-center/views/resourceAvailabilityView.xhtml"  controller="processResourceMgmtBean">
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/admin-portal/images/icons/group.png" />
-			</ippui:preferences>
-	   	</ippui:view>
-	   	<ippui:view name="roleAssignmentView" include="/plugins/business-control-center/views/roleAssignmentView.xhtml" controller="roleAssignment" >
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/admin-portal/images/icons/role.png" />
-			</ippui:preferences>
-	   	</ippui:view>
-	   	<ippui:view name="resourceLoginView" include="/plugins/business-control-center/views/resourceLoginView.xhtml" controller="resourceLogin">
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/resource_login.png" />
-			</ippui:preferences>
-	   	</ippui:view>
-	   	
-	   	<ippui:view name="resourcePerformance" include="/plugins/business-control-center/views/resourcePerformance.xhtml" controller="resourcePerformance">
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/chart-up.png" />
-			</ippui:preferences>
-	   	</ippui:view>
-	   	
-	   	<ippui:view name="performanceTeamleader" include="/plugins/business-control-center/views/performanceTeamleader.xhtml" controller="performanceTeamleader" >
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/chart-up-color.png" />
-			</ippui:preferences>
-	   	</ippui:view>
+	   	<ippui:view name="resourceAvailabilityView" include="/plugins/business-control-center/views/resourceAvailabilityView.xhtml"  controller="processResourceMgmtBean">
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/group.png" />
+			</ippui:preferences>
+	   	</ippui:view>
+	   	<ippui:view name="roleAssignmentView" include="/plugins/business-control-center/views/roleAssignmentView.xhtml" controller="roleAssignment" >
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/role.png" />
+			</ippui:preferences>
+	   	</ippui:view>
+	   	<ippui:view name="resourceLoginView" include="/plugins/business-control-center/views/resourceLoginView.xhtml" controller="resourceLogin">
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/resource_login.png" />
+			</ippui:preferences>
+	   	</ippui:view>
+	   	
+	   	<ippui:view name="resourcePerformance" include="/plugins/business-control-center/views/resourcePerformance.xhtml" controller="resourcePerformance">
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/chart-up.png" />
+			</ippui:preferences>
+	   	</ippui:view>
+	   	
+	   	<ippui:view name="performanceTeamleader" include="/plugins/business-control-center/views/performanceTeamleader.xhtml" controller="performanceTeamleader" >
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/chart-up-color.png" />
+			</ippui:preferences>
+	   	</ippui:view>
 	   	
 		<ippui:view name="trafficLightView" include="/plugins/business-control-center/views/trafficLightView.xhtml" controller="trafficLightViewManagerBean">
 			<ippui:preferences>
 				<ippui:preferencePage name="configuration"
-					include="/plugins/business-control-center/views/trafficLightViewConfigPanel.xhtml" />
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/traffic_light.png" />	
+					include="/plugins/business-control-center/views/trafficLightViewConfigPanel.xhtml" />
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/traffic_light.png" />	
 			</ippui:preferences>
 		</ippui:view>
-		
-		<ippui:view name="costs" include="/plugins/business-control-center/views/costs.xhtml" controller="costsBean">
-			<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/money-coin.png" />
-			</ippui:preferences>
-		</ippui:view>
+		
+		<ippui:view name="costs" include="/plugins/business-control-center/views/costs.xhtml" controller="costsBean">
+			<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/money-coin.png" />
+			</ippui:preferences>
+		</ippui:view>
 
-	   	<ippui:view name="activityCriticalityManagerView" include="/plugins/business-control-center/views/activityCriticalityManagerView.xhtml" controller="activityCriticalityManagerBean" >
-	   		<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/criticality_manager.png" />
-			</ippui:preferences>
-	   	</ippui:view>
+	   	<ippui:view name="activityCriticalityManagerView" include="/plugins/business-control-center/views/activityCriticalityManagerView.xhtml" controller="activityCriticalityManagerBean" >
+	   		<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/criticality_manager.png" />
+			</ippui:preferences>
+	   	</ippui:view>
    </ippui:perspective>
 </beans>
 \ No newline at end of file
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/css/ExportReport.gif b/business-control-center/src/main/resources/META-INF/xhtml/css/ExportReport.gif
deleted file mode 100644
index becbddc..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/css/ExportReport.gif
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/activityCriticalityMgrTableToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/activityCriticalityMgrTableToolbar.xhtml
index e4bd0a6..2beca1e 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/activityCriticalityMgrTableToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/activityCriticalityMgrTableToolbar.xhtml
@@ -26,7 +26,7 @@
 			<h:graphicImage
 				rendered="#{not filterToolbarItem.visible and not filterToolbarItem.neverVisible}"
 				style="border: none; padding-right: 10px;"
-				value="/plugins/common/images/t.gif" width="15px" height="15px" />
+				value="/plugins/views-common/images/t.gif" width="15px" height="15px" />
 		</ui:repeat>
 	</h:panelGroup>
 </f:view>
 \ No newline at end of file
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/activityCriticaliyMgrViewToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/activityCriticaliyMgrViewToolbar.xhtml
index aec5753..732ffe1 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/activityCriticaliyMgrViewToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/activityCriticaliyMgrViewToolbar.xhtml
@@ -11,7 +11,7 @@
 	            action="#{activityCriticalityManagerBean.update}" partialSubmit="true">
 			<pc:automationTag value="auto-BCC-CriticalityMgr-Toolbar-Refresh"
 				standAlone="false" />
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/completedActivitiesToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/completedActivitiesToolbar.xhtml
index 21f566a..c24bd8b 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/completedActivitiesToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/completedActivitiesToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{completedActivitiesBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-CompAct-ToolbarRefresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/costsandControllingToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/costsandControllingToolbar.xhtml
index 6128a28..6fae96a 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/costsandControllingToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/costsandControllingToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{costsBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-CostCtrl-ToolbarRefresh" standAlone="false"/>   
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/ganttChartViewToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/ganttChartViewToolbar.xhtml
index 1fa21cb..df21ebe 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/ganttChartViewToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/ganttChartViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{ganttChartSelectionBean.ganttChart.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-GanttChart-ToolbarRefresh" standAlone="false"/>    
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/pendingActivitiesToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/pendingActivitiesToolbar.xhtml
index 567658e..0e95ca9 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/pendingActivitiesToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/pendingActivitiesToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{openActivitiesBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-PendAct-ToolbarRefresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/performanceTeamleaderToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/performanceTeamleaderToolbar.xhtml
index 8b04ab6..d329af9 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/performanceTeamleaderToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/performanceTeamleaderToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{performanceTeamleader.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-PerfTeamLeader-ToolbarRefresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/postponedActivitiesToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/postponedActivitiesToolbar.xhtml
index f7b4b25..484b8e2 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/postponedActivitiesToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/postponedActivitiesToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{postponedActivities.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-PostponedAct-ToolbarRefresh" standAlone="false"/>   
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/priorityOverviewToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/priorityOverviewToolbar.xhtml
index d4a5a61..3d14aee 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/priorityOverviewToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/priorityOverviewToolbar.xhtml
@@ -11,7 +11,7 @@
 	            action="#{businessProcessManager.update}" partialSubmit="true">
 			<pc:automationTag value="auto-BCC-ProcMgr-Priority-ToolbarRefresh"
 				standAlone="false" />
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/processOverviewTableToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/processOverviewTableToolbar.xhtml
index 69ab6fa..97aa250 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/processOverviewTableToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/processOverviewTableToolbar.xhtml
@@ -26,7 +26,7 @@
 			<h:graphicImage
 				rendered="#{not filterToolbarItem.visible and not filterToolbarItem.neverVisible}"
 				style="border: none; padding-right: 10px;"
-				value="/plugins/common/images/t.gif" width="15px" height="15px" />
+				value="/plugins/views-common/images/t.gif" width="15px" height="15px" />
 		</ui:repeat>
 	</h:panelGroup>
 </f:view>
 \ No newline at end of file
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceAvailabilityViewToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceAvailabilityViewToolbar.xhtml
index 20f5804..c67e867 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceAvailabilityViewToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceAvailabilityViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{processResourceMgmtBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-ResAvailability-ToolbarRefresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceLoginViewToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceLoginViewToolbar.xhtml
index 2392279..5289d8e 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceLoginViewToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourceLoginViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{resourceLogin.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-ResLogin-ToolbarRefresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourcePerformanceViewToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourcePerformanceViewToolbar.xhtml
index c3fbaa3..1db81df 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourcePerformanceViewToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/resourcePerformanceViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{resourcePerformance.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-ResPerf-ToolbarRefresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/roleAssignmentViewToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/roleAssignmentViewToolbar.xhtml
index 791ba70..eafe31f 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/roleAssignmentViewToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/roleAssignmentViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{roleAssignment.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-RoleAssignment-ToolbarRefresh" standAlone="false"/>  
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/roleManagerDetailToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/roleManagerDetailToolbar.xhtml
index 22e8e7c..e5cbdce 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/roleManagerDetailToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/roleManagerDetailToolbar.xhtml
@@ -10,7 +10,7 @@
             action="#{roleManagerDetail.update}" partialSubmit="true">
 		<pc:automationTag value="auto-BCC-RoleMgrDet-ToolbarRefresh"
 			standAlone="false" />
-		<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+		<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 			styleClass="toolbar-button" />
 	</ice:commandLink>
 
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/strandedActivitiesToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/strandedActivitiesToolbar.xhtml
index 4a8aeca..585534d 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/strandedActivitiesToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/strandedActivitiesToolbar.xhtml
@@ -11,7 +11,7 @@
 	            action="#{strandedActivitiesBean.refreshActivityTable}" partialSubmit="true">
 			<pc:automationTag value="auto-BCC-StrandedAct-ToolbarRefresh"
 				standAlone="false" />
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/trafficLightViewToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/trafficLightViewToolbar.xhtml
index dc1f25b..5e640ff 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/trafficLightViewToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/trafficLightViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{trafficLightViewManagerBean.update}" partialSubmit="true">
 	        <pc:automationTag value="auto-BCC-TrafficLgt-ToolbarRefresh" standAlone="false" />    
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/userManagerDetailToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/userManagerDetailToolbar.xhtml
index a6b0de5..6b310bc 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/userManagerDetailToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/extensions/toolbar/userManagerDetailToolbar.xhtml
@@ -10,7 +10,7 @@
             action="#{userManagerDetail.update}" partialSubmit="true">
 		<pc:automationTag value="auto-BCC-UserMgrDet-ToolbarRefresh"
 			standAlone="false" />
-		<ice:graphicImage value="/plugins/business-control-center/images/icons/arrow_refresh.png"
+		<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 			styleClass="toolbar-button" />
 	</ice:commandLink>
 
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/cross.png b/business-control-center/src/main/resources/META-INF/xhtml/images/cross.png
deleted file mode 100644
index 1514d51..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/cross.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/arrow_refresh.png b/business-control-center/src/main/resources/META-INF/xhtml/images/icons/arrow_refresh.png
deleted file mode 100644
index 0de2656..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/arrow_refresh.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/document.gif b/business-control-center/src/main/resources/META-INF/xhtml/images/icons/document.gif
deleted file mode 100644
index 0214a11..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/document.gif
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/gear_find.png b/business-control-center/src/main/resources/META-INF/xhtml/images/icons/gear_find.png
deleted file mode 100644
index b19981d..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/gear_find.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/group_add.png b/business-control-center/src/main/resources/META-INF/xhtml/images/icons/group_add.png
deleted file mode 100644
index 06c5350..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/group_add.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/group_delete.png b/business-control-center/src/main/resources/META-INF/xhtml/images/icons/group_delete.png
deleted file mode 100644
index 4489ca2..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/group_delete.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/recover_process.png b/business-control-center/src/main/resources/META-INF/xhtml/images/icons/recover_process.png
deleted file mode 100644
index 4578cad..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/recover_process.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/save.gif b/business-control-center/src/main/resources/META-INF/xhtml/images/icons/save.gif
deleted file mode 100644
index 5cf8eea..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/save.gif
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/tick.png b/business-control-center/src/main/resources/META-INF/xhtml/images/tick.png
deleted file mode 100644
index a9925a0..0000000
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/tick.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/ganttChartColumns.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/ganttChartColumns.xhtml
index 203aae5..8896c8b 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/ganttChartColumns.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/ganttChartColumns.xhtml
@@ -15,11 +15,11 @@
 	<ice:panelGroup style="margin: 0px; padding: 0px; overflow: hidden;">
 
 		<ice:panelGroup rendered="#{col.columnName == 'Info'}">
-			<ice:graphicImage value="/plugins/common/images/icons/process-history/active/descriptor.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/process-history/descriptor.png"
 				title="#{row.progressStatus.descriptorText}" longdesc="#{row.progressStatus.descriptorText}" />
-			<ice:graphicImage value="/plugins/common/images/icons/process-history/active/notes-filled.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/mime-types/notes-filled.png"
 				title="#{row.progressStatus.noteText}" styleClass="#{row.progressStatus.noteIconStatus ? '' : 'iceCmdBtn-dis'}"/>
-			<ice:graphicImage value="/plugins/business-control-center/images/icons/active/complete.gif"
+			<ice:graphicImage value="/plugins/views-common/images/icons/diagram/complete.gif"
 				title="#{row.progressStatus.completeText}" rendered="#{row.progressStatus.completeIconStatus}"/>
 		</ice:panelGroup>
 
@@ -50,7 +50,7 @@
 					rendered="#{(ganttChartSelectionBean.ganttChart.showDependencyBar) and (row.progressStatus.dependencyWidth == 1)}">
 					<div
 						style="z-index: 6; top: 8px; #top: 6px; left: #{row.progressStatus.barLeft + row.progressStatus.barWidth - 5}px;">
-						<ice:graphicImage value="/plugins/business-control-center/images/kreis_trans.gif"
+						<ice:graphicImage value="/plugins/views-common/images/kreis_trans.gif"
 							width="#{row.progressStatus.dependencyWidth * 10}px"
 							height="10px" />
 					</div>
@@ -58,7 +58,7 @@
 						style="top: -#{row.progressStatus.dependencyHeight - 8}px; left: #{row.progressStatus.barLeft + row.progressStatus.barWidth}px; width: #{row.progressStatus.dependencyWidth}px; height: #{row.progressStatus.dependencyHeight}px;"></div>
 					<div
 						style="z-index: 6; top: -#{row.progressStatus.dependencyHeight - 8}px; #top: -#{row.progressStatus.dependencyHeight - 6}px; left: #{row.progressStatus.barLeft + row.progressStatus.barWidth - 5}px;">
-						<ice:graphicImage value="/plugins/business-control-center/images/kreis_trans.gif"
+						<ice:graphicImage value="/plugins/views-common/images/kreis_trans.gif"
 							width="#{row.progressStatus.dependencyWidth * 10}px"
 							height="10px" />
 					</div>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/processDiagramView.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/processDiagramView.xhtml
index 7ba2049..e898254 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/processDiagramView.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/processDiagramView.xhtml
@@ -12,7 +12,7 @@
 				<pc:automationTag value="auto-BCC-ProcDiagram-MoveProcUp"
 					standAlone="false" />
 				<h:graphicImage
-					value="#{ippBCCDiagramBean.rootProcess ? '/plugins/business-control-center/images/icons/active/upLight.gif' : '/plugins/business-control-center/images/icons/active/upGrey.gif'}"
+					value="#{ippBCCDiagramBean.rootProcess ? '/plugins/views-common/images/icons/diagram/upLight.gif' : '/plugins/views-common/images/icons/diagram/upGrey.gif'}"
 					style="border: none;"
 					title="#{ippBCCDiagramBean.messages['moveProcessUp.title']}" />
 			</ice:commandLink>
@@ -22,7 +22,7 @@
 				<pc:automationTag value="auto-BCC-ProcDiagram-MoveProcDown"
 					standAlone="false" />
 				<h:graphicImage
-					value="#{ippBCCDiagramBean.noSubProcessAvailable ? '/plugins/business-control-center/images/icons/active/downLight.gif' : '/plugins/business-control-center/images/icons/active/downGrey.gif'}"
+					value="#{ippBCCDiagramBean.noSubProcessAvailable ? '/plugins/views-common/images/icons/diagram/downLight.gif' : '/plugins/views-common/images/icons/diagram/downGrey.gif'}"
 					style="border: none;"
 					title="#{ippBCCDiagramBean.messages['moveProcessDown.title']}" />
 			</ice:commandLink>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml
index 9886e42..d894386 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchView.xhtml
@@ -342,7 +342,7 @@
 									<h:graphicImage
 										rendered="#{not activityFilterItem.visible and not activityFilterItem.neverVisible}"
 										style="border: none; padding-right: 10px;"
-										value="/plugins/common/images/t.gif" width="15px" height="15px" />
+										value="/plugins/views-common/images/t.gif" width="15px" height="15px" />
 								</ui:repeat>
 							</ice:panelGroup>
 							<ice:panelGroup style="clear: both; height:3px;"/>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchViewColumns.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchViewColumns.xhtml
index 01cb11c..7d142d1 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchViewColumns.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/processSearchViewColumns.xhtml
@@ -23,7 +23,7 @@
 	                <f:param name="viewParams" value="processInstanceOId=#{row.processInstanceOID}" />
 				</ice:commandLink>
 				<ice:commandLink action="#{ippPortalApp.openView}">
-					<h:graphicImage value="/plugins/business-control-center/images/icons/gantt_diagram.gif"
+					<h:graphicImage value="/plugins/views-common/images/icons/diagram/gantt_diagram.gif"
 						style="border: none;" title="#{processSearchBean.messages['tooltip.viewGanttChart']}" />
 					<f:param name="viewId" value="ganttChartView" />
 					<f:param name="nested" value="true" />
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/roleAssignmentViewColumns.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/roleAssignmentViewColumns.xhtml
index bb1c995..c370643 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/roleAssignmentViewColumns.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/roleAssignmentViewColumns.xhtml
@@ -32,10 +32,10 @@
 
 				<c:otherwise>
 					<h:graphicImage
-						value="/plugins/business-control-center/images/tick.png"
+						value="/plugins/views-common/images/icons/tick.png"
 						style="border: none;" rendered="#{row.userInRole}" />
 					<h:graphicImage
-						value="/plugins/business-control-center/images/cross.png"
+						value="/plugins/views-common/images/icons/cross.png"
 						style="border: none;" rendered="#{not row.userInRole}" />
 				</c:otherwise>
 			</c:choose>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/roleManagerDetailViewAssignableUserToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/roleManagerDetailViewAssignableUserToolbar.xhtml
index cdb6fd6..4814dfb 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/roleManagerDetailViewAssignableUserToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/roleManagerDetailViewAssignableUserToolbar.xhtml
@@ -13,7 +13,7 @@
 			action="#{roleManagerDetail.addUserToRole}">
 			<pc:automationTag value="auto-BCC-RoleMgrDet-AssignableUserTbl-ToolbarAdd" standAlone="false"/>
 			<h:graphicImage
-				value="/plugins/business-control-center/images/icons/group_add.png"
+				value="/plugins/views-common/images/icons/group_add.png"
 				style="border: none;"
 				styleClass="#{(roleManagerDetail.addUser > 0) and (roleManagerDetail.roleModifiable)
 							? '' : 'iceCmdBtn-dis'}"
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/roleManagerDetailViewAssignedUserToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/roleManagerDetailViewAssignedUserToolbar.xhtml
index 0a612cf..0f3bcd4 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/roleManagerDetailViewAssignedUserToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/roleManagerDetailViewAssignedUserToolbar.xhtml
@@ -14,7 +14,7 @@
 			<pc:automationTag
 				value="auto-BCC-RoleMgrDet-AssignedUserTbl-ToolbarRemove" standAlone="false" />
 			<h:graphicImage
-				value="/plugins/business-control-center/images/icons/group_delete.png"
+				value="/plugins/views-common/images/icons/group_delete.png"
 				style="border: none;"
 				styleClass="#{(roleManagerDetail.removeUser > 0) and (roleManagerDetail.roleModifiable) 
 							? '' : 'iceCmdBtn-dis'}"
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/thresholdState.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/thresholdState.xhtml
index 8bd55dd..b00d895 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/thresholdState.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/thresholdState.xhtml
@@ -8,15 +8,15 @@
 	
 	
 	<h:graphicImage title="#{messages_bcc['views.trafficLightView.critical']}" rendered="#{thresholdState eq 1}"
-		style="border: none;" value="/plugins/business-control-center/images/icons/traffic_light_red.png"
+		style="border: none;" value="/plugins/views-common/images/icons/traffic-light/traffic_light_red.png"
 		width="10px" height="10px" />	
 	
 	<h:graphicImage title="#{messages_bcc['views.trafficLightView.warning']}" rendered="#{thresholdState eq 2}"
-		style="border: none;" value="/plugins/business-control-center/images/icons/traffic_light_yellow.png"
+		style="border: none;" value="/plugins/views-common/images/icons/traffic-light/traffic_light_yellow.png"
 		width="10px" height="10px" />
 	
 	<h:graphicImage title="#{messages_bcc['views.trafficLightView.normal']}" rendered="#{thresholdState eq 3}"
-		style="border: none;" value="/plugins/business-control-center/images/icons/traffic_light_green.png"
+		style="border: none;" value="/plugins/views-common/images/icons/traffic-light/traffic_light_green.png"
 		width="10px" height="10px" />
 	
 </f:view>	
 \ No newline at end of file
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/trafficLightCompletedActivityToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/trafficLightCompletedActivityToolbar.xhtml
index 155daab..291cb35 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/trafficLightCompletedActivityToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/trafficLightCompletedActivityToolbar.xhtml
@@ -18,14 +18,14 @@
 		</ice:commandLink>
 		<ice:commandLink actionListener="#{trafficLightViewManagerBean.passedActivityHelper.openDelegateDialog}" disabled="#{trafficLightViewManagerBean.passedActivityHelper.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-BCC-TrafficLgt-CompActTbl-ToolbarDelegate" standAlone="false"/>
-			<h:graphicImage value="/plugins/common/images/icons/process-history/active/delegate.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/process-history/delegate.png"
 				style="border: none;" styleClass="#{trafficLightViewManagerBean.passedActivityHelper.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
 				title="#{views_common_msgPropsBean['common.tooltip.delegate']}"/>
 		</ice:commandLink>
 		<ice:commandLink actionListener="#{trafficLightViewManagerBean.passedActivityHelper.openAbortDialog}" disabled="#{trafficLightViewManagerBean.passedActivityHelper.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-BCC-TrafficLgt-CompActTbl-ToolbarAbort" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/common/images/icons/process-history/active/abort.png"
+				url="/plugins/views-common/images/icons/cross.png"
                    style="border:none;" styleClass="#{trafficLightViewManagerBean.passedActivityHelper.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}" 
                    title="#{views_common_msgPropsBean['common.tooltip.abort']}"/>
 		</ice:commandLink>
@@ -49,7 +49,7 @@
 			disabled="#{!trafficLightViewManagerBean.passedActivityHelper.priorityChanged}">
 			<pc:automationTag value="auto-BCC-TrafficLgt-CompActTbl-ToolbarSave" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/business-control-center/images/icons/save_flag.png"
+				url="/plugins/views-common/images/icons/save_flag.png"
                    style="border:none;" styleClass="#{!trafficLightViewManagerBean.passedActivityHelper.priorityChanged ? 'iceCmdBtn-dis' : ''}"
                    title="#{views_common_msgPropsBean['common.tooltip.savePriorityChanges']}"/>
 		</ice:commandLink>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/trafficLightPendingActivityToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/trafficLightPendingActivityToolbar.xhtml
index 8d00767..ce182e4 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/trafficLightPendingActivityToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/trafficLightPendingActivityToolbar.xhtml
@@ -18,14 +18,14 @@
 		</ice:commandLink>
 		<ice:commandLink actionListener="#{trafficLightViewManagerBean.notPassedActivityHelper.openDelegateDialog}" disabled="#{trafficLightViewManagerBean.notPassedActivityHelper.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-BCC-TrafficLgt-PendActTbl-ToolbarDelegate" standAlone="false"/>
-			<h:graphicImage value="/plugins/common/images/icons/process-history/active/delegate.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/process-history/delegate.png"
 				style="border: none;" styleClass="#{trafficLightViewManagerBean.notPassedActivityHelper.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
 				title="#{views_common_msgPropsBean['common.tooltip.delegate']}"/>
 		</ice:commandLink>
 		<ice:commandLink actionListener="#{trafficLightViewManagerBean.notPassedActivityHelper.openAbortDialog}" disabled="#{trafficLightViewManagerBean.notPassedActivityHelper.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-BCC-TrafficLgt-PendActTbl-ToolbarAbort" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/common/images/icons/process-history/active/abort.png"
+				url="/plugins/views-common/images/icons/cross.png"
                    style="border:none;" styleClass="#{trafficLightViewManagerBean.notPassedActivityHelper.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}" 
                    title="#{views_common_msgPropsBean['common.tooltip.abort']}"/>
 		</ice:commandLink>
@@ -49,7 +49,7 @@
 			disabled="#{!trafficLightViewManagerBean.notPassedActivityHelper.priorityChanged}">
 			<pc:automationTag value="auto-BCC-TrafficLgt-PendActTbl-ToolbarSave" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/business-control-center/images/icons/save_flag.png"
+				url="/plugins/views-common/images/icons/save_flag.png"
                    style="border:none;" styleClass="#{!trafficLightViewManagerBean.notPassedActivityHelper.priorityChanged ? 'iceCmdBtn-dis' : ''}"
                    title="#{views_common_msgPropsBean['common.tooltip.savePriorityChanges']}"/>
 		</ice:commandLink>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/userManagerDetailViewAssignableRolesToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/userManagerDetailViewAssignableRolesToolbar.xhtml
index 8116d3e..81f21bb 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/userManagerDetailViewAssignableRolesToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/userManagerDetailViewAssignableRolesToolbar.xhtml
@@ -12,7 +12,7 @@
 			action="#{userManagerDetail.addRoleToUser}">
 			<pc:automationTag value="auto-BCC-UserMgrDet-RoleAssignableTbl-ToolbarAdd" standAlone="false"/>
 			<h:graphicImage
-				value="/plugins/business-control-center/images/icons/group_add.png"
+				value="/plugins/views-common/images/icons/group_add.png"
 				style="border: none;"
 				styleClass="#{(userManagerDetail.assignableRolesTableSelectedCount > 0) and (userManagerDetail.manageAuthorization) ? '' : 'iceCmdBtn-dis'}"
 				title="#{userManagerDetail.messages['button.addRoleToUser']}" />
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/userManagerDetailViewAssignedRolesToolbar.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/userManagerDetailViewAssignedRolesToolbar.xhtml
index 9f53940..38bdf80 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/userManagerDetailViewAssignedRolesToolbar.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/userManagerDetailViewAssignedRolesToolbar.xhtml
@@ -12,7 +12,7 @@
 			action="#{userManagerDetail.removeRoleFromUser}">
 			<pc:automationTag value="auto-BCC-UserMgrDet-RoleAssignedTbl-ToolbarRem" standAlone="false"/>
 			<h:graphicImage
-				value="/plugins/business-control-center/images/icons/group_delete.png"
+				value="/plugins/views-common/images/icons/group_delete.png"
 				style="border: none;"
 				styleClass="#{(userManagerDetail.assignedRolesTableSelectedCount > 0) and (userManagerDetail.manageAuthorization) ? '' : 'iceCmdBtn-dis'}"
 				title="#{userManagerDetail.messages['button.removeRoleFromUser']}" />
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/Tab_MidMid_bullet.gif b/portal-common/src/main/resources/META-INF/xhtml/css/css-images/Tab_MidMid_bullet.gif
deleted file mode 100644
index 9a2e3a9..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/Tab_MidMid_bullet.gif
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/footer-BG.jpg b/portal-common/src/main/resources/META-INF/xhtml/css/css-images/footer-BG.jpg
deleted file mode 100644
index 8f7f0bb..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/footer-BG.jpg
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/footer_bg.png b/portal-common/src/main/resources/META-INF/xhtml/css/css-images/footer_bg.png
deleted file mode 100644
index e1b006c..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/footer_bg.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/login-shadow.png b/portal-common/src/main/resources/META-INF/xhtml/css/css-images/login-shadow.png
deleted file mode 100644
index 6fa614f..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/login-shadow.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/nav_main_selected.png b/portal-common/src/main/resources/META-INF/xhtml/css/css-images/nav_main_selected.png
deleted file mode 100644
index b244b12..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/nav_main_selected.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/toolbar-BG.jpg b/portal-common/src/main/resources/META-INF/xhtml/css/css-images/toolbar-BG.jpg
deleted file mode 100644
index ab37710..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/css/css-images/toolbar-BG.jpg
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/rime-override.css b/portal-common/src/main/resources/META-INF/xhtml/css/rime-override.css
index de8b7d3..b2ccc97 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/css/rime-override.css
+++ b/portal-common/src/main/resources/META-INF/xhtml/css/rime-override.css
@@ -11,7 +11,7 @@
 }
 
 .iceMnuBarItem a:hover, .iceMnuBarVrtItem a:hover {
-    background-image: url( "./css-images/nav_main_selected.png" );
+    background-image: url( "./css-images/bottom_menu_bg.png" );
 }
 
 /* Styles for ice:panelTabSet */
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/rime.css b/portal-common/src/main/resources/META-INF/xhtml/css/rime.css
index 3fc20e9..a9466f9 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/css/rime.css
+++ b/portal-common/src/main/resources/META-INF/xhtml/css/rime.css
@@ -645,7 +645,7 @@ table.iceSelInpDate tbody tr td table{
 }
 
 .icePnlTbOn .MidMid a, .icePnlTbOn .MidMid div.ptfd {
-    background: url( './css-images/Tab_MidMid_bullet.gif' ) no-repeat top left;
+    background: url( './css-images/PnlHdr_down.gif' ) no-repeat top left;
     border: none;
     padding: 4px 8px 5px 28px;
     margin: 3px;
@@ -1006,7 +1006,7 @@ table.iceSelInpDate tbody tr td table{
 }
 
 .icePnlTbOnBtm .MidMid a, .icePnlTbOnBtm .MidMid div.ptfd{
-    background: url( './css-images/Tab_MidMid_bullet.gif' ) no-repeat top left;
+    background: url( './css-images/PnlHdr_down.gif' ) no-repeat top left;
     border: none;
     padding: 3px 8px 2px 28px;
     margin: 3px;
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/pinView-horizontal-close.png b/portal-common/src/main/resources/META-INF/xhtml/images/application_home.png
index b60d0c8..b60d0c8 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/images/pinView-horizontal-close.png
+++ b/portal-common/src/main/resources/META-INF/xhtml/images/application_home.png
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/arrow-down.png b/portal-common/src/main/resources/META-INF/xhtml/images/arrow-down.png
deleted file mode 100644
index bf93d15..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/arrow-down.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/arrow_refresh.png b/portal-common/src/main/resources/META-INF/xhtml/images/arrow_refresh.png
deleted file mode 100644
index 0de2656..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/arrow_refresh.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-error.jpg b/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-error.jpg
deleted file mode 100644
index 35fb9ca..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-error.jpg
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-info.jpg b/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-info.jpg
deleted file mode 100644
index c1fa53c..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-info.jpg
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-warning.jpg b/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-warning.jpg
deleted file mode 100644
index 913cdb7..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/dialogIcon-warning.jpg
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/arrow_refresh.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/arrow_refresh.png
index 0de2656..0de2656 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/arrow_refresh.png
+++ b/portal-common/src/main/resources/META-INF/xhtml/images/icons/arrow_refresh.png
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/panel-collapse.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/panel-collapse.png
deleted file mode 100644
index 5518d10..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/panel-collapse.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/panel-expand.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/panel-expand.png
deleted file mode 100644
index bc0e52c..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/panel-expand.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/abort.gif b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/abort.gif
deleted file mode 100644
index 9b78c4a..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/abort.gif
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/abort.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/abort.png
deleted file mode 100644
index 1514d51..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/abort.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity.png
deleted file mode 100644
index ca3eebb..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_application.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_application.png
deleted file mode 100644
index 4ab4973..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_application.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_auxiliary.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_auxiliary.png
deleted file mode 100644
index 989c740..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_auxiliary.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_completed.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_completed.png
deleted file mode 100644
index bbadf6c..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_completed.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_manual.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_manual.png
deleted file mode 100644
index 3c8c7fa..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_manual.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_state.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_state.png
deleted file mode 100644
index 1b63f9a..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/activity_state.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/delegate.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/delegate.png
deleted file mode 100644
index 0c48afa..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/delegate.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/descriptor.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/descriptor.png
deleted file mode 100644
index 3fc3073..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/descriptor.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/document.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/document.png
deleted file mode 100644
index 813f712..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/document.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/envelope.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/envelope.png
deleted file mode 100644
index 841e73a..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/envelope.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/exception.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/exception.png
deleted file mode 100644
index df5a7d7..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/exception.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/notes-filled.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/notes-filled.png
deleted file mode 100644
index 362a168..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/notes-filled.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/process.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/process.png
deleted file mode 100644
index 6f6553b..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/process.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/process_auxiliary.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/process_auxiliary.png
deleted file mode 100644
index 3371c22..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/process_auxiliary.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/processrootblue.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/processrootblue.png
deleted file mode 100644
index 83c034c..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/processrootblue.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/abort.gif b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/abort.gif
deleted file mode 100644
index 4777501..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/abort.gif
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_application.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_application.png
deleted file mode 100644
index ab47934..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_application.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_auxiliary.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_auxiliary.png
deleted file mode 100644
index 71d635d..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_auxiliary.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_completed.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_completed.png
deleted file mode 100644
index b74a1bc..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_completed.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_manual.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_manual.png
deleted file mode 100644
index f47be45..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_manual.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_state.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_state.png
deleted file mode 100644
index 904e85a..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/activity_state.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/delegate.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/delegate.png
deleted file mode 100644
index 5d14309..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/delegate.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/descriptor.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/descriptor.png
deleted file mode 100644
index dcfd4b8..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/descriptor.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/document.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/document.png
deleted file mode 100644
index 813f712..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/document.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/document_set.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/document_set.png
deleted file mode 100644
index 44084ad..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/document_set.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/envelope.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/envelope.png
deleted file mode 100644
index 841e73a..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/envelope.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/exception.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/exception.png
deleted file mode 100644
index e717a40..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/exception.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/notes-filled.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/notes-filled.png
deleted file mode 100644
index b0d8dfa..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/notes-filled.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/process.png b/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/process.png
deleted file mode 100644
index 6f6553b..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/disabled/process.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/launchPanel_refresh.png b/portal-common/src/main/resources/META-INF/xhtml/images/launchPanel_refresh.png
deleted file mode 100644
index 0de2656..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/launchPanel_refresh.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/pane-collapse.png b/portal-common/src/main/resources/META-INF/xhtml/images/pane-collapse.png
deleted file mode 100644
index 0e81629..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/pane-collapse.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/pinView-vertical-close.png b/portal-common/src/main/resources/META-INF/xhtml/images/pinView-vertical-close.png
deleted file mode 100644
index b60d0c8..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/pinView-vertical-close.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/tab-bttn-close.png b/portal-common/src/main/resources/META-INF/xhtml/images/tab-bttn-close.png
deleted file mode 100644
index c3aca92..0000000
--- a/portal-common/src/main/resources/META-INF/xhtml/images/tab-bttn-close.png
+++ b/dev/null
diff --git a/portal-common/src/main/resources/META-INF/xhtml/portalAlerts.xhtml b/portal-common/src/main/resources/META-INF/xhtml/portalAlerts.xhtml
index 3df6f1a..b3ca210 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/portalAlerts.xhtml
+++ b/portal-common/src/main/resources/META-INF/xhtml/portalAlerts.xhtml
@@ -20,7 +20,7 @@
 		</ice:commandLink>
 		<ice:commandLink action="#{ippAlertManager.toggleAlertsPanel}" styleClass="portalAlertsLink">
 			<ice:graphicImage style="margin-left: 4px;"
-				value="/plugins/common/images/arrow-down.png" />
+				value="/plugins/common/images/panelHeader-triggerCollapse.png" />
 		</ice:commandLink>
 	</ice:panelGroup>
 	
diff --git a/portal-common/src/main/resources/META-INF/xhtml/portalTabDisplayMode.xhtml b/portal-common/src/main/resources/META-INF/xhtml/portalTabDisplayMode.xhtml
index d614252..fc0c6d7 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/portalTabDisplayMode.xhtml
+++ b/portal-common/src/main/resources/META-INF/xhtml/portalTabDisplayMode.xhtml
@@ -62,7 +62,7 @@
 									<ice:commandLink action="#{ippPortalApp.closeView}" immediate="false"
 										styleClass="toolbar-button viewCloseLink">
 										<f:param name="identityUrl" value="#{tab.identityUrl}" />
-										<ice:graphicImage value="/plugins/common/images/tab-bttn-close.png"
+										<ice:graphicImage value="/plugins/common/images/dialog-windowbttn-close.png"
 											style="border: none;" 
 											title="#{common_msgPropsBean['portalFramework.view.close']}"/>
 									</ice:commandLink>
diff --git a/portal-common/src/main/resources/META-INF/xhtml/portalToolbar.xhtml b/portal-common/src/main/resources/META-INF/xhtml/portalToolbar.xhtml
index 3095c10..1e01db4 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/portalToolbar.xhtml
+++ b/portal-common/src/main/resources/META-INF/xhtml/portalToolbar.xhtml
@@ -67,11 +67,11 @@
 							<ice:commandLink action="#{ippPortalApp.restorePinView}">
 								<pc:automationTag value="auto-FW-RestorePin" standAlone="false" />
 								<ice:graphicImage rendered="#{ippPortalApp.pinViewOrientation eq 'horizontal'}"
-									url="/plugins/common/images/pinView-horizontal-close.png"
+									url="/plugins/common/images/application_home.png"
 									styleClass="toolbar-button" 
 				                    title="#{common_msgPropsBean['portalFramework.toolbar.view.closePinViewHorizontal']}"/>
 								<ice:graphicImage rendered="#{ippPortalApp.pinViewOrientation eq 'vertical'}"
-									url="/plugins/common/images/pinView-vertical-close.png"
+									url="/plugins/common/images/application_home.png"
 									styleClass="toolbar-button"
 				                    title="#{common_msgPropsBean['portalFramework.toolbar.view.closePinViewVertical']}"/>
 							</ice:commandLink>
diff --git a/portal-common/src/main/resources/META-INF/xhtml/templates/launchPanelTemplate.xhtml b/portal-common/src/main/resources/META-INF/xhtml/templates/launchPanelTemplate.xhtml
index caf72ed..fb7cd84 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/templates/launchPanelTemplate.xhtml
+++ b/portal-common/src/main/resources/META-INF/xhtml/templates/launchPanelTemplate.xhtml
@@ -48,7 +48,7 @@
 			</ice:commandLink>
 			  <ice:commandLink title="#{messages_bcc['views.common.refresh']}" 
 		            action="#{bean.update}" partialSubmit="true" rendered="#{bean.expanded}">
-				<ice:graphicImage value="/plugins/common/images/launchPanel_refresh.png"/>
+				<ice:graphicImage value="/plugins/common/images/icons/arrow_refresh.png"/>
 			</ice:commandLink> 
 		</ice:panelGrid>
 
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/Resources.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/Resources.java
index 5a14f1b..e09e940 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/Resources.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/Resources.java
@@ -19,7 +19,7 @@ package org.eclipse.stardust.ui.web.processportal.common;
 public final class Resources
 {
 
-   private static final String BASE_PATH = "/plugins/processportal/images/icons/";
+   private static final String BASE_PATH = "/plugins/views-common/images/icons/";
    
    public static final String VIEW_NOTES_COLUMNS = "/plugins/processportal/notesTableColumns.xhtml";
    public static final String VIEW_WORKLIST_COLUMNS = "/plugins/processportal/worklistViewColumns.xhtml";
@@ -29,7 +29,7 @@ public final class Resources
 
       public static final String getOrganization()
       {
-         return BASE_PATH + "organization.png";
+         return BASE_PATH + "chart_organisation.png";
       }
 
       public static final String getRole()
@@ -39,7 +39,7 @@ public final class Resources
 
       public static final String getScopedOrganization()
       {
-         return BASE_PATH + "department.png";
+         return BASE_PATH + "group_link.png";
       }
 
       public static final String getScopedRole()
@@ -54,7 +54,7 @@ public final class Resources
 
       public static final String getUserGroup()
       {
-         return BASE_PATH + "user-group.png";
+         return BASE_PATH + "group.png";
       }
 
       public static final String getAssemblyLine()
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/NotesBean.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/NotesBean.java
index ce67b25..3fe97fa 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/NotesBean.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/NotesBean.java
@@ -145,9 +145,9 @@ public class NotesBean extends UIComponentBean implements IUserObjectBuilder<Not
       List<Note> noteList = attributes.getNotes();
       setNotes(noteList);
       if (noteList != null && noteList.size() > 0)
-        thisView.setIcon("/plugins/processportal/images/icons/notes-filled.png");
+        thisView.setIcon("/plugins/views-common/images/icons/mime-types/notes-filled.png");
       else
-         thisView.setIcon("/plugins/processportal/images/icons/notes-blank.png");
+         thisView.setIcon("/plugins/views-common/images/icons/notes-blank.png");
 
       Date noteTimestamp = (Date) getParamValue("noteTimestamp");
       Integer noteIndex = (Integer) getParamValue("noteIndex");
diff --git a/process-portal/src/main/resources/META-INF/spring/processPortalUi-context.xml b/process-portal/src/main/resources/META-INF/spring/processPortalUi-context.xml
index 8ebca4c..f08ada9 100644
--- a/process-portal/src/main/resources/META-INF/spring/processPortalUi-context.xml
+++ b/process-portal/src/main/resources/META-INF/spring/processPortalUi-context.xml
@@ -62,7 +62,7 @@ http://infinity.com/bpm/portal/common/uiDefinition http://infinity.com/bpm/porta
 			
 		<ippui:view name="worklistPanel" include="/plugins/processportal/worklistPanel.xhtml" controller="worklistTableBean">
 			<ippui:preferences>
-				<ippui:preferencePage name="icon" include="/plugins/processportal/images/icons/clipboard-task.png" />
+				<ippui:preferencePage name="icon" include="/plugins/views-common/images/icons/clipboard-task.png" />
 				<ippui:preferencePage name="configuration"
 					include="/plugins/processportal/worklistPanelConfiguration.xhtml" />
 			</ippui:preferences>
@@ -71,7 +71,7 @@ http://infinity.com/bpm/portal/common/uiDefinition http://infinity.com/bpm/porta
 		<ippui:view name="activityPanel" include="/plugins/processportal/activityPanel.xhtml"
             controller="activityDetailsBean">
 			<ippui:preferences>
-				<ippui:preferencePage name="icon" include="/plugins/processportal/images/icons/activity.png" />
+				<ippui:preferencePage name="icon" include="/plugins/views-common/images/icons/process-history/activity.png" />
 				<ippui:preferencePage name="configuration" include="/plugins/processportal/activityPanelConfiguration.xhtml" />
 			</ippui:preferences>
 		</ippui:view>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/add.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/add.png
deleted file mode 100644
index 6332fef..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/add.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/delete.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/delete.png
deleted file mode 100644
index 08f2493..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/delete.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/abort-disabled.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/abort-disabled.png
deleted file mode 100644
index a038cd6..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/abort-disabled.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/abort.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/abort.png
deleted file mode 100644
index 1514d51..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/abort.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/activity.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/activity.png
deleted file mode 100644
index ca3eebb..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/activity.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/activity_completed.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/activity_completed.png
deleted file mode 100644
index bbadf6c..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/activity_completed.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/complete-disabled.gif b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/complete-disabled.gif
deleted file mode 100644
index 185c686..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/complete-disabled.gif
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/delegate-disabled.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/delegate-disabled.png
deleted file mode 100644
index 5d14309..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/delegate-disabled.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/delegate.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/delegate.png
deleted file mode 100644
index 0c48afa..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/delegate.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/department.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/department.png
deleted file mode 100644
index c77ed88..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/department.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_add.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_add.png
deleted file mode 100644
index aa23dde..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_add.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_up.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_up.png
deleted file mode 100644
index e4a1ecb..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_up.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/note-add.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/note-add.png
deleted file mode 100644
index abdad91..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/note-add.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-filled.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-filled.png
deleted file mode 100644
index 362a168..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-filled.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/organization.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/organization.png
deleted file mode 100644
index c32d25c..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/organization.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/priority-normal.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/priority-normal.png
deleted file mode 100644
index 044f317..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/priority-normal.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/process-history.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/process-history.png
deleted file mode 100644
index e491d0f..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/process-history.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/process.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/process.png
deleted file mode 100644
index 6f6553b..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/process.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/role.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/role.png
deleted file mode 100644
index 4531b19..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/role.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/role_scoped.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/role_scoped.png
deleted file mode 100644
index 54824f9..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/role_scoped.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/save-disabled.gif b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/save-disabled.gif
deleted file mode 100644
index 5cf8eea..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/save-disabled.gif
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/save.gif b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/save.gif
deleted file mode 100644
index 5cf8eea..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/save.gif
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/search.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/search.png
deleted file mode 100644
index e3c9ef7..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/search.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/user-group.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/user-group.png
deleted file mode 100644
index 7fb4e1f..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/user-group.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/user.png b/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/user.png
deleted file mode 100644
index 79f35cc..0000000
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/user.png
+++ b/dev/null
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/activitySearch.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/activitySearch.xhtml
index c459667..0247f2f 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/activitySearch.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/activitySearch.xhtml
@@ -65,7 +65,7 @@
 						<pc:automationTag value="auto-PP-LP-UserWorklist-SrchBtn"/>
 						<ice:panelGrid columns="2">
 							<ice:graphicImage style="margin-left:4px;"
-								value="/plugins/processportal/images/icons/search.png" />
+								value="/plugins/views-common/images/icons/search.png" />
 							<ice:outputText styleClass="action-link" style="margin-left:4px;"
 								value="#{activitySearchPanel.messages['search']}" />
 						</ice:panelGrid>
@@ -75,7 +75,7 @@
 						<pc:automationTag value="auto-PP-LP-UserWorklist-ClearBtn"/>
 						<ice:panelGrid columns="2">
 							<ice:graphicImage style="margin-left:4px;margin-top:2px;"
-								value="/plugins/common/images/icons/close-panel.gif" />
+								value="/plugins/views-common/images/icons/dialog-close-button.gif" />
 							<ice:outputText styleClass="action-link" style="margin-left:4px;"
 								value="#{activitySearchPanel.messages['clear']}" />
 						</ice:panelGrid>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml
index 2cc580a..6859018 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/myProcesses.xhtml
@@ -24,7 +24,7 @@
 			<ice:panelSeries var="item" value="#{myProcessesPanel.items}">
 				<ice:panelGrid columns="3">
 					<ice:graphicImage
-						value="/plugins/processportal/images/icons/process.png" />
+						value="/plugins/views-common/images/icons/process.png" />
 					<ice:panelGroup style="display:inline;" panelTooltip="procToolTip">
 						<ice:outputText value="#{item.name}:" />
 					</ice:panelGroup>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml
index c8d28d3..b4bf54a 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/launchpad/processes.xhtml
@@ -24,7 +24,7 @@
 			<ice:panelSeries var="item" value="#{startableProcessBean.items}">
 				<ice:panelGrid columns="2">
 					<ice:graphicImage
-						value="/plugins/processportal/images/icons/process.png"  />
+						value="/plugins/views-common/images/icons/process.png"  />
 					<ice:panelGroup style="display:inline;" panelTooltip="procToolTip">
 						<ice:commandLink value="#{item.name}" styleClass="action-link"
 							action="#{item.selectAction}">
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/notesTableColumns.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/notesTableColumns.xhtml
index 9146f02..9a9f980 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/notesTableColumns.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/notesTableColumns.xhtml
@@ -23,7 +23,7 @@
 				<f:attribute name="noteTimestamp" value="#{row.created}" />
 				<ice:panelGrid columns="2">
 					<ice:graphicImage
-						value="/plugins/processportal/images/icons/notes-filled.png" />
+						value="/plugins/views-common/images/icons/mime-types/notes-filled.png" />
 					<ice:outputText value="#{row.notePreview}" />
 				</ice:panelGrid>
 			</ice:commandLink>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
index 9392a74..1d36d31 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
@@ -51,7 +51,7 @@
 						<pc:automationTag value="auto-PP-NotesView-ActionsNew"/>
 					<f:param name="createNote" value="true" />
 						<ice:panelGrid columns="2">
-							<ice:graphicImage value="/plugins/processportal/images/icons/note-add.png" />
+							<ice:graphicImage value="/plugins/views-common/images/icons/note-add.png" />
 							<ice:outputText style="white-space: nowrap;"
 								value="#{processportal_msgPropsBean['toolbars.workflowActions.create.new.note']}" />
 						</ice:panelGrid>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesTableToolbar.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesTableToolbar.xhtml
index de81615..6ef24bb 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesTableToolbar.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesTableToolbar.xhtml
@@ -9,7 +9,7 @@
 	<ice:panelGrid style="text-align: left;margin-right:-3px;">
 		<ice:commandButton disabled="#{processportal_NotesBean.editMode}"
 			action="#{processportal_NotesBean.addNote}"
-			image="/plugins/processportal/images/icons/note-add.png"
+			image="/plugins/views-common/images/icons/note-add.png"
 			title="#{processportal_NotesBean.messages['button.addNote']}"
 			style="vertical-align:middle;padding:0px;" >
 			<pc:automationTag value="auto-PP-NotesView-AddNote" standAlone="false"/>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml
index 8c5c6d0..a8be9e7 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml
@@ -50,7 +50,7 @@
 						action="#{ippActivityPanelController.uploadDocument}">
 						<pc:automationTag value="auto-PP-ProcAttachDlg-ToolbarUpload" />
 						<ice:panelGrid columns="2">
-							<ice:graphicImage value="/plugins/processportal/images/icons/document_up.png" />
+							<ice:graphicImage value="/plugins/views-common/images/icons/page_white_get.png" />
 							<ice:outputText style="white-space: nowrap;"
 								value="#{processportal_msgPropsBean['toolbars.workflowActions.upload.document']}" />
 						</ice:panelGrid>
@@ -61,7 +61,7 @@
 						<f:param name="folderId"
 							value="#{ippActivityPanelController.processAttachmentsFolderId}" />
 						<ice:panelGrid columns="2">
-							<ice:graphicImage value="/plugins/processportal/images/icons/document_add.png" />
+							<ice:graphicImage value="/plugins/views-common/images/icons/page_white_add.png" />
 							<ice:outputText style="white-space: nowrap;"
 								value="#{processportal_msgPropsBean['toolbars.workflowActions.create.new.file']}" />
 						</ice:panelGrid>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
index 0f52126..2993d6b 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
@@ -29,12 +29,12 @@
 					standAlone="false" />
 				<ice:graphicImage
 					rendered="#{activityDetailsBean.assemblyLinePushService}"
-					value="/plugins/processportal/images/icons/lightning_delete.png"
+					value="/plugins/views-common/images/icons/lightning_delete.png"
 					styleClass="toolbar-button"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.disableAssemblyLineFeedIn']}" />
 				<ice:graphicImage
 					rendered="#{not activityDetailsBean.assemblyLinePushService}"
-					value="/plugins/processportal/images/icons/lightning.png"
+					value="/plugins/views-common/images/icons/lightning.png"
 					styleClass="toolbar-button"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.enableAssemblyLineFeedIn']}" />
 			</ice:commandLink>
@@ -59,7 +59,7 @@
 				action="#{activityDetailsBean.completeQualityAssurancePass}">
 				<pc:automationTag value="auto-PP-ActivityPnl-Toolbar-QAPass" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/QA_Pass.png"
+					value="/plugins/views-common/images/icons/tick-octagon.png"
 					styleClass="toolbar-button"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.qaPass']}" />
 			</ice:commandLink>
@@ -68,7 +68,7 @@
 				action="#{activityDetailsBean.completeQualityAssuranceFail}">
 				<pc:automationTag value="auto-PP-ActivityPnl-Toolbar-QAFail" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/QA_Fail.png"
+					value="/plugins/views-common/images/icons/cross-octagon-frame.png"
 					styleClass="toolbar-button"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.qaFail']}" />
 			</ice:commandLink>
@@ -77,7 +77,7 @@
 				actionListener="#{activityDetailsBean.completeAction}">
 				<pc:automationTag value="auto-PP-ActivityPnl-ToolbarComplete" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/activity_completed.png"
+					value="/plugins/views-common/images/icons/process-history/activity_completed.png"
 					styleClass="toolbar-button"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.complete']}" />
 			</ice:commandLink>
@@ -87,7 +87,7 @@
 				immediate="true">
 				<pc:automationTag value="auto-PP-ActivityPnl-ToolbarSuspend" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/clock.png"
+					value="/plugins/views-common/images/icons/clock.png"
 					styleClass="toolbar-button"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.suspend']}" />
 			</ice:commandLink>
@@ -95,7 +95,7 @@
 			<ice:commandLink actionListener="#{activityDetailsBean.saveAction}">
 				<pc:automationTag value="auto-PP-ActivityPnl-ToolbarSave" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/clock_save.png"
+					value="/plugins/views-common/images/icons/clock_save.png"
 					styleClass="toolbar-button"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.suspendAndSave']}" />
 			</ice:commandLink>
@@ -105,7 +105,7 @@
 				immediate="true" rendered="#{activityDetailsBean.resubmitable}">
 				<pc:automationTag value="auto-PP-ActivityPnl-ToolbarResubmit" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/resubmission.gif"
+					value="/plugins/views-common/images/icons/resubmission.gif"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.resubmit']}" />
 			</ice:commandLink>
 			
@@ -114,7 +114,7 @@
 				disabled="#{!activityDetailsBean.delegable}">
 				<pc:automationTag value="auto-PP-ActivityPnl-ToolbarDelegate" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/delegate.png"
+					value="/plugins/views-common/images/icons/process-history/delegate.png"
 					styleClass="toolbar-button #{!activityDetailsBean.delegable ? 'iceCmdBtn-dis' : ''}"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.delegate']}" />
 			</ice:commandLink>
@@ -123,7 +123,7 @@
 				immediate="true" disabled="#{!activityDetailsBean.abortable}">
 				<pc:automationTag value="auto-PP-ActivityPnl-ToolbarAbort" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/abort.png"
+					value="/plugins/views-common/images/icons/cross.png"
 					styleClass="toolbar-button #{!activityDetailsBean.abortable ? 'iceCmdBtn-dis' : ''}"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.abort']}" />
 			</ice:commandLink>
@@ -165,7 +165,7 @@
 			<ice:commandLink action="#{ippPortalApp.openView}">
 				<pc:automationTag value="auto-PP-ActivityPnl-ToolbarProcDetails" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/process.png"
+					value="/plugins/views-common/images/icons/process.png"
 					styleClass="toolbar-button"
 					title="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.processContextExplorer']}" />
 				<f:param name="viewId" value="processInstanceDetailsView" />
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/worklistPanelViewToolbar.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/worklistPanelViewToolbar.xhtml
index 7781f87..b5123f5 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/worklistPanelViewToolbar.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/worklistPanelViewToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{worklistTableBean.messages['tooltip.update']}" 
 	            action="#{worklistTableBean.refresh}" partialSubmit="true">
 	        <pc:automationTag value="auto-PP-WorkList-Refresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/common/images/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/worklistViewToolbar.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/worklistViewToolbar.xhtml
index 0423fb0..a2aca27 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/worklistViewToolbar.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/worklistViewToolbar.xhtml
@@ -12,7 +12,7 @@
 			actionListener="#{worklistTableBean.openDelegateDialog}">
 			<pc:automationTag value="auto-PP-WorkList-ToolbarDelegate" standAlone="false"/>
 			<h:graphicImage
-				value="/plugins/processportal/images/icons/delegate.png"
+				value="/plugins/views-common/images/icons/process-history/delegate.png"
 				style="border: none;"
 				styleClass="#{worklistTableBean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
 				title="#{processportal_msgPropsBean['toolbars.worklistView.tooltip.delegate']}" />
@@ -22,7 +22,7 @@
 			disabled="#{worklistTableBean.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-PP-WorkList-ToolbarAbort" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/common/images/icons/process-history/active/abort.png"
+				url="/plugins/views-common/images/icons/cross.png"
                    style="border:none;" styleClass="#{worklistTableBean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}" 
                    title="#{processportal_msgPropsBean['toolbars.worklistView.tooltip.abort']}"/>
 		</ice:commandLink>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/views/qualityassurance/qualityACAutocompleteMultiSelectedTableColumns.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/views/qualityassurance/qualityACAutocompleteMultiSelectedTableColumns.xhtml
index f3fa4b1..f8a8194 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/views/qualityassurance/qualityACAutocompleteMultiSelectedTableColumns.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/views/qualityassurance/qualityACAutocompleteMultiSelectedTableColumns.xhtml
@@ -18,7 +18,7 @@
 			<ice:commandLink action="#{row.remove}">
 				<pc:automationTag value="auto-PP-QualityAssuranceCodesMultiSel-ActionsRemove"
 					standAlone="false" />
-				<ice:graphicImage value="/plugins/common/images/tab-bttn-close.png"
+				<ice:graphicImage value="/plugins/common/images/dialog-windowbttn-close.png"
 					styleClass="toolbar-button" />
 			</ice:commandLink>
 		</ice:panelGroup>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/worklistViewColumns.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/worklistViewColumns.xhtml
index 5ed0933..c3c4940 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/worklistViewColumns.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/worklistViewColumns.xhtml
@@ -45,7 +45,7 @@
 		<ice:panelGroup rendered="#{col.columnName == 'Priority'}">
 			<ice:panelGroup panelTooltip="priorityTootip">
 			<h:graphicImage
-				value="/plugins/processportal/images/icons/priority-#{row.priority}.png"
+				value="/plugins/views-common/images/icons/priority-#{row.priority}.png"
 				title="" />
 			</ice:panelGroup>
 			<ice:panelTooltip id="priorityTootip"
@@ -118,7 +118,7 @@
 			<ice:commandLink action="#{ippPortalApp.openView}">
 				<pc:automationTag value="auto-PP-WorkList-ActionsProcDetails" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/process.png"
+					value="/plugins/views-common/images/icons/process.png"
 					title="#{worklistTableBean.messages['tooltip.processContextExplorer']}" />
 									
 				<f:param name="viewId" value="#{row.defaultCaseActivity ? 'caseDetailsView' : 'processInstanceDetailsView'}" />
@@ -133,7 +133,7 @@
 				disabled="#{!row.delegable and row.defaultCaseActivity}">
 				<pc:automationTag value="auto-PP-WorkList-ActionsDelegate" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/delegate.png"
+					value="/plugins/views-common/images/icons/process-history/delegate.png"
 					style="border:none;"
 					styleClass="#{row.delegable ? '' : 'iceCmdBtn-dis'}"
 					title="#{worklistTableBean.messages['tooltip.delegate']}" />
@@ -147,7 +147,7 @@
 				disabled="#{!row.abortActivity and row.defaultCaseActivity}">
 				<pc:automationTag value="auto-PP-WorkList-ActionsAbort" standAlone="false"/>
 				<ice:graphicImage
-					url="/plugins/processportal/images/icons/abort.png"
+					url="/plugins/views-common/images/icons/cross.png"
 					style="border:none;"
 					styleClass="#{row.abortActivity ? '' : 'iceCmdBtn-dis'}"
 					title="#{worklistTableBean.messages['tooltip.abort']}"/>
@@ -157,14 +157,14 @@
 			<!--	Notes	-->
 			<ice:panelGroup rendered="#{row.defaultCaseActivity }">
 					<ice:graphicImage styleClass="iceCmdBtn-dis"
-						value="/plugins/processportal/images/icons/notes-blank.png" />
+						value="/plugins/views-common/images/icons/notes-blank.png" />
 			</ice:panelGroup>
 						
 			<ice:commandLink rendered="#{row.notesCount gt 0 and !row.defaultCaseActivity}" 
 				actionListener="#{worklistTableBean.openNotes}">
 				<pc:automationTag value="auto-PP-WorkList-ActionsNotes" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/notes-filled.png"
+					value="/plugins/views-common/images/icons/mime-types/notes-filled.png"
 					title="#{worklistTableBean.messages['tooltip.notes']}" />
 				<f:param name="oid" value="#{row.oid}" />
 			</ice:commandLink>
@@ -172,7 +172,7 @@
 				actionListener="#{worklistTableBean.openNotes}">
 				<pc:automationTag value="auto-PP-WorkList-ActionsNotes" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/notes-blank.png"
+					value="/plugins/views-common/images/icons/notes-blank.png"
 					title="#{worklistTableBean.messages['tooltip.notesEmpty']}" />
 				<f:param name="oid" value="#{row.oid}" />
 			</ice:commandLink>
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/Constants.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/Constants.java
index 9c2e250..9fdd249 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/Constants.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/Constants.java
@@ -26,9 +26,9 @@ import org.eclipse.stardust.engine.api.runtime.ActivityInstanceState;
  */
 public class Constants
 {
-   public static final String PROCESS_HISTORY_IMAGES_BASE_PATH = "/plugins/common/images/icons/process-history/active/";
-   public static final String WORKLIST_QA_AWAIT_STATE_IMAGE = "/plugins/processportal/images/icons/clock-small.png";
-   public static final String WORKLIST_QA_FAILED_STATE_IMAGE = "/plugins/processportal/images/icons/cross-small-circle.png";
+   public static final String PROCESS_HISTORY_IMAGES_BASE_PATH = "/plugins/views-common/images/icons/process-history/";
+   public static final String WORKLIST_QA_AWAIT_STATE_IMAGE = "/plugins/views-common/images/icons/clock-small.png";
+   public static final String WORKLIST_QA_FAILED_STATE_IMAGE = "/plugins/views-common/images/icons/cross-small-circle.png";
 
    public static final String ACTIVITY_QA_FAILED_IMAGE = "/plugins/views-common/images/icons/activity_qa_failed.png";
    public static final String ACTIVITY_QA_PASSED_IMAGE = "/plugins/views-common/images/icons/activity_qa_passed.png";
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PriorityAutocompleteSelector.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PriorityAutocompleteSelector.java
index 338b684..e15638a 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PriorityAutocompleteSelector.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/PriorityAutocompleteSelector.java
@@ -301,7 +301,7 @@ class PriorityAutocompleteDataProvider implements IAutocompleteDataProvider
          {
             // Populate PriorityAutoCompleteItem with priority Label ,priority and icon
             String iconVal = ProcessInstanceUtils.getPriorityLabel(i);
-            String iconPath = "/plugins/processportal/images/icons/priority-" + iconVal.toLowerCase() + ".png";
+            String iconPath = "/plugins/views-common/images/icons/priority-" + iconVal.toLowerCase() + ".png";
             PriorityAutoCompleteItem pItem = new PriorityAutoCompleteItem(iconVal, iconPath, i);
             if (pItem.getLabel().toUpperCase().startsWith(searchValue.toUpperCase()))
             {
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java
index 93ac3d1..3aeb205 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/core/ResourcePaths.java
@@ -60,13 +60,13 @@ public interface ResourcePaths
    
    static final String I_CASE = "/plugins/views-common/images/icons/envelope.png";
 
-   static final String I_PROCESS_ATTACHMENT = "/plugins/views-common/images/icons/document_set.png";
+   static final String I_PROCESS_ATTACHMENT = "/plugins/views-common/images/icons/page_white_stack.png";
    
-   static final String I_PROCESS_ATTACHMENT_BLANK = "/plugins/processportal/images/icons/document_set-blank-dropPanel.png";
-   static final String I_PROCESS_ATTACHMENT_FILLED = "/plugins/processportal/images/icons/document_set-filled-dropPanel.png";
+   static final String I_PROCESS_ATTACHMENT_BLANK = "/plugins/views-common/images/icons/document_set-blank-dropPanel.png";
+   static final String I_PROCESS_ATTACHMENT_FILLED = "/plugins/views-common/images/icons/document_set-filled-dropPanel.png";
 
-   static final String I_NOTES_BLANK = "/plugins/processportal/images/icons/notes-blank-dropPanel.png";
-   static final String I_NOTES_FILLED = "/plugins/processportal/images/icons/notes-filled-dropPanel.png";
+   static final String I_NOTES_BLANK = "/plugins/views-common/images/icons/notes-blank-dropPanel.png";
+   static final String I_NOTES_FILLED = "/plugins/views-common/images/icons/notes-filled-dropPanel.png";
    
    static final String I_NOTES = "/plugins/views-common/images/icons/folder_edit.png";
 
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessUIBuilder.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessUIBuilder.java
index b6d7fd9..62fc0ea 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessUIBuilder.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/process/history/ProcessUIBuilder.java
@@ -46,7 +46,7 @@ import org.eclipse.stardust.ui.web.viewscommon.utils.ProcessInstanceUtils;
  */
 public class ProcessUIBuilder
 {
-   public static final String IMAGE_BASE_PATH = "/plugins/common/images/icons/process-history/active/";
+   public static final String IMAGE_BASE_PATH = "/plugins/views-common/images/icons/process-history/";
    private MessagesViewsCommonBean propsBean;
    private List<SelectItem> priorityItems;
    private ICallbackHandler callbackHandler;
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/user/ParticipantWrapper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/user/ParticipantWrapper.java
index 8309d38..9fa1099 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/user/ParticipantWrapper.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/user/ParticipantWrapper.java
@@ -31,7 +31,7 @@ import org.eclipse.stardust.ui.web.viewscommon.utils.MyPicturePreferenceUtils;
 public class ParticipantWrapper extends DefaultRowModel
 {
    private static final long serialVersionUID = 1L;
-   private static final String BASE_IMAGE_PATH = "/plugins/processportal/images/icons/";
+   private static final String BASE_IMAGE_PATH = "/plugins/views-common/images/icons/";
    private Participant participant;
    private DepartmentInfo department;
    private boolean onlineStatus = false;
@@ -91,12 +91,12 @@ public class ParticipantWrapper extends DefaultRowModel
          }
          else
          {
-            return BASE_IMAGE_PATH + "organization.png";
+            return BASE_IMAGE_PATH + "chart_organisation.png";
          }
       }
       else
       {
-         return BASE_IMAGE_PATH + "department.png";
+         return BASE_IMAGE_PATH + "group_link.png";
       }
    }
 
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ActivityInstanceUtils.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ActivityInstanceUtils.java
index 9b829a0..ae543bc 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ActivityInstanceUtils.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ActivityInstanceUtils.java
@@ -67,7 +67,7 @@ import org.eclipse.stardust.ui.web.viewscommon.messages.MessagesViewsCommonBean;
 public class ActivityInstanceUtils
 {
    private static final String STATUS_PREFIX = "views.activityTable.statusFilter.";
-   public static final String IMAGE_BASE_PATH = "/plugins/common/images/icons/process-history/active/";
+   public static final String IMAGE_BASE_PATH = "/plugins/views-common/images/icons/process-history/";
    private static final Map<String, String> iconMap;
    
    static
@@ -81,9 +81,9 @@ public class ActivityInstanceUtils
       iconMap.put("ActivityCompleted", "activity_completed.png");
       iconMap.put("StateChange", "activity_state.png");
       iconMap.put("ProcessInstance", "processrootblue.png");
-      iconMap.put("SubProcess", "process.png");
+      iconMap.put("SubProcess", "/plugins/views-common/images/icons/process.png");
       iconMap.put("AuxiliaryProcess", "process_auxiliary.png");
-      iconMap.put("CaseInstance", "envelope.png");
+      iconMap.put("CaseInstance", "/plugins/views-common/images/icons/envelope.png");
       iconMap.put("activityQAFailed", Constants.ACTIVITY_QA_FAILED_IMAGE);
       iconMap.put("activityQAPassed", Constants.ACTIVITY_QA_PASSED_IMAGE);
       iconMap.put("activityQAAwait", Constants.ACTIVITY_QA_AWAIT_IMAGE);
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/DMSUtils.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/DMSUtils.java
index 75dd99f..44ac8d0 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/DMSUtils.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/DMSUtils.java
@@ -27,7 +27,7 @@ public class DMSUtils
    public static final String DOCUMENT_ICON_BASE_PATH = "/plugins/views-common/images/icons/mime-types/";
    public static final String I_FOLDER_MY_DOCS = "/plugins/views-common/images/icons/folder_user.png";
    public static final String I_FOLDER_CORRESPONDENCE = "/plugins/views-common/images/icons/folder_page.png";
-   public static final String I_FOLDER_PROCESS_ATTACH = "/plugins/views-common/images/icons/document_set.png";
+   public static final String I_FOLDER_PROCESS_ATTACH = "/plugins/views-common/images/icons/page_white_stack.png";
    public static final String F_CORRESPONDENCE_FOLDER = "/documents/correspondence-templates";
    private static final char SPECIAL_CHARS[] = {'<', '>', '/', '\\', '*', '?', ':', '|', '\"'};
    
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/authorization/PermissionUserObject.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/authorization/PermissionUserObject.java
index 0450653..3229b69 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/authorization/PermissionUserObject.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/authorization/PermissionUserObject.java
@@ -33,9 +33,9 @@ import com.icesoft.faces.component.tree.IceUserObject;
 public class PermissionUserObject extends IceUserObject
 {
     private static final long serialVersionUID = -364375780924462409L;
-    private static final String ICON_ROLE_UNSCOPED = "/plugins/admin-portal/images/icons/role.png";
+    private static final String ICON_ROLE_UNSCOPED = "/plugins/views-common/images/icons/role.png";
     //private static final String ICON_ROLE_SCOPED = "/plugins/admin-portal/images/icons/role_scoped.png";
-    private static final String ICON_PERMISSION = "/plugins/admin-portal/images/icons/key.png";
+    private static final String ICON_PERMISSION = "/plugins/views-common/images/icons/key.png";
     private static final String ICON_PERMISSION_MODIFIED = "/plugins/views-common/images/icons/key-modified.png";
 
     // ~ Instance fields
diff --git a/views-common/src/main/resources/META-INF/spring/views-commonUi-context.xml b/views-common/src/main/resources/META-INF/spring/views-commonUi-context.xml
index 72729c3..f69b095 100644
--- a/views-common/src/main/resources/META-INF/spring/views-commonUi-context.xml
+++ b/views-common/src/main/resources/META-INF/spring/views-commonUi-context.xml
@@ -123,7 +123,7 @@
 				controller="processInstanceDetailsBean" identityParams="processInstanceOID">
 				<ippui:preferences>
 					<ippui:preferencePage name="icon"
-						include="/plugins/views-common/images/process.png" />
+						include="/plugins/views-common/images/icons/process.png" />
 					<ippui:preferencePage name="configuration"
 						include="/plugins/views-common/views/processContextExplorer/processInstanceDetailConfiguration.xhtml" />
 				</ippui:preferences>
@@ -151,7 +151,7 @@
 				
 			<ippui:view name="myReportsView"
 			include="/plugins/views-common/views/report/myReportsView.xhtml"
-			controller="myReportsViewBean" >
-			<ippui:preferences>
-				<ippui:preferencePage name="icon"
-					include="/plugins/business-control-center/images/icons/chart-pie.png" />
-			</ippui:preferences>
-			</ippui:view>
+			controller="myReportsViewBean" >
+			<ippui:preferences>
+				<ippui:preferencePage name="icon"
+					include="/plugins/views-common/images/icons/chart-pie.png" />
+			</ippui:preferences>
+			</ippui:view>
 				
 			<ippui:view name="imageViewerConfig"
 				include="/plugins/views-common/views/document/imageViewerConfiguration.xhtml">
diff --git a/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml
index be53c7e..25c8a00 100644
--- a/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml
@@ -98,7 +98,7 @@
 			<ice:panelGrid columns="6" style="float: right;" rendered="#{row.loaded}">
 				<ice:commandLink action="#{ippPortalApp.openView}" rendered="#{!row.caseInstance}">
 					<pc:automationTag value="auto-COM-ActivityTbl-ActionsProcDetails" standAlone="false"/>
-					<h:graphicImage value="/plugins/common/images/icons/process-history/active/process.png"
+					<h:graphicImage value="/plugins/views-common/images/icons/process.png"
 						style="border: none;" title="#{messages_bcc['common.tooltip.contextExplorer']}"/>
 					<f:param name="viewId" value="processInstanceDetailsView" />
 					<f:param name="nested" value="true" />
@@ -108,7 +108,7 @@
 				
 				<ice:commandLink action="#{ippPortalApp.openView}" rendered="#{row.caseInstance}">
 					<pc:automationTag value="auto-COM-ActivityTbl-ActionsProcDetails" standAlone="false"/>
-					<h:graphicImage value="/plugins/common/images/icons/process-history/active/process.png"
+					<h:graphicImage value="/plugins/views-common/images/icons/process.png"
 						style="border: none;" title="#{messages_bcc['common.tooltip.contextExplorer']}"/>
 					<f:param name="viewId" value="caseDetailsView" />
 					<f:param name="nested" value="true" />
@@ -121,7 +121,7 @@
 					<pc:automationTag value="auto-COM-ActivityTbl-ActionsActivate" standAlone="false"/>
 					<f:param name="oid" value="#{row.activityOID}" />
 					<ice:graphicImage
-						url="/plugins/common/images/activate_activity.png"
+						url="/plugins/views-common/images/icons/process-history/activity_state.png"
 	                    style="border:none;" 
 	                    styleClass="#{row.activatable and !row.caseInstance ? '' : 'iceCmdBtn-dis'}"
 	                    title="#{messages_bcc['common.tooltip.activate']}"/>
@@ -137,7 +137,7 @@
 				</ice:commandLink>
 				<ice:commandLink actionListener="#{bean.openDelegateDialog}" disabled="#{!row.delegable or row.caseInstance}">
 					<pc:automationTag value="auto-COM-ActivityTbl-ActionsDelegate" standAlone="false"/>
-					<h:graphicImage value="/plugins/common/images/icons/process-history/active/delegate.png"
+					<h:graphicImage value="/plugins/views-common/images/icons/process-history/delegate.png"
 						style="border: none;" 
 						styleClass="#{row.delegable and !row.caseInstance ? '' : 'iceCmdBtn-dis'}"
 						title="#{messages_bcc['common.tooltip.delegate']}"/>
@@ -146,7 +146,7 @@
 				<ice:commandLink actionListener="#{bean.openAbortDialog}" disabled="#{not row.abortActivity}">
 					<pc:automationTag value="auto-COM-ActivityTbl-ActionsAbort" standAlone="false"/>
 					<ice:graphicImage
-						url="/plugins/common/images/icons/process-history/active/abort.png"
+						url="/plugins/views-common/images/icons/cross.png"
 	                    style="border:none;" styleClass="#{row.abortActivity ? '' : 'iceCmdBtn-dis'}" 
 	                    title="#{messages_bcc['common.tooltip.abort']}"/>
 	                 <f:attribute name="activityInstance" value="#{row.activityInstance}" />
@@ -168,14 +168,14 @@
 				<!--	Notes	-->
 				<ice:panelGroup rendered="#{row.caseInstance }">
 					<ice:graphicImage styleClass="iceCmdBtn-dis"
-						value="/plugins/processportal/images/icons/notes-blank.png" />
+						value="/plugins/views-common/images/icons/notes-blank.png" />
 				</ice:panelGroup>
 				
 				<ice:commandLink rendered="#{row.notesCount gt 0 and !row.caseInstance}"
 					actionListener="#{bean.openNotes}">
 					<pc:automationTag value="auto-COM-ActivityTbl-ActionsNotes" standAlone="false"/>
 					<ice:graphicImage
-						value="/plugins/processportal/images/icons/notes-filled.png"
+						value="/plugins/views-common/images/icons/mime-types/notes-filled.png"
 						title="#{messages_bcc['common.tooltip.notes']}" />
 					<f:attribute name="activityInstance" value="#{row.activityInstance}" />
 				</ice:commandLink>
@@ -183,7 +183,7 @@
 					actionListener="#{bean.openNotes}">
 					<pc:automationTag value="auto-COM-ActivityTbl-ActionsNotes" standAlone="false"/>
 					<ice:graphicImage
-						value="/plugins/processportal/images/icons/notes-blank.png"
+						value="/plugins/views-common/images/icons/notes-blank.png"
 						title="#{messages_bcc['common.tooltip.notes']}" />
 					<f:attribute name="activityInstance" value="#{row.activityInstance}" />
 				</ice:commandLink>
diff --git a/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml
index 98ae767..6cc6944 100644
--- a/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml
@@ -18,14 +18,14 @@
 		</ice:commandLink>
 		<ice:commandLink actionListener="#{bean.openDelegateDialog}" disabled="#{bean.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-COM-ActivityTbl-ToolbarDelegate" standAlone="false"/>
-			<h:graphicImage value="/plugins/common/images/icons/process-history/active/delegate.png"
+			<h:graphicImage value="/plugins/views-common/images/icons/process-history/delegate.png"
 				style="border: none;" styleClass="#{bean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
 				title="#{views_common_msgPropsBean['common.tooltip.delegate']}"/>
 		</ice:commandLink>
 		<ice:commandLink actionListener="#{bean.openAbortDialog}" disabled="#{bean.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-COM-ActivityTbl-ToolbarAbort" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/common/images/icons/process-history/active/abort.png"
+				url="/plugins/views-common/images/icons/cross.png"
                    style="border:none;" styleClass="#{bean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}" 
                    title="#{views_common_msgPropsBean['common.tooltip.abort']}"/>
 		</ice:commandLink>
@@ -48,7 +48,7 @@
 			disabled="#{!bean.priorityChanged}">
 			<pc:automationTag value="auto-COM-ActivityTbl-ToolbarSavePrio" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/business-control-center/images/icons/save_flag.png"
+				url="/plugins/views-common/images/icons/save_flag.png"
                    style="border:none;" styleClass="#{!bean.priorityChanged ? 'iceCmdBtn-dis' : ''}"
                    title="#{views_common_msgPropsBean['common.tooltip.savePriorityChanges']}"/>
 		</ice:commandLink>
diff --git a/views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml
index c40ed6b..d4080f6 100644
--- a/views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml
@@ -62,7 +62,7 @@
 										</td>
 										<td class="autoCompTableRemoveCol"><ice:commandButton
 												action="#{priorityItem.removeFromList}"
-												image="/plugins/common/images/tab-bttn-close.png" /></td>
+												image="/plugins/common/images/dialog-windowbttn-close.png" /></td>
 									</tr>
 								</c:forEach>
 							</tbody>
diff --git a/views-common/src/main/resources/META-INF/xhtml/contentmgmt/views/chatPartipantsColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/contentmgmt/views/chatPartipantsColumns.xhtml
index f45cba6..a11f79a 100644
--- a/views-common/src/main/resources/META-INF/xhtml/contentmgmt/views/chatPartipantsColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/contentmgmt/views/chatPartipantsColumns.xhtml
@@ -27,7 +27,7 @@
 			<ice:commandLink actionListener="#{chatViewBean.leave}"
 				rendered="#{(documentRepo.user == chatViewBean.chatRoom.initiatingUser) || (row == documentRepo.user)}">
 				<f:attribute name="user" value="#{row}" />
-				<ice:graphicImage value="/plugins/common/images/tab-bttn-close.png"
+				<ice:graphicImage value="/plugins/common/images/dialog-windowbttn-close.png"
 					styleClass="toolbar-button" />
 			</ice:commandLink>
 		</ice:panelGroup>
diff --git a/views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml
index 96211ac..cc418cf 100644
--- a/views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml
@@ -71,7 +71,7 @@
 											</table></td>
 										<td class="autoCompTableRemoveCol"><ice:commandButton
 												action="#{criticality.removeFromList}"
-												image="/plugins/common/images/tab-bttn-close.png" />
+												image="/plugins/common/images/dialog-windowbttn-close.png" />
 										</td>
 									</tr>
 								</c:forEach>
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer.css b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer.css
new file mode 100644
index 0000000..70950d7
--- a/dev/null
+++ b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer.css
@@ -0,0 +1,150 @@
+.toolbarButton {
+	padding-left: 8px;
+}
+
+div.footer_content a {
+	
+}
+
+a.toolbarControl {
+	background-position: top;
+	display: block;
+}
+
+a.firstToolControl {
+	background-image: url('../images/icons/resultset_first.png');
+}
+
+a.firstToolControl-disabled {
+	background-image: url('../images/icons/resultset_first.png');
+	opacity: 0.4;
+	filter: alpha(opacity = 40)
+}
+
+a.firstToolControl:hover {
+	background-image: url('../images/icons/resultset_first.png');
+}
+
+a.previousToolControl {
+	background-image: url('../images/icons/resultset_previous.png');
+}
+
+a.previousToolControl-disabled {
+	background-image: url('../images/icons/resultset_previous.png');
+	opacity: 0.4;
+	filter: alpha(opacity = 40)
+}
+
+a.previousToolControl:hover {
+	background-image: url('../images/icons/resultset_previous.png');
+}
+
+a.forwardToolControl {
+    background-image: url('../images/icons/resultset_next.png');
+}
+
+a.forwardToolControl-disabled {
+    background-image: url('../images/icons/resultset_next.png');
+    opacity: 0.4;
+	filter: alpha(opacity=40)
+}
+
+a.forwardToolControl:hover {
+    background-image: url('../images/icons/resultset_next.png');
+}
+
+a.lastToolControl {
+    background-image: url('../images/icons/resultset_last.png');
+}
+
+a.lastToolControl-disabled {
+    background-image: url('../images/icons/resultset_last.png');
+    opacity: 0.4;
+	filter: alpha(opacity=40)
+}
+
+a.lastToolControl:hover {
+    background-image: url('../images/icons/resultset_last.png');
+}
+
+a.zoomInToolControl {
+    background-image: url('../images/icons/zoom_in.png');
+}
+
+
+a.zoomInToolControl-disabled {
+    background-image: url('../images/icons/zoom_in.png');
+    opacity: 0.4;
+	filter: alpha(opacity=40)
+}
+
+a.zoomInToolControl:hover {
+    background-image: url('../images/icons/zoom_in.png');
+}
+
+a.zoomOutToolControl {
+    background-image: url('../images/icons/zoom_out.png');
+}
+
+a.zoomOutToolControl-disabled {
+    background-image: url('../images/icons/zoom_out.png');
+    opacity: 0.4;
+	filter: alpha(opacity=40)
+}
+
+a.zoomOutToolControl:hover {
+    background-image: url('../images/icons/zoom_out.png');
+}
+
+a.leftToolControl {
+    background-image: url('../images/icons/shape_rotate_anticlockwise.png');
+}
+
+a.leftToolControl:hover {
+    background-image: url('../images/icons/shape_rotate_anticlockwise.png');
+}
+
+a.rightToolControl {
+    background-image: url('../images/icons/shape_rotate_clockwise.png');
+}
+
+a.rightToolControl:hover {
+    background-image: url('../images/icons/shape_rotate_clockwise.png');
+}
+
+a.outlineToolControl {
+    background-image: url('../images/icons/application_side_tree.png');
+}
+
+a.outlineToolControl-disabled {
+    background-image: url('../images/icons/application_side_tree.png');
+    opacity: 0.4;
+	filter: alpha(opacity=40)
+}
+
+a.outlineToolControl:hover {
+    background-image: url('../images/icons/application_side_tree.png');
+}
+
+.popupHeaderWrapper {
+    text-align: center;
+    vertical-align: middle;
+}
+
+.popupHeaderImage {
+    float: right;
+    margin-right: 2px;
+    margin-top: 2px;
+}
+
+.documentOutlineContainer {
+    overflow: auto;
+    width:550px; 
+    height:350px;
+}
+
+.outline-disabled {
+    background-image: url('../images/icons/application_side_tree.png');
+    opacity: 0.4;
+	filter: alpha(opacity=40)
+}
+\ No newline at end of file
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_first.png b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_first.png
deleted file mode 100644
index b03eaf8..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_first.png
+++ b/dev/null
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_last.png b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_last.png
deleted file mode 100644
index 8ec8947..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_last.png
+++ b/dev/null
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_next.png b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_next.png
deleted file mode 100644
index e252606..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_next.png
+++ b/dev/null
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_previous.png b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_previous.png
deleted file mode 100644
index 18f9cc1..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/resultset_previous.png
+++ b/dev/null
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/spacer.gif b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/spacer.gif
deleted file mode 100644
index 0e66442..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/spacer.gif
+++ b/dev/null
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/zoom_in.png b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/zoom_in.png
deleted file mode 100644
index cdf0a52..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/zoom_in.png
+++ b/dev/null
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/zoom_out.png b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/zoom_out.png
deleted file mode 100644
index 07bf98a..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/zoom_out.png
+++ b/dev/null
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/pdf-viewer.css b/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/pdf-viewer.css
deleted file mode 100644
index dde67a1..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/pdf-viewer.css
+++ b/dev/null
@@ -1,150 +0,0 @@
-.toolbarButton {
-	padding-left: 8px;
-}
-
-div.footer_content a {
-	
-}
-
-a.toolbarControl {
-	background-position: top;
-	display: block;
-}
-
-a.firstToolControl {
-	background-image: url('./images/resultset_first.png');
-}
-
-a.firstToolControl-disabled {
-	background-image: url('./images/resultset_first.png');
-	opacity: 0.4;
-	filter: alpha(opacity = 40)
-}
-
-a.firstToolControl:hover {
-	background-image: url('./images/resultset_first.png');
-}
-
-a.previousToolControl {
-	background-image: url('./images/resultset_previous.png');
-}
-
-a.previousToolControl-disabled {
-	background-image: url('./images/resultset_previous.png');
-	opacity: 0.4;
-	filter: alpha(opacity = 40)
-}
-
-a.previousToolControl:hover {
-	background-image: url('./images/resultset_previous.png');
-}
-
-a.forwardToolControl {
-    background-image: url('./images/resultset_next.png');
-}
-
-a.forwardToolControl-disabled {
-    background-image: url('./images/resultset_next.png');
-    opacity: 0.4;
-	filter: alpha(opacity=40)
-}
-
-a.forwardToolControl:hover {
-    background-image: url('./images/resultset_next.png');
-}
-
-a.lastToolControl {
-    background-image: url('./images/resultset_last.png');
-}
-
-a.lastToolControl-disabled {
-    background-image: url('./images/resultset_last.png');
-    opacity: 0.4;
-	filter: alpha(opacity=40)
-}
-
-a.lastToolControl:hover {
-    background-image: url('./images/resultset_last.png');
-}
-
-a.zoomInToolControl {
-    background-image: url('./images/zoom_in.png');
-}
-
-
-a.zoomInToolControl-disabled {
-    background-image: url('./images/zoom_in.png');
-    opacity: 0.4;
-	filter: alpha(opacity=40)
-}
-
-a.zoomInToolControl:hover {
-    background-image: url('./images/zoom_in.png');
-}
-
-a.zoomOutToolControl {
-    background-image: url('./images/zoom_out.png');
-}
-
-a.zoomOutToolControl-disabled {
-    background-image: url('./images/zoom_out.png');
-    opacity: 0.4;
-	filter: alpha(opacity=40)
-}
-
-a.zoomOutToolControl:hover {
-    background-image: url('./images/zoom_out.png');
-}
-
-a.leftToolControl {
-    background-image: url('./images/shape_rotate_anticlockwise.png');
-}
-
-a.leftToolControl:hover {
-    background-image: url('./images/shape_rotate_anticlockwise.png');
-}
-
-a.rightToolControl {
-    background-image: url('./images/shape_rotate_clockwise.png');
-}
-
-a.rightToolControl:hover {
-    background-image: url('./images/shape_rotate_clockwise.png');
-}
-
-a.outlineToolControl {
-    background-image: url('./images/application_side_tree.png');
-}
-
-a.outlineToolControl-disabled {
-    background-image: url('./images/application_side_tree.png');
-    opacity: 0.4;
-	filter: alpha(opacity=40)
-}
-
-a.outlineToolControl:hover {
-    background-image: url('./images/application_side_tree.png');
-}
-
-.popupHeaderWrapper {
-    text-align: center;
-    vertical-align: middle;
-}
-
-.popupHeaderImage {
-    float: right;
-    margin-right: 2px;
-    margin-top: 2px;
-}
-
-.documentOutlineContainer {
-    overflow: auto;
-    width:550px; 
-    height:350px;
-}
-
-.outline-disabled {
-    background-image: url('./images/application_side_tree.png');
-    opacity: 0.4;
-	filter: alpha(opacity=40)
-}
-\ No newline at end of file
diff --git a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/extractPageTableToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/extractPageTableToolbar.xhtml
index cb688df..70cce67 100644
--- a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/extractPageTableToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/extractPageTableToolbar.xhtml
@@ -14,7 +14,7 @@
 		</ice:commandLink>
 		<ice:commandLink actionListener="#{extractPageDialogBean.delete}" disabled="#{!extractPageDialogBean.rowSelected}">
 			<pc:automationTag value="auto-COM-ExtractPageDlg-ExtPageTbl-ToolbarDelete" standAlone="false"/>		
-			<ice:graphicImage value="/plugins/processportal/images/delete.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/delete.png"
 				styleClass="#{!extractPageDialogBean.rowSelected ? 'iceCmdBtn-dis' : ''}"
 				title="#{views_common_msgPropsBean['common.delete']}" />
 		</ice:commandLink>
diff --git a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
index 4a0ccbf..af2cbd5 100644
--- a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
@@ -14,7 +14,7 @@
 	<ice:panelGrid columns="16" cellspacing="0" cellpadding="2" style="padding-right: 10px;">
 		<pc:automationTag value="auto-COM-PCETerminate"/>
 		<ice:commandButton
-			image="/plugins/business-control-center/images/icons/abort_process.png"
+			image="/plugins/views-common/images/icons/abort_process.png"
 			action="#{processInstanceDetailsBean.terminateProcess}" 
 			disabled="#{!processInstanceDetailsBean.abortProcess}"
 			partialSubmit="true"
@@ -37,7 +37,7 @@
 		
 		<pc:automationTag value="auto-COM-PCERecover"/>
 		<ice:commandButton
-			image="/plugins/business-control-center/images/icons/recover_process.png"
+			image="/plugins/views-common/images/icons/recover_process.png"
 			action="#{processInstanceDetailsBean.recoverProcess}"
 			partialSubmit="true"
 			title="#{messages_bcc['common.tooltip.recover']}"
@@ -85,7 +85,7 @@
 		
 		<pc:automationTag value="auto-COM-PCEUpdate"/>
 		<ice:commandButton
-			image="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			image="/plugins/views-common/images/icons/arrow_refresh.png"
 			action="#{processInstanceDetailsBean.update}" partialSubmit="true"
 			title="#{messages_bcc['toolbars.common.tooltip.update']}"
 			styleClass="toolbar-button" />
diff --git a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/securityDialogToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/securityDialogToolbar.xhtml
index 610b3da..cb5496c 100644
--- a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/securityDialogToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/securityDialogToolbar.xhtml
@@ -19,7 +19,7 @@
 		<ice:commandLink action="#{securityDialog.openAddEntryDialog}">
 			<pc:automationTag value="auto-COM-SecurityDlg-SecurityDlgTbl-ToolbarAdd" standAlone="false"/>
 			<h:graphicImage
-				value="/plugins/business-control-center/images/icons/group_add.png"
+				value="/plugins/views-common/images/icons/group_add.png"
 				style="border: none;"
 				title="#{securityDialog.messages['securityDialog.table.toolbar.addParticipants']}" />
 		</ice:commandLink>
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/abort_process.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/abort_process.png
index 101d1bd..101d1bd 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/abort_process.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/abort_process.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/activity_postponed.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/activity_postponed.png
index c4a1a66..c4a1a66 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/activity_postponed.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/activity_postponed.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/activity_stranded.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/activity_stranded.png
index 2bbe00c..2bbe00c 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/activity_stranded.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/activity_stranded.png
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/application_side_tree.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/application_side_tree.png
index f04a52b..f04a52b 100644
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/application_side_tree.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/application_side_tree.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/rename-accept.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/button_bid_accept.gif
index 1b1ce65..1b1ce65 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/rename-accept.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/button_bid_accept.gif
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/rename-decline.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/button_bid_decline.gif
index f075fb8..f075fb8 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/rename-decline.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/button_bid_decline.gif
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/case.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/case.png
deleted file mode 100644
index 841e73a..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/case.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/chart-pie.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/chart-pie.png
index 55f5a09..55f5a09 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/chart-pie.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/chart-pie.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/chart-up-color.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/chart-up-color.png
index afda99e..afda99e 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/chart-up-color.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/chart-up-color.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/chart-up.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/chart-up.png
index b3d1b39..b3d1b39 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/chart-up.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/chart-up.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/organization.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/chart_organisation.png
index c32d25c..c32d25c 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/organization.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/chart_organisation.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/clipboard-task.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/clipboard-task.png
index 0023b3a..0023b3a 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/clipboard-task.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/clipboard-task.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/clock-small.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/clock-small.png
index 58f9cfa..58f9cfa 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/clock-small.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/clock-small.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/clock.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/clock.png
index e2672c2..e2672c2 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/clock.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/clock.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/clock_save.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/clock_save.png
index 6622868..6622868 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/clock_save.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/clock_save.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/cog.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/cog.png
index 67de2c6..67de2c6 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/cog.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/cog.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/cog_edit.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/cog_edit.png
index 47b75a4..47b75a4 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/cog_edit.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/cog_edit.png
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/configure.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/configure.png
deleted file mode 100644
index 5c8213f..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/configure.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/control_play.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/control_play.png
index 0846555..0846555 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/control_play.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/control_play.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/control_stop.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/control_stop.png
index 893bb60..893bb60 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/control_stop.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/control_stop.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/criticality_manager.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/criticality_manager.png
index e3770a5..e3770a5 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/criticality_manager.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/criticality_manager.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/QA_Fail.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/cross-octagon-frame.png
index dedcaa9..dedcaa9 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/QA_Fail.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/cross-octagon-frame.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/cross-small-circle.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/cross-small-circle.png
index 8616562..8616562 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/cross-small-circle.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/cross-small-circle.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/complete.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/complete.gif
index b7d77d5..b7d77d5 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/complete.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/complete.gif
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/downGrey.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/downGrey.gif
index 6d1b70c..6d1b70c 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/downGrey.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/downGrey.gif
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/downLight.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/downLight.gif
index f7c14bd..f7c14bd 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/downLight.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/downLight.gif
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/gantt_diagram.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/gantt_diagram.gif
index c01c4d1..c01c4d1 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/gantt_diagram.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/gantt_diagram.gif
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/upGrey.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/upGrey.gif
index 1aaf798..1aaf798 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/upGrey.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/upGrey.gif
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/upLight.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/upLight.gif
index 38ce366..38ce366 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/active/upLight.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/diagram/upLight.gif
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_set-blank-dropPanel.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/document_set-blank-dropPanel.png
index e61e20a..e61e20a 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_set-blank-dropPanel.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/document_set-blank-dropPanel.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_set-filled-dropPanel.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/document_set-filled-dropPanel.png
index 1755169..1755169 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/document_set-filled-dropPanel.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/document_set-filled-dropPanel.png
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/document_set.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/document_set.png
deleted file mode 100644
index 44084ad..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/document_set.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/grippy.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/grippy.png
index 4aced88..4aced88 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/grippy.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/grippy.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/group.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/group.png
index 7fb4e1f..7fb4e1f 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/group.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/group.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/group_add.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/group_add.png
index 06c5350..06c5350 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/group_add.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/group_add.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/department_default.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/group_error.png
index 7364a13..7364a13 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/department_default.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/group_error.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/department.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/group_link.png
index c77ed88..c77ed88 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/department.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/group_link.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/key.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/key.png
index 4ec1a92..4ec1a92 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/key.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/key.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/lightning.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/lightning.png
index 9680afd..9680afd 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/lightning.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/lightning.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/lightning_delete.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/lightning_delete.png
index dfe2770..dfe2770 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/lightning_delete.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/lightning_delete.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/money-coin.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/money-coin.png
index a992c5a..a992c5a 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/money-coin.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/money-coin.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-blank-dropPanel.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/notes-blank-dropPanel.png
index 1790c7c..1790c7c 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-blank-dropPanel.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/notes-blank-dropPanel.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-blank.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/notes-blank.png
index 65888a7..65888a7 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-blank.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/notes-blank.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-filled-dropPanel.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/notes-filled-dropPanel.png
index bd3503a..bd3503a 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/notes-filled-dropPanel.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/notes-filled-dropPanel.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/organization_scoped.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/organization_scoped.png
index f072e87..f072e87 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/organization_scoped.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/organization_scoped.png
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/document_set.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/page_white_stack.png
index 44084ad..44084ad 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/process-history/active/document_set.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/page_white_stack.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/pending_activities.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/pending_activities.png
index 1a3b66f..1a3b66f 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/pending_activities.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/pending_activities.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/priority-high.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/priority-high.png
index 7a56f68..7a56f68 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/priority-high.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/priority-high.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/priority-low.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/priority-low.png
index 790bcc9..790bcc9 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/priority-low.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/priority-low.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/priority-normal.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/priority-normal.png
index 044f317..044f317 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/priority-normal.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/priority-normal.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/process_manager.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/process_manager.png
index 0cddf5a..0cddf5a 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/process_manager.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/process_manager.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/recover_process.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/recover_process.png
index 4578cad..4578cad 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/recover_process.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/recover_process.png
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/rename-accept.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/rename-accept.gif
deleted file mode 100644
index 1b1ce65..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/rename-accept.gif
+++ b/dev/null
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/rename-decline.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/rename-decline.gif
deleted file mode 100644
index f075fb8..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/rename-decline.gif
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/resource_login.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/resource_login.png
index 5dc151c..5dc151c 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/resource_login.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/resource_login.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/resubmission.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/resubmission.gif
index 8c685c4..8c685c4 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/resubmission.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/resubmission.gif
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/role.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/role.png
index 4531b19..4531b19 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/role.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/role.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/role_scoped.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/role_scoped.png
index 54824f9..54824f9 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/role_scoped.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/role_scoped.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/role_teamlead.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/role_teamlead.png
index a982586..a982586 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/role_teamlead.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/role_teamlead.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/role_teamlead_scoped.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/role_teamlead_scoped.png
index 642cdd1..642cdd1 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/role_teamlead_scoped.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/role_teamlead_scoped.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/save_flag.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/save_flag.png
index 884f4ed..884f4ed 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/save_flag.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/save_flag.png
diff --git a/portal-common/src/main/resources/META-INF/xhtml/images/icons/search.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/search.png
index e3c9ef7..e3c9ef7 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/images/icons/search.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/search.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/server_go.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/server_go.png
index 540c8e2..540c8e2 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/server_go.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/server_go.png
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/shape_rotate_anticlockwise.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/shape_rotate_anticlockwise.png
index 07a3020..07a3020 100644
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/shape_rotate_anticlockwise.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/shape_rotate_anticlockwise.png
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/shape_rotate_clockwise.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/shape_rotate_clockwise.png
index b99db7d..b99db7d 100644
--- a/views-common/src/main/resources/META-INF/xhtml/css/pdf-viewer/images/shape_rotate_clockwise.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/shape_rotate_clockwise.png
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/QA_Pass.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/tick-octagon.png
index 76fcf15..76fcf15 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/images/icons/QA_Pass.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/tick-octagon.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_complete.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_complete.gif
index 6da933d..6da933d 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_complete.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_complete.gif
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_complete_trans.gif b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_complete_trans.gif
index 41d9451..41d9451 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_complete_trans.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_complete_trans.gif
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_green.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_green.png
index 85f0804..85f0804 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_green.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_green.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_grey.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_grey.png
index 3dab850..3dab850 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_grey.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_grey.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_red.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_red.png
index f075f40..f075f40 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_red.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_red.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_yellow.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_yellow.png
index ffc3f4f..ffc3f4f 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light_yellow.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic-light/traffic_light_yellow.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic_light.png
index c91b312..c91b312 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/traffic_light.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/traffic_light.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user-invalidated.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/user-invalidated.png
index 881df36..881df36 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user-invalidated.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/user-invalidated.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/user.png
index 79f35cc..79f35cc 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/user.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user_add.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/user_add.png
index deae99b..deae99b 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user_add.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/user_add.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user_delete.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/user_delete.png
index acbb563..acbb563 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user_delete.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/user_delete.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user_go.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/user_go.png
index 0468cf0..0468cf0 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/user_go.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/user_go.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/realm.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/world.png
index 68f21d3..68f21d3 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/realm.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/world.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/realm_delete.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/world_delete.png
index ffcd115..ffcd115 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/realm_delete.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/world_delete.png
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/world_remove.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/world_remove.png
deleted file mode 100644
index ffcd115..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/world_remove.png
+++ b/dev/null
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/configure.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/wrench.png
index 5c8213f..5c8213f 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/icons/configure.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/wrench.png
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/wrench_closed.png b/views-common/src/main/resources/META-INF/xhtml/images/icons/wrench_closed.png
index 1f87611..1f87611 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/icons/wrench_closed.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/icons/wrench_closed.png
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/images/kreis_trans.gif b/views-common/src/main/resources/META-INF/xhtml/images/kreis_trans.gif
index 913bb84..913bb84 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/images/kreis_trans.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/kreis_trans.gif
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/process.png b/views-common/src/main/resources/META-INF/xhtml/images/process.png
deleted file mode 100644
index 6f6553b..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/process.png
+++ b/dev/null
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/images/t.gif b/views-common/src/main/resources/META-INF/xhtml/images/t.gif
index 3c1b4b4..3c1b4b4 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/images/t.gif
+++ b/views-common/src/main/resources/META-INF/xhtml/images/t.gif
diff --git a/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableColumns.xhtml
index d76f53c..5d0bc99 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableColumns.xhtml
@@ -11,12 +11,12 @@
 		<ice:panelGroup rendered="#{col.columnName == 'ProcessName'}">
 			<ice:panelGrid columns="2" rendered="#{!row.caseInstance}">
 				<h:graphicImage
-					value="/plugins/common/images/icons/process-history/active/processrootblue.png"
+					value="/plugins/views-common/images/icons/process-history/processrootblue.png"
 					style="border: none;"
 					title="#{messages_bcc['common.tooltip.process']}"
 					rendered="#{row.processInstanceOID==row.processInstanceRootOID}" />
 				<h:graphicImage
-					value="/plugins/common/images/icons/process-history/active/process.png"
+					value="/plugins/views-common/images/icons/process.png"
 					style="border: none;"
 					title="#{messages_bcc['common.tooltip.subProcess']}"
 					rendered="#{row.processInstanceOID!=row.processInstanceRootOID}" />
@@ -34,7 +34,7 @@
 
 			<ice:panelGrid columns="2" rendered="#{row.caseInstance}">
 				<h:graphicImage
-					value="/plugins/common/images/icons/process-history/active/envelope.png"
+					value="/plugins/views-common/images/icons/envelope.png"
 					style="border: none;"
 					title="#{messages_bcc['common.tooltip.case']}" />
 				<ice:commandLink value="#{row.processInstanceName}"
@@ -104,7 +104,7 @@
 			<ice:panelGrid columns="7" style="float: right;">
 				<ice:commandLink action="#{ippPortalApp.openView}" rendered="#{!row.caseInstance}">
 					<pc:automationTag value="auto-COM-ProcTbl-ActionsProcDetails" standAlone="false"/>
-					<h:graphicImage value="/plugins/common/images/icons/process-history/active/process.png"
+					<h:graphicImage value="/plugins/views-common/images/icons/process.png"
 						style="border: none;" title="#{messages_bcc['common.tooltip.contextExplorer']}"/>
 					<f:param name="viewId" value="processInstanceDetailsView" />
 					<f:param name="nested" value="true" />
@@ -116,7 +116,7 @@
 					rendered="#{row.caseInstance}">
 					<pc:automationTag value="auto-COM-ProcTbl-ActionsProcDetails" standAlone="false"/>
 					<h:graphicImage
-						value="/plugins/common/images/icons/process-history/active/process.png"
+						value="/plugins/views-common/images/icons/process.png"
 						style="border: none;"
 						title="#{messages_bcc['common.tooltip.contextExplorer']}" />
 					<f:param name="viewId" value="caseDetailsView" />
@@ -131,7 +131,7 @@
 					<pc:automationTag value="auto-COM-ProcTbl-ActionsTerminate"
 						standAlone="false" />
 					<ice:graphicImage
-						value="/plugins/business-control-center/images/icons/abort_process.png"
+						value="/plugins/views-common/images/icons/abort_process.png"
 						title="#{views_common_msgPropsBean['common.tooltip.terminate']}" styleClass="#{row.enableTerminate? '' : 'iceCmdBtn-dis'}" />
 					<f:attribute name="processInstance" value="#{row.processInstance}" />
 				</ice:commandLink>
@@ -155,7 +155,7 @@
 				<ice:commandLink actionListener="#{bean.recoverProcess}" disabled="#{not row.enableRecover}" onclick="Event.stop(event);">
 					<pc:automationTag value="auto-COM-ProcTbl-ActionsRecover" standAlone="false"/>
 					<ice:graphicImage
-						value="/plugins/business-control-center/images/icons/recover_process.png"
+						value="/plugins/views-common/images/icons/recover_process.png"
 						title="#{messages_bcc['common.tooltip.recover']}"  styleClass="#{row.enableRecover ? '' : 'iceCmdBtn-dis'}" />
 					<f:attribute name="processInstance" value="#{row.processInstance}" />
 				</ice:commandLink>
@@ -169,7 +169,7 @@
 				</ice:commandLink>
 				<ice:commandLink action="#{ippPortalApp.openView}">
 					<pc:automationTag value="auto-COM-ProcTbl-ActionsGanttChart" standAlone="false"/>
-					<h:graphicImage value="/plugins/business-control-center/images/icons/gantt_diagram.gif"
+					<h:graphicImage value="/plugins/views-common/images/icons/diagram/gantt_diagram.gif"
 						style="border: none;" title="#{messages_bcc['views.processSearchView.tooltip.viewGanttChart']}" />
 					<f:param name="viewId" value="ganttChartView" />
 					<f:param name="nested" value="true" />
@@ -179,7 +179,7 @@
 					actionListener="#{bean.openNotes}">
 					<pc:automationTag value="auto-COM-ProcTbl-ActionsNotes" standAlone="false"/>
 					<ice:graphicImage
-						value="/plugins/processportal/images/icons/notes-filled.png"
+						value="/plugins/views-common/images/icons/mime-types/notes-filled.png"
 						title="#{messages_bcc['common.tooltip.notes']}" />
 					<f:attribute name="processInstance" value="#{row.processInstance}" />
 				</ice:commandLink>
@@ -187,7 +187,7 @@
 					actionListener="#{bean.openNotes}">
 					<pc:automationTag value="auto-COM-ProcTbl-ActionsNotes" standAlone="false"/>
 					<ice:graphicImage
-						value="/plugins/processportal/images/icons/notes-blank.png"
+						value="/plugins/views-common/images/icons/notes-blank.png"
 						title="#{messages_bcc['common.tooltip.notes']}" />
 					<f:attribute name="processInstance" value="#{row.processInstance}" />
 				</ice:commandLink>
diff --git a/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml
index f3704fe..b975cfd 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableHelperToolbar.xhtml
@@ -11,7 +11,7 @@
 			disabled="#{bean.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-COM-ProcTbl-ToolbarTerminate" standAlone="false"/>
 			<ice:graphicImage styleClass="#{bean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
-				value="/plugins/business-control-center/images/icons/abort_process.png"
+				value="/plugins/views-common/images/icons/abort_process.png"
 				title="#{views_common_msgPropsBean['common.tooltip.terminate']}"/>
 		</ice:commandLink>
 		<!-- Rendered when some row is selected -->
@@ -35,7 +35,7 @@
 			disabled="#{bean.selectedItemCount eq 0 ? true : false}">
 			<pc:automationTag value="auto-COM-ProcTbl-ToolbarRecover" standAlone="false"/>
 			<ice:graphicImage styleClass="#{bean.selectedItemCount eq 0 ? 'iceCmdBtn-dis' : ''}"
-				value="/plugins/business-control-center/images/icons/recover_process.png"
+				value="/plugins/views-common/images/icons/recover_process.png"
 				title="#{views_common_msgPropsBean['common.tooltip.recover']}"/>
 		</ice:commandLink>	
 		
@@ -58,7 +58,7 @@
 			disabled="#{!bean.priorityChanged}">
 			<pc:automationTag value="auto-COM-ProcTbl-ToolbarSavePrio" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/business-control-center/images/icons/save_flag.png"
+				url="/plugins/views-common/images/icons/save_flag.png"
                    style="border:none;" styleClass="#{!bean.priorityChanged ? 'iceCmdBtn-dis' : ''}"
                    title="#{views_common_msgPropsBean['common.tooltip.savePriorityChanges']}"/>
 		</ice:commandLink>
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml
index 2108c75..f37f54f 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableColumns.xhtml
@@ -57,7 +57,7 @@
 				disabled="#{not (row.refersToActivity and row.activatable) }">
 				<pc:automationTag value="auto-COM-ACTHistoryTable-ActionsOpen" standAlone="false"/>
 				<f:param name="oid" value="#{row.tableEntry.OID}" />
-				<ice:graphicImage url="/plugins/common/images/activate_activity.png"
+				<ice:graphicImage url="/plugins/views-common/images/icons/process-history/activity_state.png"
 					styleClass="#{not (row.refersToActivity and row.activatable) ? 'iceCmdBtn-dis' : ''}"
 					title="#{common_msgPropsBean['common.activity.activate']}" />
 			</ice:commandLink>
@@ -68,7 +68,7 @@
 				disabled="#{not (row.refersToActivity and row.delegable)}">
 				<pc:automationTag value="auto-COM-ACTHistoryTable-ActionsDelegate" standAlone="false"/>
 				<h:graphicImage
-					value="/plugins/common/images/icons/process-history/active/delegate.png"
+					value="/plugins/views-common/images/icons/process-history/delegate.png"
 					title="#{views_common_msgPropsBean['delegation.tooltip.title']}"
 					styleClass="#{not (row.refersToActivity and row.delegable) ? 'iceCmdBtn-dis' : ''}" />
 				<f:attribute name="row" value="#{row}" />
@@ -80,7 +80,7 @@
 				disabled="#{not (row.refersToActivity and row.abortActivity)}">
 				<pc:automationTag value="auto-COM-ACTHistoryTable-ActionsAbort" standAlone="false"/>
 				<h:graphicImage
-					value="/plugins/common/images/icons/process-history/active/abort.png"
+					value="/plugins/views-common/images/icons/cross.png"
 					title="#{common_msgPropsBean['common.activity.abort']}"
 					styleClass="#{not (row.refersToActivity and row.abortActivity) ? 'iceCmdBtn-dis' : ''}" />
 				<f:attribute name="row" value="#{row}" />
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableToolbar.xhtml
index 9c56bae..d15b812 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/activityInstanceHistoryTableToolbar.xhtml
@@ -29,7 +29,7 @@
 			<h:graphicImage
 				rendered="#{not filterToolbarItem.visible and not filterToolbarItem.neverVisible}"
 				style="border: none; padding-right: 10px;"
-				value="/plugins/common/images/t.gif" width="15px" height="15px" />
+				value="/plugins/views-common/images/t.gif" width="15px" height="15px" />
 		</ui:repeat>
 
 		<span class="toolbarGroupRight" style="padding-left: 0px;" />
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/processHistoryTableToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/processHistoryTableToolbar.xhtml
index 09c3f11..447d431 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/processHistoryTableToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/processHistoryTableToolbar.xhtml
@@ -21,7 +21,7 @@
 				</ice:commandLink>
 
 				<ice:graphicImage rendered="#{not filterToolbarItem.visible and not filterToolbarItem.neverVisible}"
-					style="border: none; padding-right: 10px;" value="/plugins/common/images/t.gif"
+					style="border: none; padding-right: 10px;" value="/plugins/views-common/images/t.gif"
 					width="15px" height="15px" />
 			</ui:repeat>
 		</c:if>
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
index c970d8a..9f05540 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
@@ -72,7 +72,7 @@
 			<ice:commandLink action="#{ippPortalApp.openView}" rendered="#{!row.caseInstance}">
 				<pc:automationTag value="auto-COM-PCEHistoryTable-ActionsProcDetail" standAlone="false"/>
 				<h:graphicImage
-					value="/plugins/common/images/icons/process-history/active/process.png"
+					value="/plugins/views-common/images/icons/process.png"
 					style="border: none;"
 					title="#{messages_bcc['common.tooltip.contextExplorer']}" />
 				<f:param name="viewId" value="processInstanceDetailsView" />
@@ -83,7 +83,7 @@
 			<ice:commandLink action="#{ippPortalApp.openView}" rendered="#{row.caseInstance}">
 				<pc:automationTag value="auto-COM-PCEHistoryTable-ActionsProcDetail" standAlone="false"/>
 				<h:graphicImage
-					value="/plugins/common/images/icons/process-history/active/process.png"
+					value="/plugins/views-common/images/icons/process.png"
 					style="border: none;"
 					title="#{messages_bcc['common.tooltip.contextExplorer']}" />
 				<f:param name="viewId" value="caseDetailsView" />
@@ -96,7 +96,7 @@
 				disabled="#{not row.enableTerminate}">
 				<pc:automationTag value="auto-COM-PCEHistoryTable-ActionsTerminate" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/business-control-center/images/icons/abort_process.png"
+					value="/plugins/views-common/images/icons/abort_process.png"
 					title="#{views_common_msgPropsBean['common.tooltip.terminate']}"
 					styleClass="#{row.enableTerminate? '' : 'iceCmdBtn-dis'}" />
 				<f:attribute name="processInstance" value="#{row.processInstance}" />
@@ -116,7 +116,7 @@
 				disabled="#{not row.enableRecover}">
 				<pc:automationTag value="auto-COM-PCEHistoryTable-ActionsRecover" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/business-control-center/images/icons/recover_process.png"
+					value="/plugins/views-common/images/icons/recover_process.png"
 					title="#{messages_bcc['common.tooltip.recover']}"
 					styleClass="#{row.enableRecover ? '' : 'iceCmdBtn-dis'}" />
 				<f:attribute name="processInstance" value="#{row.processInstance}" />
@@ -156,7 +156,7 @@
 			<ice:commandLink action="#{ippPortalApp.openView}">
 				<pc:automationTag value="auto-COM-PCEHistoryTable-ActionsGanttChart" standAlone="false"/>
 				<h:graphicImage
-					value="/plugins/business-control-center/images/icons/gantt_diagram.gif"
+					value="/plugins/views-common/images/icons/diagram/gantt_diagram.gif"
 					style="border: none;"
 					title="#{messages_bcc['views.processSearchView.tooltip.viewGanttChart']}" />
 				<f:param name="viewId" value="ganttChartView" />
@@ -167,7 +167,7 @@
 				actionListener="#{processHistoryTable.processTreeTable.processUIBuilder.openNotes}">
 				<pc:automationTag value="auto-COM-PCEHistoryTable-ActionsNote" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/notes-filled.png"
+					value="/plugins/views-common/images/icons/mime-types/notes-filled.png"
 					title="#{messages_bcc['common.tooltip.notes']}" />
 				<f:attribute name="processInstance" value="#{row.processInstance}" />
 			</ice:commandLink>
@@ -175,7 +175,7 @@
 				actionListener="#{processHistoryTable.processTreeTable.processUIBuilder.openNotes}">
 				<pc:automationTag value="auto-COM-PCEHistoryTable-ActionsNote" standAlone="false"/>
 				<ice:graphicImage
-					value="/plugins/processportal/images/icons/notes-blank.png"
+					value="/plugins/views-common/images/icons/notes-blank.png"
 					title="#{messages_bcc['common.tooltip.notes']}" />
 				<f:attribute name="processInstance" value="#{row.processInstance}" />
 			</ice:commandLink>
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml
index 6ed9366..aa85a3a 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableToolbar.xhtml
@@ -26,7 +26,7 @@
 			disabled="#{!processHistoryTable.processTreeTable.priorityChanged}">
 			<pc:automationTag value="auto-COM-PCEHistoryTable-ToolbarSave" standAlone="false"/>
 			<ice:graphicImage
-				url="/plugins/business-control-center/images/icons/save_flag.png"
+				url="/plugins/views-common/images/icons/save_flag.png"
 				style="border:none;padding-right: 5px;padding-left: 5px;"
 				styleClass="#{!processHistoryTable.processTreeTable.priorityChanged ? 'iceCmdBtn-dis' : ''}"
 				title="#{views_common_msgPropsBean['processHistory.processTable.applyChanges']}" />
diff --git a/views-common/src/main/resources/META-INF/xhtml/security/securityDialog.xhtml b/views-common/src/main/resources/META-INF/xhtml/security/securityDialog.xhtml
index 41ab26a..25f4300 100644
--- a/views-common/src/main/resources/META-INF/xhtml/security/securityDialog.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/security/securityDialog.xhtml
@@ -30,7 +30,7 @@
 								action="#{securityDialog.toggleExpandCollpase}">
 								<ice:panelGrid columns="2">
 									<ice:graphicImage rendered="#{!securityDialog.expanded}"
-										value="/plugins/common/images/panelHeader-triggerExpand.png"
+										value="/plugins/views-common/images/icons/thumbnailsPanel-triggerExpand.png"
 										style="border: none" />
 									<ice:graphicImage rendered="#{securityDialog.expanded}"
 										value="/plugins/common/images/panelHeader-triggerCollapse.png"
diff --git a/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml
index e091ff3..e5c3097 100644
--- a/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml
@@ -57,7 +57,7 @@
 										<td class="autoCompTableRemoveCol">
 											<ice:commandButton
 												action="#{participant.removeParticipant}"
-												image="/plugins/common/images/tab-bttn-close.png" />
+												image="/plugins/common/images/dialog-windowbttn-close.png" />
 										</td>
 									</tr>
 								</c:forEach>
diff --git a/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTableColumns.xhtml
index 2aa8a10..58d136e 100644
--- a/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTableColumns.xhtml
@@ -23,7 +23,7 @@
 			<ice:commandLink action="#{row.removeParticipant}"
 				disabled="#{not row.removeable}">
 				<pc:automationTag value="auto-COM-PartAutoMultiSel-PartTbl-ActionsRemove" standAlone="false"/>
-				<ice:graphicImage value="/plugins/common/images/tab-bttn-close.png"
+				<ice:graphicImage value="/plugins/common/images/dialog-windowbttn-close.png"
 					styleClass="#{(not row.removeable) ? 'iceCmdBtn-dis' : 'toolbar-button'}"/>
 			</ice:commandLink>
 		</ice:panelGroup>
diff --git a/views-common/src/main/resources/META-INF/xhtml/user/userAutocompleteMultiSelectorUserTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/user/userAutocompleteMultiSelectorUserTable.xhtml
index 57c7ec5..9512b63 100644
--- a/views-common/src/main/resources/META-INF/xhtml/user/userAutocompleteMultiSelectorUserTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/user/userAutocompleteMultiSelectorUserTable.xhtml
@@ -49,7 +49,7 @@
 											<pc:automationTag value="auto-COM-UserMultiSel-ActionsRemove"
 												standAlone="false" />
 											<ice:graphicImage
-												value="/plugins/common/images/tab-bttn-close.png"
+												value="/plugins/common/images/dialog-windowbttn-close.png"
 												styleClass="#{(not user.removeable) ? 'iceCmdBtn-dis' : 'toolbar-button'}" />
 											</ice:commandLink>
 										</td>
diff --git a/views-common/src/main/resources/META-INF/xhtml/user/userAutocompleteMultiSelectorUserTableToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/user/userAutocompleteMultiSelectorUserTableToolbar.xhtml
index d687dd8..c8acec0 100644
--- a/views-common/src/main/resources/META-INF/xhtml/user/userAutocompleteMultiSelectorUserTableToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/user/userAutocompleteMultiSelectorUserTableToolbar.xhtml
@@ -29,7 +29,7 @@
 		<ice:panelGroup rendered="#{col.columnName == 'Actions'}">
 			<ice:commandLink action="#{row.removeUser}"
 				rendered="#{row.removeable}">
-				<ice:graphicImage value="/plugins/common/images/tab-bttn-close.png"
+				<ice:graphicImage value="/plugins/common/images/dialog-windowbttn-close.png"
 					styleClass="toolbar-button" />
 			</ice:commandLink>
 		</ice:panelGroup>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/authorization/participantTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/authorization/participantTable.xhtml
index be23b36..a3185d3 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/authorization/participantTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/authorization/participantTable.xhtml
@@ -121,7 +121,7 @@
 									<ice:commandLink
 										actionListener="#{authorizationManagerBean.participantHelper.removeRow}">
 										<ice:graphicImage
-											value="/plugins/common/images/tab-bttn-close.png"
+											value="/plugins/common/images/dialog-windowbttn-close.png"
 											styleClass="iceCmdBtn" />
 										<f:attribute name="participant" value="#{participant}" />
 									</ice:commandLink>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/authorization/permissionTree.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/authorization/permissionTree.xhtml
index 81e2f70..4ff4822 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/authorization/permissionTree.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/authorization/permissionTree.xhtml
@@ -49,7 +49,7 @@
 
 						<ice:menuPopup id="menuPopupUser" hideOn="mouseout">
 							<ice:menuItem id="removeParticipant"
-								icon="/plugins/admin-portal/images/icons/user_delete.png"
+								icon="/plugins/views-common/images/icons/user_delete.png"
 								value="#{authorizationManagerBean.messages['permission.contextMenu.removeParticipant']}"
 								actionListener="#{authorizationManagerBean.contextMenuAction}">
 								<pc:automationTag
@@ -157,7 +157,7 @@
 
 						<ice:menuPopup id="menuPopupUser" hideOn="mouseout">
 							<ice:menuItem id="removeParticipant"
-								icon="/plugins/views-common/images/icons/world_remove.png"
+								icon="/plugins/views-common/images/icons/world_delete.png"
 								value="#{authorizationManagerBean.messages['permission.contextMenu.removeParticipant']}"
 								action="#{participantTree.removeUserFromParticipant}">
 								<pc:automationTag
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/case/caseDescriptorsToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/case/caseDescriptorsToolbar.xhtml
index 14049f2..1421196 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/case/caseDescriptorsToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/case/caseDescriptorsToolbar.xhtml
@@ -10,7 +10,7 @@
 		<ice:commandLink title="#{messages_bcc['toolbars.common.tooltip.update']}" 
 	            action="#{caseDetailsBean.updateDescriptors}" partialSubmit="true">
 	            <pc:automationTag value="auto-COM-CaseDescriptorTbl-ToolbarRefresh" standAlone="false"/>
-			<ice:graphicImage value="/plugins/admin-portal/images/icons/arrow_refresh.png"
+			<ice:graphicImage value="/plugins/views-common/images/icons/arrow_refresh.png"
 				styleClass="toolbar-button" />
 		</ice:commandLink>
 	</ice:panelGrid>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/case/caseDetailsView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/case/caseDetailsView.xhtml
index 2745e61..66c51ba 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/case/caseDetailsView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/case/caseDetailsView.xhtml
@@ -75,13 +75,13 @@
 									<ice:commandLink
 										action="#{caseDetailsBean.updateProcessName}">
 										<h:graphicImage
-											value="/plugins/admin-portal/images/icons/rename-accept.gif"
+											value="/plugins/views-common/images/icons/button_bid_accept.gif"
 											style="border: none;" />
 									</ice:commandLink>
 									<ice:commandLink
 										action="#{caseDetailsBean.cancelEditProcessName}">
 										<h:graphicImage
-											value="/plugins/admin-portal/images/icons/rename-decline.gif"
+											value="/plugins/views-common/images/icons/button_bid_decline.gif"
 											style="border: none;" />
 									</ice:commandLink>
 
@@ -160,13 +160,13 @@
 									<pc:automationTag value="auto-COM-CaseDetView-EditDescriptionBtnsBar"/>
 									<ice:commandLink action="#{caseDetailsBean.updateDescription}">
 										<h:graphicImage
-											value="/plugins/admin-portal/images/icons/rename-accept.gif"
+											value="/plugins/views-common/images/icons/button_bid_accept.gif"
 											style="border: none;" />
 									</ice:commandLink>
 									<ice:commandLink
 										action="#{caseDetailsBean.cancelEditDescription}">
 										<h:graphicImage
-											value="/plugins/admin-portal/images/icons/rename-decline.gif"
+											value="/plugins/views-common/images/icons/button_bid_decline.gif"
 											style="border: none;" />
 									</ice:commandLink>
 
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/case/caseDetailsViewToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/case/caseDetailsViewToolbar.xhtml
index bb54d35..6b0d838 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/case/caseDetailsViewToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/case/caseDetailsViewToolbar.xhtml
@@ -14,7 +14,7 @@
 		style="padding-right: 10px;" columns="15">
 		<pc:automationTag value="auto-COM-CaseDetView-ToolbarTerminate"/>
 		<ice:commandButton
-			image="/plugins/business-control-center/images/icons/abort_process.png"
+			image="/plugins/views-common/images/icons/abort_process.png"
 			action="#{caseDetailsBean.terminateProcess}"
 			disabled="#{!caseDetailsBean.abortProcess}" partialSubmit="true"
 			title="#{views_common_msgPropsBean['common.tooltip.terminate']}"
@@ -38,7 +38,7 @@
 
 		<pc:automationTag value="auto-COM-CaseDetView-ToolbarRecover"/>
 		<ice:commandButton
-			image="/plugins/business-control-center/images/icons/recover_process.png"
+			image="/plugins/views-common/images/icons/recover_process.png"
 			action="#{caseDetailsBean.recoverProcess}"
 			partialSubmit="true"
 			title="#{messages_bcc['common.tooltip.recover']}"
@@ -76,7 +76,7 @@
 		
 		<pc:automationTag value="auto-COM-CaseDetView-ToolbarRefresh"/>
 		<ice:commandButton
-			image="/plugins/business-control-center/images/icons/arrow_refresh.png"
+			image="/plugins/views-common/images/icons/arrow_refresh.png"
 			action="#{caseDetailsBean.update}" partialSubmit="true"
 			title="#{messages_bcc['toolbars.common.tooltip.update']}"
 			styleClass="toolbar-button" />
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml
index 9f65f95..0a16b99 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml
@@ -62,7 +62,7 @@
 									<ice:outputText value="" />
 								</f:facet>
 								<ice:graphicImage
-									value="/plugins/common/images/tab-bttn-close.png"
+									value="/plugins/common/images/dialog-windowbttn-close.png"
 									styleClass="iceCmdBtn-dis" />
 							</h:column>
 						</ice:dataTable>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/doctree/genericRepositoryView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/doctree/genericRepositoryView.xhtml
index 903791f..159e09a 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/doctree/genericRepositoryView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/doctree/genericRepositoryView.xhtml
@@ -232,7 +232,7 @@
 							</ice:menuItem>
 
 							<ice:menuItem id="securitySettings"
-								icon="/plugins/views-common/images/icons/configure.png"
+								icon="/plugins/views-common/images/icons/wrench.png"
 								value="#{genericRepositoryTreeViewBean.messages['treeMenuItem.security']}"
 								action="#{securityDialog.open}"
 								disabled="#{!item.userObject.readACL}">
@@ -303,12 +303,12 @@
 							<ice:inputText value="#{item.userObject.name}"
 								partialSubmit="true" />
 							<ice:commandButton id="image_button__rename_accept"
-								image="/plugins/admin-portal/images/icons/rename-accept.gif"
+								image="/plugins/views-common/images/icons/button_bid_accept.gif"
 								action="#{item.userObject.renameAccept}"
 								style="border: 0px;width: 15px;height:15px;" />
 							<ice:commandButton id="image_button_rename_decline"
 								immediate="true"
-								image="/plugins/admin-portal/images/icons/rename-decline.gif"
+								image="/plugins/views-common/images/icons/button_bid_decline.gif"
 								action="#{item.userObject.renameDecline}"
 								rendered="#{not item.userObject.newNodeCreated}"
 								style="border: 0px;width: 15px;height:15px" />
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/document/pdfViewer.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/document/pdfViewer.xhtml
index cf68e41..7a0e18f 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/document/pdfViewer.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/document/pdfViewer.xhtml
@@ -8,7 +8,7 @@
 	<html>
 	<head>
 	<link
-		href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/pdf-viewer/pdf-viewer.css"
+		href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/pdf-viewer.css"
 		rel="stylesheet" type="text/css" />
 	</head>
 	<body>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentProcessesDialog.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentProcessesDialog.xhtml
index 6f3b6e4..ff44256 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentProcessesDialog.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentProcessesDialog.xhtml
@@ -36,7 +36,7 @@
 								<ui:repeat value="#{bean.processList}"
 									var="processWrapper">
 									<h:graphicImage
-										url="/plugins/processportal/images/icons/process.png" />
+										url="/plugins/views-common/images/icons/process.png" />
 									<h:outputText value="&#160;" />
 									<ice:commandLink style="white-space:nowrap;"
 										value="#{processWrapper.processName} (##{processWrapper.processInstance.OID})"
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/processContextExplorer/processInstanceDetailConfiguration.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/processContextExplorer/processInstanceDetailConfiguration.xhtml
index c30f3fc..a250e96 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/processContextExplorer/processInstanceDetailConfiguration.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/processContextExplorer/processInstanceDetailConfiguration.xhtml
@@ -40,7 +40,7 @@
 					<h:graphicImage
 						rendered="#{not filterToolbarItem.visible and not filterToolbarItem.neverVisible}"
 						style="border: none; padding-right: 10px;"
-						value="/plugins/common/images/t.gif" width="15px" height="15px" />
+						value="/plugins/views-common/images/t.gif" width="15px" height="15px" />
 				</ui:repeat>
 			</ice:panelGroup>
 
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/processContextExplorer/processInstanceDetailsView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/processContextExplorer/processInstanceDetailsView.xhtml
index d95eda5..2c85da5 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/processContextExplorer/processInstanceDetailsView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/processContextExplorer/processInstanceDetailsView.xhtml
@@ -41,7 +41,7 @@
 								<ice:commandLink action="#{ippPortalApp.openView}">
 									<pc:automationTag value="auto-COM-PCEOverview-GanttChart" standAlone="false"/>
 									<h:graphicImage
-										value="/plugins/business-control-center/images/icons/gantt_diagram.gif"
+										value="/plugins/views-common/images/icons/diagram/gantt_diagram.gif"
 										style="border: none;" title="#{ippBCCDiagramBean.messages['tooltip.viewGanttChart.title']}"/>
 									<f:param name="viewId" value="ganttChartView" />
 									<f:param name="nested" value="true" />
author	Sidharth Singh	2012-03-15 11:19:03 (EDT)
committer	Manik Kishore	2012-06-19 07:21:33 (EDT)
commit	6cda125620f78e77662e4e7306e7b7dc1ed63a4c (patch) (side-by-side diff)
tree	df65fc4c74a79e068ffaad6572c27d8d5dd968c1
parent	50a91c57a9c011d7705c04821857edc38f8a047d (diff)
download	org.eclipse.stardust.ui.web-6cda125620f78e77662e4e7306e7b7dc1ed63a4c.zip org.eclipse.stardust.ui.web-6cda125620f78e77662e4e7306e7b7dc1ed63a4c.tar.gz org.eclipse.stardust.ui.web-6cda125620f78e77662e4e7306e7b7dc1ed63a4c.tar.bz2