diff --git a/app/src/main/java/com/keylesspalace/tusky/db/MediaEntity.java b/app/src/main/java/com/keylesspalace/tusky/db/MediaEntity.java
deleted file mode 100644
index 398b1d1ce..000000000
--- a/app/src/main/java/com/keylesspalace/tusky/db/MediaEntity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.keylesspalace.tusky.db;
-
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.ForeignKey;
-import android.arch.persistence.room.PrimaryKey;
-
-/**
- * Media model
- */
-
-@Entity(foreignKeys = @ForeignKey(entity = TootEntity.class,
-        parentColumns = "uid",
-        childColumns = "toot_id"))
-public class MediaEntity {
-    @ColumnInfo(name = "toot_id")
-    private int toot_id;
-    @PrimaryKey(autoGenerate = true)
-    private int uid;
-    @ColumnInfo(name = "url")
-    private String url;
-
-    // getter setter
-    public int getToot_id() {
-        return toot_id;
-    }
-
-    public void setToot_id(int toot_id) {
-        this.toot_id = toot_id;
-    }
-
-    public int getUid() {
-        return uid;
-    }
-
-    public void setUid(int uid) {
-        this.uid = uid;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-}
diff --git a/app/src/main/res/drawable-hdpi/splash.png b/app/src/main/res/drawable-hdpi/splash.png
new file mode 100644
index 000000000..965c97d30
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/app/src/main/res/drawable-mdpi/splash.png b/app/src/main/res/drawable-mdpi/splash.png
new file mode 100644
index 000000000..019fc271f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/app/src/main/res/drawable-xhdpi/splash.png b/app/src/main/res/drawable-xhdpi/splash.png
new file mode 100644
index 000000000..b7ed665bd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/splash.png b/app/src/main/res/drawable-xxhdpi/splash.png
new file mode 100644
index 000000000..0ba150ca1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/splash.png b/app/src/main/res/drawable-xxxhdpi/splash.png
new file mode 100644
index 000000000..0b656a305
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml
index 548f87bad..6f0a29fb9 100644
--- a/app/src/main/res/drawable/background_splash.xml
+++ b/app/src/main/res/drawable/background_splash.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <bitmap
-            android:src="@drawable/splash_pattern"
-            android:tileMode="repeat" />
+        <color android:color="@color/color_primary_dark_dark"/>
     </item>
     <item>
         <bitmap
-            android:src="@mipmap/ic_logo"
-            android:gravity="center"
-            android:tileMode="disabled" />
+            android:src="@drawable/splash"
+            android:gravity="center" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash_pattern.png b/app/src/main/res/drawable/splash_pattern.png
deleted file mode 100644
index dcc6f6476..000000000
Binary files a/app/src/main/res/drawable/splash_pattern.png and /dev/null differ
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 02b838532..4f912a7e1 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -11,8 +11,6 @@
     </declare-styleable>
 
     <!--Themed Attributes-->
-    <attr name="splash_background_color" format="reference|color" />
-    <attr name="splash_wave_color" format="reference|color" />
     <attr name="toolbar_background_color" format="reference" />
     <attr name="toolbar_icon_tint" format="reference" />
     <attr name="image_button_style" format="reference" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0b6dff588..cbf79699a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,6 +17,7 @@
     
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/background_splash</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark_dark</item>
         <item name="android:windowNoTitle">true</item>
     </style>
 
@@ -41,8 +42,6 @@
 
         <item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Dark</item>
 
-        <item name="splash_background_color">@color/color_background_dark</item>
-        <item name="splash_wave_color">@color/color_primary_dark</item>
         <item name="toolbar_background_color">@color/toolbar_background_dark</item>
         <item name="toolbar_icon_tint">@color/toolbar_icon_dark</item>
         <item name="image_button_style">@style/AppTheme.ImageButton.Dark</item>
@@ -119,8 +118,6 @@
 
         <item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Light</item>
 
-        <item name="splash_background_color">@color/color_background_light</item>
-        <item name="splash_wave_color">@color/color_primary_light</item>
         <item name="toolbar_background_color">@color/toolbar_background_light</item>
         <item name="toolbar_icon_tint">@color/toolbar_icon_light</item>
         <item name="image_button_style">@style/AppTheme.ImageButton.Light</item>
diff --git a/assets/splash.xcf b/assets/splash.xcf
new file mode 100644
index 000000000..1a7961419
Binary files /dev/null and b/assets/splash.xcf differ