diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
index d58e53b26e..d2e7afbaba 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
@@ -153,12 +153,12 @@
                 </VListTileContent>
                 <template v-if="!copying">
                   <VListTileAction class="actions-end-col">
-                    <IconButton
+                    <KIconButton
                       v-if="isTopic"
                       :aria-hidden="hover"
                       data-test="btn-chevron"
                       icon="chevronRight"
-                      :text="$tr('openTopic')"
+                      :tooltip="$tr('openTopic')"
                       size="small"
                       @click="$emit('topicChevronClick')"
                     />
@@ -209,7 +209,6 @@
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
   import { RolesNames } from 'shared/leUtils/Roles';
   import ImageOnlyThumbnail from 'shared/views/files/ImageOnlyThumbnail';
-  import IconButton from 'shared/views/IconButton';
   import ToggleText from 'shared/views/ToggleText';
   import ContextMenuCloak from 'shared/views/ContextMenuCloak';
   import DraggableHandle from 'shared/views/draggable/DraggableHandle';
@@ -223,7 +222,6 @@
       DraggableHandle,
       ContextMenuCloak,
       ImageOnlyThumbnail,
-      IconButton,
       ContentNodeValidator,
       ContentNodeChangedIcon,
       ToggleText,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 007e332d41..cdb0899e63 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -73,9 +73,10 @@
               v-on="on"
             >
               {{ $formatNumber(errorsInChannel) }}
-              <Icon color="amber">
-                warning
-              </Icon>
+              <KIcon
+                icon="warningIncomplete"
+              />
+
             </div>
           </template>
           <span>{{ $tr('incompleteDescendantsText', { count: errorsInChannel }) }}</span>
diff --git a/contentcuration/contentcuration/frontend/shared/views/AppBar.vue b/contentcuration/contentcuration/frontend/shared/views/AppBar.vue
index f437e06e51..98ab6c7272 100644
--- a/contentcuration/contentcuration/frontend/shared/views/AppBar.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/AppBar.vue
@@ -31,21 +31,35 @@
           <Menu>
             <template #activator="{ on }">
               <VBtn flat style="text-transform: none;" v-on="on">
-                <Icon>person</Icon>
+                <KIconButton
+                  disabled="true"
+                  icon="person"
+                  color="white"
+                />
                 <span class="mx-2 subheading">{{ user.first_name }}</span>
-                <Icon>arrow_drop_down</Icon>
+                <KIconButton
+                  disabled="true"
+                  icon="dropdown"
+                  color="white"
+                />
               </VBtn>
             </template>
             <VList>
               <VListTile v-if="user.is_admin" :href="administrationLink">
                 <VListTileAction>
-                  <Icon>people</Icon>
+                  <KIconButton
+                    disabled="true"
+                    icon="people"
+                  />
                 </VListTileAction>
                 <VListTileTitle v-text="$tr('administration')" />
               </VListTile>
               <VListTile :href="settingsLink">
                 <VListTileAction>
-                  <Icon>settings</Icon>
+                  <KIconButton
+                    disabled="true"
+                    icon="settings"
+                  />
                 </VListTileAction>
                 <VListTileTitle v-text="$tr('settings')" />
               </VListTile>
@@ -53,7 +67,10 @@
                 @click="showLanguageModal = true"
               >
                 <VListTileAction>
-                  <Icon>language</Icon>
+                  <KIconButton
+                    disabled="true"
+                    icon="language"
+                  />
                 </VListTileAction>
                 <VListTileTitle v-text="$tr('changeLanguage')" />
               </VListTile>
@@ -62,13 +79,19 @@
                 target="_blank"
               >
                 <VListTileAction>
-                  <Icon>open_in_new</Icon>
+                  <KIconButton
+                    disabled="true"
+                    icon="openNewTab"
+                  />
                 </VListTileAction>
                 <VListTileTitle v-text="$tr('help')" />
               </VListTile>
               <VListTile @click="logout">
                 <VListTileAction>
-                  <Icon>exit_to_app</Icon>
+                  <KIconButton
+                    disabled="true"
+                    icon="logout"
+                  />
                 </VListTileAction>
                 <VListTileTitle v-text="$tr('logOut')" />
               </VListTile>
diff --git a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
index 7f1843ccc5..0c6b6ff4b7 100644
--- a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
@@ -10,7 +10,10 @@
     >
       <VToolbar color="primary" dark>
         <VBtn flat icon :tabindex="handleclickTab" @click="drawer = false">
-          <Icon>clear</Icon>
+          <KIconButton
+            icon="clear"
+            color="white"
+          />
         </VBtn>
         <VToolbarTitle class="notranslate">
           Kolibri Studio
@@ -19,7 +22,10 @@
       <VList>
         <VListTile :href="channelsLink" :tabindex="handleclickTab">
           <VListTileAction>
-            <Icon>home</Icon>
+            <KIconButton
+              disabled="true"
+              icon="home"
+            />
           </VListTileAction>
           <VListTileContent class="subheading">
             <VListTileTitle>{{ $tr('channelsLink') }}</VListTileTitle>
@@ -27,7 +33,10 @@
         </VListTile>
         <VListTile v-if="user.is_admin" :href="administrationLink" :tabindex="handleclickTab">
           <VListTileAction>
-            <Icon>people</Icon>
+            <KIconButton
+              disabled="true"
+              icon="people"
+            />
           </VListTileAction>
           <VListTileContent class="subheading">
             <VListTileTitle>{{ $tr('administrationLink') }}</VListTileTitle>
@@ -36,7 +45,10 @@
         </VListTile>
         <VListTile :href="settingsLink" :tabindex="handleclickTab" @click="trackClick('Settings')">
           <VListTileAction>
-            <Icon>settings</Icon>
+            <KIconButton
+              disabled="true"
+              icon="settings"
+            />
           </VListTileAction>
           <VListTileContent class="subheading">
             <VListTileTitle>{{ $tr('settingsLink') }}</VListTileTitle>
@@ -44,7 +56,10 @@
         </VListTile>
         <VListTile @click="openLanguageModal">
           <VListTileAction>
-            <Icon>language</Icon>
+            <KIconButton
+              disabled="true"
+              icon="language"
+            />
           </VListTileAction>
           <VListTileContent class="subheading">
             <VListTileTitle v-text="$tr('changeLanguage')" />
@@ -57,7 +72,10 @@
           @click="trackClick('Help')"
         >
           <VListTileAction>
-            <Icon>open_in_new</Icon>
+            <KIconButton
+              disabled="true"
+              icon="openNewTab"
+            />
           </VListTileAction>
           <VListTileContent class="subheading">
             <VListTileTitle>{{ $tr('helpLink') }}</VListTileTitle>
@@ -65,7 +83,10 @@
         </VListTile>
         <VListTile @click="logout">
           <VListTileAction>
-            <Icon>exit_to_app</Icon>
+            <KIconButton
+              disabled="true"
+              icon="logout"
+            />
           </VListTileAction>
           <VListTileContent class="subheading">
             <VListTileTitle>{{ $tr('logoutLink') }}</VListTileTitle>