diff --git a/client/web/admin/src/components/Apigw/CFiltersTable.vue b/client/web/admin/src/components/Apigw/CFiltersTable.vue
index 072afc0ec..7e0a1da87 100644
--- a/client/web/admin/src/components/Apigw/CFiltersTable.vue
+++ b/client/web/admin/src/components/Apigw/CFiltersTable.vue
@@ -45,7 +45,7 @@
               @click.stop="onRowClick(filter, index)"
             >
               <font-awesome-icon
-                :icon="['fas', 'pen']"
+                :icon="['far', 'edit']"
               />
             </b-button>
             <c-input-confirm
diff --git a/client/web/admin/src/components/Connection/CConnectionPrimary.vue b/client/web/admin/src/components/Connection/CConnectionPrimary.vue
index f0e341441..a3c48c4a2 100644
--- a/client/web/admin/src/components/Connection/CConnectionPrimary.vue
+++ b/client/web/admin/src/components/Connection/CConnectionPrimary.vue
@@ -18,7 +18,7 @@
           :to="{ name: 'system.connection.edit', params: { connectionID: (connection || {}).connectionID } }"
         >
           <font-awesome-icon
-            :icon="['fas', 'pen']"
+            :icon="['far', 'edit']"
           />
         </b-button>
       </h3>
diff --git a/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue b/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
index 2278a9240..537f95df5 100644
--- a/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
+++ b/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
@@ -46,7 +46,7 @@
         lg="6"
       >
         <b-form-group
-          label-class="text-primary"
+          label-class="d-flex align-items-center text-primary"
         >
           <template #label>
             {{ $t("image.editor.label") }}
diff --git a/client/web/admin/src/views/Automation/Session/List.vue b/client/web/admin/src/views/Automation/Session/List.vue
index b7c663af0..207e7f352 100644
--- a/client/web/admin/src/views/Automation/Session/List.vue
+++ b/client/web/admin/src/views/Automation/Session/List.vue
@@ -98,7 +98,7 @@
           :to="{ name: editRoute, params: { [primaryKey]: item[primaryKey] } }"
         >
           <font-awesome-icon
-            :icon="['fas', 'pen']"
+            :icon="['far', 'edit']"
           />
         </b-button>
       </template>
diff --git a/client/web/compose/src/components/Common/Grid.vue b/client/web/compose/src/components/Common/Grid.vue
index 9f4960741..7735e92bf 100644
--- a/client/web/compose/src/components/Common/Grid.vue
+++ b/client/web/compose/src/components/Common/Grid.vue
@@ -166,3 +166,9 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+.vue-grid-item.vue-grid-placeholder {
+  background: var(--primary) !important;
+}
+</style>
diff --git a/client/web/reporter/src/components/Report/Grid.vue b/client/web/reporter/src/components/Report/Grid.vue
index 1ffb230cc..d37ddf24a 100644
--- a/client/web/reporter/src/components/Report/Grid.vue
+++ b/client/web/reporter/src/components/Report/Grid.vue
@@ -122,11 +122,3 @@ export default {
   background: var(--primary) !important;
 }
 </style>
-
-<style lang="scss" scoped>
-.editable-grid-item {
-  touch-action: none;
-  background-image: linear-gradient(45deg, var(--gray-200) 25%, var(--white) 25%, var(--white) 50%, var(--gray-200) 50%, var(--gray-200) 75%, var(--white) 75%, var(--white) 100%);
-  background-size: 28.28px 28.28px;
-}
-</style>
diff --git a/client/web/reporter/src/views/Report/Builder.vue b/client/web/reporter/src/views/Report/Builder.vue
index 0dc078f19..80e27f59b 100644
--- a/client/web/reporter/src/views/Report/Builder.vue
+++ b/client/web/reporter/src/views/Report/Builder.vue
@@ -76,7 +76,7 @@
           :to="reportEditor"
         >
           <font-awesome-icon
-            :icon="['fas', 'pen']"
+            :icon="['far', 'edit']"
           />
         </b-button>
       </b-button-group>
@@ -526,7 +526,7 @@ export default {
 
     pageTitle () {
       const title = this.report ? (this.report.meta.name || this.report.handle) : ''
-      return `${this.$t('builder:report.builder')} - '${title}'` || this.$t('builder:report.builder')
+      return `${this.$t('builder:report.builder')} - "${title}"` || this.$t('builder:report.builder')
     },
 
     canRead () {
diff --git a/client/web/reporter/src/views/Report/View.vue b/client/web/reporter/src/views/Report/View.vue
index 3f426686e..50e7394b3 100644
--- a/client/web/reporter/src/views/Report/View.vue
+++ b/client/web/reporter/src/views/Report/View.vue
@@ -46,7 +46,7 @@
           :to="reportEditor"
         >
           <font-awesome-icon
-            :icon="['fas', 'pen']"
+            :icon="['far', 'edit']"
           />
         </b-button>
       </b-button-group>
diff --git a/lib/vue/src/components/navigation/CTopbar.vue b/lib/vue/src/components/navigation/CTopbar.vue
index 240a49412..786c16a97 100644
--- a/lib/vue/src/components/navigation/CTopbar.vue
+++ b/lib/vue/src/components/navigation/CTopbar.vue
@@ -342,6 +342,7 @@ $nav-user-icon-size: 50px;
   .vue-portal-target {
     display: flex;
     justify-content: end;
+    align-items: center;
     flex-wrap: wrap;
   }
 }