diff --git a/.gitattributes b/.gitattributes
index 70123d8194..14cfdace2d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,6 @@
 *.png filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
 *.vox filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
diff --git a/assets/voxygen/background/bg_1.png b/assets/voxygen/background/bg_1.png
deleted file mode 100644
index ce99cb58cc..0000000000
Binary files a/assets/voxygen/background/bg_1.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_10.png b/assets/voxygen/background/bg_10.png
deleted file mode 100644
index 4dc0970c74..0000000000
Binary files a/assets/voxygen/background/bg_10.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_11.png b/assets/voxygen/background/bg_11.png
deleted file mode 100644
index daa524ce53..0000000000
Binary files a/assets/voxygen/background/bg_11.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_12.png b/assets/voxygen/background/bg_12.png
deleted file mode 100644
index 30964e7aea..0000000000
Binary files a/assets/voxygen/background/bg_12.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_13.png b/assets/voxygen/background/bg_13.png
deleted file mode 100644
index f2723e84a5..0000000000
Binary files a/assets/voxygen/background/bg_13.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_2.png b/assets/voxygen/background/bg_2.png
deleted file mode 100644
index 7f74537ca6..0000000000
Binary files a/assets/voxygen/background/bg_2.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_3.png b/assets/voxygen/background/bg_3.png
deleted file mode 100644
index 36261b82c0..0000000000
Binary files a/assets/voxygen/background/bg_3.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_4.png b/assets/voxygen/background/bg_4.png
deleted file mode 100644
index 8d52f68c46..0000000000
Binary files a/assets/voxygen/background/bg_4.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_5.png b/assets/voxygen/background/bg_5.png
deleted file mode 100644
index e607801d7d..0000000000
Binary files a/assets/voxygen/background/bg_5.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_6.png b/assets/voxygen/background/bg_6.png
deleted file mode 100644
index 9bfceb69dc..0000000000
Binary files a/assets/voxygen/background/bg_6.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_7.png b/assets/voxygen/background/bg_7.png
deleted file mode 100644
index bce41e46bd..0000000000
Binary files a/assets/voxygen/background/bg_7.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_8.png b/assets/voxygen/background/bg_8.png
deleted file mode 100644
index d5d69e065c..0000000000
Binary files a/assets/voxygen/background/bg_8.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_9.png b/assets/voxygen/background/bg_9.png
deleted file mode 100644
index 4ae98077c3..0000000000
Binary files a/assets/voxygen/background/bg_9.png and /dev/null differ
diff --git a/assets/voxygen/background/bg_main.png b/assets/voxygen/background/bg_main.png
deleted file mode 100755
index ab0c0d43b1..0000000000
Binary files a/assets/voxygen/background/bg_main.png and /dev/null differ
diff --git a/common/assets/src/lib.rs b/common/assets/src/lib.rs
index b3031053d6..ee3156c5b9 100644
--- a/common/assets/src/lib.rs
+++ b/common/assets/src/lib.rs
@@ -97,19 +97,20 @@ impl Image {
     pub fn to_image(&self) -> Arc<DynamicImage> { Arc::clone(&self.0) }
 }
 
-pub struct PngLoader;
-impl Loader<Image> for PngLoader {
-    fn load(content: Cow<[u8]>, _: &str) -> Result<Image, BoxedError> {
-        let format = image::ImageFormat::Png;
+pub struct ImageLoader;
+impl Loader<Image> for ImageLoader {
+    fn load(content: Cow<[u8]>, ext: &str) -> Result<Image, BoxedError> {
+        let format = image::ImageFormat::from_extension(ext)
+            .ok_or_else(|| format!("Invalid file extension {}", ext))?;
         let image = image::load_from_memory_with_format(&content, format)?;
         Ok(Image(Arc::new(image)))
     }
 }
 
 impl Asset for Image {
-    type Loader = PngLoader;
+    type Loader = ImageLoader;
 
-    const EXTENSION: &'static str = "png";
+    const EXTENSIONS: &'static [&'static str] = &["png", "jpg", "jpeg"];
 }
 
 pub struct DotVoxAsset(pub DotVoxData);