diff --git a/lib/themes/juniper.dart b/lib/themes/juniper.dart
deleted file mode 100644
index 50dc446e..00000000
--- a/lib/themes/juniper.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:cwtch/themes/cwtch.dart';
-import 'package:flutter/material.dart';
-
-import 'opaque.dart';
-
-const juniper_theme = "juniper";
-
-OpaqueThemeType GetJuniperTheme(String mode) {
-  // there is only one juniper theme
-  return Juniper();
-}
-
-class Juniper extends CwtchDark {
-  static final Color background = Color(0xFF1B1B1B);
-  static final Color backgroundAlt = Color(0xFF494949);
-  static final Color header = Color(0xFF1B1B1B);
-  static final Color userBubble = Color(0xFF373737);
-  static final Color peerBubble = Color(0xFF494949);
-  static final Color font = Color(0xFFFFFFFF);
-  static final Color settings = Color(0xFFFFFDFF);
-  static final Color accent = Color(0xFF9E6A56);
-
-  get theme => juniper_theme;
-  get mode => mode_dark;
-
-  get backgroundMainColor => background; // darkGreyPurple;
-  get backgroundPaneColor => header; //darkGreyPurple;
-  get topbarColor => header; //darkGreyPurple;
-  get mainTextColor => font; //whiteishPurple;
-  get defaultButtonColor => accent; //hotPink;
-  get textfieldHintColor => mainTextColor; //TODO pick
-  get toolbarIconColor => settings; //whiteishPurple;
-  get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
-  get messageFromMeTextColor => font; //whiteishPurple;
-  get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
-  get messageFromOtherTextColor => font; //whiteishPurple;
-  get textfieldBackgroundColor => peerBubble;
-  get textfieldBorderColor => userBubble;
-  get backgroundHilightElementColor => backgroundAlt;
-}
diff --git a/lib/views/peersettingsview.dart b/lib/views/peersettingsview.dart
index 6ddbd6e7..7d4c029e 100644
--- a/lib/views/peersettingsview.dart
+++ b/lib/views/peersettingsview.dart
@@ -129,21 +129,23 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                           ]),
 
                           // Address Copy Button
-                          Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
-                            SizedBox(
-                              height: 20,
-                            ),
-                            CwtchLabel(label: AppLocalizations.of(context)!.addressLabel),
-                            SizedBox(
-                              height: 20,
-                            ),
-                            CwtchButtonTextField(
-                              controller: TextEditingController(text: Provider.of<ContactInfoState>(context, listen: false).onion),
-                              onPressed: _copyOnion,
-                              icon: Icon(CwtchIcons.address_copy),
-                              tooltip: AppLocalizations.of(context)!.copyBtn,
-                            )
-                          ]),
+                          Visibility(
+                              visible: settings.streamerMode == false,
+                              child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
+                                SizedBox(
+                                  height: 20,
+                                ),
+                                CwtchLabel(label: AppLocalizations.of(context)!.addressLabel),
+                                SizedBox(
+                                  height: 20,
+                                ),
+                                CwtchButtonTextField(
+                                  controller: TextEditingController(text: Provider.of<ContactInfoState>(context, listen: false).onion),
+                                  onPressed: _copyOnion,
+                                  icon: Icon(CwtchIcons.address_copy),
+                                  tooltip: AppLocalizations.of(context)!.copyBtn,
+                                )
+                              ])),
                           Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
                             SizedBox(
                               height: 20,