diff --git a/extras/benchmark/bench.py b/extras/benchmark/bench.py
index edcfa3075..31e886d01 100755
--- a/extras/benchmark/bench.py
+++ b/extras/benchmark/bench.py
@@ -32,11 +32,7 @@ URL_SETS = {
         "/static/styles/base.css",
         "/static/javascript/utils.js",
         "/static/javascript/jquery.min.js",
-        "/static/images/bg-submenu.gif",
-        "/static/images/bg-header.gif",
-        "/static/images/logo.png",
-        "/static/images/icons/dialog-information.png",
-        "/static/images/icons/cross.png",
+        "/static/img/logo.png",
     ],
     "agenda": [
         "/agenda/",
@@ -46,11 +42,6 @@ URL_SETS = {
         "/static/styles/agenda.css",
         "/static/javascript/jquery.min.js",
         "/jsi18n/",
-        "/static/images/bg-header.gif",
-        "/static/images/bg-submenu.gif",
-        "/static/images/logo.png",
-        "/static/images/icons/application-pdf.png",
-        "/static/images/icons/cross.png",
     ],
     "application": [
         "/application/",
@@ -58,11 +49,6 @@ URL_SETS = {
         "/static/javascript/utils.js",
         "/static/javascript/jquery.min.js",
         "/jsi18n/",
-        "/static/images/bg-header.gif",
-        "/static/images/bg-submenu.gif",
-        "/static/images/icons/cross.png",
-        "/static/images/logo.png",
-        "/static/images/icons/application-pdf.png",
     ]
 }
 
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index aa6640aa4..46024e1d2 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -533,7 +533,7 @@ class AssignmentPollPDF(PDFView):
         pdf_document.build(story)
 
     def append_to_pdf(self, story):
-        imgpath = os.path.join(settings.SITE_ROOT, 'static/images/circle.png')
+        imgpath = os.path.join(settings.SITE_ROOT, 'static/img/circle.png')
         circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath
         cell = []
         cell.append(Spacer(0, 0.8 * cm))
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index a323b5594..2ab024a62 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -864,7 +864,7 @@ class MotionPollPDF(PDFView):
         pdf_document.build(story)
 
     def append_to_pdf(self, story):
-        imgpath = os.path.join(settings.SITE_ROOT, 'static/images/circle.png')
+        imgpath = os.path.join(settings.SITE_ROOT, 'static/img/circle.png')
         circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath
         cell = []
         cell.append(Spacer(0,0.8*cm))
diff --git a/openslides/static/images/bg-header.gif b/openslides/static/images/bg-header.gif
deleted file mode 100644
index c69df6fbd..000000000
Binary files a/openslides/static/images/bg-header.gif and /dev/null differ
diff --git a/openslides/static/images/bg-submenu.gif b/openslides/static/images/bg-submenu.gif
deleted file mode 100644
index 91880b8b3..000000000
Binary files a/openslides/static/images/bg-submenu.gif and /dev/null differ
diff --git a/openslides/static/images/button.gif b/openslides/static/images/button.gif
deleted file mode 100644
index 37ee55372..000000000
Binary files a/openslides/static/images/button.gif and /dev/null differ
diff --git a/openslides/static/images/favicon.png b/openslides/static/images/favicon.png
deleted file mode 100644
index a10d30810..000000000
Binary files a/openslides/static/images/favicon.png and /dev/null differ
diff --git a/openslides/static/images/circle.png b/openslides/static/img/circle.png
similarity index 100%
rename from openslides/static/images/circle.png
rename to openslides/static/img/circle.png
diff --git a/openslides/static/images/draggable.png b/openslides/static/img/draggable.png
similarity index 100%
rename from openslides/static/images/draggable.png
rename to openslides/static/img/draggable.png
diff --git a/openslides/static/images/logo.png b/openslides/static/img/logo-small.png
similarity index 100%
rename from openslides/static/images/logo.png
rename to openslides/static/img/logo-small.png
diff --git a/openslides/static/images/tree-bottom.png b/openslides/static/img/tree-bottom.png
similarity index 100%
rename from openslides/static/images/tree-bottom.png
rename to openslides/static/img/tree-bottom.png
diff --git a/openslides/static/images/tree.png b/openslides/static/img/tree.png
similarity index 100%
rename from openslides/static/images/tree.png
rename to openslides/static/img/tree.png
diff --git a/openslides/static/styles/tabledrag.css b/openslides/static/styles/tabledrag.css
index 8585bcba0..ed8946288 100644
--- a/openslides/static/styles/tabledrag.css
+++ b/openslides/static/styles/tabledrag.css
@@ -19,7 +19,7 @@ a.tabledrag-handle:hover {
   text-decoration: none;
 }
 a.tabledrag-handle .handle {
-  background: url("../images/draggable.png") no-repeat scroll 0 0 transparent;
+  background: url("../img/draggable.png") no-repeat scroll 0 0 transparent;
   height: 13px;
   margin-top: 4px;
   width: 13px;
@@ -35,13 +35,13 @@ div.indentation {
   width: 10px;
 }
 div.tree-child {
-  background: url(../images/tree.png) no-repeat 11px center; /* LTR */
+  background: url(../img/tree.png) no-repeat 11px center; /* LTR */
 }
 div.tree-child-last {
-  background: url(../images/tree-bottom.png) no-repeat 11px center; /* LTR */
+  background: url(../img/tree-bottom.png) no-repeat 11px center; /* LTR */
 }
 div.tree-child-horizontal {
-  background: url(../images/tree.png) no-repeat -11px center;
+  background: url(../img/tree.png) no-repeat -11px center;
 }
 .tabledrag-toggle-weight-wrapper {
   text-align: right; /* LTR */