diff --git a/db/sql/updates/updateTo3.15.4.sql b/db/sql/updates/old/updateTo3.15.4.sql
similarity index 100%
rename from db/sql/updates/updateTo3.15.4.sql
rename to db/sql/updates/old/updateTo3.15.4.sql
diff --git a/db/sql/updates/updateTo3.15.5.sql b/db/sql/updates/updateTo3.15.5.sql
index a7a3d3a5b..76861215f 100644
--- a/db/sql/updates/updateTo3.15.5.sql
+++ b/db/sql/updates/updateTo3.15.5.sql
@@ -3,7 +3,9 @@
 -- See LICENSE file.
 --
 
--- Execute by running `mysql CDB_DB_NAME --host=127.0.0.1 --user=cdb -p < updateTo3.15.4.sql`
+-- Execute by running `mysql CDB_DB_NAME --host=127.0.0.1 --user=cdb -p < updateTo3.15.5.sql`
+
+delimiter //
 
 DROP PROCEDURE IF EXISTS fetch_relationship_children_items;//
 CREATE PROCEDURE `fetch_relationship_children_items` (IN item_id INT, IN relationship_type_id INT, IN parent_relationship_id INT) 
diff --git a/etc/version b/etc/version
index 8f6e357b3..9658bd085 100644
--- a/etc/version
+++ b/etc/version
@@ -1 +1 @@
-3.15.4
+3.15.5
diff --git a/src/java/CdbWebPortal/src/java/openapi.yaml b/src/java/CdbWebPortal/src/java/openapi.yaml
index 0dcc11fdf..9896eb14f 100644
--- a/src/java/CdbWebPortal/src/java/openapi.yaml
+++ b/src/java/CdbWebPortal/src/java/openapi.yaml
@@ -4,7 +4,7 @@ prettyPrint: true
 cacheTTL: 0
 openAPI:
   info:
-    version: '3.15.4'
+    version: '3.15.5'
     title: Component Database API
     description: 'The API that provides access to Component Database data.'
     contact:
diff --git a/src/java/CdbWebPortal/web/resources/css/portal.css b/src/java/CdbWebPortal/web/resources/css/portal.css
index e057a4907..96e3e9431 100644
--- a/src/java/CdbWebPortal/web/resources/css/portal.css
+++ b/src/java/CdbWebPortal/web/resources/css/portal.css
@@ -834,6 +834,15 @@ h2 {
     filter: grayscale(100%) brightness(500%) brightness(10%);
 }
 
