diff --git a/support/android/apk/servoapp/src/main/AndroidManifest.xml b/support/android/apk/servoapp/src/main/AndroidManifest.xml
index 3c7cdc11507..7c0b914b421 100644
--- a/support/android/apk/servoapp/src/main/AndroidManifest.xml
+++ b/support/android/apk/servoapp/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
     <application android:label="Servo" android:icon="@mipmap/servo">
         <activity android:name=".MainActivity"
             android:configChanges="density|keyboardHidden|navigation|orientation|screenSize|uiMode"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/AppTheme">
             <meta-data android:name="android.app.lib_name" android:value="servo" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/support/android/apk/servoapp/src/main/java/org/servo/servoshell/MainActivity.java b/support/android/apk/servoapp/src/main/java/org/servo/servoshell/MainActivity.java
index ee301bfb19c..4eab22ba0d2 100644
--- a/support/android/apk/servoapp/src/main/java/org/servo/servoshell/MainActivity.java
+++ b/support/android/apk/servoapp/src/main/java/org/servo/servoshell/MainActivity.java
@@ -19,6 +19,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -32,10 +33,10 @@ public class MainActivity extends Activity implements Servo.Client {
     private static final String LOGTAG = "MainActivity";
 
     ServoView mServoView;
-    Button mBackButton;
-    Button mFwdButton;
-    Button mReloadButton;
-    Button mStopButton;
+    ImageButton mBackButton;
+    ImageButton mFwdButton;
+    ImageButton mReloadButton;
+    ImageButton mStopButton;
     EditText mUrlField;
     ProgressBar mProgressBar;
     TextView mIdleText;
@@ -60,6 +61,9 @@ public class MainActivity extends Activity implements Servo.Client {
         mBackButton.setEnabled(false);
         mFwdButton.setEnabled(false);
 
+        // Avoid reload/stop icons doubling up on launch
+        mReloadButton.setVisibility(View.GONE);
+
         mServoView.setClient(this);
         mServoView.requestFocus();
 
diff --git a/support/android/apk/servoapp/src/main/res/drawable/cancel.png b/support/android/apk/servoapp/src/main/res/drawable/cancel.png
new file mode 100644
index 00000000000..397881217ac
Binary files /dev/null and b/support/android/apk/servoapp/src/main/res/drawable/cancel.png differ
diff --git a/support/android/apk/servoapp/src/main/res/drawable/history_back.png b/support/android/apk/servoapp/src/main/res/drawable/history_back.png
new file mode 100644
index 00000000000..7b6f829420d
Binary files /dev/null and b/support/android/apk/servoapp/src/main/res/drawable/history_back.png differ
diff --git a/support/android/apk/servoapp/src/main/res/drawable/history_forward.png b/support/android/apk/servoapp/src/main/res/drawable/history_forward.png
new file mode 100644
index 00000000000..bf8f3fe0c09
Binary files /dev/null and b/support/android/apk/servoapp/src/main/res/drawable/history_forward.png differ
diff --git a/support/android/apk/servoapp/src/main/res/drawable/refresh.png b/support/android/apk/servoapp/src/main/res/drawable/refresh.png
new file mode 100644
index 00000000000..3acfd59781b
Binary files /dev/null and b/support/android/apk/servoapp/src/main/res/drawable/refresh.png differ
diff --git a/support/android/apk/servoapp/src/main/res/layout/activity_main.xml b/support/android/apk/servoapp/src/main/res/layout/activity_main.xml
index 291b8470531..874b6850617 100644
--- a/support/android/apk/servoapp/src/main/res/layout/activity_main.xml
+++ b/support/android/apk/servoapp/src/main/res/layout/activity_main.xml
@@ -16,90 +16,117 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/my_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal">
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:elevation="4dp"
+            android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+    
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/backbutton"
-                style="@android:style/Widget.Material.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="onBackClicked"
-                android:text="Back"
-                android:textSize="10sp" />
+                <EditText
+                    android:id="@+id/urlfield"
+                    style="@android:style/Widget.Material.EditText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:ems="10"
+                    android:hint="URL or Search"
+                    android:inputType="textUri"
+                    android:selectAllOnFocus="true"
+                    android:singleLine="true"
+                    android:imeOptions="actionDone"/>
 
-            <Button
-                android:id="@+id/forwardbutton"
-                style="@android:style/Widget.Material.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="onForwardClicked"
-                android:text="Fwd"
-                android:textSize="10sp" />
+                <ProgressBar
+                    android:id="@+id/progressbar"
+                    style="@android:style/Widget.ProgressBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:indeterminate="true"
+                    android:gravity="center" />
 
-            <EditText
-                android:id="@+id/urlfield"
-                style="@android:style/Widget.Material.EditText"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:ems="10"
-                android:hint="URL or Search"
-                android:inputType="textUri"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
-                android:imeOptions="actionDone"/>
+                <ImageButton
+                    android:id="@+id/stopbutton"
+                    style="@android:style/Widget.Material.ImageButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:scaleType="centerInside"
+                    android:adjustViewBounds="true"
+                    android:onClick="onStopClicked"
+                    android:src="@drawable/cancel"
+                    android:gravity="center" />
 
-            <ProgressBar
-                android:id="@+id/progressbar"
-                style="@android:style/Widget.ProgressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:indeterminate="true" />
+                <ImageButton
+                    android:id="@+id/reloadbutton"
+                    style="@android:style/Widget.Material.ImageButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:scaleType="centerInside"
+                    android:adjustViewBounds="true"
+                    android:onClick="onReloadClicked"
+                    android:src="@drawable/refresh"
+                    android:gravity="center" />
 
-            <Button
-                android:id="@+id/stopbutton"
-                style="@android:style/Widget.Material.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="onStopClicked"
-                android:text="Stop"
-                android:textSize="10sp" />
+                <TextView
+                    android:id="@+id/redrawing"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="monospace"
+                    android:text="idle"
+                    android:textAlignment="center"
+                    android:textSize="10sp"
+                    android:visibility="visible"
+                    android:gravity="center" />
 
-            <Button
-                android:id="@+id/reloadbutton"
-                style="@android:style/Widget.Material.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="onReloadClicked"
-                android:text="Rld"
-                android:textSize="10sp" />
+            </LinearLayout>
 
-            <TextView
-                android:id="@+id/redrawing"
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:fontFamily="monospace"
-                android:text="idle"
-                android:textAlignment="center"
-                android:textSize="10sp"
-                android:visibility="visible" />
-
-        </LinearLayout>
+        </androidx.appcompat.widget.Toolbar>
 
         <org.servo.servoview.ServoView
             android:id="@+id/servoview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_weight="1"
             android:focusable="true"/>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+            
+            <ImageButton
+                android:id="@+id/backbutton"
+                style="@android:style/Widget.Material.ImageButton"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:scaleType="centerInside"
+                android:adjustViewBounds="true"
+                android:onClick="onBackClicked"
+                android:src="@drawable/history_back" />
+
+            <ImageButton
+                android:id="@+id/forwardbutton"
+                style="@android:style/Widget.Material.ImageButton"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:scaleType="centerInside"
+                android:adjustViewBounds="true"
+                android:onClick="onForwardClicked"
+                android:src="@drawable/history_forward" />
+
+        </LinearLayout>
+
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/support/android/apk/servoapp/src/main/res/values/styles.xml b/support/android/apk/servoapp/src/main/res/values/styles.xml
index 715515cdac2..0325b4cab32 100644
--- a/support/android/apk/servoapp/src/main/res/values/styles.xml
+++ b/support/android/apk/servoapp/src/main/res/values/styles.xml
@@ -1,9 +1,8 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
-        <item name="android:windowNoTitle">true</item>
-        <!-- Customize your theme here. -->
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:statusBarColor">#212121</item>
     </style>
 
 </resources>