=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-12-02 11:11:18 +0000
@@ -234,7 +234,7 @@
 }
 
 .contextMenuItemActive {
-  background-color: #4A89B9;
+  background-color: #668cb9;
   color: #fff;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-12-02 11:11:18 +0000
@@ -234,7 +234,7 @@
 }
 
 .contextMenuItemActive {
-  background-color: #4A89B9;
+  background-color: #668cb9;
   color: #fff;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-12-02 11:11:18 +0000
@@ -234,7 +234,7 @@
 }
 
 .contextMenuItemActive {
-  background-color: #4A89B9;
+  background-color: #668cb9;
   color: #fff;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-12-02 11:11:18 +0000
@@ -234,7 +234,7 @@
 }
 
 .contextMenuItemActive {
-  background-color: #4A89B9;
+  background-color: #668cb9;
   color: #fff;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2013-12-01 22:05:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2013-12-02 11:11:18 +0000
@@ -133,13 +133,13 @@
 
 .dropDown > ul > li {
   list-style-type : none;
-  padding         : 100;
-  margin          : 5px 0;
+  padding         : 0;
+  margin          : 0;
 }
 
 .dropDown > ul > li > a {
   display       : block;
-  padding       : 5px 5px;
+  padding       : 8px 5px;
   color         : #000;
   border-radius : 3px;
   cursor        : pointer;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm	2013-12-02 11:11:18 +0000
@@ -16,11 +16,11 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    #if( $security.canManage( $dataDictionary ) )<li><a data-target-fn="showSharingDialogWithContext">$i18n.getString( "sharing_settings" )</a></li>#end
-    #if( $security.canUpdate( $dataDictionary ) )<li><a data-target-fn="showUpdateDataDictionaryForm">$i18n.getString( "edit" )</a></li>#end
-    #if( $security.canUpdate( $dataDictionary ) )<li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>#end
-    #if( $security.canDelete( $dataDictionary ) )<li><a data-target-fn="removeDataDictionary">$i18n.getString( "remove" )</a></li>#end
-    <li><a data-target-fn="showDataDictionaryDetails">$i18n.getString( "show_details" )</a></li>
+    #if( $security.canManage( $dataDictionary ) )<li><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>#end
+    #if( $security.canUpdate( $dataDictionary ) )<li><a data-target-fn="showUpdateDataDictionaryForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>#end
+    #if( $security.canUpdate( $dataDictionary ) )<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>#end
+    #if( $security.canDelete( $dataDictionary ) )<li><a data-target-fn="removeDataDictionary"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>#end
+    <li><a data-target-fn="showDataDictionaryDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm	2013-12-02 11:11:18 +0000
@@ -32,11 +32,11 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    #if( $security.canManage( $dataElement ) )<li><a data-target-fn="showSharingDialogWithContext">$i18n.getString( "sharing_settings" )</a></li>#end
-    #if( $security.canUpdate( $dataElement ) )<li><a data-target-fn="showUpdateDataElementForm">$i18n.getString( "edit" )</a></li>#end
-    #if( $security.canUpdate( $dataElement ) )<li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>#end
-    #if( $security.canDelete( $dataElement ) )<li><a data-target-fn="removeDataElement">$i18n.getString( "remove" )</a></li>#end
-    <li><a data-target-fn="showDataElementDetails">$i18n.getString( "show_details" )</a></li>
+    #if( $security.canManage( $dataElement ) )<li><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>#end
+    #if( $security.canUpdate( $dataElement ) )<li><a data-target-fn="showUpdateDataElementForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>#end
+    #if( $security.canUpdate( $dataElement ) )<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>#end
+    #if( $security.canDelete( $dataElement ) )<li><a data-target-fn="removeDataElement"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>#end
+    <li><a data-target-fn="showDataElementDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm	2013-12-02 11:11:18 +0000
@@ -13,10 +13,10 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li><a data-target-fn="showUpdateDataElementGroupForm">$i18n.getString( "edit" )</a></li>
-    <li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>
-    <li><a data-target-fn="removeDataElementGroup">$i18n.getString( "remove" )</a></li>
-    <li><a data-target-fn="showDataElementGroupDetails">$i18n.getString( "show_details" )</a></li>
+    <li><a data-target-fn="showUpdateDataElementGroupForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
+    <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
+    <li><a data-target-fn="removeDataElementGroup"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
+    <li><a data-target-fn="showDataElementGroupDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm	2013-12-02 11:11:18 +0000
@@ -14,10 +14,10 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li><a data-target-fn="showUpdateDataElementGroupSetForm">$i18n.getString( "edit" )</a></li>
-    <li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>
-    <li><a data-target-fn="deleteDataElementGroupSet">$i18n.getString( "remove" )</a></li>
-    <li><a data-target-fn="showDataElementGroupSetDetails">$i18n.getString( "show_details" )</a></li>
+    <li><a data-target-fn="showUpdateDataElementGroupSetForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
+    <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
+    <li><a data-target-fn="deleteDataElementGroupSet"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
+    <li><a data-target-fn="showDataElementGroupSetDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm	2013-12-02 11:11:18 +0000
@@ -19,11 +19,11 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    #if( $security.canManage( $indicator ) )<li><a data-target-fn="showSharingDialogWithContext">$i18n.getString( "sharing_settings" )</a></li>#end
-    #if( $security.canUpdate( $indicator ) )<li><a data-target-fn="showUpdateIndicatorForm">$i18n.getString( "edit" )</a></li>#end
-    #if( $security.canUpdate( $indicator ) )<li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>#end
-    #if( $security.canDelete( $indicator ) )<li><a data-target-fn="removeIndicator">$i18n.getString( "remove" )</a></li>#end
-    <li><a data-target-fn="showIndicatorDetails">$i18n.getString( "show_details" )</a></li>
+    #if( $security.canManage( $indicator ) )<li><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>#end
+    #if( $security.canUpdate( $indicator ) )<li><a data-target-fn="showUpdateIndicatorForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>#end
+    #if( $security.canUpdate( $indicator ) )<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>#end
+    #if( $security.canDelete( $indicator ) )<li><a data-target-fn="removeIndicator"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>#end
+    <li><a data-target-fn="showIndicatorDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm	2013-12-02 11:11:18 +0000
@@ -16,11 +16,11 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    #if( $security.canManage( $indicatorGroup ) )<li><a data-target-fn="showSharingDialogWithContext">$i18n.getString( "sharing_settings" )</a></li>#end
-    #if( $security.canUpdate( $indicatorGroup ) )<li><a data-target-fn="showUpdateIndicatorGroupForm">$i18n.getString( "edit" )</a></li>#end
-    #if( $security.canUpdate( $indicatorGroup ) )<li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>#end
-    #if( $security.canDelete( $indicatorGroup ) )<li><a data-target-fn="removeIndicatorGroup">$i18n.getString( "remove" )</a></li>#end
-    <li><a data-target-fn="showIndicatorGroupDetails">$i18n.getString( "show_details" )</a></li>
+    #if( $security.canManage( $indicatorGroup ) )<li><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>#end
+    #if( $security.canUpdate( $indicatorGroup ) )<li><a data-target-fn="showUpdateIndicatorGroupForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>#end
+    #if( $security.canUpdate( $indicatorGroup ) )<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>#end
+    #if( $security.canDelete( $indicatorGroup ) )<li><a data-target-fn="removeIndicatorGroup"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>#end
+    <li><a data-target-fn="showIndicatorGroupDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm	2013-12-02 11:11:18 +0000
@@ -16,11 +16,11 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    #if( $security.canManage( $indicatorGroupSet ) )<li><a data-target-fn="showSharingDialogWithContext">$i18n.getString( "sharing_settings" )</a></li>#end
-    #if( $security.canUpdate( $indicatorGroupSet ) )<li><a data-target-fn="showUpdateIndicatorGroupSetForm">$i18n.getString( "edit" )</a></li>#end
-    #if( $security.canUpdate( $indicatorGroupSet ) )<li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>#end
-    #if( $security.canDelete( $indicatorGroupSet ) )<li><a data-target-fn="deleteIndicatorGroupSet">$i18n.getString( "remove" )</a></li>#end
-    <li><a data-target-fn="showIndicatorGroupSetDetails">$i18n.getString( "show_details" )</a></li>
+    #if( $security.canManage( $indicatorGroupSet ) )<li><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>#end
+    #if( $security.canUpdate( $indicatorGroupSet ) )<li><a data-target-fn="showUpdateIndicatorGroupSetForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>#end
+    #if( $security.canUpdate( $indicatorGroupSet ) )<li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>#end
+    #if( $security.canDelete( $indicatorGroupSet ) )<li><a data-target-fn="deleteIndicatorGroupSet"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>#end
+    <li><a data-target-fn="showIndicatorGroupSetDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm	2013-12-02 11:11:18 +0000
@@ -34,10 +34,10 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li><a data-target-fn="showUpdateIndicatorTypeForm">$i18n.getString( "edit" )</a></li>
-    <li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>
-    <li><a data-target-fn="removeIndicatorType">$i18n.getString( "remove" )</a></li>
-    <li><a data-target-fn="showIndicatorTypeDetails">$i18n.getString( "show_details" )</a></li>
+    <li><a data-target-fn="showUpdateIndicatorTypeForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
+    <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
+    <li><a data-target-fn="removeIndicatorType"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
+    <li><a data-target-fn="showIndicatorTypeDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm	2013-12-02 11:11:18 +0000
@@ -34,10 +34,10 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li><a data-target-fn="showUpdateDataElementCategoryForm">$i18n.getString( "edit" )</a></li>
-    <li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>
-    <li><a data-target-fn="removeDataElementCategory">$i18n.getString( "remove" )</a></li>
-    <li><a data-target-fn="showDataElementCategoryDetails">$i18n.getString( "show_details" )</a></li>
+    <li><a data-target-fn="showUpdateDataElementCategoryForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
+    <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
+    <li><a data-target-fn="removeDataElementCategory"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
+    <li><a data-target-fn="showDataElementCategoryDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm	2013-12-02 11:11:18 +0000
@@ -10,10 +10,10 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li><a data-target-fn="showUpdateDataElementCategoryComboForm">$i18n.getString( "edit" )</a></li>
-    <li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>
-    <li><a data-target-fn="removeDataElementCategoryCombo">$i18n.getString( "remove" )</a></li>
-    <li><a data-target-fn="showDataElementCategoryComboDetails">$i18n.getString( "show_details" )</a></li>
+    <li><a data-target-fn="showUpdateDataElementCategoryComboForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
+    <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
+    <li><a data-target-fn="removeDataElementCategoryCombo"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
+    <li><a data-target-fn="showDataElementCategoryComboDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm	2013-12-02 11:11:18 +0000
@@ -35,10 +35,10 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li><a data-target-fn="showUpdateDataElementCategoryOptionForm">$i18n.getString( "edit" )</a></li>
-    <li><a data-target-fn="translateWithContext">$i18n.getString( "translation_translate" )</a></li>
-    <li><a data-target-fn="removeDataElementCategoryOption">$i18n.getString( "remove" )</a></li>
-    <li><a data-target-fn="showDataElementCategoryOptionDetails">$i18n.getString( "show_details" )</a></li>
+    <li><a data-target-fn="showUpdateDataElementCategoryOptionForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
+    <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
+    <li><a data-target-fn="removeDataElementCategoryOption"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
+    <li><a data-target-fn="showDataElementCategoryOptionDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm	2013-11-28 18:48:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm	2013-12-02 11:11:18 +0000
@@ -12,9 +12,9 @@
 
 <div id="contextMenu" class="contextMenu">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li><a data-target-fn="showUpdateConcept">$i18n.getString( "edit" )</a></li>
-    <li><a data-target-fn="removeConcept">$i18n.getString( "remove" )</a></li>
-    <li><a data-target-fn="showConceptDetails">$i18n.getString( "show_details" )</a></li>
+    <li><a data-target-fn="showUpdateConcept"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
+    <li><a data-target-fn="removeConcept"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
+    <li><a data-target-fn="showConceptDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
   </ul>
 </div>