diff --git a/catalog-ui/src/assets/languages/en_US.json b/catalog-ui/src/assets/languages/en_US.json
index 2957f8a..85acea6 100644
--- a/catalog-ui/src/assets/languages/en_US.json
+++ b/catalog-ui/src/assets/languages/en_US.json
@@ -200,10 +200,8 @@
 
     "=========== NEW RESOURCE SERVICE ===========": "",
     "NEW_SERVICE_RESOURCE_WRAPPER_TAB_GENERAL_INFORMATION": "General Information",
-    "NEW_SERVICE_RESOURCE_WRAPPER_TAB_ASSIGN_PRODUCT_HIERARCHY": "Assign Product Hierarchy",
     "NEW_SERVICE_RESOURCE_WRAPPER_TAB_ADDITIONAL_INFO": "Additional Information",
     "NEW_SERVICE_RESOURCE_WRAPPER_TAB_BILLING_AND_ORDERING": "Order Attributes & Rules",
-    "NEW_SERVICE_RESOURCE_WRAPPER_TAB_PRODUCT_COMPOSITION": "Bill Attributes & Rules",
     "NEW_SERVICE_RESOURCE_SAVE_BUTTON": "Save",
     "NEW_SERVICE_RESOURCE_DONE_BUTTON": "Done",
 
@@ -226,9 +224,7 @@
     "NEW_SERVICE_RESOURCE_ERROR_SERVICE_ICON": "Icon required.",
     "NEW_SERVICE_RESOURCE_ERROR_RESOURCE_ICON": "Icon required.",
     "NEW_SERVICE_RESOURCE_ERROR_RESOURCE_NAME_REQUIRED": "Name is required.",
-    "NEW_SERVICE_RESOURCE_ERROR_PRODUCT_NAME_REQUIRED": "Name is required.",
     "NEW_SERVICE_RESOURCE_ERROR_RESOURCE_DESCRIPTION_REQUIRED": "Description is required.",
-    "NEW_SERVICE_RESOURCE_ERROR_PRODUCT_DESCRIPTION_REQUIRED": "Description is required.",
     "NEW_SERVICE_RESOURCE_ERROR_VENDOR_NAME_REQUIRED": "Vendor name is required.",
     "NEW_SERVICE_RESOURCE_ERROR_VENDOR_RELEASE_REQUIRED": "Vendor Release is required.",
     "NEW_SERVICE_RESOURCE_ERROR_TEMPLATE_REQUIRED": "Template is required.",
@@ -238,7 +234,6 @@
     "NEW_SERVICE_RESOURCE_ERROR_TOSCA_FILE_REQUIRED": "Tosca file is required.",
     "NEW_SERVICE_RESOURCE_ERROR_VALID_CSAR_EXTENSIONS_TITLE": "Invalid csar file",
     "NEW_SERVICE_RESOURCE_ERROR_VALID_CSAR_EXTENSIONS": "File extension should be {{extensions}}.",
-    "NEW_PRODUCT_NO_CATEGORIES_TO_DISPLAY": "Your product is not assigned to any group yet. <br> To select/find a group, begin typing above and select group to add",
 
     "=========== SUGGESTED ICONS TOOLTIP ===========": "",
     "call_controll": "Call Control",
diff --git a/catalog-ui/src/assets/styles/app.less b/catalog-ui/src/assets/styles/app.less
index 1ce1801..13d88a3 100644
--- a/catalog-ui/src/assets/styles/app.less
+++ b/catalog-ui/src/assets/styles/app.less
@@ -11,7 +11,6 @@
 
 @import 'sprite-old.less';
 @import 'sprite.less';
-@import 'sprite-product-icons.less';
 @import 'sprite-resource-icons.less';
 @import 'sprite-services-icons.less';
 
@@ -90,6 +89,7 @@
 @import '../../app/view-models/modals/message-modal/message-client-modal/client-message-modal.less';
 @import '../../app/view-models/modals/message-modal/message-server-modal/server-message-modal.less';
 @import '../../app/view-models/modals/onboarding-modal/onboarding-modal.less';
+@import '../../app/view-models/modals/icons-modal/icons-modal-view.less';
 @import '../../app/view-models/onboard-vendor/onboard-vendor.less';
 @import '../../app/view-models/support/support.less';
 @import '../../app/view-models/tabs/general-tab.less';
