diff --git a/packages/frontend/src/main/dialogs/NewStream.vue b/packages/frontend/src/main/dialogs/NewStream.vue
index 22d878aae..86e2e1828 100644
--- a/packages/frontend/src/main/dialogs/NewStream.vue
+++ b/packages/frontend/src/main/dialogs/NewStream.vue
@@ -33,12 +33,12 @@
           v-model="isPublic"
           v-tooltip="
             isPublic
-              ? `Anyone can view this stream. It is also visible on your profile page. Only collaborators
+              ? `Anyone with the link can view this stream. It is also visible on your profile page. Only collaborators
           can edit it.`
               : `Only collaborators can access this stream.`
           "
           inset
-          :label="`${isPublic ? 'Public stream' : 'Private stream'}`"
+          :label="`${isPublic ? 'Link Sharing On' : 'Link Sharing Off'}`"
         />
 
         <p class="mt-5">
@@ -155,7 +155,7 @@ export default {
       valid: false,
       search: null,
       nameRules: [],
-      isPublic: false,
+      isPublic: true,
       collabs: [],
       isLoading: false
     }
diff --git a/packages/frontend/src/main/dialogs/ShareStreamDialog.vue b/packages/frontend/src/main/dialogs/ShareStreamDialog.vue
index 91550f973..4e36484fd 100644
--- a/packages/frontend/src/main/dialogs/ShareStreamDialog.vue
+++ b/packages/frontend/src/main/dialogs/ShareStreamDialog.vue
@@ -70,7 +70,7 @@
         <v-toolbar-title>Embed {{ embedType }}</v-toolbar-title>
         <v-spacer></v-spacer>
         <span v-if="!stream.isPublic" class="caption">
-          Viewer embedding only works if the stream is public.
+          Viewer embedding only works if link sharing is on.
         </span>
       </v-toolbar>
       <div v-if="stream.isPublic">
@@ -114,7 +114,7 @@
           <v-icon>{{ stream.isPublic ? 'mdi-lock-open' : 'mdi-lock' }}</v-icon>
         </v-app-bar-nav-icon>
         <v-toolbar-title>
-          {{ stream.isPublic ? 'Public stream' : 'Private stream' }}
+          {{ stream.isPublic ? 'Link Sharing On' : 'Link Sharing Off' }}
         </v-toolbar-title>
         <v-spacer></v-spacer>
         <v-switch
@@ -127,11 +127,12 @@
         />
       </v-toolbar>
       <v-card-text v-if="stream.isPublic" class="pt-2">
-        This stream is public. This means that anyone with the link can view and read
-        data from it.
+        Link sharing is on. This means that anyone with the link can view this stream.
+        Only collaborators will be able to send or edit data.
       </v-card-text>
       <v-card-text v-if="!stream.isPublic" class="pt-2 pb-2">
-        This stream is private. This means that only collaborators can access it.
+        Link sharing is off. This means that only collaborators can view or edit this
+        stream.
       </v-card-text>
     </v-sheet>
     <v-sheet v-if="stream">
diff --git a/packages/frontend/src/main/pages/stream/TheSettings.vue b/packages/frontend/src/main/pages/stream/TheSettings.vue
index 680349bb9..92142779f 100644
--- a/packages/frontend/src/main/pages/stream/TheSettings.vue
+++ b/packages/frontend/src/main/pages/stream/TheSettings.vue
@@ -55,7 +55,7 @@
                 v-model="isPublic"
                 inset
                 class="mt-5"
-                :label="isPublic ? 'Public (Link Sharing)' : 'Private'"
+                :label="isPublic ? 'Link Sharing On' : 'Link Sharing Off'"
                 :hint="
                   isPublic
                     ? 'Anyone with the link can view this stream. It is also visible on your profile page. Only collaborators can push data to it.'
diff --git a/packages/frontend/src/main/toolbars/StreamToolbar.vue b/packages/frontend/src/main/toolbars/StreamToolbar.vue
index a2c844fe8..4bec61803 100644
--- a/packages/frontend/src/main/toolbars/StreamToolbar.vue
+++ b/packages/frontend/src/main/toolbars/StreamToolbar.vue
@@ -46,17 +46,13 @@
       <v-btn
         v-if="stream"
         v-tooltip="'Share this stream'"
-        elevation="0"
-        text
+        xxxelevation="0"
         rounded
-        class="mr-1 px-0"
+        class="mr-2 ml-2 px-0 primary"
         @click="shareStream = true"
       >
-        <v-icon v-if="!stream.isPublic" x-small class="mr-1 grey--text">
-          mdi-lock
-        </v-icon>
-        <v-icon v-else x-small class="mr-1 grey--text">mdi-lock-open</v-icon>
-        <v-icon small class="primary--text">mdi-share-variant</v-icon>
+        <v-icon v-if="!stream.isPublic" small class="mr-1">mdi-lock</v-icon>
+        <v-icon small>mdi-share-variant</v-icon>
       </v-btn>
     </portal>
     <v-dialog