Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt	(revision 11551)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt	(revision 11558)
@@ -28,6 +28,14 @@
         <td>
           <img src="passport.jpg" height="180px" /><br />
-          <input type="file" name="form.passport" />
           <br />
+      		<div class="input-group half">
+      			<div class="input-group-btn">
+      				<div class="btn btn-default btn-file">
+                Select&hellip;
+                <input type="file" name="form.passport" />
+              </div>
+      			</div>
+      			<input type="text" class="form-control" readonly>
+          </div>
           <span i18n:translate="">
             Max. file size:
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt	(revision 11551)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt	(revision 11558)
@@ -16,5 +16,13 @@
       </td>
       <td>
-        <input type="file" size=47 name="uploadfile:file" />
+    		<div class="input-group half">
+    			<div class="input-group-btn">
+    				<div class="btn btn-default btn-file">
+              Select&hellip;
+              <input type="file" name="uploadfile:file" />
+            </div>
+    			</div>
+    			<input type="text" class="form-control" readonly>
+        </div>
       </td>
     </tr>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt	(revision 11551)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt	(revision 11558)
@@ -4,5 +4,30 @@
   </td>
   <td>
+
+		<div class="input-group">
+			<div class="input-group-btn">
+				<div class="btn btn-default btn-file">
+          Select new file&hellip;
+          <input type="file" tal:attributes="name viewlet/input_name" />
+        </div>
+			</div>
+			<input type="text" class="form-control" readonly>
+      <div class="input-group-btn">
+        <input type="submit"
+               tal:attributes="id python:('upload_%s' % viewlet.input_name);
+                name python:('upload_%s' % viewlet.input_name);
+                value viewlet/upload_button"
+               class="btn btn-primary" />
+        (<span tal:replace="viewlet/max_upload_size">10 kB</span> max.)
+      </div>
+    </div>
+
     <tal:file tal:condition="viewlet/file_exists">
+      <br />
+      <input type="submit"
+             tal:attributes="id python:('delete_%s' % viewlet.input_name);
+                name python:('delete_%s' % viewlet.input_name);
+                value viewlet/delete_button"
+             class="btn btn-danger" />&nbsp;
       <a tal:attributes="href python: view.url(context, viewlet.download_name)"
          tal:content="viewlet/title"
@@ -11,20 +36,5 @@
       </a>
     </tal:file>
-    <input type="file" tal:attributes="name viewlet/input_name"/>
-    <br />
-    <input type="submit" tal:condition="viewlet/file_exists"
-           tal:attributes="id python:('delete_%s' % viewlet.input_name);
-              name python:('delete_%s' % viewlet.input_name);
-              value viewlet/delete_button"
-           class="btn btn-danger" />
-    <input type="submit"
-             tal:attributes="id python:('upload_%s' % viewlet.input_name);
-                name python:('upload_%s' % viewlet.input_name);
-                value viewlet/upload_button"
-             class="btn btn-primary" />
-    <span i18n:translate="">
-      Max. file size:
-    </span>
-    <span tal:replace="viewlet/max_upload_size">10 KB</span>
+
     <br />
   </td>
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/imageupload.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/imageupload.pt	(revision 11551)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/imageupload.pt	(revision 11558)
@@ -6,4 +6,5 @@
     <img align="middle" height="125px"
          tal:attributes="src python: view.url(context, viewlet.download_name)" />
+    &nbsp;
     <input type="submit" tal:condition="viewlet/file_exists"
      tal:attributes="id python:('delete_%s' % viewlet.input_name);
@@ -11,15 +12,22 @@
      value="Delete" class="btn btn-danger" />
     <br /><br />
-    <input type="file" tal:attributes="name viewlet/input_name"/>
-    <br /><br />
-    <input type="submit"
-             tal:attributes="id python:('upload_%s' % viewlet.input_name);
+
+		<div class="input-group">
+			<div class="input-group-btn">
+				<div class="btn btn-default btn-file">
+          Select new file&hellip;
+          <input type="file" tal:attributes="name viewlet/input_name" />
+        </div>
+			</div>
+			<input type="text" class="form-control" readonly>
+      <div class="input-group-btn">
+        <input type="submit"
+               tal:attributes="id python:('upload_%s' % viewlet.input_name);
                 name python:('upload_%s' % viewlet.input_name);
                 value viewlet/upload_button"
-             value="Upload" class="btn btn-primary" />
-    <span i18n:translate="">
-      Max. file size:
-    </span>
-    <span tal:replace="viewlet/max_upload_size">10 KB</span>
+               class="btn btn-primary" />
+        (<span tal:replace="viewlet/max_upload_size">10 kB</span> max.)
+      </div>
+    </div>
   </td>
 </tr>
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 11551)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 11558)
@@ -894,6 +894,6 @@
     tab_redirect = '#tab2-top'
     mus = 1024 * 150
-    upload_button =_('Upload new file')
-    delete_button = _('Delete attachment')
+    upload_button =_('Upload selected file')
+    delete_button = _('Delete')
 
     @property
