diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
index cec724e8a..7f44850ca 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
@@ -51,7 +51,8 @@ public class UIButton extends AppCompatImageButton implements CustomUIButton {
     private int mTooltipDelay;
     private float mTooltipDensity;
     private @LayoutRes int mTooltipLayout;
-    private boolean mCurvedTooltip = true;
+    private boolean mCurvedTooltip;
+    private boolean mCurvedTooltipOverridden;
     private ViewUtils.TooltipPosition mTooltipPosition;
     private boolean mIsPrivate;
     private boolean mIsActive;
@@ -85,6 +86,8 @@ public UIButton(Context context, AttributeSet attrs, int defStyleAttr) {
             mTooltipText = arr.getString(0);
         }
         mTooltipLayout = attributes.getResourceId(R.styleable.UIButton_tooltipLayout, R.layout.tooltip);
+        mCurvedTooltip = attributes.getBoolean(R.styleable.UIButton_tooltipCurved, false);
+        mCurvedTooltipOverridden = attributes.hasValue(R.styleable.UIButton_tooltipCurved);
         mClipDrawable = (ClipDrawable)attributes.getDrawable(R.styleable.UIButton_clipDrawable);
         mClipColor = attributes.getColor(R.styleable.UIButton_clipColor, 0);
         attributes.recycle();
@@ -154,13 +157,6 @@ private void setTooltipTextInternal(@Nullable CharSequence tooltipText) {
         super.setTooltipText(tooltipText);
     }
 
-    public void setCurvedTooltip(boolean aEnabled) {
-        mCurvedTooltip = aEnabled;
-        if (mTooltipView != null) {
-            mTooltipView.setCurvedMode(aEnabled);
-        }
-    }
-
     @Override
     public boolean onHoverEvent(MotionEvent event) {
         if (getTooltipText() != null) {
@@ -304,7 +300,6 @@ public void run() {
             if (mTooltipView == null) {
                 mTooltipView = new TooltipWidget(getContext(), mTooltipLayout);
             }
-            mTooltipView.setCurvedMode(mCurvedTooltip);
             if (getTooltipText() != null) {
                 mTooltipView.setText(getTooltipText().toString());
             }
@@ -314,6 +309,12 @@ public void run() {
             UIWidget parent = ViewUtils.getParentWidget(UIButton.this);
             parent.offsetDescendantRectToMyCoords(UIButton.this, offsetViewBounds);
 
+            // Use parent curved mode unless it has been overridden in the tooltip XML properties
+            mTooltipView.setCurvedMode(parent.getPlacement().cylinder);
+            if (mCurvedTooltipOverridden) {
+                mTooltipView.setCurvedMode(mCurvedTooltip);
+            }
+
             float ratio = WidgetPlacement.viewToWidgetRatio(getContext(), parent);
 
             mTooltipView.getPlacement().parentHandle = parent.getHandle();
@@ -323,16 +324,13 @@ public void run() {
                 mTooltipView.getPlacement().anchorY = 1.0f;
                 mTooltipView.getPlacement().parentAnchorY = 0.0f;
                 mTooltipView.getPlacement().translationX = (offsetViewBounds.left + UIButton.this.getWidth() / 2.0f) * ratio;
-                mTooltipView.getPlacement().translationY = -offsetViewBounds.top * ratio;
 
             } else {
                 mTooltipView.getPlacement().anchorY = 0.0f;
                 mTooltipView.getPlacement().parentAnchorY = 1.0f;
                 mTooltipView.getPlacement().translationX = (offsetViewBounds.left + UIButton.this.getHeight() / 2.0f) * ratio;
-                mTooltipView.getPlacement().translationY = offsetViewBounds.top * ratio;
             }
 
-            mTooltipView.setCurvedMode(false);
             mTooltipView.show(UIWidget.CLEAR_FOCUS);
         }
     };
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java
index 2d22dff17..882b5d351 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java
@@ -7,40 +7,27 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.TextView;
 
-import org.mozilla.telemetry.schedule.jobscheduler.TelemetryJobService;
-import org.mozilla.vrbrowser.R;
+import androidx.databinding.DataBindingUtil;
+
 import org.mozilla.geckoview.MediaElement;
+import org.mozilla.vrbrowser.R;
 import org.mozilla.vrbrowser.browser.Media;
 import org.mozilla.vrbrowser.browser.SettingsStore;
+import org.mozilla.vrbrowser.databinding.MediaControlsBinding;
 import org.mozilla.vrbrowser.ui.views.MediaSeekBar;
-import org.mozilla.vrbrowser.ui.views.UIButton;
 import org.mozilla.vrbrowser.ui.views.VolumeControl;
 import org.mozilla.vrbrowser.ui.widgets.menus.VideoProjectionMenuWidget;
 
 public class MediaControlsWidget extends UIWidget implements MediaElement.Delegate {
 
+    private MediaControlsBinding mBinding;
     private Media mMedia;
-    private MediaSeekBar mSeekBar;
-    private VolumeControl mVolumeControl;
-    private UIButton mMediaPlayButton;
-    private UIButton mMediaSeekBackButton;
-    private UIButton mMediaSeekForwardButton;
-    private UIButton mMediaProjectionButton;
-    private UIButton mMediaVolumeButton;
-    private UIButton mMediaBackButton;
-    private TextView mMediaSeekLabel;
-    private Drawable mPlayIcon;
-    private Drawable mPauseIcon;
-    private Drawable mVolumeIcon;
-    private Drawable mMutedIcon;
     private Runnable mBackHandler;
     private boolean mPlayOnSeekEnd;
     private Rect mOffsetViewBounds;
@@ -66,31 +53,21 @@ public MediaControlsWidget(Context aContext, AttributeSet aAttrs, int aDefStyle)
     }
 
     private void initialize(Context aContext) {
-        inflate(aContext, R.layout.media_controls, this);
-
-        mSeekBar = findViewById(R.id.mediaControlSeekBar);
-        mVolumeControl = findViewById(R.id.volumeControl);
-        mMediaPlayButton = findViewById(R.id.mediaPlayButton);
-        mMediaSeekBackButton = findViewById(R.id.mediaSeekBackwardButton);
-        mMediaSeekForwardButton = findViewById(R.id.mediaSeekForwardButton);
-        mMediaProjectionButton = findViewById(R.id.mediaProjectionButton);
-        mMediaVolumeButton = findViewById(R.id.mediaVolumeButton);
-        mMediaBackButton = findViewById(R.id.mediaBackButton);
-        mMediaSeekLabel = findViewById(R.id.mediaControlSeekLabel);
-        mPlayIcon = aContext.getDrawable(R.drawable.ic_icon_media_play);
-        mPauseIcon = aContext.getDrawable(R.drawable.ic_icon_media_pause);
-        mMutedIcon = aContext.getDrawable(R.drawable.ic_icon_media_volume_muted);
-        mVolumeIcon = aContext.getDrawable(R.drawable.ic_icon_media_volume);
+        LayoutInflater inflater = LayoutInflater.from(getContext());
+        mBinding = DataBindingUtil.inflate(inflater, R.layout.media_controls, this, true);
+        mBinding.setPlaying(true);
+        mBinding.setMuted(false);
+
         mOffsetViewBounds = new Rect();
 
         mVolumeCtrlRunnable = () -> {
-            if ((mHideVolumeSlider) && (mVolumeControl.getVisibility() == View.VISIBLE)) {
-                mVolumeControl.setVisibility(View.INVISIBLE);
+            if ((mHideVolumeSlider) && (mBinding.volumeControl.getVisibility() == View.VISIBLE)) {
+                mBinding.volumeControl.setVisibility(View.INVISIBLE);
                 stopVolumeCtrlHandler();
             }
         };
 
-        mMediaPlayButton.setOnClickListener(v -> {
+        mBinding.mediaPlayButton.setOnClickListener(v -> {
             if (mMedia.isEnded()) {
                 mMedia.seek(0);
                 mMedia.play();
@@ -100,24 +77,24 @@ private void initialize(Context aContext) {
                 mMedia.play();
             }
 
-            mMediaPlayButton.requestFocusFromTouch();
+            mBinding.mediaPlayButton.requestFocusFromTouch();
         });
 
-        mMediaSeekBackButton.setOnClickListener(v -> {
+        mBinding.mediaSeekBackwardButton.setOnClickListener(v -> {
             mMedia.seek(Math.max(0, mMedia.getCurrentTime() - 10.0f));
-            mMediaSeekBackButton.requestFocusFromTouch();
+            mBinding.mediaSeekBackwardButton.requestFocusFromTouch();
         });
 
-        mMediaSeekForwardButton.setOnClickListener(v -> {
+        mBinding.mediaSeekForwardButton.setOnClickListener(v -> {
             double t = mMedia.getCurrentTime() + 30;
             if (mMedia.getDuration() > 0) {
                 t = Math.min(mMedia.getDuration(), t);
             }
             mMedia.seek(t);
-            mMediaSeekForwardButton.requestFocusFromTouch();
+            mBinding.mediaSeekForwardButton.requestFocusFromTouch();
         });
 
-        mMediaProjectionButton.setOnClickListener(v -> {
+        mBinding.mediaProjectionButton.setOnClickListener(v -> {
             WidgetPlacement placement = mProjectionMenu.getPlacement();
             placement.parentHandle = this.getHandle();
             placement.worldWidth = 0.5f;
@@ -138,30 +115,30 @@ private void initialize(Context aContext) {
             mWidgetManager.updateWidget(mProjectionMenu);
         });
 
-        mMediaVolumeButton.setOnClickListener(v -> {
+        mBinding.mediaVolumeButton.setOnClickListener(v -> {
             if (mMedia.isMuted()) {
                 mMedia.setMuted(false);
             } else {
                 mMedia.setMuted(true);
-                mVolumeControl.setVolume(0);
+                mBinding.volumeControl.setVolume(0);
             }
-            mMediaVolumeButton.requestFocusFromTouch();
+            mBinding.mediaVolumeButton.requestFocusFromTouch();
         });
 
-        mMediaBackButton.setOnClickListener(v -> {
+        mBinding.mediaBackButton.setOnClickListener(v -> {
             if (mBackHandler != null) {
                 mBackHandler.run();
             }
-            mMediaBackButton.requestFocusFromTouch();
+            mBinding.mediaBackButton.requestFocusFromTouch();
         });
 
-        mSeekBar.setDelegate(new MediaSeekBar.Delegate() {
+        mBinding.mediaControlSeekBar.setDelegate(new MediaSeekBar.Delegate() {
             @Override
             public void onSeekDragStart() {
                 mPlayOnSeekEnd = mMedia.isPlaying();
-                mMediaSeekLabel.setVisibility(View.VISIBLE);
+                mBinding.mediaControlSeekLabel.setVisibility(View.VISIBLE);
                 mMedia.pause();
-                mSeekBar.requestFocusFromTouch();
+                mBinding.mediaControlSeekBar.requestFocusFromTouch();
             }
 
             @Override
@@ -174,34 +151,34 @@ public void onSeekDragEnd() {
                 if (mPlayOnSeekEnd) {
                     mMedia.play();
                 }
-                mMediaSeekLabel.setVisibility(View.GONE);
+                mBinding.mediaControlSeekLabel.setVisibility(View.GONE);
             }
 
             @Override
             public void onSeekHoverStart() {
-                mMediaSeekLabel.setVisibility(View.VISIBLE);
+                mBinding.mediaControlSeekLabel.setVisibility(View.VISIBLE);
             }
 
             @Override
             public void onSeekHoverEnd() {
-                mMediaSeekLabel.setVisibility(View.GONE);
+                mBinding.mediaControlSeekLabel.setVisibility(View.GONE);
             }
 
             @Override
             public void onSeekPreview(String aText, double aRatio) {
-                mMediaSeekLabel.setText(aText);
-                View childView = mSeekBar.getSeekBarView();
+                mBinding.mediaControlSeekLabel.setText(aText);
+                View childView = mBinding.mediaControlSeekBar.getSeekBarView();
                 childView.getDrawingRect(mOffsetViewBounds);
                 MediaControlsWidget.this.offsetDescendantRectToMyCoords(childView, mOffsetViewBounds);
 
-                FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mMediaSeekLabel.getLayoutParams();
-                params.setMarginStart(mOffsetViewBounds.left + (int) (aRatio * mOffsetViewBounds.width()) - mMediaSeekLabel.getMeasuredWidth() / 2);
-                mMediaSeekLabel.setLayoutParams(params);
+                FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mBinding.mediaControlSeekLabel.getLayoutParams();
+                params.setMarginStart(mOffsetViewBounds.left + (int) (aRatio * mOffsetViewBounds.width()) - mBinding.mediaControlSeekLabel.getMeasuredWidth() / 2);
+                mBinding.mediaControlSeekLabel.setLayoutParams(params);
             }
         });
 
 
-        mVolumeControl.setDelegate(new VolumeControl.Delegate() {
+        mBinding.volumeControl.setDelegate(new VolumeControl.Delegate() {
 
             @Override
             public void onVolumeChange(double aVolume) {
@@ -209,7 +186,7 @@ public void onVolumeChange(double aVolume) {
                 if (mMedia.isMuted()) {
                     mMedia.setMuted(false);
                 }
-                mVolumeControl.requestFocusFromTouch();
+                mBinding.volumeControl.requestFocusFromTouch();
             }
 
             @Override
@@ -237,7 +214,7 @@ public void onSeekBarActionCancelled() {
 
             return false;
         });
-        mMediaVolumeButton.setOnHoverListener((v, event) -> {
+        mBinding.mediaVolumeButton.setOnHoverListener((v, event) -> {
             float startY = v.getY();
             float maxY = startY + v.getHeight();
             //for this we only hide on the left side of volume button or outside y area of button
@@ -245,14 +222,14 @@ public void onSeekBarActionCancelled() {
                 mHideVolumeSlider = true;
                 startVolumeCtrlHandler();
             } else {
-                mVolumeControl.setVisibility(View.VISIBLE);
+                mBinding.volumeControl.setVisibility(View.VISIBLE);
                 mHideVolumeSlider = false;
                 stopVolumeCtrlHandler();
             }
             return false;
         });
 
-        mVolumeControl.setOnHoverListener((v, event) -> {
+        mBinding.volumeControl.setOnHoverListener((v, event) -> {
             float startY = 0;
             float maxY = startY + v.getHeight();
             if ((event.getX() > 0 && event.getX() < v.getWidth()) && (event.getY() > startY && event.getY() < maxY)) {
@@ -273,6 +250,7 @@ else if ((event.getX() <= 0) || (event.getX() >= v.getWidth()) || (!(event.getY(
     @Override
     protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         Context context = getContext();
+        aPlacement.worldWidth = WidgetPlacement.floatDimension(getContext(), R.dimen.media_controls_world_width);
         aPlacement.width = WidgetPlacement.dpDimension(context, R.dimen.media_controls_container_width);
         aPlacement.height = WidgetPlacement.dpDimension(context, R.dimen.media_controls_container_height);
         aPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.settings_world_y) -
@@ -311,11 +289,11 @@ public void setMedia(Media aMedia) {
         }
         mMedia = aMedia;
         boolean enabled = mMedia != null;
-        mMediaPlayButton.setEnabled(enabled);
-        mMediaVolumeButton.setEnabled(enabled);
-        mMediaSeekForwardButton.setEnabled(enabled);
-        mMediaSeekBackButton.setEnabled(enabled);
-        mSeekBar.setEnabled(enabled);
+        mBinding.mediaPlayButton.setEnabled(enabled);
+        mBinding.mediaVolumeButton.setEnabled(enabled);
+        mBinding.mediaSeekForwardButton.setEnabled(enabled);
+        mBinding.mediaSeekBackwardButton.setEnabled(enabled);
+        mBinding.mediaControlSeekBar.setEnabled(enabled);
 
         if (mMedia == null) {
             return;
@@ -330,16 +308,16 @@ public void setMedia(Media aMedia) {
     }
 
     public void setProjectionSelectorEnabled(boolean aEnabled) {
-        mMediaProjectionButton.setEnabled(aEnabled);
+        mBinding.mediaProjectionButton.setEnabled(aEnabled);
     }
 
     // Media Element delegate
     @Override
     public void onPlaybackStateChange(MediaElement mediaElement, int playbackState) {
         if (playbackState == MediaElement.MEDIA_STATE_PLAY) {
-            mMediaPlayButton.setImageDrawable(mPauseIcon);
+            mBinding.setPlaying(true);
         } else if (playbackState == MediaElement.MEDIA_STATE_PAUSE) {
-            mMediaPlayButton.setImageDrawable(mPlayIcon);
+            mBinding.setPlaying(false);
         }
     }
 
@@ -354,36 +332,36 @@ public void onMetadataChange(MediaElement mediaElement, MediaElement.Metadata me
         if (metaData == null) {
             return;
         }
-        mSeekBar.setDuration(metaData.duration);
+        mBinding.mediaControlSeekBar.setDuration(metaData.duration);
         if (metaData.audioTrackCount == 0) {
-            mMediaVolumeButton.setImageDrawable(mMutedIcon);
-            mMediaVolumeButton.setEnabled(false);
+            mBinding.setMuted(true);
+            mBinding.mediaVolumeButton.setEnabled(false);
         } else {
-            mMediaVolumeButton.setEnabled(true);
+            mBinding.mediaVolumeButton.setEnabled(true);
         }
-        mSeekBar.setSeekable(metaData.isSeekable);
+        mBinding.mediaControlSeekBar.setSeekable(metaData.isSeekable);
     }
 
     @Override
     public void onLoadProgress(MediaElement mediaElement, MediaElement.LoadProgressInfo progressInfo) {
         if (progressInfo.buffered != null) {
-            mSeekBar.setBuffered(progressInfo.buffered[progressInfo.buffered.length - 1].end);
+            mBinding.mediaControlSeekBar.setBuffered(progressInfo.buffered[progressInfo.buffered.length - 1].end);
         }
     }
 
     @Override
     public void onVolumeChange(MediaElement mediaElement, double volume, boolean muted) {
-        if (!mMediaVolumeButton.isEnabled()) {
+        if (!mBinding.mediaVolumeButton.isEnabled()) {
             return;
         }
-        mMediaVolumeButton.setImageDrawable(muted ? mMutedIcon : mVolumeIcon);
-        mVolumeControl.setVolume(volume);
-        mVolumeControl.setMuted(muted);
+        mBinding.setMuted(muted);
+        mBinding.volumeControl.setVolume(volume);
+        mBinding.volumeControl.setMuted(muted);
     }
 
     @Override
     public void onTimeChange(MediaElement mediaElement, double time) {
-        mSeekBar.setCurrentTime(time);
+        mBinding.mediaControlSeekBar.setCurrentTime(time);
     }
 
     @Override
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java
index 9c85d9e58..ca5f02144 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java
@@ -123,7 +123,6 @@ public void updateUI() {
             notifyPrivateBrowsingClicked();
             view.requestFocusFromTouch();
         });
-        mBinding.privateButton.setCurvedTooltip(false);
 
         mBinding.settingsButton.setOnHoverListener(mButtonScaleHoverListener);
         mBinding.settingsButton.setOnClickListener(view -> {
@@ -136,7 +135,6 @@ public void updateUI() {
                 view.requestFocusFromTouch();
             }
         });
-        mBinding.settingsButton.setCurvedTooltip(false);
 
         mBinding.bookmarksButton.setOnHoverListener(mButtonScaleHoverListener);
         mBinding.bookmarksButton.setOnClickListener(view -> {
@@ -147,7 +145,6 @@ public void updateUI() {
             notifyBookmarksClicked();
             view.requestFocusFromTouch();
         });
-        mBinding.bookmarksButton.setCurvedTooltip(false);
 
         mBinding.historyButton.setOnHoverListener(mButtonScaleHoverListener);
         mBinding.historyButton.setOnClickListener(view -> {
@@ -158,7 +155,6 @@ public void updateUI() {
             notifyHistoryClicked();
             view.requestFocusFromTouch();
         });
-        mBinding.historyButton.setCurvedTooltip(false);
 
         mBinding.tabsButton.setOnHoverListener(mButtonScaleHoverListener);
         mBinding.tabsButton.setOnClickListener(view -> {
@@ -169,7 +165,6 @@ public void updateUI() {
             view.requestFocusFromTouch();
             notifyTabsClicked();
         });
-        mBinding.tabsButton.setCurvedTooltip(false);
 
         mBinding.addwindowButton.setOnHoverListener(mButtonScaleHoverListener);
         mBinding.addwindowButton.setOnClickListener(view -> {
@@ -181,7 +176,6 @@ public void updateUI() {
 
             notifyAddWindowClicked();
         });
-        mBinding.addwindowButton.setCurvedTooltip(false);
 
         mBinding.downloadsButton.setOnHoverListener(mButtonScaleHoverListener);
         mBinding.downloadsButton.setOnClickListener(view -> {
@@ -192,7 +186,6 @@ public void updateUI() {
             notifyDownloadsClicked();
             view.requestFocusFromTouch();
         });
-        mBinding.downloadsButton.setCurvedTooltip(false);
     }
 
     Observer<ObservableBoolean> mIsVisibleObserver = aVisible -> {
diff --git a/app/src/main/res/layout/media_controls.xml b/app/src/main/res/layout/media_controls.xml
index 71a82b4de..978c1363a 100644
--- a/app/src/main/res/layout/media_controls.xml
+++ b/app/src/main/res/layout/media_controls.xml
@@ -1,95 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
-        android:layout_width="@dimen/media_controls_panel_width"
-        android:layout_height="@dimen/media_controls_panel_height"
-        android:layout_gravity="left"
-        android:orientation="vertical"
-        android:background="@drawable/media_controls_background"
-        android:layout_marginTop="15dp"
-        android:paddingTop="12dp"
-        android:paddingBottom="0dp"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp">
-
-        <org.mozilla.vrbrowser.ui.views.MediaSeekBar
-            android:id="@+id/mediaControlSeekBar"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:gravity="center_vertical">
-        </org.mozilla.vrbrowser.ui.views.MediaSeekBar>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="playing"
+            type="boolean" />
+        <variable
+            name="muted"
+            type="boolean" />
+    </data>
+    <FrameLayout
+        android:layout_width="@dimen/media_controls_container_width"
+        android:layout_height="@dimen/media_controls_container_height">
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="44dp"
-            android:orientation="horizontal"
-            android:layout_marginTop="1dp">
-            <org.mozilla.vrbrowser.ui.views.UIButton
-                android:id="@+id/mediaBackButton"
-                style="?attr/mediaControlsButtonStyle"
-                android:layout_weight="1"
-                android:src="@drawable/ic_icon_back" />
+            android:layout_width="@dimen/media_controls_panel_width"
+            android:layout_height="@dimen/media_controls_panel_height"
+            android:layout_gravity="left"
+            android:orientation="vertical"
+            android:background="@drawable/media_controls_background"
+            android:layout_marginTop="15dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="0dp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp">
+
+            <org.mozilla.vrbrowser.ui.views.MediaSeekBar
+                android:id="@+id/mediaControlSeekBar"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:gravity="center_vertical">
+            </org.mozilla.vrbrowser.ui.views.MediaSeekBar>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:orientation="horizontal"
+                android:layout_marginTop="1dp">
+                <org.mozilla.vrbrowser.ui.views.UIButton
+                    android:id="@+id/mediaBackButton"
+                    style="?attr/mediaControlsButtonStyle"
+                    android:layout_weight="1"
+                    android:src="@drawable/ic_icon_back"
+                    android:tooltipText="@string/video_controls_exit"
+                    app:tooltipDensity="@dimen/tray_tooltip_density"
+                    app:tooltipPosition="bottom"
+                    app:tooltipLayout="@layout/tooltip_tray"/>
 
-            <org.mozilla.vrbrowser.ui.views.UIButton
-                android:id="@+id/mediaSeekBackwardButton"
-                style="?attr/mediaControlsButtonStyle"
-                android:layout_weight="1"
-                android:src="@drawable/ic_icon_media_seek_backward_10" />
+                <org.mozilla.vrbrowser.ui.views.UIButton
+                    android:id="@+id/mediaSeekBackwardButton"
+                    style="?attr/mediaControlsButtonStyle"
+                    android:layout_weight="1"
+                    android:src="@drawable/ic_icon_media_seek_backward_10"
+                    android:tooltipText="@{String.format(@string/video_controls_seek_backward, 10)}"
+                    app:tooltipDensity="@dimen/tray_tooltip_density"
+                    app:tooltipPosition="bottom"
+                    app:tooltipLayout="@layout/tooltip_tray"/>
 
-            <org.mozilla.vrbrowser.ui.views.UIButton
-                android:id="@+id/mediaPlayButton"
-                style="?attr/mediaControlsButtonStyle"
-                android:layout_weight="1"
-                android:src="@drawable/ic_icon_media_play" />
+                <org.mozilla.vrbrowser.ui.views.UIButton
+                    android:id="@+id/mediaPlayButton"
+                    style="?attr/mediaControlsButtonStyle"
+                    android:layout_weight="1"
+                    android:src="@{playing ? @drawable/ic_icon_media_pause : @drawable/ic_icon_media_play}"
+                    android:tooltipText="@{playing ? @string/video_controls_pause : @string/video_controls_play}"
+                    app:tooltipDensity="@dimen/tray_tooltip_density"
+                    app:tooltipPosition="bottom"
+                    app:tooltipLayout="@layout/tooltip_tray"/>
 
-            <org.mozilla.vrbrowser.ui.views.UIButton
-                android:id="@+id/mediaSeekForwardButton"
-                style="?attr/mediaControlsButtonStyle"
-                android:layout_weight="1"
-                android:src="@drawable/ic_icon_media_seek_forward_30" />
+                <org.mozilla.vrbrowser.ui.views.UIButton
+                    android:id="@+id/mediaSeekForwardButton"
+                    style="?attr/mediaControlsButtonStyle"
+                    android:layout_weight="1"
+                    android:src="@drawable/ic_icon_media_seek_forward_30"
+                    android:tooltipText="@{String.format(@string/video_controls_seek_forward, 10)}"
+                    app:tooltipDensity="@dimen/tray_tooltip_density"
+                    app:tooltipPosition="bottom"
+                    app:tooltipLayout="@layout/tooltip_tray"/>
 
-            <org.mozilla.vrbrowser.ui.views.UIButton
-                android:id="@+id/mediaProjectionButton"
-                style="?attr/mediaControlsButtonStyle"
-                android:layout_weight="1"
-                android:src="@drawable/ic_icon_vr_projection" />
+                <org.mozilla.vrbrowser.ui.views.UIButton
+                    android:id="@+id/mediaProjectionButton"
+                    style="?attr/mediaControlsButtonStyle"
+                    android:layout_weight="1"
+                    android:src="@drawable/ic_icon_vr_projection"
+                    android:tooltipText="@string/video_controls_projection"
+                    app:tooltipDensity="@dimen/tray_tooltip_density"
+                    app:tooltipPosition="bottom"
+                    app:tooltipLayout="@layout/tooltip_tray"/>
 
-            <org.mozilla.vrbrowser.ui.views.UIButton
-                android:id="@+id/mediaVolumeButton"
-                style="?attr/mediaControlsButtonStyle"
-                android:layout_weight="1"
-                android:src="@drawable/ic_icon_media_volume" />
+                <org.mozilla.vrbrowser.ui.views.UIButton
+                    android:id="@+id/mediaVolumeButton"
+                    style="?attr/mediaControlsButtonStyle"
+                    android:layout_weight="1"
+                    android:src="@{muted ? @drawable/ic_icon_media_volume_muted : @drawable/ic_icon_media_volume}"
+                    android:tooltipText="@{muted ? @string/video_controls_unmute : @string/video_controls_mute}"
+                    app:tooltipDensity="@dimen/tray_tooltip_density"
+                    app:tooltipPosition="bottom"
+                    app:tooltipLayout="@layout/tooltip_tray"/>
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
 
-    <org.mozilla.vrbrowser.ui.views.VolumeControl
-        android:id="@+id/volumeControl"
-        android:layout_width="20dp"
-        android:layout_height="@dimen/media_controls_panel_height"
-        android:layout_marginTop="15dp"
-        android:layout_marginRight="10dp"
-        android:layout_gravity="right"
-        android:visibility="invisible"
-        android:background="@drawable/media_controls_background">
+        <org.mozilla.vrbrowser.ui.views.VolumeControl
+            android:id="@+id/volumeControl"
+            android:layout_width="20dp"
+            android:layout_height="@dimen/media_controls_panel_height"
+            android:layout_marginTop="15dp"
+            android:layout_marginRight="10dp"
+            android:layout_gravity="right"
+            android:visibility="invisible"
+            android:background="@drawable/media_controls_background">
 
-    </org.mozilla.vrbrowser.ui.views.VolumeControl>
+        </org.mozilla.vrbrowser.ui.views.VolumeControl>
 
-    <TextView
-        android:id="@+id/mediaControlSeekLabel"
-        android:visibility="gone"
-        android:minWidth="45dp"
-        android:layout_width="wrap_content"
-        android:layout_height="24dp"
-        android:layout_gravity="top"
-        android:layout_marginTop="2dp"
-        android:layout_marginLeft="40dp"
-        android:background="@drawable/media_seekbar_label_background"
-        android:textColor="@color/white"
-        android:fontFamily="sans-serif"
-        android:textStyle="normal"
-        android:textSize="11dp"
-        android:textAlignment="center"
-        android:paddingStart="2dp"
-        android:paddingEnd="2dp"
-        android:paddingTop="3dp"
-        />
-</merge>
+        <TextView
+            android:id="@+id/mediaControlSeekLabel"
+            android:visibility="gone"
+            android:minWidth="45dp"
+            android:layout_width="wrap_content"
+            android:layout_height="24dp"
+            android:layout_gravity="top"
+            android:layout_marginTop="2dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/media_seekbar_label_background"
+            android:textColor="@color/white"
+            android:fontFamily="sans-serif"
+            android:textStyle="normal"
+            android:textSize="11dp"
+            android:textAlignment="center"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
+            android:paddingTop="3dp"
+            />
+    </FrameLayout>
+</layout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index adecdd20c..d0d613f85 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -29,6 +29,7 @@
         <attr name="tooltipPosition" />
         <attr name="tooltipDensity" />
         <attr name="tooltipLayout" />
+        <attr name="tooltipCurved" />
     </declare-styleable>
 
     <attr name="buttonText" format="string" />
@@ -44,6 +45,7 @@
     </attr>
     <attr name="tooltipDensity" format="dimension" />
     <attr name="tooltipLayout" format="reference" />
+    <attr name="tooltipCurved" format="boolean" />
 
     <declare-styleable name="SwitchSetting">
         <attr name="description" />
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 2f4855043..8b7207122 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -86,6 +86,7 @@
     <dimen name="brightness_menu_width">150dp</dimen>
 
     <!-- Media Controls Widget -->
+    <item name="media_controls_world_width" format="float" type="dimen">1</item>
     <dimen name="media_controls_container_width">324dp</dimen>
     <dimen name="media_controls_container_height">105dp</dimen>
     <dimen name="media_controls_panel_width">284dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 57d6d62e2..674169823 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -832,6 +832,9 @@
     <!-- This string is displayed in a tooltip in the video controls UI. -->
     <string name="video_controls_play">Play</string>
 
+    <!-- This string is displayed in a tooltip in the video controls UI. -->
+    <string name="video_controls_exit">Exit</string>
+
     <!-- This string is displayed in a tooltip in the video controls UI. -->
     <string name="video_controls_pause">Pause</string>
 
@@ -844,6 +847,9 @@
     <!-- This string is displayed in a tooltip below the video controls UI. -->
     <string name="video_controls_volume">Volume</string>
 
+    <!-- This string is displayed in a tooltip below the video controls UI. -->
+    <string name="video_controls_projection">Video Projection</string>
+
     <!-- This string is displayed in a tooltip in the video controls UI (e.g., 'Seek +30 seconds').
     '%1$s' will be replaced at runtime with a duration in seconds (e.g., '30'). -->
     <string name="video_controls_seek_forward">Seek +%1$s seconds</string>