diff --git a/frontend/src/Editor/Components/components.js b/frontend/src/Editor/Components/components.js
index c4f6c2ec40..706eedfa0a 100644
--- a/frontend/src/Editor/Components/components.js
+++ b/frontend/src/Editor/Components/components.js
@@ -1,6 +1,6 @@
 export const componentTypes = [
     { 
-        icon: 'https://www.svgrepo.com/show/243696/buy-click.svg', 
+        icon: 'https://www.svgrepo.com/show/243604/buy-click.svg', 
         name: 'Button', 
         description: 'Trigger actions: queries, alerts etc',
         component: 'Button',
@@ -131,7 +131,7 @@ export const componentTypes = [
         }
     },
     { 
-        icon: 'https://www.svgrepo.com/show/34217/image.svg', 
+        icon: 'https://www.svgrepo.com/show/35088/image.svg', 
         name: 'Image', 
         description: 'Display an Image',
         component: 'Image',
@@ -190,7 +190,7 @@ export const componentTypes = [
         }
     },
     { 
-        icon: 'https://www.svgrepo.com/show/10112/map.svg', 
+        icon: 'https://www.svgrepo.com/show/16476/map.svg', 
         name: 'Map', 
         description: 'Display maps with markers.',
         component: 'Map',
diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index c4ed211e62..67a76fbc9e 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -249,7 +249,7 @@ class Editor extends React.Component {
                                     </li>
                                     <li className="nav-item col-md-6">
                                         <a onClick={() => this.switchSidebarTab(2)} className={currentSidebarTab === 2 ? 'nav-link active' : 'nav-link'}  data-bs-toggle="tab">
-                                            <img src="https://www.svgrepo.com/show/315687/components.svg" width="16" height="16"/>
+                                            <img src="https://www.svgrepo.com/show/274200/insert.svg" width="16" height="16"/>
                                                 &nbsp; Insert
                                         </a>
                                     </li>
@@ -311,6 +311,9 @@ class Editor extends React.Component {
                                                     <h5 className="p-1 text-muted">QUERIES</h5>
                                                     </div>
                                                 <div className="col-auto">
+                                                    {<button className="btn btn-sm btn-light mx-2">
+                                                        <img className="p-1" src="https://www.svgrepo.com/show/13682/search.svg" width="17" height="17"/>
+                                                    </button>}
                                                     {<button className="btn btn-sm btn-light" onClick={() => this.setState({ editingQuery: false, addingQuery: true})}>+</button>}
                                                 </div>
                                         </div>
diff --git a/frontend/src/Editor/Inspector/Components/Table.jsx b/frontend/src/Editor/Inspector/Components/Table.jsx
index d583d22f67..915fa982b3 100644
--- a/frontend/src/Editor/Inspector/Components/Table.jsx
+++ b/frontend/src/Editor/Inspector/Components/Table.jsx
@@ -197,12 +197,12 @@ class Table extends React.Component {
                 {renderElement(component, componentMeta, paramUpdated, dataQueries, 'title', 'properties')}
                 {renderElement(component, componentMeta, paramUpdated, dataQueries, 'data', 'properties')}
 
-                <div className="field mb-2 mt-2">
+                <div className="field mb-2 mt-3">
                     <div class="row g-2">
-                        <div class="col-auto">
+                        <div class="col">
                             <label class="form-label col pt-1">Columns</label>
                         </div>
-                        <div class="col">
+                        <div class="col-auto">
                             <button onClick={this.addNewColumn} className="btn btn-sm btn-light col-auto">
                                 + Add column
                             </button>
@@ -211,7 +211,7 @@ class Table extends React.Component {
                     <div>
                         <SortableList
                             onSortEnd={this.onSortEnd}
-                            className="w-100 p-2"
+                            className="w-100"
                             draggedItemClassName="dragged"
                             >
                             {columns.value.map((item, index) => (
@@ -254,7 +254,6 @@ class Table extends React.Component {
                     </div>
 
                     <hr></hr>
-                    <h4 className="text-muted">Actions</h4>  
                     <div className="field mb-2 mt-2">
                         <div class="row g-2">
                             <div class="col">