diff --git a/app/src/visionglass/java/com/igalia/wolvic/PlatformActivity.java b/app/src/visionglass/java/com/igalia/wolvic/PlatformActivity.java
index 29aac12ef0..3e6be3a205 100644
--- a/app/src/visionglass/java/com/igalia/wolvic/PlatformActivity.java
+++ b/app/src/visionglass/java/com/igalia/wolvic/PlatformActivity.java
@@ -35,7 +35,6 @@
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.PopupWindow;
 import android.widget.SeekBar;
 
 import androidx.annotation.Keep;
@@ -47,6 +46,7 @@
 import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.google.android.material.slider.Slider;
 import com.huawei.hms.mlsdk.common.MLApplication;
 import com.huawei.usblib.DisplayMode;
 import com.huawei.usblib.DisplayModeCallback;
@@ -87,7 +87,6 @@ public class PlatformActivity extends FragmentActivity implements SensorEventLis
     private boolean mSwitchedTo3DMode = false;
     private AlignPhoneDialogFragment mAlignDialogFragment;
     private AlignNotificationUIDialog mAlignNotificationUIDialog;
-    private PopupWindow mWindowDistancePopupWindow;
 
     @SuppressWarnings("unused")
     public static boolean filterPermission(final String aPermission) {
@@ -515,9 +514,6 @@ private void notifyPendingEvents() {
     }
 
     private void updateDisplays() {
-        if (mWindowDistancePopupWindow.isShowing())
-            mWindowDistancePopupWindow.dismiss();
-
         // a display may be added before we receive the USB permission
         if (!VisionGlass.getInstance().hasUsbPermission()) {
             Log.d(LOGTAG, "updateDisplays: no USB permissions yet");
@@ -638,37 +634,16 @@ private void setupPhoneUI() {
                 mDelegate.setLockMode(mBinding.headlockToggleButton.isChecked() ? WidgetManagerDelegate.HEAD_LOCK : WidgetManagerDelegate.NO_LOCK);
             });
 
-            ContextThemeWrapper themedContext = new ContextThemeWrapper(PlatformActivity.this, R.style.Theme_WolvicPhone);
-            LayoutInflater inflater = getLayoutInflater().cloneInContext(themedContext);
-            View popupView = inflater.inflate(R.layout.window_distance_popup_layout, null);
-
-            final int width = LinearLayout.LayoutParams.WRAP_CONTENT;
-            final int height = LinearLayout.LayoutParams.WRAP_CONTENT;
-            final boolean focusable = true; // Let taps outside the popup also dismiss it
-            mWindowDistancePopupWindow = new PopupWindow(popupView, width, height, focusable);
-
-            SeekBar seekBar = popupView.findViewById(R.id.windowDistancePopupSeekBar);
-            seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                    settings.setWindowDistance((float) progress / seekBar.getMax());
-                }
-
+            Slider distanceSlider = findViewById(R.id.distance_slider);
+            float maxValue = distanceSlider.getValueTo();
+            distanceSlider.setValue(settings.getWindowDistance() * maxValue);
+            distanceSlider.addOnChangeListener(new Slider.OnChangeListener() {
                 @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {}
-
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
-                    // Automatically hide the popup after the user has selected a value.
-                    mWindowDistancePopupWindow.dismiss();
+                public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) {
+                    settings.setWindowDistance((float) value / maxValue);
                 }
             });
 
