diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
index 755d4368c9e1..eb84568f8645 100644
--- a/contribs/gmf/apps/desktop_alt/index.html.ejs
+++ b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -232,7 +232,7 @@
 
       <!-- Selection -->
       <gmf-selection-button slot="tool-button"></gmf-selection-button>
-      <div slot="tool-panel-query"  class="row pointer-events-none">
+      <div slot="tool-panel-selection"  class="row pointer-events-none">
         <div class="col-sm-12">
           <div class="gmf-app-tools-content-heading">
             {{ 'Selection' | translate }}
diff --git a/src/canvas/ToolButtonsImplElements.ts b/src/canvas/ToolButtonsImplElements.ts
index 3ce897008bd5..4e00ff5a674a 100644
--- a/src/canvas/ToolButtonsImplElements.ts
+++ b/src/canvas/ToolButtonsImplElements.ts
@@ -19,7 +19,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import {TemplateResult, html} from 'lit';
+import {TemplateResult, html, css} from 'lit';
 import {customElement} from 'lit/decorators.js';
 import ToolButtonElement from 'gmfapi/elements/ToolButtonElement';
 import i18next from 'i18next';
@@ -252,3 +252,34 @@ export class ToolButtonRouting extends ToolButtonElement {
     `;
   }
 }
+
+@customElement('gmf-selection-button')
+export class ToolButtonSelection extends ToolButtonElement {
+  static styles = [
+    ...ToolButtonElement.styles,
+    css`
+      .offset-info-icon {
+        position: absolute;
+        line-height: normal;
+      }
+    `,
+  ];
+  constructor() {
+    super('selection');
+  }
+
+  render(): TemplateResult {
+    return html`
+      <button
+        @click=${() => this.click_()}
+        class="btn btn-default ${this.active_ ? 'active' : ''}"
+        data-toggle="tooltip"
+        data-placement="left"
+        data-original-title="${i18next.t('Selection')}"
+      >
+        <i class="fa-solid fa-arrow-pointer"></i>
+        <i class="fa-solid fa-info fa-sm offset-info-icon"></i>
+      </button>
+    `;
+  }
+}