diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index 083ec6265..89e3e1ce5 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -51,7 +51,7 @@ class LetoDMS_View_RemoveDocument extends LetoDMS_Bootstrap_Style {
 <p>
 <?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
 </p>
-<p><input type="submit" class="btn" value="<?php printMLText("rm_document");?>"></p>
+<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_document");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveDocumentFile.php b/views/bootstrap/class.RemoveDocumentFile.php
index 2693ecff2..8df25b8bd 100644
--- a/views/bootstrap/class.RemoveDocumentFile.php
+++ b/views/bootstrap/class.RemoveDocumentFile.php
@@ -51,7 +51,7 @@ class LetoDMS_View_RemoveDocumentFile extends LetoDMS_Bootstrap_Style {
 	<input type="Hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="Hidden" name="fileid" value="<?php echo $file->getID()?>">
 	<p><?php printMLText("confirm_rm_file", array ("documentname" => htmlspecialchars($document->getName()), "name" => htmlspecialchars($file->getName())));?></p>
-	<input type="submit" class="btn" value="<?php printMLText("rm_file");?>">
+	<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_file");?></button>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveEvent.php b/views/bootstrap/class.RemoveEvent.php
index 5991c0ae0..719442844 100644
--- a/views/bootstrap/class.RemoveEvent.php
+++ b/views/bootstrap/class.RemoveEvent.php
@@ -49,7 +49,7 @@ class LetoDMS_View_RemoveEvent extends LetoDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<input class="btn" type="submit" value="<?php printMLText("delete");?>">
+	<button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveFolder.php b/views/bootstrap/class.RemoveFolder.php
index 26e2a1538..c7b102fd4 100644
--- a/views/bootstrap/class.RemoveFolder.php
+++ b/views/bootstrap/class.RemoveFolder.php
@@ -35,7 +35,6 @@ class LetoDMS_View_RemoveFolder extends LetoDMS_Bootstrap_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
-		$document = $this->params['document'];
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
@@ -51,7 +50,7 @@ class LetoDMS_View_RemoveFolder extends LetoDMS_Bootstrap_Style {
 	<p>
 	<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
 	</p>
-	<p><input class="btn" type="submit" value="<?php printMLText("rm_folder");?>"></p>
+	<p><button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("rm_folder");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();