diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss
index d4a8058763e..3951b37d4f8 100644
--- a/addons/web_editor/static/src/scss/web_editor.variables.scss
+++ b/addons/web_editor/static/src/scss/web_editor.variables.scss
@@ -414,6 +414,27 @@ $o-we-sidebar-content-field-toggle-control-shadow: 0 2px 3px 0 $o-we-bg-darkest
     }
 }
 
+// ------------------------------------------------------------------
+// Selection wrapper
+// ------------------------------------------------------------------
+
+@mixin o-we-active-wrapper($icon: '\f00c', $top: auto, $right: auto, $bottom: auto, $left: auto) {
+    border: 3px solid $o-brand-primary;
+    &:before {
+        content: $icon;
+        @include o-position-absolute($top, $right, $bottom, $left);
+        width: 19px;
+        height: 19px;
+        background-color: $o-brand-primary;
+        font-family: 'FontAwesome';
+        color: white;
+        border-radius: 50%;
+        text-align: center;
+        z-index: 1;
+        box-shadow: $box-shadow;
+    }
+}
+
 //------------------------------------------------------------------------------
 // Edited content
 //------------------------------------------------------------------------------
diff --git a/addons/web_editor/static/src/scss/wysiwyg.scss b/addons/web_editor/static/src/scss/wysiwyg.scss
index 27856b17526..65f863e152b 100644
--- a/addons/web_editor/static/src/scss/wysiwyg.scss
+++ b/addons/web_editor/static/src/scss/wysiwyg.scss
@@ -296,8 +296,7 @@ body .modal {
             }
 
             .o_we_attachment_selected {
-                border-color: $o-brand-primary;
-                box-shadow: 0px 0px 2px 2px $o-brand-primary;
+                @include o-we-active-wrapper($top: 5px, $left: 5px);
             }
 
             .o_we_attachment_optimized .badge {
diff --git a/addons/website/static/src/scss/website.backend.scss b/addons/website/static/src/scss/website.backend.scss
index 058c779b341..8355f0093ad 100644
--- a/addons/website/static/src/scss/website.backend.scss
+++ b/addons/website/static/src/scss/website.backend.scss
@@ -329,7 +329,7 @@
         }
 
         &.o_theme_installed .o_theme_preview_top {
-            border: 3px solid $o-brand-primary;
+            @include o-we-active-wrapper($top: 7px, $right: 7px);
         }
     }
 
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 03d499c2ddd..d476ccbe13d 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -363,10 +363,6 @@
                                     <hr t-if="record.url.value"/>
                                     <button role="button" type="edit" t-if="record.url.value" class="btn btn-secondary">Live Preview</button>
                                 </div>
-                                <i states="installed" t-if="record.is_installed_on_current_website.raw_value"
-                                    class="fa fa-check position-absolute p-1 m-2 rounded-circle bg-primary shadow"
-                                    style="top: 0; right: 0;"
-                                    role="img" aria-label="Installed" title="Installed"/>
                             </div>
                             <div class="o_theme_preview_bottom clearfix">
                                 <h5 t-if="record.display_name.value" class="text-uppercase float-left">