diff --git a/apps/remix-ide/src/walkthroughService.js b/apps/remix-ide/src/walkthroughService.js
index 2e5e9a8305..12b448601b 100644
--- a/apps/remix-ide/src/walkthroughService.js
+++ b/apps/remix-ide/src/walkthroughService.js
@@ -6,8 +6,13 @@ export class WalkthroughService {
   }
 
   start (params) {
+<<<<<<< HEAD
     document.addEventListener('doWalkThrough', (e) => {
       if (!localStorage.getItem('hadTour_initial')) {
+=======
+    if (!localStorage.getItem('hadTour_initial')) {
+      document.addEventListener('doWalkThrough', (e) => {
+>>>>>>> e0fcb6bcd (changes based on LianaHus comments complete)
         introJs().setOptions({
           steps: [{
             title: 'Welcome to Remix IDE',
@@ -47,8 +52,13 @@ export class WalkthroughService {
           }
         }).start()
         localStorage.setItem('hadTour_initial', true)
+<<<<<<< HEAD
       }
     })
+=======
+      })
+    }
+>>>>>>> e0fcb6bcd (changes based on LianaHus comments complete)
   }
 
   startFeatureTour () {
diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx b/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx
index af379593ac..29a0e7749d 100644
--- a/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx
+++ b/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx
@@ -3,6 +3,7 @@
 import React, {
   Fragment,
   useEffect,
+  useReducer,
   useRef
 } from 'react'
 
@@ -23,6 +24,7 @@ export function RemixUiVerticalIconsPanel ({
 }: RemixUiVerticalIconsPanelProps) {
   const scrollableRef = useRef<any>()
   const iconPanelRef = useRef<any>()
+  const udappPanelRef = useRef<any>()
 
   function onThemeChanged (themeType: any) {
     const invert = themeType === 'dark' ? 1 : 0
@@ -106,10 +108,6 @@ export function RemixUiVerticalIconsPanel ({
             scrollableRef={scrollableRef}
           />
         </div>
-        {scrollableRef.current && scrollableRef.current!.scrollHeight > scrollableRef.current!.clientHeight
-          ? <i className="fa fa-chevron-up remixui_icon-chevron m-3"></i>
-          : null
-        }
         <div
           id="remixuiScrollable"
           className={scrollableRef.current && scrollableRef.current.scrollHeight > scrollableRef.current.clientHeight