diff --git a/packages/block-editor/src/components/use-resize-canvas/index.js b/packages/block-editor/src/components/use-resize-canvas/index.js
index 0095f610bb7d84..587a151c3b946d 100644
--- a/packages/block-editor/src/components/use-resize-canvas/index.js
+++ b/packages/block-editor/src/components/use-resize-canvas/index.js
@@ -68,7 +68,7 @@ export default function useResizeCanvas(
 					maxHeight: height,
 					overflowY: 'auto',
 					borderRadius: '2px',
-					boxShadow: '0 1px 3px rgba(0, 0, 0, 0.4)',
+					border: '1px solid #ddd',
 				};
 			default:
 				return null;
diff --git a/packages/edit-post/src/components/layout/style.scss b/packages/edit-post/src/components/layout/style.scss
index e2c3a144674b5d..bbc5fe56c3ebbc 100644
--- a/packages/edit-post/src/components/layout/style.scss
+++ b/packages/edit-post/src/components/layout/style.scss
@@ -87,7 +87,7 @@
 }
 
 .edit-post-layout .interface-interface-skeleton__content {
-	background-color: $gray-400;
+	background-color: $gray-100;
 }
 
 .edit-post-layout__inserter-panel {
diff --git a/packages/edit-post/src/components/visual-editor/style.scss b/packages/edit-post/src/components/visual-editor/style.scss
index 0026638fbe9024..6a687b1d454f0f 100644
--- a/packages/edit-post/src/components/visual-editor/style.scss
+++ b/packages/edit-post/src/components/visual-editor/style.scss
@@ -29,7 +29,7 @@
 
 		.editor-styles-wrapper {
 			border-radius: 2px;
-			box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+			border: 1px solid $gray-300;
 		}
 	}
 }
diff --git a/packages/edit-post/src/store/selectors.js b/packages/edit-post/src/store/selectors.js
index 940ad34517ac82..b734484b213953 100644
--- a/packages/edit-post/src/store/selectors.js
+++ b/packages/edit-post/src/store/selectors.js
@@ -313,7 +313,7 @@ export function isSavingMetaBoxes( state ) {
  * @return {string} Device type.
  */
 export function __experimentalGetPreviewDeviceType( state ) {
-	return state.deviceType;
+	return state.isEditingTemplate ? 'Desktop' : state.deviceType;
 }
 
 /**