diff --git a/app/src/main/java/subreddit/android/appstore/screens/details/ScreenshotDialog.java b/app/src/main/java/subreddit/android/appstore/screens/details/ScreenshotDialog.java
index 6690446..5ebb519 100644
--- a/app/src/main/java/subreddit/android/appstore/screens/details/ScreenshotDialog.java
+++ b/app/src/main/java/subreddit/android/appstore/screens/details/ScreenshotDialog.java
@@ -19,10 +19,9 @@ public class ScreenshotDialog extends Dialog implements View.OnClickListener {
     private final int currentImage;
     @BindView(R.id.screenshot_dialog_pager) ViewPager viewPager;
     @BindView(R.id.screenshot_dialog_toolbar) Toolbar toolbar;
-    @BindView(R.id.screenshot_dialog_page_indicator) TextView pageIndicator;
 
     public ScreenshotDialog(Context context, List<String> urls, int currentImage) {
-        super(context, android.R.style.Theme_Black_NoTitleBar);
+        super(context, R.style.AppTheme_Black);
         this.currentImage = currentImage;
         this.urls = urls;
     }
@@ -34,6 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
         toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_48px);
         toolbar.setNavigationOnClickListener(this);
+        toolbar.setTitle(R.string.screenshots);
 
         ScreenshotsAdapter screenshotsAdapter = new ScreenshotsAdapter(getContext(), 1);
         screenshotsAdapter.update(urls);
@@ -59,7 +59,7 @@ public void onPageScrollStateChanged(int state) {
     }
 
     private void updatePageIndicator(int position) {
-        pageIndicator.setText(String.format("%s/%s", position + 1, urls.size()));
+        toolbar.setSubtitle(String.format("%s/%s", position + 1, urls.size()));
     }
 
     @Override
diff --git a/app/src/main/res/layout/dialog_screenshot.xml b/app/src/main/res/layout/dialog_screenshot.xml
index 708ba03..f093577 100644
--- a/app/src/main/res/layout/dialog_screenshot.xml
+++ b/app/src/main/res/layout/dialog_screenshot.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -9,19 +8,8 @@
         android:id="@+id/screenshot_dialog_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorPrimary">
-
-        <TextView
-            android:id="@+id/screenshot_dialog_page_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:textColor="@android:color/white"
-            tools:text="1/4" />
-
-    </android.support.v7.widget.Toolbar>
+        android:background="@color/colorPrimary"
+        android:title="@string/screenshots"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/screenshot_dialog_pager"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 81434a5..8dc0325 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,11 +24,12 @@
     <string name="appearance">Appearance</string>
     <string name="preference_theme">Theme</string>
     <string name="preference_theme_desc">Theme to use</string>
-    <string name="restart">A restart is required to toggle night mode</string>
+    <string name="restart">A restart is required to toggle themes</string>
     <string name="later">Later</string>
     <string name="app_category_everything">Everything</string>
     <string name="error">Error fetching repository</string>
     <string name="data_options">Data options</string>
+    <string name="screenshots">Screenshots</string>
     <string name="data_option_loadmedia_title"><![CDATA[Icons & screenshots]]></string>
     <string name="data_option_loadmedia_summary">Load app icons and screenshots</string>
     <string name="update">Update available</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 74da5e0..fb5818f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,7 +18,8 @@
     </style>
 
     <style name="AppTheme.Black" parent="AppTheme.Dark">
-        <item name="android:colorBackground">#FF000000</item>
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
     </style>
 
     <style name="DefaultListItemContainer">