diff --git a/src/App.vue b/src/App.vue
index 900a202..c345c03 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,13 +65,16 @@ watch(filters, (newFilters, oldFilters) => {
 <template>
   <div class="flex overflow-hidden grid max-h-full m-0">
     <div class="flex-column flex col-2 surface-50 full-vue-heigth shadow-right scrollable-div">
-      <span class="p-buttonset mb-2 w-full">
-        <p-button label="Circle" rounded :outlined="activeView !== 1" :severity="activeView === 1 ? '' : 'secondary'" @click="onViewChange(1)" class="w-4"/>
-        <p-button label="Tree" rounded :outlined="activeView !== 2" :severity="activeView === 2 ? '' : 'secondary'" @click="onViewChange(2)" class="w-4"/>
-        <p-button label="List" rounded :outlined="activeView !== 3" :severity="activeView === 3 ? '' : 'secondary'" @click="onViewChange(3)" class="w-4"/>
-      </span>
 
-      <span class="p-buttonset w-full">
+      <div class="mb-2 w-full">
+        <p-buttonGroup>
+          <p-button label="Circle" rounded :outlined="activeView !== 1" :severity="activeView === 1 ? '' : 'secondary'" @click="onViewChange(1)" class="w-4"/>
+          <p-button label="Tree" rounded :outlined="activeView !== 2" :severity="activeView === 2 ? '' : 'secondary'" @click="onViewChange(2)" class="w-4"/>
+          <p-button label="List" rounded :outlined="activeView !== 3" :severity="activeView === 3 ? '' : 'secondary'" @click="onViewChange(3)" class="w-4"/>
+        </p-buttonGroup>
+        </div>
+
+      <p-buttonGroup>
         <p-button label="Normalize" rounded :outlined="activeMode !== 'normalize'"
                   :severity="activeMode === 'normalize' ? '' : 'secondary'"
                   @click="onModeChange('normalize')" class="w-6"
@@ -80,7 +83,7 @@ watch(filters, (newFilters, oldFilters) => {
                   :severity="activeMode === 'aggregate' ? '' : 'secondary'"
                   @click="onModeChange('aggregate')" class="w-6"
                   v-tooltip="{ value: 'This mode groups entries by their categories to reduce duplication. If an entry belongs to multiple categories, it will only be displayed once, under a group that represents those categories. This is useful when you want a simplified view of the data, without repeated entries.', showDelay: 750, hideDelay: 300 }"/>
-      </span>
+      </p-buttonGroup>
 
       <p-divider/>
 
diff --git a/src/components/plots/list-plot.vue b/src/components/plots/list-plot.vue
index cfa34e0..b714b21 100644
--- a/src/components/plots/list-plot.vue
+++ b/src/components/plots/list-plot.vue
@@ -41,10 +41,10 @@ const filters = ref({
       <template #header>
         <div class="flex justify-content-between align-items-center">
           <h2>List of all SBOM related Tools:</h2>
-          <span class="p-input-icon-left">
-                <i class="pi pi-search"/>
+          <p-iconField iconPosition="left">
+                <p-inputIcon class="pi pi-search"/>
                 <p-inputText v-model="filters['global'].value" placeholder="Search"/>
-            </span>
+          </p-iconField>
         </div>
       </template>
 
diff --git a/src/components/plots/tree-plot.vue b/src/components/plots/tree-plot.vue
index 9a16e27..cd62197 100644
--- a/src/components/plots/tree-plot.vue
+++ b/src/components/plots/tree-plot.vue
@@ -227,10 +227,10 @@ function generateTreeObjectFlat() {
 
 <template>
   <div class="overlay">
-    <span class="p-buttonset m-2 w-full">
+    <p-buttonGroup>
       <p-button label="Round" rounded :outlined="activeView !== 0" :severity="activeView === 0 ? '' : 'secondary'" @click="onViewChange(0)"/>
       <p-button label="Flat" rounded :outlined="activeView !== 1" :severity="activeView === 1 ? '' : 'secondary'" @click="onViewChange(1)"/>
-    </span>
+    </p-buttonGroup>
   </div>
 
   <div :class="scrollableDiv ? 'scrollable-div' : 'flex'">
diff --git a/src/main.js b/src/main.js
index 86051e1..40a00f2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,12 +17,16 @@ import Divider from "primevue/divider";
 import InputText from "primevue/inputtext";
 import Tooltip from 'primevue/tooltip';
 import Tag from "primevue/tag";
+import ButtonGroup from "primevue/buttongroup";
+import InputIcon from "primevue/inputicon";
+import IconField from "primevue/iconfield";
 
 const app = createApp(App);
 
 app.use(PrimeVue)
 
 app.component('p-button', Button)
+app.component('p-buttonGroup', ButtonGroup)
 app.component("p-dataTable", DataTable)
 app.component("p-column", Column)
 app.component("p-chip", Chip)
@@ -30,6 +34,9 @@ app.component("p-card", Card)
 app.component("p-inputSwitch", InputSwitch)
 app.component("p-divider", Divider)
 app.component('p-inputText', InputText)
+app.component('p-iconField', IconField)
+app.component('p-inputIcon', InputIcon)
+
 app.component('p-tag', Tag)
 
 app.directive('tooltip', Tooltip);