diff --git a/src/assets/stylesheets/audio.scss b/src/assets/stylesheets/audio.scss
index a1daf753adfb9ce9d75fb2d3eff0a5f57f1837df..93e819f7a356f8b946c1292ff0ccddb5c0c03d5a 100644
--- a/src/assets/stylesheets/audio.scss
+++ b/src/assets/stylesheets/audio.scss
@@ -63,6 +63,8 @@
   top: 0;
   left: 0;
   z-index: 2;
+  min-width: 111px;
+  min-height: 111px;
 }
 
 .audio-setup-panel__levels__speaker {
@@ -76,6 +78,8 @@
   top: 0;
   left: 0;
   z-index: 2;
+  min-width: 111px;
+  min-height: 111px;
 }
 
 .audio-setup-panel__levels__level {
diff --git a/src/assets/stylesheets/entry.scss b/src/assets/stylesheets/entry.scss
index 27a6d1832b476cfde61d6df19dbb80f22a4601d3..d30ffc98bc332d450d24dc29f3e2ebbcf5d21772 100644
--- a/src/assets/stylesheets/entry.scss
+++ b/src/assets/stylesheets/entry.scss
@@ -38,6 +38,8 @@
 
 .entry-button__icon {
   flex: 1 1 90px;
+  min-width: 90px;
+  min-height: 90px;
 }
 
 .entry-button__label {
diff --git a/src/react-components/entry-buttons.js b/src/react-components/entry-buttons.js
index 133cd91b307cd7cb01ef498010b5cd7daf98f68d..e567c6e1111f362ab4175087794af1f38a6a1c24 100644
--- a/src/react-components/entry-buttons.js
+++ b/src/react-components/entry-buttons.js
@@ -61,7 +61,7 @@ export const GenericEntryButton = (props) => {
 export const GearVREntryButton = (props) => {
   const entryButtonProps = {
     ...props,
-    iconSrc: GenericVREntryImg,
+    iconSrc: GearVREntryImg,
     prefixMessageId: "entry.gearvr-prefix",
     mediumMessageId: "entry.gearvr-medium"
   };
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index b1fd8bb033eae5a1514827ae047134450b12d27f..e2f4c2a1629def812e484f2617b07d3c61548d2a 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -96,7 +96,6 @@ class UIRoot extends Component {
   componentDidMount() {
     this.setupTestTone();
     this.props.concurrentLoadDetector.addEventListener("concurrentload", this.onConcurrentLoad);
-    this.handleForcedVREntryType();
     this.micLevelMovingAverage = MovingAverage(100);
     this.props.scene.addEventListener("loaded", this.onSceneLoaded);
   }
diff --git a/src/room.js b/src/room.js
index eee34df54fd904dfae5ec31ec68784ce4ec88f0a..6369effad94a73a3c8d86353c1afd527799d0db3 100644
--- a/src/room.js
+++ b/src/room.js
@@ -235,6 +235,7 @@ function mountUI(scene) {
 
   getAvailableVREntryTypes().then(availableVREntryTypes => {
     uiRoot.setState({ availableVREntryTypes });
+    uiRoot.handleForcedVREntryType();
   });
 }