diff --git a/images/osada-32.png b/images/osada-32.png
new file mode 100644
index 000000000..c87d6cb71
Binary files /dev/null and b/images/osada-32.png differ
diff --git a/images/osada-64.png b/images/osada-64.png
new file mode 100644
index 000000000..390f55c60
Binary files /dev/null and b/images/osada-64.png differ
diff --git a/images/osada.png b/images/osada.png
new file mode 100644
index 000000000..6040c4c05
Binary files /dev/null and b/images/osada.png differ
diff --git a/images/osada.svg b/images/osada.svg
new file mode 100644
index 000000000..279cd63e8
--- /dev/null
+++ b/images/osada.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="600"
+   height="600"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="osada.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1317"
+     inkscape:window-height="793"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.41133379"
+     inkscape:cx="320.0137"
+     inkscape:cy="408.66439"
+     inkscape:window-x="118"
+     inkscape:window-y="120"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 589.89855,270.88544 c -1.64091,-0.7505 -19.91814,-0.85402 -44.55705,-0.62111 A 241.46642,247.53842 0 0 0 496.06367,150.88172 c 17.4189,-17.31346 30.29375,-30.43442 31.27829,-32.45303 6.3112,-12.83628 -28.27416,-48.731288 -42.20929,-43.270698 -1.66615,0.64699 -14.59149,13.76795 -31.7327,31.650758 A 249.77196,256.05281 0 0 0 329.65001,53.884962 c 0.35342,-23.83512 0.37867,-41.43325 -0.30294,-43.5295 -4.39259,-13.6385503 -53.59469,-13.9749903 -59.70393,0 -0.70685,1.63042 -0.83308,19.33207 -0.63112,43.47774 A 249.67098,255.94929 0 0 0 145.61548,106.21352 C 128.90343,88.537752 116.25579,75.494432 114.2867,74.485122 c -12.52142,-6.4699 -47.535943,28.985158 -42.209292,43.270698 0.63112,1.70806 13.329249,14.85489 30.672422,32.32363 a 241.71887,247.79722 0 0 0 -49.732239,119.4085 c -23.477655,-0.36232 -40.871316,-0.3882 -42.916144,0.31055 -13.3040051,4.50305 -13.6321874,54.9424 0,61.20527 1.590422,0.72463 18.731634,0.85402 42.133555,0.64699 a 230.4092,236.20315 0 0 0 50.110908,121.45298 c -17.115966,17.0029 -29.662627,29.81331 -30.647174,31.83192 -6.311198,12.83628 28.274164,48.73129 42.209294,43.2707 1.66615,-0.64699 14.7682,-13.94911 32.11137,-32.03895 a 254.51798,260.91818 0 0 0 122.26052,49.45592 c -0.35343,24.06803 -0.37867,41.89908 0.30294,44.02121 4.39259,13.63855 53.59469,13.97499 59.70393,0 0.70685,-1.63041 0.83308,-19.51322 0.63112,-43.86593 a 254.39176,260.78878 0 0 0 123.64898,-49.87 c 17.14122,18.1416 30.16753,31.57312 32.16187,32.6083 12.52141,6.4699 47.53594,-28.98515 42.20929,-43.2707 -0.63112,-1.70805 -13.37974,-14.90665 -30.79865,-32.45302 a 230.23249,236.022 0 0 0 49.73224,-120.39192 c 24.05828,0.38819 41.9316,0.41407 44.02691,-0.28468 13.30401,-4.52893 13.63219,-54.96828 0,-61.23115 z m -86.99355,-0.0259 c -45.16293,0.75051 -93.0018,1.88922 -102.99874,2.14801 a 102.03944,104.60536 0 0 0 -8.40652,-20.18609 15965.563,16367.039 0 0 0 74.01773,-71.8159 200.94853,206.00166 0 0 1 37.38753,89.85398 z M 423.7121,138.01953 c -29.73837,31.4696 -60.91568,64.95781 -70.10479,74.81794 A 106.8612,109.54837 0 0 0 326.04,200.57054 c 0.47965,-16.35591 1.79238,-61.10175 2.72644,-103.130228 A 207.86561,213.09267 0 0 1 423.7121,138.01953 Z M 269.51692,97.440312 c 0.65636,42.157878 1.64091,87.084868 2.01958,103.311378 a 106.48253,109.16017 0 0 0 -26.98668,12.13754 13312.765,13647.532 0 0 0 -69.49891,-75.25789 207.10826,212.31628 0 0 1 94.46601,-40.191028 z M 133.11931,180.46208 a 14756.767,15127.845 0 0 0 73.56332,72.43702 c -3.53427,6.41814 -6.33644,13.25036 -8.457,20.34137 -13.17778,-0.41408 -59.47673,-1.83745 -102.872525,-2.87264 A 201.27672,206.33809 0 0 1 133.11931,180.46208 Z M 94.393803,331.10727 c 43.421037,-0.69875 90.048167,-1.81158 103.629867,-2.12213 2.24678,7.68624 5.3014,15.01017 9.23959,21.84238 -9.39106,9.05787 -43.623,42.10612 -75.38094,73.16165 a 191.75943,196.58148 0 0 1 -37.488517,-92.8819 z m 80.000737,135.19505 c 31.22781,-33.04825 64.32373,-68.60683 72.04864,-76.8883 7.92686,4.55481 16.4596,8.10031 25.39626,10.50711 -0.5049,17.08054 -1.81763,62.73217 -2.77693,104.99356 a 211.34939,216.66405 0 0 1 -94.66797,-38.61235 z m 154.01847,38.71589 c -0.65636,-42.28727 -1.66615,-87.99066 -2.04483,-105.09708 a 108.88078,111.61874 0 0 0 26.73424,-11.2835 c 7.52294,8.20383 40.31593,43.91769 71.31653,77.22474 a 211.42512,216.74169 0 0 1 -96.00594,39.15584 z m 138.31621,-81.62427 a 16120.011,16525.37 0 0 0 -75.10325,-73.93804 95.172861,97.566111 0 0 0 8.63372,-20.83308 c 10.85526,0.33644 58.59316,1.83745 103.47839,2.89852 a 191.02733,195.83097 0 0 1 -37.00886,91.8726 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:#008000;stroke-width:25.56022644" />
+</svg>
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 91c502b7c..7996187d1 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -58,7 +58,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
 	}
 
 
-	$channel = ((local_channel()) ? \App::get_channel() : '');
+	$channel = ((local_channel()) ? App::get_channel() : '');
 	$has_acl = false;
 	$single_group = false;
 	$just_me = false;