diff --git a/webapp/i18n/i18n_en.properties b/webapp/i18n/i18n_en.properties
index ac7869b..a8a8777 100644
--- a/webapp/i18n/i18n_en.properties
+++ b/webapp/i18n/i18n_en.properties
@@ -148,7 +148,6 @@ creationDate=Creation Date
 workflowType=Workflow Type
 taskType=Task Type
 approvers=Approver(s)
-app
 decision=Decision
 actionType={0}
 accept=Accept
diff --git a/webapp/resources/fragments/systems/SwitchSystemKeyConfig.fragment.xml b/webapp/resources/fragments/systems/SwitchSystemKeyConfig.fragment.xml
index 0d7f785..34b7b19 100644
--- a/webapp/resources/fragments/systems/SwitchSystemKeyConfig.fragment.xml
+++ b/webapp/resources/fragments/systems/SwitchSystemKeyConfig.fragment.xml
@@ -13,7 +13,7 @@
                 width="100%"
                 class="sapUiContentPadding">
                 <MessageStrip
-                    text="{i18n>connnectSystemMessageStrip}"
+                    text="{i18n>connnectSystemNeedsApprovalMessage}"
                     showIcon="true"
                     showCloseButton="false"
                     class="sapUiMediumMarginBottom">
@@ -26,19 +26,6 @@
                         class="sapUiSmallMarginBegin sapUiSmallMarginTop" />
                     <Label text="{switchKeyConfigModel>/connectedKeyConfig/id}"
                         class="sapUiSmallMarginBegin" />
-                    <VBox class="sapUiSmallMarginBegin sapUiSmallMarginTop sapUiSmallMarginBottom">
-                        <Label text="{i18n>description}:" />
-                        <TextArea value="{switchKeyConfigModel>/connectedKeyConfig/description}"
-                            width="95%"
-                            editable="false">
-                            <customData>
-                                <core:CustomData
-                                    key="testId"
-                                    value="switchKeyConfig-descriptionText"
-                                    writeToDom="true" />
-                            </customData>
-                        </TextArea>
-                    </VBox>
                 </VBox>
                 <HBox justifyContent="Center" alignContent="Center"
                     class="sapUiSmallMarginTop sapUiSmallMarginBottom">
diff --git a/webapp/resources/fragments/systems/SystemsTable.fragment.xml b/webapp/resources/fragments/systems/SystemsTable.fragment.xml
index bb33c9e..c1ea8ee 100644
--- a/webapp/resources/fragments/systems/SystemsTable.fragment.xml
+++ b/webapp/resources/fragments/systems/SystemsTable.fragment.xml
@@ -172,8 +172,7 @@
                             visible="{= ${oneWay>status} !== 'FAILED'}">
                             <menu>
                                 <Menu class="sapUiSizeCompact">
-                                    <!-- @Todo TEMP: Revert after demo -->
-                                    <!-- <MenuItem text="{i18n>switchKeyConfiguration}"
+                                    <MenuItem text="{i18n>switchKeyConfiguration}"
                                         press="onSwitchKeyConfigPress">
                                         <customData>
                                             <core:CustomData
@@ -181,7 +180,7 @@
                                                 value="systemsTable-switchKeyConfigMenuItem"
                                                 writeToDom="true" />
                                         </customData>
-                                    </MenuItem> -->
+                                    </MenuItem>
                                     <MenuItem
                                         press="onSystemsTableDisconnectPress"
                                         visible="{= !!${oneWay>keyConfigurationID} &amp;&amp; ${oneWay>status} !== 'FAILED'}"
diff --git a/webapp/view/systems/Details.view.xml b/webapp/view/systems/Details.view.xml
index a34cc45..7aab036 100644
--- a/webapp/view/systems/Details.view.xml
+++ b/webapp/view/systems/Details.view.xml
@@ -24,12 +24,10 @@
                     <m:OverflowToolbar style="Clear"
                         visible="{=  ${roleBasedAccess>/systems/canManage}}">
                         <m:ToolbarSpacer />
-                        <!-- @Todo TEMP: Revert after demo -->
-                        <!-- <ObjectPageHeaderActionButton text="{i18n>switchKeyConfiguration}"
-                        visible="{= !!${oneWay>/selectedSystem/keyConfigurationID} &amp;&amp;
-                    ${oneWay>/selectedSystem/status} !== 'FAILED'}"
-                        press="onSwitchKeyConfigPress"
-                        hideText="false" /> -->
+                        <ObjectPageHeaderActionButton text="{i18n>switchKeyConfiguration}"
+                            visible="{= !!${oneWay>/selectedSystem/keyConfigurationID} &amp;&amp; ${oneWay>/selectedSystem/status} !== 'FAILED'}"
+                            press="onSwitchKeyConfigPress"
+                            hideText="false" />
                         <ObjectPageHeaderActionButton text="{i18n>cancel}"
                             visible="{= !!${oneWay>/selectedSystem/canCancel} &amp;&amp; ${oneWay>/selectedSystem/status} === 'FAILED'}"
                             press="onSystemCancelPress"