diff --git a/templates/web/admin/statusbit.html.twig b/templates/web/admin/statusbit.html.twig
index 08e741bb40..fc81560ca7 100644
--- a/templates/web/admin/statusbit.html.twig
+++ b/templates/web/admin/statusbit.html.twig
@@ -42,12 +42,12 @@
                     {% set statusbit = attribute(status, bit) %}
                     <td>
                         {% if statusbit['img_off'] %}
-                            <img title='{{ statusbit['labels_off_i18n'][app['locale.I18n']] }}' src='{{ statusbit['img_off'] }}' />
+                            <img class="status-img" title='{{ statusbit['labels_off_i18n'][app['locale.I18n']] }}' src='{{ statusbit['img_off'] }}' />
                         {% endif %}
                         {{ statusbit['labels_off_i18n'][app['locale.I18n']] }}
                         /
                         {% if statusbit['img_on'] %}
-                            <img title='{{ statusbit['labels_on_i18n'][app['locale.I18n']] }}' src='{{ statusbit['img_on'] }}' />
+                            <img class="status-img" title='{{ statusbit['labels_on_i18n'][app['locale.I18n']] }}' src='{{ statusbit['img_on'] }}' />
                         {% endif %}
                         {{ statusbit['labels_on_i18n'][app['locale.I18n']] }}
                     </td>
diff --git a/templates/web/admin/statusbit/edit.html.twig b/templates/web/admin/statusbit/edit.html.twig
index d0eb8186b2..24fc3cdf72 100644
--- a/templates/web/admin/statusbit/edit.html.twig
+++ b/templates/web/admin/statusbit/edit.html.twig
@@ -53,7 +53,7 @@
                     <span class="btn btn-success fileinput-button pull-left">
                         <i class="icon-plus icon-white"></i>
                         <span>{% trans %}Select files...{% endtrans %}</span>
-                        <input type="file" name="image_off" accept="image/*"/>
+                        <input type="file" name="image_off" accept="image/jpg, image/png"/>
                     </span>
                     <div class='thumbnail pull-left' style='height:20px;width:20px;margin-left:10px;'>
                         {% if status['img_off'] is defined and status['img_off'] %}
@@ -117,7 +117,7 @@
                     <span class="btn btn-success fileinput-button pull-left">
                         <i class="icon-plus icon-white"></i>
                         <span>{% trans %}Select files...{% endtrans %}</span>
-                        <input type="file" name="image_on" accept="image/*"/>
+                        <input type="file" name="image_on" accept="image/jpg, image/png"/>
                     </span>
                     <div class='thumbnail pull-left' style='height:20px;width:20px;margin-left:10px'>
                         {% if status['img_on'] is defined and status['img_on'] %}
diff --git a/www/skins/admin/css/Bases.css b/www/skins/admin/css/Bases.css
index 0b88c91512..c60c60819e 100644
--- a/www/skins/admin/css/Bases.css
+++ b/www/skins/admin/css/Bases.css
@@ -75,3 +75,8 @@ div[id$="_indexed_percent"] {
 a.btn {
     text-decoration: none;
 }
+
+.status-img {
+  max-width: 16px;
+  max-heigh: 16px;
+}
diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index 4141df63de..ca5ed72e83 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -4261,3 +4261,8 @@ ui-dialog-titlebar {
 #clientModal .close {
     color: #fff;
 }
+
+#answers .status img {
+    max-width: 16px;
+    max-heigh: 16px;
+}
\ No newline at end of file
diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css
index 7b3eab5a5a..322dcc2d16 100644
--- a/www/skins/prod/959595/prodcolor.css
+++ b/www/skins/prod/959595/prodcolor.css
@@ -4385,3 +4385,8 @@ ui-dialog-titlebar {
 #clientModal .close {
     color: #404040;
 }
+
+#answers .status img {
+   max-width: 16px;
+   max-heigh: 16px;
+}
\ No newline at end of file