+.ui-icon-control {    
+    background-image: url(../../resources/images/control.svg) !important;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: contain;     
+    animation: transition-ui-icon-machine-design 0.25s;
+    filter: grayscale(100%) brightness(500%) brightness(10%);
+}
+
 @keyframes transition-ui-icon-machine-design {
     0% {        
         transform:rotate(0deg);  
diff --git a/src/java/CdbWebPortal/web/resources/images/control.svg b/src/java/CdbWebPortal/web/resources/images/control.svg
new file mode 100644
index 000000000..137b3f075
--- /dev/null
+++ b/src/java/CdbWebPortal/web/resources/images/control.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="225.000000pt" height="132.000000pt" viewBox="0 0 225.000000 132.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.10, written by Peter Selinger 2001-2011
+</metadata>
+<g transform="translate(0.000000,132.000000) scale(0.050000,-0.050000)"
+fill="#000000" stroke="none">
+<path d="M2967 2337 c-448 -78 -571 -797 -177 -1028 257 -151 691 -24 541 159
+l-47 58 -88 -43 c-224 -109 -396 25 -396 307 0 277 196 431 394 311 l65 -40
+53 69 c29 38 47 83 41 99 -28 72 -245 133 -386 108z"/>
+<path d="M3820 2345 c-407 -62 -437 -467 -46 -633 192 -82 226 -106 226 -161
+0 -113 -152 -142 -312 -61 l-98 51 -67 -72 c-82 -89 -61 -124 115 -191 505
+-190 874 352 392 577 -268 125 -280 133 -287 184 -14 99 144 135 288 66 l73
+-34 48 59 c68 86 61 106 -57 159 -115 51 -198 68 -275 56z"/>
+<path d="M200 1790 l0 -530 351 0 351 0 -6 95 -6 95 -225 6 -225 5 0 98 c0
+161 1 161 203 161 l179 0 -6 85 -6 85 -180 10 -180 10 -6 105 c-7 119 -28 108
+226 116 230 8 210 -1 210 99 l0 90 -340 0 -340 0 0 -530z"/>
+<path d="M1120 1790 l0 -530 120 0 120 0 0 180 0 180 105 0 c277 0 435 133
+435 364 0 259 -117 336 -514 336 l-266 0 0 -530z m523 291 c99 -122 8 -261
+-172 -261 l-111 0 0 162 0 163 123 -9 c97 -7 131 -18 160 -55z"/>
+<path d="M2100 1790 l0 -530 120 0 120 0 0 530 0 530 -120 0 -120 0 0 -530z"/>
+<path d="M200 640 l0 -420 370 0 370 0 0 308 c0 340 -3 332 132 332 89 0 90
+-2 94 -343 l4 -287 364 -5 365 -6 5 316 6 315 100 0 100 0 6 -315 5 -315 1065
+5 1064 5 5 415 6 415 -370 0 -370 0 -5 -315 -6 -315 -105 -6 -105 -6 -2 76
+c-1 42 -3 184 -5 316 l-3 240 -364 5 -365 6 -5 -316 -6 -315 -100 0 -100 0 -6
+315 -5 315 -1070 0 -1069 0 0 -420z"/>
+</g>
+</svg>
diff --git a/src/java/CdbWebPortal/web/templates/portalViewMenubarTemplate.xhtml b/src/java/CdbWebPortal/web/templates/portalViewMenubarTemplate.xhtml
index c0b228f45..39e96510b 100644
--- a/src/java/CdbWebPortal/web/templates/portalViewMenubarTemplate.xhtml
+++ b/src/java/CdbWebPortal/web/templates/portalViewMenubarTemplate.xhtml
@@ -92,7 +92,7 @@ See LICENSE file.
                             styleClass="#{fn:startsWith(view.viewId, '/views/itemDomainCableDesign/list') ? 'activeMenuItem' : ''} "/>
                 <p:menuitem value="Control"
                             id="machineControlMenubarButton"
-                            icon="fa fa-code"
+                            icon="ui-icon-control"
                             url="#{request.contextPath}/views/itemDomainMachineDesignControl/list"
                             styleClass="#{fn:startsWith(view.viewId, '/views/itemDomainMachineDesignControl/list') ? 'activeMenuItem' : ''} "/>
                 <p:menuitem value="Power"
@@ -101,6 +101,11 @@ See LICENSE file.
                             rendered="#{false}"
                             url="#{request.contextPath}/views/itemDomainMachineDesignPower/list"
                             styleClass="#{fn:startsWith(view.viewId, '/views/itemDomainMachineDesignPower/list') ? 'activeMenuItem' : ''} "/>
+                <p:menuitem value="Applications"
+                            id="machineApplicationsMenubarButton"
+                            icon="fa fa-code"
+                            url="#{request.contextPath}/views/itemDomainApp/list"
+                            styleClass="#{fn:startsWith(view.viewId, '/views/itemDomainApp/list') ? 'activeMenuItem' : ''} "/>
             </p:submenu>
 
             <p:menuitem value="MAARC" 
diff --git a/src/java/CdbWebPortal/web/views/itemDomainInventoryBase/private/itemDomainInventoryBaseListCustomIdentifierObject.xhtml b/src/java/CdbWebPortal/web/views/itemDomainInventoryBase/private/itemDomainInventoryBaseListCustomIdentifierObject.xhtml
index dbcf95212..c956c8bca 100644
--- a/src/java/CdbWebPortal/web/views/itemDomainInventoryBase/private/itemDomainInventoryBaseListCustomIdentifierObject.xhtml
+++ b/src/java/CdbWebPortal/web/views/itemDomainInventoryBase/private/itemDomainInventoryBaseListCustomIdentifierObject.xhtml
@@ -16,6 +16,7 @@ See LICENSE file.
               value="#{partNameString != null ? partNameString : itemDomainInventoryController.getItemDisplayString(itemListObject)}" />
     <p:column headerText="Inventory Item"
               sortBy="#{partNameString}"
+              exportValue="#{partNameString}"
               filterBy="#{facesUtility.getFilterString(partNameString)}" 
               filterMatchMode="contains"
               filterable="#{filterable}"
diff --git a/src/java/CdbWebPortal/web/views/itemDomainMachineDesignControl/list.xhtml b/src/java/CdbWebPortal/web/views/itemDomainMachineDesignControl/list.xhtml
index 7a085c61a..27e391f22 100644
--- a/src/java/CdbWebPortal/web/views/itemDomainMachineDesignControl/list.xhtml
+++ b/src/java/CdbWebPortal/web/views/itemDomainMachineDesignControl/list.xhtml
@@ -25,17 +25,7 @@ See LICENSE file.
 
     <ui:define name="additionalDualColumnEditPanels">
         <ui:include src="private/itemDomainMachineDesignControlSelectMachineControlledByElement.xhtml" /> 
-    </ui:define>
-    
-    <ui:define name="additonalItemListButtons">
-        <p:commandButton id="#{entityTypeName}AppsListPageButton"                         
-                         alt="Apps List" styleClass="actionButtonRight"
-                         action="#{itemDomainAppController.getListPath()}"
-                         ajax="false"
-                         icon="fa fa-code">
-            <p:tooltip for="#{entityTypeName}AppsListPageButton" value="Go to apps list."/>
-        </p:commandButton>
-    </ui:define>
+    </ui:define>        
     
     <ui:define name="machineDesignExtraInfoPromotedColumn">
         <ui:param name="controlInterfaceToParentPV"
diff --git a/tools/developer_tools/python-client/setup-api.py b/tools/developer_tools/python-client/setup-api.py
index 11929c566..006f158d5 100644
--- a/tools/developer_tools/python-client/setup-api.py
+++ b/tools/developer_tools/python-client/setup-api.py
@@ -16,7 +16,7 @@
 from setuptools import find_packages
 
 setup(name='ComponentDB-API',
-      version='3.15.5.dev0',
+      version='3.15.5',
       packages=["cdbApi",
                 "cdbApi.api",
                 "cdbApi.models"],
diff --git a/tools/developer_tools/python-client/setup-cli.py b/tools/developer_tools/python-client/setup-cli.py
index df22f9b19..be6b1369b 100644
--- a/tools/developer_tools/python-client/setup-cli.py
+++ b/tools/developer_tools/python-client/setup-cli.py
@@ -16,7 +16,7 @@
 from setuptools import find_packages
 
 setup(name='ComponentDB-CLI',
-      version='3.15.5.dev0',
+      version='3.15.5',
       packages=['cdbCli',
                 'cdbCli.common',
                 'cdbCli.common.cli',
@@ -32,7 +32,7 @@
                         'pandas',
                         'rich',
                         'InquirerPy',
-                        'ComponentDB-API==3.15.5.dev0'],
+                        'ComponentDB-API==3.15.5'],
       license='Copyright (c) UChicago Argonne, LLC. All rights reserved.',
       description='Python APIs used to communicate with java hosted ComponentDB API.',
       maintainer='Dariusz Jarosz',