6 files changed, 62 insertions, 35 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 777bf69eb..b68517e25 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -5,6 +5,7 @@
 nav .badge {
 	position: relative;
 	top: -49px;
+	left: 2px;
 	float: left;
 	font-size: 10px;
 	line-height: 20px;
@@ -21,7 +22,8 @@ nav .badge {
 	}
 }
 
-nav i {
+#navbar-collapse-1 i,
+.navbar-header i {
 	font-size: 14px;
 }
 
@@ -50,10 +52,6 @@ nav .navbar-collapse .navbar-right {
 	float: right;
 }
 
-nav .navbar-toggle {
-	margin-bottom: 7px;
-}
-
 /* nav overrides end */
 
 
@@ -62,6 +60,11 @@ aside .nav-pills > li > a,
 	padding: 6px 10px;
 }
 
+.wall-item-tools .dropdown-menu,
+.section-title-wrapper .dropdown-menu {
+	min-width: auto;
+}
+
 .dropdown-menu li a {
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 304e0f196..68aa8bfbe 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -1,11 +1,3 @@
-/* common */
-
-code {
-	font-family: Courier, monospace;
-	display: block;
-	overflow: auto;
-}
-
 /* jot */
 
 .jothidden input {
@@ -34,10 +26,18 @@ code {
 	padding: 10px;
 }
 
-.profile-jot-text {
+#profile-jot-text {
+	resize: none;
+	border-width: 0px;
 	height: 39px;
+	line-height: 19px;
 	padding: 10px;
 	width: 100%;
+	display: inherit;
+}
+
+#profile-jot-text:focus {
+	resize: vertical;
 }
 
 .jot-attachment {
@@ -60,10 +60,6 @@ code {
 	height: 30px;
 }
 
-#profile-jot-form {
-	line-height: initial;
-}
-
 #profile-jot-wrapper {
 	margin-bottom: 30px;
 }
@@ -73,7 +69,7 @@ code {
 }
 
 #profile-rotator {
-	margin: 16px;
+	padding: 15px 0px 0px 15px;
 }
 
 .profile-jot-net {
@@ -120,12 +116,12 @@ a.wall-item-name-link {
 	text-overflow: ellipsis;
 }
 
-.wall-item-ago .icon-ok {
+.wall-item-ago .fa-check {
 	cursor: pointer;
 }
 
 .wall-item-content {
-	overflow: auto;
+	overflow: hidden;
 }
 
 .wall-item-content h1,
@@ -192,8 +188,10 @@ a.wall-item-name-link {
 
 /* comment_item */
 
-.comment-edit-text-empty, .comment-edit-text-full {
+.comment-edit-text-empty,
+.comment-edit-text-full {
 	width: 100%;
+	display: inherit;
 }
 
 .comment-edit-text-empty {
@@ -299,6 +297,23 @@ a.wall-item-name-link {
 
 /* bb-code */
 
+code {
+	font-family: Courier, monospace;
+	font-size: 1em;
+	padding: 1em 1.5em;
+	display: block;
+}
+
+code.inline-code {
+	padding: 0px 4px;
+	display: inline;
+}
+
 .overline {
 	text-decoration: overline;
 }
+
+img.smiley.emoji:hover {
+	width: 32px;
+	height: 32px;
+}
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 9bfea856d..af89e597d 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -30,5 +30,5 @@
 }
 
 .directory-collapse {
-		overflow: auto;
+	overflow: hidden;
 }
diff --git a/view/css/mod_profile.css b/view/css/mod_profile.css
index e1ceae7f7..35016d10b 100644
--- a/view/css/mod_profile.css
+++ b/view/css/mod_profile.css
@@ -1,16 +1,7 @@
-.aprofile dt {
-	font-weight: bold;
-}
-
 .profile-thing-list {
 	list-style-type: none;
 }
 
-.profile-thing-list img {
-	margin-bottom: 5px;
+.profile-thing-img {
+	margin: 7px 0px;
 }
-
-.profile-thing-list > li {
-	margin-bottom: 15px;
-}
-
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index e81d115d4..4236b3dff 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -7,5 +7,22 @@
 }
 
 .channel-menu {
-    margin-top: 24px;
+	margin-top: 24px;
+}
+
+.zat-example {
+	color: red;
+}
+
+#atoken-index {
+	width: 100%;
+}
+
+#atoken-index td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+.atoken-index-tool {
+	padding: 7px 10px;
 }
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 38809896c..2a7c57f53 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -11,6 +11,7 @@
 	width: 100%;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
+	border-right: 0px;
 }
 
 .tags {