Index: /controller/wpsg_ProduktController.class.php
===================================================================
--- /controller/wpsg_ProduktController.class.php	(revision 5915)
+++ /controller/wpsg_ProduktController.class.php	(revision 5916)
@@ -698,9 +698,9 @@
 		 */
 		public function selectAction()
-		{
+		{ 
 			
 			if (wpsg_isSizedString($_REQUEST['wpsg_mode'], 'filterDialog'))
 			{
-				
+				 
 				die($this->shop->render(WPSG_PATH_VIEW.'/produkt/select_filter.phtml'));
 				
@@ -722,6 +722,6 @@
 				 		P.`lang_parent` = '0'
 						".$strQueryWHERE."
-				 ");
-				
+				");
+				 				
 				$this->shop->view['arProducts'] = array();
 				
@@ -770,5 +770,5 @@
 						P.`id` != '".wpsg_q($_REQUEST['edit_id'])."'
 				", "id", "name"); 
-				
+								
 			}
 			else
Index: /views/admin/form/select.phtml
===================================================================
--- /views/admin/form/select.phtml	(revision 5915)
+++ /views/admin/form/select.phtml	(revision 5916)
@@ -1,3 +1,3 @@
-<div class="form-group form-group-sm form-select <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?>">
+<div class="form-group form-group-sm form-select <?php echo ((wpsg_isSizedString($this->view['field_config']['help']) || wpsg_isSizedString($this->view['field_config']['icon']))?'has-feedback':''); ?>">
 
 	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>
@@ -84,4 +84,8 @@
 			<?php } ?>
 			
+			<?php if (wpsg_isSizedString($this->view['field_config']['icon'])) { ?>
+				<a href="#" class="<?php echo $this->view['field_config']['icon']; ?> form-control-feedback" aria-hidden="true"></a>
+			<?php } ?>
+			
 		</div>
 	
Index: /views/mods/mod_relatedproducts/list.phtml
===================================================================
--- /views/mods/mod_relatedproducts/list.phtml	(revision 5915)
+++ /views/mods/mod_relatedproducts/list.phtml	(revision 5916)
@@ -12,14 +12,5 @@
 <?php foreach ($this->view['wpsg_mod_relatedproducts']['data'] as $p) { ?>
 	<span id="wpsg_rp_<?php echo $p['id']; ?>">
-		<?php if (!wpsg_isSizedString($this->get_option('wpsg_mod_relatedproducts_template')) || $this->get_option('wpsg_mod_relatedproducts_template') == '0') { ?>
-		<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproduct['.$p['id'].']', $p['name'], $this->view['wpsg_mod_relatedproducts']['arTemplates'], $p['template'], array('remove' => __('Zuordnung löschen', 'wpsg'), 'labellink' => WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$p['id'])); ?>
-		<?php } else { ?>
-		<a class="wpsg_icon wpsg_icon_right wpsg_icon_remove" href="#" title="<?php echo __('Zuordnung löschen', 'wpsg'); ?>"></a>
-		<span style="line-height:25px;">
-			<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $p['id']; ?>">
-				<?php echo wpsg_hspc($p['name']); ?>
-			</a>
-		</span>		
-		<?php } ?>
+		<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproduct['.$p['id'].']', $p['name'], $this->view['wpsg_mod_relatedproducts']['arTemplates'], $p['template'], array('icon' => 'wpsg_icon_remove glyphicon glyphicon-trash')); ?>
 	</span>
 	<div class="wpsg_clear"></div>
Index: /views/mods/mod_relatedproducts/produkt_addedit_sidebar.phtml
===================================================================
--- /views/mods/mod_relatedproducts/produkt_addedit_sidebar.phtml	(revision 5915)
+++ /views/mods/mod_relatedproducts/produkt_addedit_sidebar.phtml	(revision 5916)
@@ -6,4 +6,26 @@
 
 ?>
+<div id="wpsg_mod_relatedproducts_dialog" class="modal fade" tabindex="-1" role="dialog">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+            <div class="modal-header">
+        		<button type="button" class="close" data-dismiss="modal" aria-label="<?php echo __('Abbrechen', 'wpsg'); ?>"><span aria-hidden="true">&times;</span></button>
+        		<h4 class="modal-title"><?php echo __('Produktauswahl', 'wpsg'); ?></h4>
+      		</div>
+			<div class="modal-body">
+	 
+			</div>
+			<div class="modal-footer">
+	 
+				<button type="button" class="btn-sm btn btn-default" data-dismiss="modal"><?php echo __('Abbrechen', 'wpsg'); ?></button>
+				<button type="button" class="btn-sm btn btn-primary" onclick="return insertProdukt();"><?php echo __('EinfÃŒgen', 'wpsg'); ?></button>
+				<button type="button" class="btn-sm btn btn-primary" onclick="return insertProduktClose();"><?php echo __('EinfÃŒgen und schließen', 'wpsg'); ?></button>
+				
+			</div>
+			
+		</div>
+	</div>      
+</div>
+
 <div id="wpsg_relatedproducts" class="panel panel-default">
 	<div class="panel-heading clearfix">
@@ -12,46 +34,40 @@
 		</h3>
 	</div>
-	<div class="panel-body">
-		 <a title="<?php echo __('Neuens Produkt zuordnen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_relatedproducts_add();"></a>
-		 <div class="wpsg_clear"></div>
+	<div class="panel-body">		 
 		 <div id="relatedproducts_list"><?php echo $this->callMod('wpsg_mod_relatedproducts', 'drawList', array($this->view['data']['id'])); ?></div>
 
-<script type="text/javascript">
-
-	/**
-	 * Wird aufgerufen wenn ein Produkt zugeordnet werden soll
-	 */
-	function wpsg_relatedproducts_add() 
-	{
-
-		jQuery('#wpsg_relatedproducts_produktauswahl').html('<img style="margin:15px;" src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		<script type="text/javascript">
 		
-		jQuery('#wpsg_relatedproducts_produktauswahl').dialog( {
-			'dialogClass': 'wp-dialog',           
-	        'modal': true,
-	        'width': 390,
-	        'height': 350,	       
-	        'title': '<?php echo __('Produktauswahl', 'wpsg'); ?>',
-	        'open': function() {
-
-	        	jQuery.ajax( {
-	    			url: 'admin.php?page=wpsg-Produkt&action=select&noheader=1&wpsg_mode=wpsg_mod_relatedproducts&edit_id=<?php echo $this->view['data']['id']; ?>',
-	    			success: function(data) {
-	    				jQuery('#wpsg_relatedproducts_produktauswahl').html(data);	
-	    			}
-	    		} );
-			        
-	        }
-		} );
-
-		return false;
-		 		
-	} // function wpsg_relatedproducts_add()
-
-</script>
-
-	<br /><br />
+			/**
+			 * Wird aufgerufen wenn ein Produkt zugeordnet werden soll
+			 */
+			function wpsg_relatedproducts_add() 
+			{
+				
+				jQuery('#wpsg_mod_relatedproducts_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		 		jQuery('#wpsg_mod_relatedproducts_dialog').modal( { } ).modal('show');
+								
+				jQuery.ajax( {
+					url: 'admin.php?page=wpsg-Produkt&action=select&noheader=1&wpsg_mode=wpsg_mod_relatedproducts&edit_id=<?php echo $this->view['data']['id']; ?>',
+					success: function(data) {
+					
+						jQuery('#wpsg_mod_relatedproducts_dialog .modal-body').html(data);
+						
+					}
+				} ); 
+		
+				return false;
+						
+			} // function wpsg_relatedproducts_add()
+		
+		</script>
+		
+		<br />
+ 
+		<a title="<?php echo __('Neuens Produkt zuordnen', 'wpsg'); ?>" href="" onclick="return wpsg_relatedproducts_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Produkt zuordnen', 'wpsg'); ?></a>
+			
+		<br /><br />
 	
-	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_relatedproducts"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Zubehörprodukte', 'wpsg'); ?></a>
+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_relatedproducts"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Zubehörprodukte', 'wpsg'); ?></a>
 		
 	</div>
Index: /views/produkt/select.phtml
===================================================================
--- /views/produkt/select.phtml	(revision 5915)
+++ /views/produkt/select.phtml	(revision 5916)
@@ -139,8 +139,5 @@
 				<?php echo wpsg_drawForm_Select('template', __('Template', 'wpsg'), $this->view['arTemplates'], false); ?>
 				
-				<?php if ($_REQUEST['wpsg_mode'] == 'wpsg_mod_relatedproducts') { ?>
-				<input class="button" type="button" style="float:right; padding:2px 10px 2px 10px;" value="<?php echo __('EinfÃŒgen und schließen', 'wpsg'); ?>" onclick="return insertProduktClose();" />
-				<input class="button" type="button" style="float:right; padding:2px 10px 2px 10px; margin-right:5px;" value="<?php echo __('EinfÃŒgen', 'wpsg'); ?>" onclick="return insertProdukt();" />
-				<?php } else { ?>
+				<?php if ($_REQUEST['wpsg_mode'] != 'wpsg_mod_relatedproducts') { ?>				
 				<input type="button" style="float:right; padding:2px;" value="<?php echo __('EinfÃŒgen', 'wpsg'); ?>" onclick="return insertProdukt();" />
 				<?php } ?>