-            mBinding.windowDistanceButton.setOnClickListener(v -> {
-                seekBar.setProgress((int) (settings.getWindowDistance() * seekBar.getMax()));
-                mWindowDistancePopupWindow.showAsDropDown(v, 0, 0);
-            });
-
             mBinding.playButton.setOnClickListener(v -> {
                 Media media = getActiveMedia();
                 if (media == null)
diff --git a/app/src/visionglass/res/drawable/touchpad_ripple_bg.xml b/app/src/visionglass/res/drawable/touchpad_ripple_bg.xml
index 0c60ce4365..2b5af367c8 100644
--- a/app/src/visionglass/res/drawable/touchpad_ripple_bg.xml
+++ b/app/src/visionglass/res/drawable/touchpad_ripple_bg.xml
@@ -3,13 +3,6 @@
     android:color="@color/azure">
     <item
         android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
-    <item>
-        <selector>
-            <item
-                android:drawable="@color/silver"
-                android:state_pressed="true" />
-            <item android:drawable="@color/silver" />
-        </selector>
-    </item>
+        android:drawable="@drawable/touchpad_rounded_bg" />
+    <item android:drawable="@drawable/touchpad_rounded_bg" />
 </ripple>
diff --git a/app/src/visionglass/res/drawable/touchpad_rounded_bg.xml b/app/src/visionglass/res/drawable/touchpad_rounded_bg.xml
new file mode 100644
index 0000000000..6e49ef9970
--- /dev/null
+++ b/app/src/visionglass/res/drawable/touchpad_rounded_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/photonGrey50" />
+    <corners android:radius="32dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/visionglass/res/layout/visionglass_layout.xml b/app/src/visionglass/res/layout/visionglass_layout.xml
index 9a9ca7c180..49be441bf5 100644
--- a/app/src/visionglass/res/layout/visionglass_layout.xml
+++ b/app/src/visionglass/res/layout/visionglass_layout.xml
@@ -18,16 +18,8 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
-            style="@style/Widget.MaterialComponents.Toolbar.Primary"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="0dp"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            app:logoAdjustViewBounds="true"
-            app:navigationIcon="@drawable/ff_logo_icon_48"
-            app:popupTheme="@style/Theme.WolvicPhone.PopupOverlay"
-            app:title="@string/app_name" />
+            app:title="@string/app_name"
+            style="@style/ToolbarStyle" />
 
         <TextView
             style="@style/TextAppearance.AppCompat.Headline"
@@ -68,62 +60,43 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/headlock_toggle_button"
-                android:layout_width="wrap_content"
-                android:layout_height="?attr/actionBarSize"
-                android:backgroundTint="@color/bg_button_checkable"
-                android:checkable="true"
-                android:checked="false"
                 android:contentDescription="@string/display_options_head_lock"
-                android:scaleType="fitCenter"
-                app:icon="@drawable/headlock_toggle_button_states"
-                app:iconGravity="textStart"
-                app:iconPadding="0dp"
-                app:iconTint="@color/white"
-                app:layout_constraintEnd_toStartOf="@id/realign_button"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintEnd_toStartOf="@id/realign_button"
+                app:layout_constraintTop_toTopOf="parent"
+                style="@style/HeadlockToggleButtonStyle" />
 
             <com.igalia.wolvic.AlignDynamicButton
                 android:id="@+id/realign_button"
-                android:layout_width="?attr/actionBarSize"
-                android:layout_height="?attr/actionBarSize"
-                android:backgroundTint="@color/azure"
-                app:iconTint="@color/white"
-                app:layout_constraintEnd_toStartOf="@id/voice_search_button"
                 app:layout_constraintStart_toEndOf="@id/headlock_toggle_button"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintEnd_toStartOf="@id/voice_search_button"
+                app:layout_constraintTop_toTopOf="parent"
+                style="@style/RealignButtonStyle" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/voice_search_button"
-                android:layout_width="wrap_content"
-                android:layout_height="?attr/actionBarSize"
-                android:backgroundTint="@color/azure"
-                android:checkable="true"
-                android:checked="false"
                 android:contentDescription="@string/voice_search_tooltip"
-                android:scaleType="fitCenter"
-                app:icon="@drawable/ic_icon_microphone"
-                app:iconGravity="textStart"
-                app:iconPadding="0dp"
-                app:iconTint="@color/white"
-                app:layout_constraintEnd_toStartOf="@id/window_distance_button"
                 app:layout_constraintStart_toEndOf="@id/realign_button"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                style="@style/VoiceSearchButtonStyle" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/window_distance_button"
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrier"
                 android:layout_width="wrap_content"
-                android:layout_height="?attr/actionBarSize"
-                android:backgroundTint="@color/azure"
-                android:contentDescription="@string/display_options_windows_distance"
-                android:scaleType="fitCenter"
-                app:icon="@drawable/unfold_more_24px"
-                app:iconGravity="textStart"
-                app:iconPadding="0dp"
-                app:iconTint="@color/white"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="headlock_toggle_button,realign_button,voice_search_button" />
+
+            <com.google.android.material.slider.Slider
+                android:id="@+id/distance_slider"
+                style="@style/DistanceSliderStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/voice_search_button"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/barrier" />
 
             <FrameLayout
                 android:id="@+id/touchpad_container"
@@ -134,22 +107,16 @@
                 app:layout_constraintBottom_toTopOf="@id/media_controls"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/headlock_toggle_button">
+                app:layout_constraintTop_toBottomOf="@id/distance_slider">
+
                 <View
                     android:id="@+id/touchpad"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/touchpad_ripple_bg"
-                    android:clickable="true"
-                    android:focusable="true"/>
+                    style="@style/TouchpadStyle" />
+
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:clickable="false"
-                    android:focusable="false"
-                    android:text="@string/vision_glass_touchpad_instructions"/>
+                    style="@style/TouchpadInstructionsStyle" />
             </FrameLayout>
+
             <LinearLayout
                 android:id="@+id/media_controls"
                 android:layout_width="match_parent"
@@ -165,8 +132,7 @@
 
                 <SeekBar
                     android:id="@+id/media_seekbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize" />
+                    style="@style/MediaSeekBarStyle" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -175,36 +141,15 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/seek_backward_button"
-                        style="@style/Widget.AppCompat.Button.Borderless"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        app:icon="@drawable/ic_icon_media_seek_backward"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"
-                        app:iconTint="@color/white" />
+                        style="@style/SeekBackwardButtonStyle" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/play_button"
-                        style="@style/Widget.AppCompat.Button.Borderless"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="2"
-                        app:icon="@android:drawable/ic_media_play"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"
-                        app:iconTint="@color/white" />
+                        style="@style/PlayButtonStyle" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/seek_forward_button"
-                        style="@style/Widget.AppCompat.Button.Borderless"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        app:icon="@drawable/ic_icon_media_seek_forward"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"
-                        app:iconTint="@color/white" />
+                        style="@style/SeekForwardButtonStyle" />
 
                     <Space
                         android:layout_width="16dp"
@@ -213,13 +158,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/mute_button"
-                        style="@style/Widget.AppCompat.Button.Borderless"
-                        android:layout_width="64dp"
-                        android:layout_height="match_parent"
-                        app:icon="@drawable/ic_icon_media_volume"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"
-                        app:iconTint="@color/white" />
+                        style="@style/MuteButtonStyle" />
                 </LinearLayout>
 
             </LinearLayout>
@@ -237,16 +176,9 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/back_button"
-                    android:layout_width="0dp"
-                    android:layout_height="64dp"
-                    android:layout_weight="3"
-                    android:backgroundTint="@color/azure"
                     android:contentDescription="@string/back_tooltip"
-                    android:scaleType="fitCenter"
-                    app:icon="@drawable/ic_icon_back"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconTint="@color/white" />
+                    android:layout_weight="3"
+                    style="@style/BackButtonButtonStyle" />
 
                 <Space
                     android:layout_width="16dp"
@@ -254,17 +186,11 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/home_button"
-                    android:layout_width="64dp"
-                    android:layout_height="64dp"
-                    android:backgroundTint="@color/azure"
                     android:contentDescription="@string/home_tooltip"
-                    android:scaleType="fitCenter"
-                    app:icon="@drawable/ic_icon_home"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconTint="@color/white" />
+                    style="@style/HomeButtonStyle" />
 
             </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/visionglass/res/layout/window_distance_popup_layout.xml b/app/src/visionglass/res/layout/window_distance_popup_layout.xml
deleted file mode 100644
index a6fb2f8af2..0000000000
--- a/app/src/visionglass/res/layout/window_distance_popup_layout.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/midnight"
-    android:padding="16dp">
-
-    <TextView
-        style="@style/TextAppearance.AppCompat.Widget.PopupMenu.Header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="4dp"
-        android:text="@string/display_options_windows_distance"
-        android:textColor="?colorOnPrimary" />
-
-    <SeekBar
-        android:id="@+id/windowDistancePopupSeekBar"
-        android:layout_width="265dp"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        android:max="10" />
-
-</LinearLayout>
diff --git a/app/src/visionglass/res/values/themes.xml b/app/src/visionglass/res/values/themes.xml
index ff2c1be5c5..60437bf016 100644
--- a/app/src/visionglass/res/values/themes.xml
+++ b/app/src/visionglass/res/values/themes.xml
@@ -15,6 +15,137 @@
         <item name="backgroundColor">@color/midnight</item>
     </style>
 
+    <style name="ShapeAppearanceOverlay.App.Button.Rounded" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">32dp</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Slider" parent="">
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorOnPrimary">@color/white</item>
+    </style>
+
+    <style name="BaseToolbarButton" parent="Widget.MaterialComponents.Button">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">?attr/actionBarSize</item>
+        <item name="android:backgroundTint">@color/bg_button_checkable</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:layout_margin">8dp</item>
+        <item name="iconGravity">textStart</item>
+        <item name="iconPadding">0dp</item>
+        <item name="iconTint">@color/white</item>
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.App.Button.Rounded</item>"
+    </style>
+
+    <style name="BaseFooterButton" parent="Widget.MaterialComponents.Button">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">?attr/actionBarSize</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:backgroundTint">@color/asphalt</item>
+        <item name="iconGravity">textStart</item>
+        <item name="iconPadding">0dp</item>
+        <item name="iconTint">@color/white</item>
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.App.Button.Rounded</item>"
+    </style>
+
+    <style name="BaseBorderlessButton" parent="Widget.AppCompat.Button.Borderless">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="iconGravity">textStart</item>
+        <item name="iconPadding">0dp</item>
+        <item name="iconTint">@color/white</item>
+    </style>
+
+    <style name="BaseMediaButton" parent="BaseBorderlessButton">
+        <item name="android:layout_weight">1</item>
+    </style>
+
+
+    <!-- Specific Styles -->
+    <style name="ToolbarStyle" parent="Widget.MaterialComponents.Toolbar.Primary">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">?attr/actionBarSize</item>
+        <item name="android:elevation">0dp</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="logoAdjustViewBounds">true</item>
+        <item name="navigationIcon">@drawable/ff_logo_icon_48</item>
+        <item name="popupTheme">@style/Theme.WolvicPhone.PopupOverlay</item>
+    </style>
+
+    <style name="HeadlockToggleButtonStyle" parent="BaseToolbarButton">
+        <item name="icon">@drawable/headlock_toggle_button_states</item>
+        <item name="android:checkable">true</item>
+        <item name="android:checked">false</item>
+    </style>
+
+    <style name="RealignButtonStyle" parent="BaseToolbarButton">
+    </style>
+
+    <style name="VoiceSearchButtonStyle" parent="BaseToolbarButton">
+        <item name="icon">@drawable/ic_icon_microphone</item>
+    </style>
+
+    <style name="BackButtonButtonStyle" parent="BaseFooterButton">
+        <item name="icon">@drawable/ic_icon_back</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">64dp</item>
+    </style>
+
+    <style name="HomeButtonStyle" parent="BaseFooterButton">
+        <item name="icon">@drawable/ic_icon_home</item>
+        <item name="android:layout_width">64dp</item>
+        <item name="android:layout_height">64dp</item>
+    </style>
+
+    <style name="DistanceSliderStyle" parent="Widget.MaterialComponents.Slider">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Slider</item>
+        <item name="android:valueFrom">0.0</item>
+        <item name="android:valueTo">100.0</item>
+        <item name="android:stepSize">10.0</item>
+    </style>
+
+    <style name="TouchpadStyle">
+        <item name="android:background">@drawable/touchpad_ripple_bg</item>
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+
+    <style name="TouchpadInstructionsStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:clickable">false</item>
+        <item name="android:focusable">false</item>
+        <item name="android:text">@string/vision_glass_touchpad_instructions</item>
+    </style>
+
+    <style name="MediaSeekBarStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">?attr/actionBarSize</item>
+    </style>
+
+    <style name="SeekBackwardButtonStyle" parent="BaseMediaButton">
+        <item name="icon">@drawable/ic_icon_media_seek_backward</item>
+    </style>
+
+    <style name="PlayButtonStyle" parent="BaseMediaButton">
+        <item name="android:layout_weight">2</item>
+        <item name="icon">@android:drawable/ic_media_play</item>
+    </style>
+
+    <style name="SeekForwardButtonStyle" parent="BaseMediaButton">
+        <item name="icon">@drawable/ic_icon_media_seek_forward</item>
+    </style>
+
+    <style name="MuteButtonStyle" parent="BaseBorderlessButton">
+        <item name="android:layout_width">64dp</item>
+        <item name="icon">@drawable/ic_icon_media_volume</item>
+    </style>
+
+
     <style name="Theme.WolvicPhone.Bar" parent="Widget.MaterialComponents.Toolbar.Primary" />
 
     <style name="Theme.WolvicPhone.PopupOverlay" parent="ThemeOverlay.MaterialComponents" />