Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php	(revision 5828)
+++ t3lib/class.t3lib_befunc.php	(working copy)
@@ -4179,12 +4179,19 @@
 
 			if (count($warnings)) {
 				$style = ' style="margin-bottom:10px;"';
-				$content = '<table border="0" cellpadding="0" cellspacing="0" class="warningbox"><tr><td>' .
-					$GLOBALS['TBE_TEMPLATE']->icons(3) . '<span class="warningboxheader">' .
-					$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.header') .
-					'</span><br /><ul><li' . $style.'>' .
-					implode('</li><li' . $style . '>', $warnings) . '</li></ul>' .
-					'</td></tr></table>';
+				$securityWarnings = '<ul><li' . $style . '>'
+					. implode('</li><li' . $style . '>', $warnings)
+					. '</li></ul>';
+
+				$securityMessage = t3lib_div::makeInstance(
+					't3lib_FlashMessage',
+					$securityWarnings,
+					$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.header'),
+					t3lib_FlashMessage::ERROR
+				);
+				$content = '<div style="margin: 20px 0px;">'
+					. $securityMessage->render()
+					. '</div>';
 
 				unset($warnings);
 				return $content;
Index: typo3/mod/web/perm/index.php
===================================================================
--- typo3/mod/web/perm/index.php	(revision 5828)
+++ typo3/mod/web/perm/index.php	(working copy)
@@ -389,10 +389,15 @@
 	public function doEdit() {
 		global $BE_USER,$LANG;
 
-		if ($BE_USER->workspace!=0)	{
+		if ($BE_USER->workspace != 0) {
 				// Adding section with the permission setting matrix:
-			$this->content.=$this->doc->divider(5);
-			$this->content.=$this->doc->section($LANG->getLL('WorkspaceWarning'),'<div class="warningbox">'.$LANG->getLL('WorkspaceWarningText').'</div>',0,1,3);
+			$lockedMessage = t3lib_div::makeInstance(
+				't3lib_FlashMessage',
+				$LANG->getLL('WorkspaceWarningText'),
+				$LANG->getLL('WorkspaceWarning'),
+				t3lib_FlashMessage::WARNING
+			);
+			$this->doc->pushFlashMessage($lockedMessage);
 		}
 
 			// Get usernames and groupnames
Index: typo3/alt_doc.php
===================================================================
--- typo3/alt_doc.php	(revision 5828)
+++ typo3/alt_doc.php	(working copy)
@@ -760,18 +760,16 @@
 									}
 
 										// Display "is-locked" message:
-									if ($lockInfo = t3lib_BEfunc::isRecordLocked($table,$rec['uid']))	{
-										$lockIcon = '
-
-											<!-- Warning box: -->
-											<table border="0" cellpadding="0" cellspacing="0" class="warningbox">
-												<tr>
-													<td><img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/recordlock_warning3.gif','width="17" height="12"').' alt="" /></td>
-													<td>'.htmlspecialchars($lockInfo['msg']).'</td>
-												</tr>
-											</table>
-										';
-									} else $lockIcon = '';
+									$lockIcon = '';
+									if ($lockInfo = t3lib_BEfunc::isRecordLocked($table, $rec['uid'])) {
+										$lockedMessage = t3lib_div::makeInstance(
+											't3lib_FlashMessage',
+											htmlspecialchars($lockInfo['msg']),
+											'',
+											t3lib_FlashMessage::WARNING
+										);
+										$this->doc->pushFlashMessage($lockedMessage);
+									}
 
 										// Combine it all:
 									$editForm.= $lockIcon.$panel;
Index: typo3/sysext/cms/layout/db_layout.php
===================================================================
--- typo3/sysext/cms/layout/db_layout.php	(revision 5828)
+++ typo3/sysext/cms/layout/db_layout.php	(working copy)
@@ -826,20 +826,16 @@
 				$theCode=$tceforms->printNeededJSFunctions_top().$theCode.$tceforms->printNeededJSFunctions();
 
 					// Add warning sign if record was "locked":
-				if ($lockInfo=t3lib_BEfunc::isRecordLocked($this->eRParts[0],$rec['uid']))	{
-					$lockIcon='
-
-						<!--
-						 	Warning box:
-						-->
-						<table border="0" cellpadding="0" cellspacing="0" class="warningbox">
-							<tr>
-								<td><img'.t3lib_iconWorks::skinImg($BACK_PATH,'gfx/recordlock_warning3.gif','width="17" height="12"').' alt="" /></td>
-								<td>'.htmlspecialchars($lockInfo['msg']).'</td>
-							</tr>
-						</table>
-						';
-				} else $lockIcon='';
+				$lockIcon = '';
+				if ($lockInfo=t3lib_BEfunc::isRecordLocked($this->eRParts[0], $rec['uid'])) {
+					$lockedMessage = t3lib_div::makeInstance(
+						't3lib_FlashMessage',
+						htmlspecialchars($lockInfo['msg']),
+						'',
+						t3lib_FlashMessage::WARNING
+					);
+					$this->doc->pushFlashMessage($lockedMessage);
+				}
 
 					// Add whole form as a document section:
 				$content.=$this->doc->section('',$lockIcon.$theCode);
Index: typo3/sysext/setup/mod/index.php
===================================================================
--- typo3/sysext/setup/mod/index.php	(revision 5828)
+++ typo3/sysext/setup/mod/index.php	(working copy)
@@ -612,11 +612,20 @@
 					implode('', $languageOptions) . '
 				</select>';
 		if ($GLOBALS['BE_USER']->uc['lang'] && !@is_dir(PATH_typo3conf . 'l10n/' . $GLOBALS['BE_USER']->uc['lang'])) {
-			$languageCode .= '<table border="0" cellpadding="0" cellspacing="0" class="warningbox"><tr><td>'.
-					$this->doc->icons(3) .
-					'The selected language is not available before the language pack is installed.<br />'.
-					($GLOBALS['BE_USER']->isAdmin() ? 'You can use the Extension Manager to easily download and install new language packs.':'Please ask your system administrator to do this.') .
-					'</td></tr></table>';
+			$languageUnavailableWarning = 'The selected language is not available before the language pack is installed.<br />'
+				. ($GLOBALS['BE_USER']->isAdmin() ?
+					'You can use the Extension Manager to easily download and install new language packs.'
+				:	'Please ask your system administrator to do this.');
+
+
+			$languageUnavailableMessage = t3lib_div::makeInstance(
+				't3lib_FlashMessage',
+				$languageUnavailableWarning,
+				'',
+				t3lib_FlashMessage::WARNING
+			);
+
+			$languageCode = $languageUnavailableMessage->render() . $languageCode;
 		}

 		return $languageCode;