@@ -107,12 +107,10 @@
 @import '../../app/view-models/workspace/tabs/distribution/disribution-status-modal/disribution-status-modal.less';
 @import '../../app/view-models/workspace/tabs/distribution/distribution.less';
 @import '../../app/view-models/workspace/tabs/general/general.less';
-@import '../../app/view-models/workspace/tabs/icons/icons.less';
 @import '../../app/view-models/workspace/tabs/information-artifacts/information-artifacts.less';
 @import '../../app/view-models/workspace/tabs/inputs/inputs.less';
 @import '../../app/view-models/workspace/tabs/inputs/resource-input/resource-inputs.less';
 @import '../../app/view-models/workspace/tabs/inputs/service-input/service-inputs.less';
-@import '../../app/view-models/workspace/tabs/product-hierarchy/product-hierarchy.less';
 @import '../../app/view-models/workspace/tabs/properties/properties.less';
 @import '../../app/view-models/workspace/tabs/req-and-capabilities/req-and-capabilities.less';
 @import '../../app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts.less';
diff --git a/catalog-ui/src/assets/styles/images/resource-icons/vnfconfiguration.png b/catalog-ui/src/assets/styles/images/resource-icons/vnfconfiguration.png
new file mode 100644
index 0000000..66c64c3
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/resource-icons/vnfconfiguration.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/sprites/sprite-global.png b/catalog-ui/src/assets/styles/images/sprites/sprite-global.png
index 7a795c7..962478f 100644
--- a/catalog-ui/src/assets/styles/images/sprites/sprite-global.png
+++ b/catalog-ui/src/assets/styles/images/sprites/sprite-global.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/sprites/sprite-product-icons.png b/catalog-ui/src/assets/styles/images/sprites/sprite-product-icons.png
deleted file mode 100644
index e85467a..0000000
--- a/catalog-ui/src/assets/styles/images/sprites/sprite-product-icons.png
+++ /dev/null
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.png b/catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.png
index 7d520a8..27e96f3 100644
--- a/catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.png
+++ b/catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/mixins.less b/catalog-ui/src/assets/styles/mixins.less
index 4a0356d..fbc5f83 100644
--- a/catalog-ui/src/assets/styles/mixins.less
+++ b/catalog-ui/src/assets/styles/mixins.less
@@ -34,6 +34,10 @@
         font-family: @font-opensans-light;
         font-size: 36px;
     }
+    ._28 {
+        font-family: @font-opensans-light;
+        font-size: 28px;
+    }
     ._24 {
         font-family: @font-opensans-light;
         font-size: 24px;
diff --git a/catalog-ui/src/assets/styles/modal.less b/catalog-ui/src/assets/styles/modal.less
index eb9de92..3307bfc 100644
--- a/catalog-ui/src/assets/styles/modal.less
+++ b/catalog-ui/src/assets/styles/modal.less
@@ -33,6 +33,10 @@
     width: 552px;
 }
 
+.modal-dialog.modal-sdc-auto {
+    width: auto;
+}
+
 .modal-dialog.modal-sdc-xsm {
     width: 432px;
 }
@@ -324,7 +328,8 @@
 .modal-sdc-l,
 .modal-sdc-md,
 .modal-sdc-sm,
