diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 2f19030f7..150a6f581 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -66,7 +66,7 @@
 
                 @if(auth()->user()->hasRole('open-beta'))
                     <div id="station-board-new">
-                        <Stationautocomplete :dashboard="true"></Stationautocomplete>
+                        <Stationautocomplete :dashboard="true" :show-gps-button="true"></Stationautocomplete>
                     </div>
                 @else
                     @include('includes.station-autocomplete')
diff --git a/resources/vue/components/StationAutocomplete.vue b/resources/vue/components/StationAutocomplete.vue
index 1bb1f87f9..4167f4435 100644
--- a/resources/vue/components/StationAutocomplete.vue
+++ b/resources/vue/components/StationAutocomplete.vue
@@ -24,6 +24,16 @@ export default {
             type: DateTime,
             required: false,
             default: null
+        },
+        showFilterButton: {
+            type: Boolean,
+            required: false,
+            default: false
+        },
+        showGpsButton: {
+            type: Boolean,
+            required: false,
+            default: false
         }
     },
     data() {
@@ -174,10 +184,14 @@ export default {
                            @focusin="showModal"
                            @keyup.enter="setStationFromText"
                     />
-                    <button type="button" class="btn btn-outline-dark stationSearchButton"
+                    <button v-if="showFilterButton" type="button" class="btn btn-outline-dark stationSearchButton"
                             @click="showFilter = !showFilter">
                         <i class="fa fa-filter" aria-hidden="true"></i>
                     </button>
+                    <button v-if="showGpsButton" type="button" class="btn btn-outline-dark stationSearchButton"
+                            @click="setStationFromGps">
+                        <i class="fa fa-map-marker-alt" aria-hidden="true"></i>
+                    </button>
                     <button type="button" class="btn btn-outline-dark stationSearchButton" @click="showPicker">
                         <i class="fa fa-clock" aria-hidden="true"></i>
                     </button>
diff --git a/resources/vue/components/Stationboard.vue b/resources/vue/components/Stationboard.vue
index ef121b3b3..c450839ca 100644
--- a/resources/vue/components/Stationboard.vue
+++ b/resources/vue/components/Stationboard.vue
@@ -135,6 +135,7 @@ export default {
         v-on:update:travel-type="updateTravelType"
         :station="{name: stationName}"
         :time="now"
+        :show-filter-button="true"
     />
     <div v-if="loading" style="max-width: 200px;" class="spinner-grow text-trwl mx-auto p-2" role="status">
         <span class="visually-hidden">Loading...</span>