diff --git a/app.css b/app.css
index 28887f8..ba668fc 100644
--- a/app.css
+++ b/app.css
@@ -147,129 +147,3 @@
 		transition:margin 0.5s;
 	}
 }
-
-/* Hack because of otpimization: can't have relative paths since the folder hierarchy changes after optimization */
-
-/* Devices Brands */
-.device-popup .brand-selection .brand-box.polycom {
-    background: url('static/images/brands/polycom.png') center no-repeat;
-}
-.device-popup .brand-selection .brand-box.yealink {
-    background: url('static/images/brands/yealink.png') center no-repeat;
-}
-.device-popup .brand-selection .brand-box.cisco {
-    background: url('static/images/brands/cisco.png') center no-repeat;
-}
-.device-popup .brand-selection .brand-box.mocet {
-    background: url('static/images/brands/mocet.png') center no-repeat;
-}
-.device-popup .brand-selection .brand-box.snom {
-    background: url('static/images/brands/snom.png') center no-repeat;
-}
-.device-popup .brand-selection .brand-box.audiocodes {
-    background: url('static/images/brands/audiocodes.png') center no-repeat;
-}
-
-/* Devices Models */
-.device-image {
-	width: 100px;
-	height: 80px;
-}
-/* Yealink */
-.device-image.yealink-t18 {
-	background: url('static/images/devices/yealinkt18.jpg') center no-repeat;
-}
-.device-image.yealink-t20 {
-	background: url('static/images/devices/yealinkt20.jpg') center no-repeat;
-}
-.device-image.yealink-t22 {
-	background: url('static/images/devices/yealinkt22.jpg') center no-repeat;
-}
-.device-image.yealink-t26 {
-	background: url('static/images/devices/yealinkt26.jpg') center no-repeat;
-}
-.device-image.yealink-t28 {
-	background: url('static/images/devices/yealinkt28.jpg') center no-repeat;
-}
-.device-image.yealink-t32 {
-	background: url('static/images/devices/yealinkt32.jpg') center no-repeat;
-}
-.device-image.yealink-t38 {
-	background: url('static/images/devices/yealinkt38.jpg') center no-repeat;
-}
-
-/* Cisco */
-.device-image.cisco-901 {
-	background: url('static/images/devices/cisco901.jpg') center no-repeat;
-}
-.device-image.cisco-921 {
-	background: url('static/images/devices/cisco921.jpg') center no-repeat;
-}
-.device-image.cisco-922 {
-	background: url('static/images/devices/cisco922.jpg') center no-repeat;
-}
-.device-image.cisco-941 {
-	background: url('static/images/devices/cisco941.jpg') center no-repeat;
-}
-.device-image.cisco-942 {
-	background: url('static/images/devices/cisco942.jpg') center no-repeat;
-}
-.device-image.cisco-962 {
-	background: url('static/images/devices/cisco962.jpg') center no-repeat;
-}
-.device-image.cisco-303 {
-	background: url('static/images/devices/cisco303.jpg') center no-repeat;
-}
-.device-image.cisco-501g {
-	background: url('static/images/devices/cisco501g.jpg') center no-repeat;
-}
-.device-image.cisco-502g {
-	background: url('static/images/devices/cisco502g.jpg') center no-repeat;
-}
-.device-image.cisco-504g {
-	background: url('static/images/devices/cisco504g.jpg') center no-repeat;
-}
-.device-image.cisco-525g {
-	background: url('static/images/devices/cisco525g.jpg') center no-repeat;
-}
-.device-image.cisco-525g2 {
-	background: url('static/images/devices/cisco525g2.jpg') center no-repeat;
-}
-
-/* Polycom */
-.device-image.polycom-1500 {
-	background: url('static/images/devices/polycom1500.jpg') center no-repeat;
-}
-.device-image.polycom-321 {
-	background: url('static/images/devices/polycom321.jpg') center no-repeat;
-}
-.device-image.polycom-331 {
-	background: url('static/images/devices/polycom331.jpg') center no-repeat;
-}
-.device-image.polycom-335 {
-	background: url('static/images/devices/polycom335.jpg') center no-repeat;
-}
-.device-image.polycom-450 {
-	background: url('static/images/devices/polycom450.jpg') center no-repeat;
-}
-.device-image.polycom-5000 {
-	background: url('static/images/devices/polycom5000.jpg') center no-repeat;
-}
-.device-image.polycom-550 {
-	background: url('static/images/devices/polycom550.jpg') center no-repeat;
-}
-.device-image.polycom-560 {
-	background: url('static/images/devices/polycom560.jpg') center no-repeat;
-}
-.device-image.polycom-6000 {
-	background: url('static/images/devices/polycom6000.jpg') center no-repeat;
-}
-.device-image.polycom-650 {
-	background: url('static/images/devices/polycom650.jpg') center no-repeat;
-}
-.device-image.polycom-670 {
-	background: url('static/images/devices/polycom670.jpg') center no-repeat;
-}
-.device-image.polycom-7000 {
-	background: url('static/images/devices/polycom7000.jpg') center no-repeat;
-}
diff --git a/static/images/brands/audiocodes.png b/static/images/brands/audiocodes.png
deleted file mode 100644
index 08b1f95..0000000
Binary files a/static/images/brands/audiocodes.png and /dev/null differ
diff --git a/static/images/brands/cisco.png b/static/images/brands/cisco.png
deleted file mode 100644
index 13319d3..0000000
Binary files a/static/images/brands/cisco.png and /dev/null differ
diff --git a/static/images/brands/mocet.png b/static/images/brands/mocet.png
deleted file mode 100644
index 7161ce4..0000000
Binary files a/static/images/brands/mocet.png and /dev/null differ
diff --git a/static/images/brands/polycom.png b/static/images/brands/polycom.png
deleted file mode 100644
index ccc590d..0000000
Binary files a/static/images/brands/polycom.png and /dev/null differ
diff --git a/static/images/brands/snom.png b/static/images/brands/snom.png
deleted file mode 100644
index 68a7cbe..0000000
Binary files a/static/images/brands/snom.png and /dev/null differ
diff --git a/static/images/brands/yealink.png b/static/images/brands/yealink.png
deleted file mode 100644
index f9dde13..0000000
Binary files a/static/images/brands/yealink.png and /dev/null differ
diff --git a/static/images/devices/cisco303.jpg b/static/images/devices/cisco303.jpg
deleted file mode 100644
index 50f0be3..0000000
Binary files a/static/images/devices/cisco303.jpg and /dev/null differ
diff --git a/static/images/devices/cisco501g.jpg b/static/images/devices/cisco501g.jpg
deleted file mode 100644
index fd37735..0000000
Binary files a/static/images/devices/cisco501g.jpg and /dev/null differ
diff --git a/static/images/devices/cisco502g.jpg b/static/images/devices/cisco502g.jpg
deleted file mode 100644
index bcff909..0000000
Binary files a/static/images/devices/cisco502g.jpg and /dev/null differ
diff --git a/static/images/devices/cisco504g.jpg b/static/images/devices/cisco504g.jpg
deleted file mode 100644
index 75d8494..0000000
Binary files a/static/images/devices/cisco504g.jpg and /dev/null differ
diff --git a/static/images/devices/cisco525g.jpg b/static/images/devices/cisco525g.jpg
deleted file mode 100644
index 36fc461..0000000
Binary files a/static/images/devices/cisco525g.jpg and /dev/null differ
diff --git a/static/images/devices/cisco525g2.jpg b/static/images/devices/cisco525g2.jpg
deleted file mode 100644
index 19462d8..0000000
Binary files a/static/images/devices/cisco525g2.jpg and /dev/null differ
diff --git a/static/images/devices/cisco901.jpg b/static/images/devices/cisco901.jpg
deleted file mode 100644
index 50c2b91..0000000
Binary files a/static/images/devices/cisco901.jpg and /dev/null differ
diff --git a/static/images/devices/cisco921.jpg b/static/images/devices/cisco921.jpg
deleted file mode 100644
index d116a63..0000000
Binary files a/static/images/devices/cisco921.jpg and /dev/null differ
diff --git a/static/images/devices/cisco922.jpg b/static/images/devices/cisco922.jpg
deleted file mode 100644
index e51ff75..0000000
Binary files a/static/images/devices/cisco922.jpg and /dev/null differ
diff --git a/static/images/devices/cisco941.jpg b/static/images/devices/cisco941.jpg
deleted file mode 100644
index bed3c5f..0000000
Binary files a/static/images/devices/cisco941.jpg and /dev/null differ
diff --git a/static/images/devices/cisco942.jpg b/static/images/devices/cisco942.jpg
deleted file mode 100644
index 1d41961..0000000
Binary files a/static/images/devices/cisco942.jpg and /dev/null differ
diff --git a/static/images/devices/cisco962.jpg b/static/images/devices/cisco962.jpg
deleted file mode 100644
index 87704ea..0000000
Binary files a/static/images/devices/cisco962.jpg and /dev/null differ
diff --git a/static/images/devices/polycom1500.jpg b/static/images/devices/polycom1500.jpg
deleted file mode 100644
index 932ce61..0000000
Binary files a/static/images/devices/polycom1500.jpg and /dev/null differ
diff --git a/static/images/devices/polycom321.jpg b/static/images/devices/polycom321.jpg
deleted file mode 100644
index aca5589..0000000
Binary files a/static/images/devices/polycom321.jpg and /dev/null differ
diff --git a/static/images/devices/polycom331.jpg b/static/images/devices/polycom331.jpg
deleted file mode 100644
index 344481e..0000000
Binary files a/static/images/devices/polycom331.jpg and /dev/null differ
diff --git a/static/images/devices/polycom335.jpg b/static/images/devices/polycom335.jpg
deleted file mode 100644
index cbc5ee9..0000000
Binary files a/static/images/devices/polycom335.jpg and /dev/null differ
diff --git a/static/images/devices/polycom450.jpg b/static/images/devices/polycom450.jpg
deleted file mode 100644
index ef40e20..0000000
Binary files a/static/images/devices/polycom450.jpg and /dev/null differ
diff --git a/static/images/devices/polycom5000.jpg b/static/images/devices/polycom5000.jpg
deleted file mode 100644
index bf3a46c..0000000
Binary files a/static/images/devices/polycom5000.jpg and /dev/null differ
diff --git a/static/images/devices/polycom550.jpg b/static/images/devices/polycom550.jpg
deleted file mode 100644
index 1478837..0000000
Binary files a/static/images/devices/polycom550.jpg and /dev/null differ
diff --git a/static/images/devices/polycom560.jpg b/static/images/devices/polycom560.jpg
deleted file mode 100644
index 1478837..0000000
Binary files a/static/images/devices/polycom560.jpg and /dev/null differ
diff --git a/static/images/devices/polycom6000.jpg b/static/images/devices/polycom6000.jpg
deleted file mode 100644
index 417a7be..0000000
Binary files a/static/images/devices/polycom6000.jpg and /dev/null differ
diff --git a/static/images/devices/polycom650.jpg b/static/images/devices/polycom650.jpg
deleted file mode 100644
index ce243a9..0000000
Binary files a/static/images/devices/polycom650.jpg and /dev/null differ
diff --git a/static/images/devices/polycom670.jpg b/static/images/devices/polycom670.jpg
deleted file mode 100644
index fa8d4da..0000000
Binary files a/static/images/devices/polycom670.jpg and /dev/null differ
diff --git a/static/images/devices/polycom7000.jpg b/static/images/devices/polycom7000.jpg
deleted file mode 100644
index a704b25..0000000
Binary files a/static/images/devices/polycom7000.jpg and /dev/null differ
diff --git a/static/images/devices/yealinkt18.jpg b/static/images/devices/yealinkt18.jpg
deleted file mode 100644
index 2d82cca..0000000
Binary files a/static/images/devices/yealinkt18.jpg and /dev/null differ
diff --git a/static/images/devices/yealinkt20.jpg b/static/images/devices/yealinkt20.jpg
deleted file mode 100644
index ff503ad..0000000
Binary files a/static/images/devices/yealinkt20.jpg and /dev/null differ
diff --git a/static/images/devices/yealinkt22.jpg b/static/images/devices/yealinkt22.jpg
deleted file mode 100644
index 84607ea..0000000
Binary files a/static/images/devices/yealinkt22.jpg and /dev/null differ
diff --git a/static/images/devices/yealinkt26.jpg b/static/images/devices/yealinkt26.jpg
deleted file mode 100644
index f292e59..0000000
Binary files a/static/images/devices/yealinkt26.jpg and /dev/null differ
diff --git a/static/images/devices/yealinkt28.jpg b/static/images/devices/yealinkt28.jpg
deleted file mode 100644
index c36fc8c..0000000
Binary files a/static/images/devices/yealinkt28.jpg and /dev/null differ
diff --git a/static/images/devices/yealinkt32.jpg b/static/images/devices/yealinkt32.jpg
deleted file mode 100644
index 210aa2e..0000000
Binary files a/static/images/devices/yealinkt32.jpg and /dev/null differ
diff --git a/static/images/devices/yealinkt38.jpg b/static/images/devices/yealinkt38.jpg
deleted file mode 100644
index aa89a54..0000000
Binary files a/static/images/devices/yealinkt38.jpg and /dev/null differ
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index c6f0453..09c76c6 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -2,7 +2,7 @@
 	<div class="title-bar clearfix">
 		<div class="device-title pull-left">
 			{{#if provision}}
-			<div class="device-image {{provision.endpoint_brand}}-{{provision.endpoint_model}}"></div>
+			<div class="device-image model-image {{provision.endpoint_brand}}-{{provision.endpoint_model}}"></div>
 			<div class="device-model">{{provision.endpoint_brand}} - {{provision.endpoint_model}}</div>
 			{{else}}
 				<div class="device-icon">