diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss
index 82ea12fc16a9d0..207acd240f0a45 100644
--- a/packages/block-editor/src/components/block-switcher/style.scss
+++ b/packages/block-editor/src/components/block-switcher/style.scss
@@ -3,11 +3,12 @@
}
// Show an indicator triangle.
+.block-editor-block-switcher__no-switcher-icon,
.block-editor-block-switcher__toggle {
position: relative;
&::after {
- display: none;
+ display: block;
content: "";
position: absolute;
bottom: 1px;
@@ -41,14 +42,12 @@
}
}
-// When the block switcher does not have any transformations, we show it but as disabled.
-// The background and opacity change helps make the icon legible, despite being disabled.
+// Even when the block switcher does not have any transformations, it still serves as a block indicator.
.components-button.block-editor-block-switcher__no-switcher-icon:disabled {
- opacity: 0.84;
+ opacity: 1;
- // Also make the icon monochrome to further imply disabled state.
- // We use !important here because icon colors are set as inline styles,
- // and should be overridden when disabled.
+ // Since it's not clickable, though, don't show a hover state.
+ &,
.block-editor-block-icon.has-colors {
color: $dark-gray-primary !important;
}
@@ -164,10 +163,6 @@
}
.components-button.block-editor-block-switcher__toggle {
- &::after {
- display: block;
- }
-
.block-editor-block-icon,
.block-editor-block-switcher__transform {
width: $block-toolbar-height;
diff --git a/packages/block-library/src/navigation-link/index.js b/packages/block-library/src/navigation-link/index.js
index bbb180e4c3d3c3..57c01fc50ad76b 100644
--- a/packages/block-library/src/navigation-link/index.js
+++ b/packages/block-library/src/navigation-link/index.js
@@ -2,7 +2,7 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
-import { navigation as icon } from '@wordpress/icons';
+import { mapMarker as icon } from '@wordpress/icons';
/**
* Internal dependencies
diff --git a/packages/icons/src/library/map-marker.js b/packages/icons/src/library/map-marker.js
index 7b7d43e0f25e82..5891003c81b950 100644
--- a/packages/icons/src/library/map-marker.js
+++ b/packages/icons/src/library/map-marker.js
@@ -1,12 +1,11 @@
/**
* WordPress dependencies
*/
-import { SVG, Path, Circle } from '@wordpress/primitives';
+import { SVG, Path } from '@wordpress/primitives';
const mapMarker = (
);
diff --git a/storybook/test/__snapshots__/index.js.snap b/storybook/test/__snapshots__/index.js.snap
index 99d418b29f4e41..603152a58439e5 100644
--- a/storybook/test/__snapshots__/index.js.snap
+++ b/storybook/test/__snapshots__/index.js.snap
@@ -12481,12 +12481,7 @@ exports[`Storyshots Icons/Icon Library 1`] = `
xmlns="https://www.w3.org/2000/svg"
>
-