-.modal-sdc-xsm {
+.modal-sdc-xsm,
+.modal-sdc-auto {
 
     .w-sdc-classic-top-line-modal {
         padding: 0 30px;
diff --git a/catalog-ui/src/assets/styles/sprite-product-icons.less b/catalog-ui/src/assets/styles/sprite-product-icons.less
deleted file mode 100644
index 3485ec8..0000000
--- a/catalog-ui/src/assets/styles/sprite-product-icons.less
+++ /dev/null
@@ -1,71 +0,0 @@
-.sprite-product-icons {
-    background-image: url('images/sprites/sprite-product-icons.png');
-    display: inline-block;
-}
-
-.sprite-product-icons.disable               { opacity:0.5;}
-
-.sprite-product-icons.setting               { background-position: -291px -102px;  width: 61px; height: 67px;}
-.sprite-product-icons.setting.small         { background-position: -217px -142px;  width: 29px; height: 28px;}
-.sprite-product-icons.setting.medium        { background-position: -148px -130px;  width: 41px; height: 40px;}
-.sprite-product-icons.setting.large         { background-position: -77px -110px;  width: 60px; height: 60px;}
-
-.sprite-product-icons.cloud                 { background-position: -290px -215px; width: 64px; height: 43px;}
-.sprite-product-icons.cloud.small           { background-position: -217px -232px; width: 29px; height: 28px;}
-.sprite-product-icons.cloud.medium          { background-position: -148px -220px; width: 41px; height: 40px;}
-.sprite-product-icons.cloud.large           { background-position: -77px -200px; width: 60px; height: 60px;}
-
-.sprite-product-icons.security              { background-position: -289px -293px;  width: 50px; height: 57px;}
-.sprite-product-icons.security.small        { background-position: -217px -321px;  width: 29px; height: 28px;}
-.sprite-product-icons.security.medium       { background-position: -148px -310px;  width: 41px; height: 40px;}
-.sprite-product-icons.security.large        { background-position: -77px -290px;  width: 60px; height: 60px;}
-
-.sprite-product-icons.network               { background-position: -290px -383px;  width: 56px; height: 57px;}
-.sprite-product-icons.network.small         { background-position: -217px -411px;  width: 29px; height: 29px;}
-.sprite-product-icons.network.medium        { background-position: -148px -399px;  width: 41px; height: 41px;}
-.sprite-product-icons.network.large         { background-position: -77px -380px;  width: 60px; height: 60px;}
-
-.sprite-product-icons.orphan                { background-position: -290px -478px;  width: 52px; height: 52px;}
-.sprite-product-icons.orphan.small          { background-position: -217px -500px; width: 29px; height: 29px;}
-.sprite-product-icons.orphan.medium         { background-position: -148px -488px; width: 41px; height: 41px;}
-.sprite-product-icons.orphan.large          { background-position: -77px -470px;  width: 60px; height: 60px;}
-
-.sprite-product-icons.defaulticon           { background-position: -290px -478px;  width: 52px; height: 52px;}
-.sprite-product-icons.defaulticon.small     { background-position: -217px -500px; width: 29px; height: 29px;}
-.sprite-product-icons.defaulticon.medium    { background-position: -148px -488px; width: 41px; height: 41px;}
-.sprite-product-icons.defaulticon.large     { background-position: -77px -470px;  width: 60px; height: 60px;}
-
-.sprite-product-icons.vfw                   { background-position: -289px -548px;  width: 73px; height: 73px;}
-.sprite-product-icons.vfw.small             { background-position: -217px -591px;  width: 29px; height: 29px;}
-.sprite-product-icons.vfw.medium            { background-position: -148px -580px;  width: 41px; height: 41px;}
-.sprite-product-icons.vfw.large             { background-position: -77px -560px;  width: 60px; height: 61px;}
-
-.sprite-product-icons.wanx                  { background-position: -290px -664px;  width: 59px; height: 47px;}
-.sprite-product-icons.wanx.small            { background-position: -217px -681px;  width: 30px; height: 30px;}
-.sprite-product-icons.wanx.medium           { background-position: -148px -670px;   width: 41px; height: 41px;}
-.sprite-product-icons.wanx.large            { background-position: -77px -651px;  width: 60px; height: 60px;}
-
-.sprite-product-icons.vrouter               { background-position: -289px -758px;  width: 69px; height: 43px;}
-.sprite-product-icons.vrouter.small         { background-position: -217px -772px;  width: 29px; height: 29px;}
-.sprite-product-icons.vrouter.medium        { background-position: -148px -760px;  width: 41px; height: 41px;}
-.sprite-product-icons.vrouter.large         { background-position: -77px -741px;  width: 60px; height: 60px;}
-
-.sprite-product-icons.ucpe                  { background-position: -289px -832px;  width: 59px; height: 60px;}
-.sprite-product-icons.ucpe.small            { background-position: -217px -862px;  width: 28px; height: 29px;}
-.sprite-product-icons.ucpe.medium           { background-position: -148px -849px;  width: 41px; height: 41px;}
-.sprite-product-icons.ucpe.large            { background-position: -77px -831px;  width: 60px; height: 61px;}
-
-.sprite-product-icons.mobility              { background-position: -288px -919px;  width: 64px; height: 62px;}
-.sprite-product-icons.mobility.small        { background-position: -216px -952px;  width: 29px; height: 29px;}
-.sprite-product-icons.mobility.medium       { background-position: -147px -940px;  width: 41px; height: 41px;}
-.sprite-product-icons.mobility.large        { background-position: -76px -921px;  width: 60px; height: 60px;}
-
-.sprite-product-icons.wanx_customer_managed         { background-position: -290px -1024px;  width: 58px; height: 62px;}
-.sprite-product-icons.wanx.small_customer_managed   { background-position: -217px -1041px;  width: 30px; height: 38px;}
-.sprite-product-icons.wanx.medium_customer_managed  { background-position: -148px -1030px;   width: 42px; height: 47px;}
-.sprite-product-icons.wanx.large_customer_managed   { background-position: -77px -1011px;  width: 61px; height: 66px;}
-
-.sprite-product-icons.wanx_attr_managed         { background-position: -290px -1114px;  width: 59px; height: 62px;}
-.sprite-product-icons.wanx.small_att_managed   { background-position: -218px -1131px;  width: 31px; height: 36px;}
-.sprite-product-icons.wanx.medium_att_managed  { background-position: -149px -1120px;   width: 42px; height: 47px;}
-.sprite-product-icons.wanx.large_att_managed   { background-position: -77px -1101px;  width: 60px; height: 67px;}
diff --git a/catalog-ui/src/assets/styles/sprite-resource-icons.less b/catalog-ui/src/assets/styles/sprite-resource-icons.less
index 153e8c0..2c19ee3 100644
--- a/catalog-ui/src/assets/styles/sprite-resource-icons.less
+++ b/catalog-ui/src/assets/styles/sprite-resource-icons.less
@@ -266,3 +266,4 @@
 .sprite-resource-icons.allotted_resource.medium       { background-position: -141px -4898px;  width: 41px;  height: 41px;}
 .sprite-resource-icons.allotted_resource.large        { background-position: -70px -4879px; width: 60px; height: 60px;}
 
+.sprite-resource-icons.vnfconfiguration.large        { background-position: -70px -4959px; width: 60px; height: 60px;}
diff --git a/catalog-ui/src/assets/styles/sprite.less b/catalog-ui/src/assets/styles/sprite.less
index 0c0f538..2076744 100644
--- a/catalog-ui/src/assets/styles/sprite.less
+++ b/catalog-ui/src/assets/styles/sprite.less
@@ -238,6 +238,8 @@
 .round-expand-icon:hover       { background-position: -100px -1188px;  width: 15px;  height: 15px; }
 .round-expand-icon.open        { background-position: -50px -1216px;  width: 15px;  height: 15px; }
 .round-expand-icon.open:hover  { background-position: -100px -1216px;  width: 15px;  height: 15px; }
+.update-component-icon {    background-position: -140px -1183px;  width: 20px;  height: 20px;}
+.update-component-icon:hover {    background-position: -170px -1183px;  width: 20px;  height: 20px;}
 /*
 .sprite-new.expand-asset-icon {  background-position: -740px -590px;  width: 40px;  height: 40px; }
 .sprite-new.view-info-icon {  background-position: -739px -621px;  width: 40px;  height: 40px; }
diff --git a/catalog-ui/src/assets/styles/variables-old.less b/catalog-ui/src/assets/styles/variables-old.less
index 57f3fc2..d16252d 100644
--- a/catalog-ui/src/assets/styles/variables-old.less
+++ b/catalog-ui/src/assets/styles/variables-old.less
@@ -2,7 +2,7 @@
 @images: "images";
 
 /* Colors */
-@color_a: #3b7b9b; // product category
+@color_a: #3b7b9b;
 @color_b: #666666;
 @color_c: #ffffff;
 @color_d: #1d9a95; // dashboard service (S at the top left of the card)
diff --git a/catalog-ui/src/assets/styles/variables.less b/catalog-ui/src/assets/styles/variables.less
index 3c23bdb..1637374 100644
--- a/catalog-ui/src/assets/styles/variables.less
+++ b/catalog-ui/src/assets/styles/variables.less
@@ -47,5 +47,6 @@
 @top_nav_height: 50px;
 @top_nav_admin_height: 44px;
 @action_nav_height: 53px;
+@tab_title: 110px;
 @footer_height: 89px;
 @border_color_view-mode: #ededed;