diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index b0aa89d43..4a3b8f083 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -84,7 +84,7 @@ $('#action-delete-picture').on('click', function() {
 }());
 {/footer_script}
 
-<h2>{$TITLE} &#8250; {'Edit photo #%s'|@translate:$INTRO.id} {$TABSHEET_TITLE}</h2>
+<h2>{'Edit photo #%s'|@translate:$INTRO.id}</h2>
 
 <form action="{$F_ACTION}" method="post" id="pictureModify">
   <div id='picture-preview'>
@@ -154,7 +154,7 @@ $('#action-delete-picture').on('click', function() {
       <br>
       <select data-selectize="categories" data-value="{$associated_albums|@json_encode|escape:html}"
         placeholder="{'Type in a search term'|translate}"
-        data-default="{$STORAGE_ALBUM}" name="associate[]" multiple style="width:103%;"></select>
+        data-default="{$STORAGE_ALBUM}" name="associate[]" multiple style="width:calc(100% + 2px);"></select>
     </p>
 
     <p>
@@ -162,7 +162,7 @@ $('#action-delete-picture').on('click', function() {
       <br>
       <select data-selectize="categories" data-value="{$represented_albums|@json_encode|escape:html}"
         placeholder="{'Type in a search term'|translate}"
-        name="represent[]" multiple style="width:103%;"></select>
+        name="represent[]" multiple style="width:calc(100% + 2px);"></select>
     </p>
 
     <p>
@@ -170,7 +170,7 @@ $('#action-delete-picture').on('click', function() {
       <br>
       <select data-selectize="tags" data-value="{$tag_selection|@json_encode|escape:html}"
         placeholder="{'Type in a search term'|translate}"
-        data-create="true" name="tags[]" multiple style="width:103%;"></select>
+        data-create="true" name="tags[]" multiple style="width:calc(100% + 2px);"></select>
     </p>
 
     <p>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index bb5976dd5..ac2dd8a85 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1774,6 +1774,7 @@ a#showPermissions:hover {text-decoration: none;}
   height: 35vw;
   flex-shrink: 0;
   overflow: hidden;
+  margin-left: 10px;
 }
 
 #picture-preview .preview-box{
@@ -1793,6 +1794,7 @@ a#showPermissions:hover {text-decoration: none;}
   top: 0;
   font-size: 18px;
   z-index: 100;
+  background-color: #101010A0;
 }
 
 .picture-preview-actions a {
@@ -1804,12 +1806,12 @@ a#showPermissions:hover {text-decoration: none;}
   width: 50%;
 }
 
-#picture-content * {
+#picture-content p {
   text-align: left;
 }
 
 #picture-content input[type=text], #picture-content textarea {
-  width: 100%;
+  width: calc(100% - 15px);
   background-color: #f8f8f8;
   padding: 8px;
   border-radius: 4px;
@@ -1827,7 +1829,7 @@ a#showPermissions:hover {text-decoration: none;}
 
 #picture-content .date-input input{
   padding-left: 35px;
-  width: calc(100% - 28px);
+  width: calc(100% - 43px);
 }
 
 #picture-content .date-input i{
@@ -1852,7 +1854,7 @@ a#showPermissions:hover {text-decoration: none;}
   border: #EEE solid 2px;
   padding: 20px;
   border-radius: 5px;
-  margin: 5px 10px;
+  margin: 0px 10px;
   align-items: center;
 }
 
@@ -1874,6 +1876,7 @@ a#showPermissions:hover {text-decoration: none;}
 
 .picture-infos-container div {
   margin: 0;
+  word-wrap: anywhere;
 }
 
 .picture-infos-title {