diff --git a/studio/src/app/popovers/editor/app-shape/app-shape.scss b/studio/src/app/popovers/editor/app-shape/app-shape.scss
index a6a70549d..4778947b4 100644
--- a/studio/src/app/popovers/editor/app-shape/app-shape.scss
+++ b/studio/src/app/popovers/editor/app-shape/app-shape.scss
@@ -20,7 +20,6 @@ app-shape {
       align-self: center;
 
       div.image-container {
-        border-radius: 4px;
         overflow: hidden;
         position: relative;
 
diff --git a/studio/src/app/popovers/editor/app-shape/app-shape.tsx b/studio/src/app/popovers/editor/app-shape/app-shape.tsx
index 39257c14a..d7a01f6e9 100644
--- a/studio/src/app/popovers/editor/app-shape/app-shape.tsx
+++ b/studio/src/app/popovers/editor/app-shape/app-shape.tsx
@@ -31,12 +31,34 @@ export class AppShape {
       <div class="container ion-margin-bottom">
         <ion-list>
           <ion-item-divider>
-            <ion-label>Alert</ion-label>
+            <ion-label>Shapes</ion-label>
           </ion-item-divider>
 
           <div class="ion-padding shapes">
+            {this.renderImage(`/assets/img/shapes/circle-solid.svg`, 'Circle solid')}
+            {this.renderImage(`/assets/img/shapes/circle-regular.svg`, 'Circle solid')}
+            {this.renderImage(`/assets/img/shapes/square-solid.svg`, 'Square solid')}
+            {this.renderImage(`/assets/img/shapes/square-regular.svg`, 'Square regular')}
+            {this.renderImage(`/assets/img/shapes/heart-solid.svg`, 'Heart solid')}
+            {this.renderImage(`/assets/img/shapes/heart-regular.svg`, 'Heart regular')}
+            {this.renderImage(`/assets/img/shapes/star-solid.svg`, 'Star solid')}
+            {this.renderImage(`/assets/img/shapes/star-regular.svg`, 'Star regular')}
+            {this.renderImage(`/assets/img/shapes/bookmark-solid.svg`, 'Bookmark solid')}
+            {this.renderImage(`/assets/img/shapes/bookmark-regular.svg`, 'Bookmark regular')}
+            {this.renderImage(`/assets/img/shapes/certificate-solid.svg`, 'Certificate')}
+            {this.renderImage(`/assets/img/shapes/cloud-solid.svg`, 'Cloud')}
+            {this.renderImage(`/assets/img/shapes/cog-solid.svg`, 'Cog')}
+            {this.renderImage(`/assets/img/shapes/shopping-cart-solid.svg`, 'Shopping cart')}
+            {this.renderImage(`/assets/img/shapes/tag-solid.svg`, 'Tag')}
+            {this.renderImage(`/assets/img/shapes/trophy-solid.svg`, 'Trophy')}
             {this.renderImage(`/assets/img/shapes/bell-solid.svg`, 'Bell solid')}
             {this.renderImage(`/assets/img/shapes/bell-regular.svg`, 'Bell regular')}
+            {this.renderImage(`/assets/img/shapes/building-solid.svg`, 'Building solid')}
+            {this.renderImage(`/assets/img/shapes/building-regular.svg`, 'Building regular')}
+            {this.renderImage(`/assets/img/shapes/square-full-solid.svg`, 'Square full')}
+            {this.renderImage(`/assets/img/shapes/map-marker-solid.svg`, 'Map marker')}
+            {this.renderImage(`/assets/img/shapes/play-solid.svg`, 'Play')}
+            {this.renderImage(`/assets/img/shapes/camera-solid.svg`, 'Camera')}
           </div>
 
           <ion-item-divider>
@@ -72,24 +94,24 @@ export class AppShape {
           </div>
 
           <ion-item-divider>
-            <ion-label>Buildings</ion-label>
-          </ion-item-divider>
-
-          <div class="ion-padding shapes">
-            {this.renderImage(`/assets/img/shapes/building-solid.svg`, 'Building solid')}
-            {this.renderImage(`/assets/img/shapes/building-regular.svg`, 'Building regular')}
-          </div>
-
-          <ion-item-divider>
-            <ion-label>Brands</ion-label>
+            <ion-label>Status</ion-label>
           </ion-item-divider>
 
           <div class="ion-padding shapes">
-            {this.renderImage(`/assets/img/shapes/cc-amazon-pay-brands.svg`, 'Amazon Pay')}
-            {this.renderImage(`/assets/img/shapes/cc-apple-pay-brands.svg`, 'Apple Pay')}
-            {this.renderImage(`/assets/img/shapes/cc-paypal-brands.svg`, 'Paypal')}
-            {this.renderImage(`/assets/img/shapes/cc-stripe-brands.svg`, 'Stripe')}
-            {this.renderImage(`/assets/img/shapes/bitcoin-brands.svg`, 'Bitcoin')}
+            {this.renderImage(`/assets/img/shapes/check-circle-solid.svg`, 'Check circle solid')}
+            {this.renderImage(`/assets/img/shapes/check-circle-regular.svg`, 'Check circle regular')}
+            {this.renderImage(`/assets/img/shapes/check-solid.svg`, 'Check')}
+            {this.renderImage(`/assets/img/shapes/check-square-solid.svg`, 'Check square')}
+            {this.renderImage(`/assets/img/shapes/info-solid.svg`, 'Info')}
+            {this.renderImage(`/assets/img/shapes/info-circle-solid.svg`, 'Info circle')}
+            {this.renderImage(`/assets/img/shapes/minus-circle-solid.svg`, 'Minus circle')}
+            {this.renderImage(`/assets/img/shapes/plus-circle-solid.svg`, 'Plus circle')}
+            {this.renderImage(`/assets/img/shapes/unlock-solid.svg`, 'Unlock')}
+            {this.renderImage(`/assets/img/shapes/lock-solid.svg`, 'Lock')}
+            {this.renderImage(`/assets/img/shapes/ban-solid.svg`, 'Ban')}
+            {this.renderImage(`/assets/img/shapes/plus-solid.svg`, 'Plus')}
+            {this.renderImage(`/assets/img/shapes/plus-square-solid.svg`, 'Plus square solid')}
+            {this.renderImage(`/assets/img/shapes/plus-square-regular.svg`, 'Plus square regular')}
           </div>
 
           <ion-item-divider>
@@ -97,17 +119,17 @@ export class AppShape {
           </ion-item-divider>
 
           <div class="ion-padding shapes">
-            {this.renderImage(`/assets/img/shapes/database-solid.svg`, 'Database')}
             {this.renderImage(`/assets/img/shapes/desktop-solid.svg`, 'Desktop')}
-            {this.renderImage(`/assets/img/shapes/download-solid.svg`, 'Download')}
             {this.renderImage(`/assets/img/shapes/laptop-solid.svg`, 'Laptop')}
+            {this.renderImage(`/assets/img/shapes/tablet-solid.svg`, 'Tablet')}
             {this.renderImage(`/assets/img/shapes/mobile-solid.svg`, 'Mobile')}
+            {this.renderImage(`/assets/img/shapes/server-solid.svg`, 'Server')}
+            {this.renderImage(`/assets/img/shapes/database-solid.svg`, 'Database')}
+            {this.renderImage(`/assets/img/shapes/download-solid.svg`, 'Download')}
+            {this.renderImage(`/assets/img/shapes/envelope-solid.svg`, 'Envelope')}
             {this.renderImage(`/assets/img/shapes/power-off-solid.svg`, 'Power off')}
-            {this.renderImage(`/assets/img/shapes/robot-solid.svg`, 'Robot')}
             {this.renderImage(`/assets/img/shapes/rocket-solid.svg`, 'Rocket')}
-            {this.renderImage(`/assets/img/shapes/server-solid.svg`, 'Server')}
-            {this.renderImage(`/assets/img/shapes/tablet-solid.svg`, 'Tablet')}
-            {this.renderImage(`/assets/img/shapes/tv-solid.svg`, 'TV')}
+            {this.renderImage(`/assets/img/shapes/robot-solid.svg`, 'Robot')}
           </div>
 
           <ion-item-divider>
@@ -117,9 +139,8 @@ export class AppShape {
           <div class="ion-padding shapes">
             {this.renderImage(`/assets/img/shapes/calendar-solid.svg`, 'Calendar solid')}
             {this.renderImage(`/assets/img/shapes/calendar-regular.svg`, 'Calendar regular')}
-            {this.renderImage(`/assets/img/shapes/calendar-day-solid.svg`, 'Calendar day')}
             {this.renderImage(`/assets/img/shapes/clock-solid.svg`, 'Clock solid')}
-            {this.renderImage(`/assets/img/shapes/clock-solid.svg`, 'Clock regular')}
+            {this.renderImage(`/assets/img/shapes/clock-regular.svg`, 'Clock regular')}
           </div>
 
           <ion-item-divider>
@@ -129,11 +150,13 @@ export class AppShape {
           <div class="ion-padding shapes">
             {this.renderImage(`/assets/img/shapes/copy-solid.svg`, 'Copy solid')}
             {this.renderImage(`/assets/img/shapes/copy-regular.svg`, 'Copy regular')}
-            {this.renderImage(`/assets/img/shapes/cut-solid.svg`, 'Cut')}
+            {this.renderImage(`/assets/img/shapes/clipboard-solid.svg`, 'Clipboard solid')}
+            {this.renderImage(`/assets/img/shapes/clipboard-regular.svg`, 'Clipboard regular')}
             {this.renderImage(`/assets/img/shapes/file-solid.svg`, 'File solid')}
             {this.renderImage(`/assets/img/shapes/file-regular.svg`, 'File regular')}
             {this.renderImage(`/assets/img/shapes/folder-solid.svg`, 'Folder solid')}
             {this.renderImage(`/assets/img/shapes/folder-regular.svg`, 'Folder regular')}
+            {this.renderImage(`/assets/img/shapes/cut-solid.svg`, 'Cut')}
           </div>
 
           <ion-item-divider>
@@ -145,71 +168,11 @@ export class AppShape {
             {this.renderImage(`/assets/img/shapes/chart-pie-solid.svg`, 'Chart pie')}
             {this.renderImage(`/assets/img/shapes/credit-card-solid.svg`, 'Credit card solid')}
             {this.renderImage(`/assets/img/shapes/credit-card-regular.svg`, 'Credit card regular')}
-          </div>
-
-          <ion-item-divider>
-            <ion-label>Interfaces</ion-label>
-          </ion-item-divider>
-
-          <div class="ion-padding shapes">
-            {this.renderImage(`/assets/img/shapes/clipboard-solid.svg`, 'Clipboard solid')}
-            {this.renderImage(`/assets/img/shapes/clipboard-regular.svg`, 'Clipboard regular')}
-            {this.renderImage(`/assets/img/shapes/check-circle-solid.svg`, 'Check circle solid')}
-            {this.renderImage(`/assets/img/shapes/check-circle-regular.svg`, 'Check circle regular')}
-            {this.renderImage(`/assets/img/shapes/check-solid.svg`, 'Check')}
-            {this.renderImage(`/assets/img/shapes/check-square-solid.svg`, 'Check square')}
-          </div>
-
-          <ion-item-divider>
-            <ion-label>Shapes</ion-label>
-          </ion-item-divider>
-
-          <div class="ion-padding shapes">
-            {this.renderImage(`/assets/img/shapes/bookmark-solid.svg`, 'Bookmark solid')}
-            {this.renderImage(`/assets/img/shapes/bookmark-regular.svg`, 'Bookmark regular')}
-            {this.renderImage(`/assets/img/shapes/certificate-solid.svg`, 'Certificate')}
-            {this.renderImage(`/assets/img/shapes/circle-solid.svg`, 'Circle solid')}
-            {this.renderImage(`/assets/img/shapes/circle-regular.svg`, 'Circle solid')}
-            {this.renderImage(`/assets/img/shapes/cloud-solid.svg`, 'Cloud')}
-            {this.renderImage(`/assets/img/shapes/cog-solid.svg`, 'Cog')}
-            {this.renderImage(`/assets/img/shapes/shopping-cart-solid.svg`, 'Shopping cart')}
-            {this.renderImage(`/assets/img/shapes/square-solid.svg`, 'Square solid')}
-            {this.renderImage(`/assets/img/shapes/square-regular.svg`, 'Square regular')}
-            {this.renderImage(`/assets/img/shapes/square-full-solid.svg`, 'Square full')}
-            {this.renderImage(`/assets/img/shapes/tag-solid.svg`, 'Tag')}
-            {this.renderImage(`/assets/img/shapes/trophy-solid.svg`, 'Trophy')}
-          </div>
-
-          <ion-item-divider>
-            <ion-label>Social</ion-label>
-          </ion-item-divider>
-
-          <div class="ion-padding shapes">
-            {this.renderImage(`/assets/img/shapes/camera-solid.svg`, 'Camera')}
-            {this.renderImage(`/assets/img/shapes/envelope-solid.svg`, 'Envelope')}
-            {this.renderImage(`/assets/img/shapes/heart-solid.svg`, 'Heart solid')}
-            {this.renderImage(`/assets/img/shapes/heart-regular.svg`, 'Heart regular')}
-            {this.renderImage(`/assets/img/shapes/map-marker-solid.svg`, 'Map marker')}
-            {this.renderImage(`/assets/img/shapes/play-solid.svg`, 'Play')}
-            {this.renderImage(`/assets/img/shapes/star-solid.svg`, 'Star solid')}
-            {this.renderImage(`/assets/img/shapes/star-regular.svg`, 'Star regular')}
-          </div>
-
-          <ion-item-divider>
-            <ion-label>Status</ion-label>
-          </ion-item-divider>
-
-          <div class="ion-padding shapes">
-            {this.renderImage(`/assets/img/shapes/ban-solid.svg`, 'Ban')}
-            {this.renderImage(`/assets/img/shapes/info-solid.svg`, 'Info')}
-            {this.renderImage(`/assets/img/shapes/info-circle-solid.svg`, 'Info circle')}
-            {this.renderImage(`/assets/img/shapes/lock-solid.svg`, 'Lock')}
-            {this.renderImage(`/assets/img/shapes/unlock-solid.svg`, 'Unlock')}
-            {this.renderImage(`/assets/img/shapes/minus-circle-solid.svg`, 'Minus circle')}
-            {this.renderImage(`/assets/img/shapes/plus-circle-solid.svg`, 'Plus circle')}
-            {this.renderImage(`/assets/img/shapes/plus-solid.svg`, 'Plus')}
-            {this.renderImage(`/assets/img/shapes/plus-square-solid.svg`, 'Plus square solid')}
-            {this.renderImage(`/assets/img/shapes/plus-square-regular.svg`, 'Plus square regular')}
+            {this.renderImage(`/assets/img/shapes/cc-amazon-pay-brands.svg`, 'Amazon Pay')}
+            {this.renderImage(`/assets/img/shapes/cc-apple-pay-brands.svg`, 'Apple Pay')}
+            {this.renderImage(`/assets/img/shapes/cc-paypal-brands.svg`, 'Paypal')}
+            {this.renderImage(`/assets/img/shapes/cc-stripe-brands.svg`, 'Stripe')}
+            {this.renderImage(`/assets/img/shapes/bitcoin-brands.svg`, 'Bitcoin')}
           </div>
         </ion-list>
       </div>
diff --git a/studio/src/assets/img/shapes/calendar-day-solid.svg b/studio/src/assets/img/shapes/calendar-day-solid.svg
deleted file mode 100644
index e6ef132bc..000000000
--- a/studio/src/assets/img/shapes/calendar-day-solid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="calendar-day" class="svg-inline--fa fa-calendar-day fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M0 464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V192H0v272zm64-192c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16v96c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16v-96zM400 64h-48V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v48H160V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v48H48C21.5 64 0 85.5 0 112v48h448v-48c0-26.5-21.5-48-48-48z"></path></svg>
\ No newline at end of file
diff --git a/studio/src/assets/img/shapes/tv-solid.svg b/studio/src/assets/img/shapes/tv-solid.svg
deleted file mode 100644
index e1fd0de3c..000000000
--- a/studio/src/assets/img/shapes/tv-solid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="tv" class="svg-inline--fa fa-tv fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M592 0H48A48 48 0 0 0 0 48v320a48 48 0 0 0 48 48h240v32H112a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16H352v-32h240a48 48 0 0 0 48-48V48a48 48 0 0 0-48-48zm-16 352H64V64h512z"></path></svg>
\ No newline at end of file