diff --git a/public/images/wiki_styles/caution.png b/public/images/wiki_styles/caution.png
new file mode 100644
index 00000000..4c02ea4c
Binary files /dev/null and b/public/images/wiki_styles/caution.png differ
diff --git a/public/images/wiki_styles/caution_small.png b/public/images/wiki_styles/caution_small.png
new file mode 100644
index 00000000..cc240aa5
Binary files /dev/null and b/public/images/wiki_styles/caution_small.png differ
diff --git a/public/images/wiki_styles/important.png b/public/images/wiki_styles/important.png
new file mode 100644
index 00000000..0a30addb
Binary files /dev/null and b/public/images/wiki_styles/important.png differ
diff --git a/public/images/wiki_styles/important_small.png b/public/images/wiki_styles/important_small.png
new file mode 100644
index 00000000..950ac19e
Binary files /dev/null and b/public/images/wiki_styles/important_small.png differ
diff --git a/public/images/wiki_styles/info.png b/public/images/wiki_styles/info.png
new file mode 100644
index 00000000..5732c4f3
Binary files /dev/null and b/public/images/wiki_styles/info.png differ
diff --git a/public/images/wiki_styles/info_small.png b/public/images/wiki_styles/info_small.png
new file mode 100644
index 00000000..eb37d9a0
Binary files /dev/null and b/public/images/wiki_styles/info_small.png differ
diff --git a/public/images/wiki_styles/note.png b/public/images/wiki_styles/note.png
new file mode 100644
index 00000000..401e128d
Binary files /dev/null and b/public/images/wiki_styles/note.png differ
diff --git a/public/images/wiki_styles/note_small.png b/public/images/wiki_styles/note_small.png
new file mode 100644
index 00000000..8bb798ec
Binary files /dev/null and b/public/images/wiki_styles/note_small.png differ
diff --git a/public/images/wiki_styles/see-also.png b/public/images/wiki_styles/see-also.png
new file mode 100644
index 00000000..3a25abf0
Binary files /dev/null and b/public/images/wiki_styles/see-also.png differ
diff --git a/public/images/wiki_styles/see-also_small.png b/public/images/wiki_styles/see-also_small.png
new file mode 100644
index 00000000..db9fb835
Binary files /dev/null and b/public/images/wiki_styles/see-also_small.png differ
diff --git a/public/images/wiki_styles/tip.png b/public/images/wiki_styles/tip.png
new file mode 100644
index 00000000..e8a2eaea
Binary files /dev/null and b/public/images/wiki_styles/tip.png differ
diff --git a/public/images/wiki_styles/tip_small.png b/public/images/wiki_styles/tip_small.png
new file mode 100644
index 00000000..d5eac1c5
Binary files /dev/null and b/public/images/wiki_styles/tip_small.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 44ab915e..a78173fa 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2344,3 +2344,87 @@ a.has-thumb img {
 
 #more-menu.drop-down ul li a.projects { border-top:1px solid #555; }
 
+/*************************************************************************
+Additional wiki styles
+*************************************************************************/
+
+.button {
+  padding-left: .25em;
+  padding-right: .25em;
+  background:#507aaa;
+  color: white;
+  font-weight: bold;
+}
+
+.wiki p.see-also,    .wiki p.caution,    .wiki p.important,    .wiki p.info,    .wiki p.tip,    .wiki p.note,
+.wiki span.see-also, .wiki span.caution, .wiki span.important, .wiki span.info, .wiki span.tip, .wiki span.note {
+  display: block;
+  margin-top: .5em;
+  margin-bottom: .5em;
+
+  padding: 4px 4px 4px 48px;
+  min-height: 33px;
+}
+.wiki p.smallsee-also,    .wiki p.smallcaution,    .wiki p.smallimportant,    .wiki p.smallinfo,    .wiki p.smalltip,    .wiki p.smallnote,
+.wiki span.smallsee-also, .wiki span.smallcaution, .wiki span.smallimportant, .wiki span.smallinfo, .wiki span.smalltip, .wiki span.smallnote {
+  display: block;
+  margin-top: .5em;
+  margin-bottom: .5em;
+  
+  padding: 4px 4px 4px 34px;
+  min-height: 24px;
+}
+
+.wiki p.see-also, .wiki span.see-also {
+  background: url(../images/wiki_styles/see-also.png) 4px 4px no-repeat #f5fffa;
+  border: 1px solid #AAB1AD;
+}
+.wiki p.smallsee-also, .wiki span.smallsee-also {
+  background: url(../images/wiki_styles/see-also_small.png) 4px 4px no-repeat #f5fffa;
+  border: 1px solid #AAB1AD;
+}
+
+.wiki p.caution, .wiki span.caution {
+  background: url(../images/wiki_styles/caution.png) 4px 6px no-repeat #f5fffa;
+  border: 1px solid #AAB1AD;
+}
+.wiki p.smallcaution, .wiki span.smallcaution {
+  background: url(../images/wiki_styles/caution_small.png) 4px 4px no-repeat #f5fffa;
+  border: 1px solid #AAB1AD;
+}
+
+.wiki p.important, .wiki span.important {
+  background: url(../images/wiki_styles/important.png) 4px 7px no-repeat #F0F8FF;
+  border: 1px solid #C1C8CF;
+}
+.wiki p.smallimportant, .wiki span.smallimportant {
+  background: url(../images/wiki_styles/important_small.png) 4px 6px no-repeat #F0F8FF;
+  border: 1px solid #C1C8CF;
+}
+
+.wiki p.info, .wiki span.info {
+  background: url(../images/wiki_styles/info.png) 4px 4px no-repeat #FFFFE0;
+  border: 1px solid #FFFF00;
+}
+.wiki p.smallinfo, .wiki span.smallinfo {
+  background: url(../images/wiki_styles/info_small.png) 4px 4px no-repeat #FFFFE0;
+  border: 1px solid #FFFF00;
+}
+
+.wiki p.tip, .wiki span.tip {
+  background: url(../images/wiki_styles/tip.png) 4px 4px no-repeat #F5FFFA;
+  border: 1px solid #C7CFCA;
+}
+.wiki p.smalltip, .wiki span.smalltip {
+  background: url(../images/wiki_styles/tip_small.png) 4px 5px no-repeat #F5FFFA;
+  border: 1px solid #C7CFCA;
+}
+
+.wiki p.note, .wiki span.note {
+  background: url(../images/wiki_styles/note.png) 6px 4px no-repeat #F5FFFA;
+  border: 1px solid #C7CFCA;
+}
+.wiki p.smallnote, .wiki span.smallnote {
+  background: url(../images/wiki_styles/note_small.png) 5px 4px no-repeat #F5FFFA;
+  border: 1px solid #C7CFCA;
+}